From ce22955fc78835069fcb2c0c678e87b8c167844d Mon Sep 17 00:00:00 2001
From: Shane Osbourne <shane.osbourne8@gmail.com>
Date: Tue, 7 Nov 2023 09:38:28 +0000
Subject: [PATCH 01/16] Adding 'protectionsState' to breakage form submission
 (#2120)

Co-authored-by: Shane Osbourne <sosbourne@duckduckgo.com>
---
 DuckDuckGo/BrokenSiteInfo.swift                | 16 +++++++++++++---
 DuckDuckGo/TabViewController.swift             |  8 ++++++--
 DuckDuckGoTests/BrokenSiteReportingTests.swift |  1 +
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/DuckDuckGo/BrokenSiteInfo.swift b/DuckDuckGo/BrokenSiteInfo.swift
index ed96e5e460..063784c78f 100644
--- a/DuckDuckGo/BrokenSiteInfo.swift
+++ b/DuckDuckGo/BrokenSiteInfo.swift
@@ -24,6 +24,11 @@ public struct BrokenSiteInfo {
 
     static let allowedQueryReservedCharacters =  CharacterSet(charactersIn: ",")
 
+    enum ProtectionsState: String {
+        case enabled = "1"
+        case disabled = "0"
+    }
+
     private struct Keys {
         static let url = "siteUrl"
         static let category = "category"
@@ -40,6 +45,7 @@ public struct BrokenSiteInfo {
         static let gpc = "gpc"
         static let ampUrl = "ampUrl"
         static let urlParametersRemoved = "urlParametersRemoved"
+        static let protectionsState = "protectionsState"
     }
     
     private let url: URL?
@@ -54,12 +60,14 @@ public struct BrokenSiteInfo {
     private let manufacturer: String
     private let systemVersion: String
     private let gpc: Bool
-    
+    private let protectionsState: ProtectionsState
+
     public init(url: URL?, httpsUpgrade: Bool,
                 blockedTrackerDomains: [String], installedSurrogates: [String],
                 isDesktop: Bool, tdsETag: String?,
                 ampUrl: String?,
                 urlParametersRemoved: Bool,
+                protected: Bool,
                 model: String = UIDevice.current.model,
                 manufacturer: String = "Apple",
                 systemVersion: String = UIDevice.current.systemVersion,
@@ -76,7 +84,8 @@ public struct BrokenSiteInfo {
         self.model = model
         self.manufacturer = manufacturer
         self.systemVersion = systemVersion
-        
+        self.protectionsState = protected ? .enabled : .disabled
+
         if let gpcParam = gpc {
             self.gpc = gpcParam
         } else {
@@ -101,7 +110,8 @@ public struct BrokenSiteInfo {
             Keys.model: model,
             Keys.gpc: gpc ? "true" : "false",
             Keys.ampUrl: ampUrl ?? "",
-            Keys.urlParametersRemoved: urlParametersRemoved ? "true" : "false"
+            Keys.urlParametersRemoved: urlParametersRemoved ? "true" : "false",
+            Keys.protectionsState: protectionsState.rawValue
         ]
         
         Pixel.fire(pixel: .brokenSiteReport,
diff --git a/DuckDuckGo/TabViewController.swift b/DuckDuckGo/TabViewController.swift
index 04a448e738..5e4da0f41b 100644
--- a/DuckDuckGo/TabViewController.swift
+++ b/DuckDuckGo/TabViewController.swift
@@ -866,7 +866,10 @@ class TabViewController: UIViewController {
         
     public func getCurrentWebsiteInfo() -> BrokenSiteInfo {
         let blockedTrackerDomains = privacyInfo?.trackerInfo.trackersBlocked.compactMap { $0.domain } ?? []
-        
+
+        let configuration = ContentBlocking.shared.privacyConfigurationManager.privacyConfig
+        let protected = configuration.isFeature(.contentBlocking, enabledForDomain: url?.host)
+
         return BrokenSiteInfo(url: url,
                               httpsUpgrade: httpsForced,
                               blockedTrackerDomains: blockedTrackerDomains,
@@ -874,7 +877,8 @@ class TabViewController: UIViewController {
                               isDesktop: tabModel.isDesktop,
                               tdsETag: ContentBlocking.shared.contentBlockingManager.currentMainRules?.etag ?? "",
                               ampUrl: linkProtection.lastAMPURLString,
-                              urlParametersRemoved: linkProtection.urlParametersRemoved)
+                              urlParametersRemoved: linkProtection.urlParametersRemoved,
+                              protected: protected)
     }
     
     public func print() {
diff --git a/DuckDuckGoTests/BrokenSiteReportingTests.swift b/DuckDuckGoTests/BrokenSiteReportingTests.swift
index b36c95b240..82b3d25c2a 100644
--- a/DuckDuckGoTests/BrokenSiteReportingTests.swift
+++ b/DuckDuckGoTests/BrokenSiteReportingTests.swift
@@ -75,6 +75,7 @@ final class BrokenSiteReportingTests: XCTestCase {
                                             tdsETag: test.blocklistVersion,
                                             ampUrl: nil,
                                             urlParametersRemoved: false,
+                                            protected: true,
                                             model: test.model ?? "",
                                             manufacturer: test.manufacturer ?? "",
                                             systemVersion: test.os ?? "",

From 1c19d062e591979873b353b8136cd13bf585488c Mon Sep 17 00:00:00 2001
From: Christopher Brind <brindy@duckduckgo.com>
Date: Tue, 7 Nov 2023 12:50:24 +0000
Subject: [PATCH 02/16] kill variant when receiving atb update (#2130)

---
 Core/StatisticsLoader.swift | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Core/StatisticsLoader.swift b/Core/StatisticsLoader.swift
index e852d70540..8b7a6e481c 100644
--- a/Core/StatisticsLoader.swift
+++ b/Core/StatisticsLoader.swift
@@ -134,6 +134,7 @@ public class StatisticsLoader {
     public func storeUpdateVersionIfPresent(_ atb: Atb) {
         if let updateVersion = atb.updateVersion {
             statisticsStore.atb = updateVersion
+            statisticsStore.variant = nil
             returnUserMeasurement.updateStoredATB(atb)
         }
     }

From c0c34179e870dbd64cc4c6901ff6f4b36328fc72 Mon Sep 17 00:00:00 2001
From: Dominik Kapusta <dkapusta@duckduckgo.com>
Date: Tue, 7 Nov 2023 13:54:12 +0100
Subject: [PATCH 03/16] Fix syncing empty favorites folders (#2121)

Task/Issue URL: https://app.asana.com/0/414235014887631/1205843304285892/f

Description:
Update bookmarks sync response handler to actually process favorites
also when an empty folder is received from the server.
---
 DuckDuckGo.xcodeproj/project.pbxproj                          | 2 +-
 .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
index e49528f6ea..f35d46135c 100644
--- a/DuckDuckGo.xcodeproj/project.pbxproj
+++ b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -9058,7 +9058,7 @@
 			repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit";
 			requirement = {
 				kind = exactVersion;
-				version = 82.2.0;
+				version = 82.2.1;
 			};
 		};
 		C14882EB27F211A000D59F0C /* XCRemoteSwiftPackageReference "SwiftSoup" */ = {
diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index b7ebada7d8..d9ed11f7d0 100644
--- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -15,8 +15,8 @@
         "repositoryURL": "https://github.com/DuckDuckGo/BrowserServicesKit",
         "state": {
           "branch": null,
-          "revision": "86e4aba326ce06585b842ab13023ce08f86ac424",
-          "version": "82.2.0"
+          "revision": "0ac6d8e2153bec4ddd4e983915da6db09fcbed05",
+          "version": "82.2.1"
         }
       },
       {

From 910a4f8e53332e1010687afe8b16e09bd55fc3e4 Mon Sep 17 00:00:00 2001
From: Christopher Brind <brindy@duckduckgo.com>
Date: Tue, 7 Nov 2023 13:51:05 +0000
Subject: [PATCH 04/16] fix favorite launch with keyboard bug (#2131)

Task/Issue URL: https://app.asana.com/0/414709148257752/1205885847854331/f
Tech Design URL:
CC:

Description:
Fix bug that shows black bar when launching a favorite with the keyboard open.
---
 DuckDuckGo/MainViewController.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DuckDuckGo/MainViewController.swift b/DuckDuckGo/MainViewController.swift
index 2331fd1fb6..6dd1d6bb44 100644
--- a/DuckDuckGo/MainViewController.swift
+++ b/DuckDuckGo/MainViewController.swift
@@ -694,8 +694,8 @@ class MainViewController: UIViewController {
         allowContentUnderflow = false
         request()
         guard let tab = currentTab else { fatalError("no tab") }
-        select(tab: tab)
         dismissOmniBar()
+        select(tab: tab)
     }
 
     private func addTab(url: URL?, inheritedAttribution: AdClickAttributionLogic.State?) {

From 81e555e467882d09a4b61081209000455a352556 Mon Sep 17 00:00:00 2001
From: Christopher Brind <brindy@duckduckgo.com>
Date: Tue, 7 Nov 2023 19:33:56 +0000
Subject: [PATCH 05/16] re-enable keyboard shortcuts (#2132)

Task/Issue URL: https://app.asana.com/0/414709148257752/1205886244765299/f
Tech Design URL:
CC:

Description:

Fix bug preventing keyboard shortcuts working correctly.
---
 DuckDuckGo/MainViewController+KeyCommands.swift | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/DuckDuckGo/MainViewController+KeyCommands.swift b/DuckDuckGo/MainViewController+KeyCommands.swift
index e1229209d2..f7fffded92 100644
--- a/DuckDuckGo/MainViewController+KeyCommands.swift
+++ b/DuckDuckGo/MainViewController+KeyCommands.swift
@@ -110,7 +110,13 @@ extension MainViewController {
             UIKeyCommand(title: "", action: #selector(keyboardEscape), input: UIKeyCommand.inputEscape, modifierFlags: [])
         ]
 
-        return [alwaysAvailable, browsingCommands, findInPageCommands, arrowKeys, other].flatMap { $0 }
+        let commands = [alwaysAvailable, browsingCommands, findInPageCommands, arrowKeys, other].flatMap { $0 }
+        if #available(iOS 15, *) {
+            commands.forEach {
+                $0.wantsPriorityOverSystemBehavior = true
+            }
+        }
+        return commands
     }
 
     @objc func keyboardMoveSelectionUp() {

From 0f73f8a1e055d8a80eb4fd73875b82330a075b76 Mon Sep 17 00:00:00 2001
From: Sam Symons <sam@samsymons.com>
Date: Tue, 7 Nov 2023 19:38:22 -0800
Subject: [PATCH 06/16] Avoid AppTP DB initialization when disabled (#2090)

Task/Issue URL: https://app.asana.com/0/1199333091098016/1205714053673490/f
Tech Design URL:
CC:

Description:

This PR disables AppTP database initialization when the feature is disabled.
---
 DuckDuckGo/AppDelegate.swift        | 14 ++++++++++++
 DuckDuckGo/HomeViewController.swift | 26 +++++++++++++++++-----
 DuckDuckGo/MainViewController.swift | 34 +++++++++++++++++++++++++++--
 3 files changed, 67 insertions(+), 7 deletions(-)

diff --git a/DuckDuckGo/AppDelegate.swift b/DuckDuckGo/AppDelegate.swift
index cc6917da35..d49f873e3d 100644
--- a/DuckDuckGo/AppDelegate.swift
+++ b/DuckDuckGo/AppDelegate.swift
@@ -62,7 +62,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     private lazy var privacyStore = PrivacyUserDefaults()
     private var bookmarksDatabase: CoreDataDatabase = BookmarksDatabase.make()
+
+#if APP_TRACKING_PROTECTION
     private var appTrackingProtectionDatabase: CoreDataDatabase = AppTrackingProtectionDatabase.make()
+#endif
+
     private var autoClear: AutoClear?
     private var showKeyboardIfSettingOn = true
     private var lastBackgroundDate: Date?
@@ -183,6 +187,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
             WidgetCenter.shared.reloadAllTimelines()
         }
 
+#if APP_TRACKING_PROTECTION
         appTrackingProtectionDatabase.loadStore { context, error in
             guard context != nil else {
                 if let error = error {
@@ -199,6 +204,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
                 }
             }
         }
+#endif
 
         Favicons.shared.migrateFavicons(to: Favicons.Constants.maxFaviconSize) {
             WidgetCenter.shared.reloadAllTimelines()
@@ -234,12 +240,20 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         syncService.initializeIfNeeded()
         self.syncService = syncService
 
+#if APP_TRACKING_PROTECTION
         let main = MainViewController(bookmarksDatabase: bookmarksDatabase,
                                       bookmarksDatabaseCleaner: syncDataProviders.bookmarksAdapter.databaseCleaner,
                                       appTrackingProtectionDatabase: appTrackingProtectionDatabase,
                                       syncService: syncService,
                                       syncDataProviders: syncDataProviders,
                                       appSettings: AppDependencyProvider.shared.appSettings)
+#else
+        let main = MainViewController(bookmarksDatabase: bookmarksDatabase,
+                                      bookmarksDatabaseCleaner: syncDataProviders.bookmarksAdapter.databaseCleaner,
+                                      syncService: syncService,
+                                      syncDataProviders: syncDataProviders,
+                                      appSettings: AppDependencyProvider.shared.appSettings)
+#endif
         main.loadViewIfNeeded()
 
         window = UIWindow(frame: UIScreen.main.bounds)
diff --git a/DuckDuckGo/HomeViewController.swift b/DuckDuckGo/HomeViewController.swift
index f938dca3c1..4f97f8c46b 100644
--- a/DuckDuckGo/HomeViewController.swift
+++ b/DuckDuckGo/HomeViewController.swift
@@ -69,6 +69,7 @@ class HomeViewController: UIViewController {
     private let appTPHomeViewModel: AppTPHomeViewModel
 #endif
     
+#if APP_TRACKING_PROTECTION
     static func loadFromStoryboard(model: Tab, favoritesViewModel: FavoritesListInteracting, appTPDatabase: CoreDataDatabase) -> HomeViewController {
         let storyboard = UIStoryboard(name: "Home", bundle: nil)
         let controller = storyboard.instantiateViewController(identifier: "HomeViewController", creator: { coder in
@@ -76,18 +77,33 @@ class HomeViewController: UIViewController {
         })
         return controller
     }
-    
+#else
+    static func loadFromStoryboard(model: Tab, favoritesViewModel: FavoritesListInteracting) -> HomeViewController {
+        let storyboard = UIStoryboard(name: "Home", bundle: nil)
+        let controller = storyboard.instantiateViewController(identifier: "HomeViewController", creator: { coder in
+            HomeViewController(coder: coder, tabModel: model, favoritesViewModel: favoritesViewModel)
+        })
+        return controller
+    }
+#endif
+
+#if APP_TRACKING_PROTECTION
     required init?(coder: NSCoder, tabModel: Tab, favoritesViewModel: FavoritesListInteracting, appTPDatabase: CoreDataDatabase) {
         self.tabModel = tabModel
         self.favoritesViewModel = favoritesViewModel
-
-#if APP_TRACKING_PROTECTION
         self.appTPHomeViewModel = AppTPHomeViewModel(appTrackingProtectionDatabase: appTPDatabase)
-#endif
 
         super.init(coder: coder)
     }
-    
+#else
+    required init?(coder: NSCoder, tabModel: Tab, favoritesViewModel: FavoritesListInteracting) {
+        self.tabModel = tabModel
+        self.favoritesViewModel = favoritesViewModel
+
+        super.init(coder: coder)
+    }
+#endif
+
     required init?(coder: NSCoder) {
         fatalError("Not implemented")
     }
diff --git a/DuckDuckGo/MainViewController.swift b/DuckDuckGo/MainViewController.swift
index 6dd1d6bb44..df77c8acc5 100644
--- a/DuckDuckGo/MainViewController.swift
+++ b/DuckDuckGo/MainViewController.swift
@@ -78,8 +78,11 @@ class MainViewController: UIViewController {
     let previewsSource = TabPreviewsSource()
     let appSettings: AppSettings
     private var launchTabObserver: LaunchTabNotification.Observer?
-    
+
+#if APP_TRACKING_PROTECTION
     private let appTrackingProtectionDatabase: CoreDataDatabase
+#endif
+
     let bookmarksDatabase: CoreDataDatabase
     private weak var bookmarksDatabaseCleaner: BookmarkDatabaseCleaner?
     private let favoritesViewModel: FavoritesListInteracting
@@ -128,6 +131,7 @@ class MainViewController: UIViewController {
 
     var viewCoordinator: MainViewCoordinator!
 
+#if APP_TRACKING_PROTECTION
     init(
         bookmarksDatabase: CoreDataDatabase,
         bookmarksDatabaseCleaner: BookmarkDatabaseCleaner,
@@ -149,6 +153,27 @@ class MainViewController: UIViewController {
 
         bindSyncService()
     }
+#else
+    init(
+        bookmarksDatabase: CoreDataDatabase,
+        bookmarksDatabaseCleaner: BookmarkDatabaseCleaner,
+        syncService: DDGSyncing,
+        syncDataProviders: SyncDataProviders,
+        appSettings: AppSettings
+    ) {
+        self.bookmarksDatabase = bookmarksDatabase
+        self.bookmarksDatabaseCleaner = bookmarksDatabaseCleaner
+        self.syncService = syncService
+        self.syncDataProviders = syncDataProviders
+        self.favoritesViewModel = FavoritesListViewModel(bookmarksDatabase: bookmarksDatabase)
+        self.bookmarksCachingSearch = BookmarksCachingSearch(bookmarksStore: CoreDataBookmarksSearchStore(bookmarksStore: bookmarksDatabase))
+        self.appSettings = appSettings
+        
+        super.init(nibName: nil, bundle: nil)
+
+        bindSyncService()
+    }
+#endif
 
     fileprivate var tabCountInfo: TabCountInfo?
 
@@ -554,10 +579,15 @@ class MainViewController: UIViewController {
         AppDependencyProvider.shared.homePageConfiguration.refresh()
 
         let tabModel = currentTab?.tabModel
+
+#if APP_TRACKING_PROTECTION
         let controller = HomeViewController.loadFromStoryboard(model: tabModel!,
                                                                favoritesViewModel: favoritesViewModel,
                                                                appTPDatabase: appTrackingProtectionDatabase)
-        
+#else
+        let controller = HomeViewController.loadFromStoryboard(model: tabModel!, favoritesViewModel: favoritesViewModel)
+#endif
+
         homeController = controller
 
         controller.chromeDelegate = self

From fbcd0d4639647136d1973b08fa4244d79e6b56e6 Mon Sep 17 00:00:00 2001
From: bwaresiak <bartek@duckduckgo.com>
Date: Wed, 8 Nov 2023 12:12:54 +0100
Subject: [PATCH 07/16] Update test to match exact tracker (#2133)

Task/Issue URL: https://app.asana.com/0/1205237866452338/1205902260676401/f
Tech Design URL:
CC:

Description:

Update URL in tests to reflect latest blocking rules.
---
 IntegrationTests/ContentBlockingRulesTests.swift | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IntegrationTests/ContentBlockingRulesTests.swift b/IntegrationTests/ContentBlockingRulesTests.swift
index a03e8bdcc6..723fa8bec8 100644
--- a/IntegrationTests/ContentBlockingRulesTests.swift
+++ b/IntegrationTests/ContentBlockingRulesTests.swift
@@ -33,10 +33,10 @@ class ContentBlockingRulesTests: XCTestCase {
         andTemporaryUnprotectedDomains: [])
          
         // Test tracker is set up to be blocked
-        if let rule = rules.findExactFilter(filter: "^(https?)?(wss?)?://([a-z0-9-]+\\.)*googleadservices\\.com(:?[0-9]+)?/.*") {
+        if let rule = rules.findExactFilter(filter: "^(https?)?(wss?)?://([a-z0-9-]+\\.)*bad\\.third-party\\.site(:?[0-9]+)?/.*") {
             XCTAssert(rule.action == .block())
         } else {
-            XCTFail("Missing google ad services rule")
+            XCTFail("Missing tracking rule")
         }
         
         // Test exceptiions are set to ignore previous rules

From 58a4021a81c1832f02d7facb17b50e71ddd9c6eb Mon Sep 17 00:00:00 2001
From: Sam Symons <sam@samsymons.com>
Date: Wed, 8 Nov 2023 11:23:49 -0800
Subject: [PATCH 08/16] Update BSK for NetP change (#2134)

Task/Issue URL: https://app.asana.com/0/0/1205909514194474/f
Tech Design URL:
CC:

Description:

This PR updates BSK to account for a NetP change.
---
 DuckDuckGo.xcodeproj/project.pbxproj                          | 2 +-
 .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
index f35d46135c..9930057c0b 100644
--- a/DuckDuckGo.xcodeproj/project.pbxproj
+++ b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -9058,7 +9058,7 @@
 			repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit";
 			requirement = {
 				kind = exactVersion;
-				version = 82.2.1;
+				version = 82.2.2;
 			};
 		};
 		C14882EB27F211A000D59F0C /* XCRemoteSwiftPackageReference "SwiftSoup" */ = {
diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index d9ed11f7d0..39d7ce6624 100644
--- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -15,8 +15,8 @@
         "repositoryURL": "https://github.com/DuckDuckGo/BrowserServicesKit",
         "state": {
           "branch": null,
-          "revision": "0ac6d8e2153bec4ddd4e983915da6db09fcbed05",
-          "version": "82.2.1"
+          "revision": "989e306052bc284a1202fad1087f8b88e515a966",
+          "version": "82.2.2"
         }
       },
       {

From aa7c242376dca12c33ac0d5f06738f80c0a5a423 Mon Sep 17 00:00:00 2001
From: Fernando Bunn <bunn@idevzilla.com>
Date: Thu, 9 Nov 2023 13:47:58 +0000
Subject: [PATCH 09/16] Update BSK (#2136)

Task/Issue URL: https://app.asana.com/0/0/1205915133582459/f

Description:
Update BSK, no changes in iOS code,
---
 DuckDuckGo.xcodeproj/project.pbxproj                          | 2 +-
 .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
index 9930057c0b..bafe4e69c6 100644
--- a/DuckDuckGo.xcodeproj/project.pbxproj
+++ b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -9058,7 +9058,7 @@
 			repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit";
 			requirement = {
 				kind = exactVersion;
-				version = 82.2.2;
+				version = 82.2.3;
 			};
 		};
 		C14882EB27F211A000D59F0C /* XCRemoteSwiftPackageReference "SwiftSoup" */ = {
diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 39d7ce6624..0354822386 100644
--- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -15,8 +15,8 @@
         "repositoryURL": "https://github.com/DuckDuckGo/BrowserServicesKit",
         "state": {
           "branch": null,
-          "revision": "989e306052bc284a1202fad1087f8b88e515a966",
-          "version": "82.2.2"
+          "revision": "f2936a65ef7685fe9c39d6a996c8391cdb3d95ff",
+          "version": "82.2.3"
         }
       },
       {

From f4c0eba4ac3008c63d91f27233ccdc0f642c33c0 Mon Sep 17 00:00:00 2001
From: Anh Do <18567+quanganhdo@users.noreply.github.com>
Date: Thu, 9 Nov 2023 13:51:53 -0500
Subject: [PATCH 10/16] Support environment setting (#2140)

---
 DuckDuckGo.xcodeproj/project.pbxproj                          | 2 +-
 .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
index bafe4e69c6..b79bb0ad72 100644
--- a/DuckDuckGo.xcodeproj/project.pbxproj
+++ b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -9058,7 +9058,7 @@
 			repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit";
 			requirement = {
 				kind = exactVersion;
-				version = 82.2.3;
+				version = 82.3.0;
 			};
 		};
 		C14882EB27F211A000D59F0C /* XCRemoteSwiftPackageReference "SwiftSoup" */ = {
diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 0354822386..129f2539b2 100644
--- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -15,8 +15,8 @@
         "repositoryURL": "https://github.com/DuckDuckGo/BrowserServicesKit",
         "state": {
           "branch": null,
-          "revision": "f2936a65ef7685fe9c39d6a996c8391cdb3d95ff",
-          "version": "82.2.3"
+          "revision": "c4d5f6df0340f0a5c109dcded9801ab676de7db5",
+          "version": "82.3.0"
         }
       },
       {

From 9ad737ce62da9878740a9713407d090b8ab6fed5 Mon Sep 17 00:00:00 2001
From: Shane Osbourne <shane.osbourne8@gmail.com>
Date: Fri, 10 Nov 2023 09:50:56 +0000
Subject: [PATCH 11/16] switch to true|false for protectionsState param (#2137)

Co-authored-by: Shane Osbourne <sosbourne@duckduckgo.com>
---
 DuckDuckGo/BrokenSiteInfo.swift                | 13 ++++---------
 DuckDuckGo/TabViewController.swift             |  4 ++--
 DuckDuckGoTests/BrokenSiteReportingTests.swift |  2 +-
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/DuckDuckGo/BrokenSiteInfo.swift b/DuckDuckGo/BrokenSiteInfo.swift
index 063784c78f..9a1ed49e6e 100644
--- a/DuckDuckGo/BrokenSiteInfo.swift
+++ b/DuckDuckGo/BrokenSiteInfo.swift
@@ -24,11 +24,6 @@ public struct BrokenSiteInfo {
 
     static let allowedQueryReservedCharacters =  CharacterSet(charactersIn: ",")
 
-    enum ProtectionsState: String {
-        case enabled = "1"
-        case disabled = "0"
-    }
-
     private struct Keys {
         static let url = "siteUrl"
         static let category = "category"
@@ -60,14 +55,14 @@ public struct BrokenSiteInfo {
     private let manufacturer: String
     private let systemVersion: String
     private let gpc: Bool
-    private let protectionsState: ProtectionsState
+    private let protectionsState: Bool
 
     public init(url: URL?, httpsUpgrade: Bool,
                 blockedTrackerDomains: [String], installedSurrogates: [String],
                 isDesktop: Bool, tdsETag: String?,
                 ampUrl: String?,
                 urlParametersRemoved: Bool,
-                protected: Bool,
+                protectionsState: Bool,
                 model: String = UIDevice.current.model,
                 manufacturer: String = "Apple",
                 systemVersion: String = UIDevice.current.systemVersion,
@@ -84,7 +79,7 @@ public struct BrokenSiteInfo {
         self.model = model
         self.manufacturer = manufacturer
         self.systemVersion = systemVersion
-        self.protectionsState = protected ? .enabled : .disabled
+        self.protectionsState = protectionsState
 
         if let gpcParam = gpc {
             self.gpc = gpcParam
@@ -111,7 +106,7 @@ public struct BrokenSiteInfo {
             Keys.gpc: gpc ? "true" : "false",
             Keys.ampUrl: ampUrl ?? "",
             Keys.urlParametersRemoved: urlParametersRemoved ? "true" : "false",
-            Keys.protectionsState: protectionsState.rawValue
+            Keys.protectionsState: protectionsState ? "true" : "false"
         ]
         
         Pixel.fire(pixel: .brokenSiteReport,
diff --git a/DuckDuckGo/TabViewController.swift b/DuckDuckGo/TabViewController.swift
index 5e4da0f41b..6962907e0e 100644
--- a/DuckDuckGo/TabViewController.swift
+++ b/DuckDuckGo/TabViewController.swift
@@ -868,7 +868,7 @@ class TabViewController: UIViewController {
         let blockedTrackerDomains = privacyInfo?.trackerInfo.trackersBlocked.compactMap { $0.domain } ?? []
 
         let configuration = ContentBlocking.shared.privacyConfigurationManager.privacyConfig
-        let protected = configuration.isFeature(.contentBlocking, enabledForDomain: url?.host)
+        let protectionsState = configuration.isFeature(.contentBlocking, enabledForDomain: url?.host)
 
         return BrokenSiteInfo(url: url,
                               httpsUpgrade: httpsForced,
@@ -878,7 +878,7 @@ class TabViewController: UIViewController {
                               tdsETag: ContentBlocking.shared.contentBlockingManager.currentMainRules?.etag ?? "",
                               ampUrl: linkProtection.lastAMPURLString,
                               urlParametersRemoved: linkProtection.urlParametersRemoved,
-                              protected: protected)
+                              protectionsState: protectionsState)
     }
     
     public func print() {
diff --git a/DuckDuckGoTests/BrokenSiteReportingTests.swift b/DuckDuckGoTests/BrokenSiteReportingTests.swift
index 82b3d25c2a..e65fb7f268 100644
--- a/DuckDuckGoTests/BrokenSiteReportingTests.swift
+++ b/DuckDuckGoTests/BrokenSiteReportingTests.swift
@@ -75,7 +75,7 @@ final class BrokenSiteReportingTests: XCTestCase {
                                             tdsETag: test.blocklistVersion,
                                             ampUrl: nil,
                                             urlParametersRemoved: false,
-                                            protected: true,
+                                            protectionsState: true,
                                             model: test.model ?? "",
                                             manufacturer: test.manufacturer ?? "",
                                             systemVersion: test.os ?? "",

From 0389ed604ccc13d79d814a6a2aca920c9a931e7a Mon Sep 17 00:00:00 2001
From: Lorenzo Mattei <lore.mattei@gmail.com>
Date: Fri, 10 Nov 2023 15:41:18 +0100
Subject: [PATCH 12/16] Add Sync e2e test flows (#2127)

---
 .github/workflows/sync-end-to-end.yml       |  63 ++++++++
 .gitignore                                  |   3 -
 .maestro/shared/set_internal_user.yaml      |  10 ++
 .maestro/shared/sync_create.yaml            |  12 ++
 .maestro/shared/sync_delete.yaml            |   9 ++
 .maestro/sync_tests/01_create_account.yaml  |  29 ++++
 .maestro/sync_tests/02_login_account.yaml   |  45 ++++++
 .maestro/sync_tests/03_recover_account.yaml |  51 ++++++
 .maestro/sync_tests/04_sync_data.yaml       | 162 ++++++++++++++++++++
 9 files changed, 381 insertions(+), 3 deletions(-)
 create mode 100644 .github/workflows/sync-end-to-end.yml
 create mode 100644 .maestro/shared/set_internal_user.yaml
 create mode 100644 .maestro/shared/sync_create.yaml
 create mode 100644 .maestro/shared/sync_delete.yaml
 create mode 100644 .maestro/sync_tests/01_create_account.yaml
 create mode 100644 .maestro/sync_tests/02_login_account.yaml
 create mode 100644 .maestro/sync_tests/03_recover_account.yaml
 create mode 100644 .maestro/sync_tests/04_sync_data.yaml

diff --git a/.github/workflows/sync-end-to-end.yml b/.github/workflows/sync-end-to-end.yml
new file mode 100644
index 0000000000..df2a04df7c
--- /dev/null
+++ b/.github/workflows/sync-end-to-end.yml
@@ -0,0 +1,63 @@
+name: Sync-End-to-End tests
+
+on:
+  schedule:
+    - cron: '0 5 * * *' # run at 5 AM UTC
+
+jobs:
+  sync-end-to-end-tests:
+    name: Sync End to end Tests
+    runs-on: macos-13
+
+    steps:
+    - name: Check out the code
+      uses: actions/checkout@v3
+      with:
+        submodules: recursive
+
+    - name: Set cache key hash
+      run: |
+         has_only_tags=$(jq '[ .object.pins[].state | has("version") ] | all' DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved)
+         if [[ "$has_only_tags" == "true" ]]; then
+           echo "cache_key_hash=${{ hashFiles('DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved') }}" >> $GITHUB_ENV
+         else
+           echo "Package.resolved contains dependencies specified by branch or commit, skipping cache."
+         fi
+
+    - name: Cache SPM
+      if: env.cache_key_hash
+      uses: actions/cache@v3
+      with:
+        path: DerivedData/SourcePackages
+        key: ${{ runner.os }}-spm-${{ env.cache_key_hash }}
+        restore-keys: |
+          ${{ runner.os }}-spm-
+
+    - name: Select Xcode
+      run: sudo xcode-select -s /Applications/Xcode_$(<.xcode-version).app/Contents/Developer
+
+    - name: Build for tests
+      run: |
+        set -o pipefail && xcodebuild \
+          -scheme "DuckDuckGo" \
+          -destination "platform=iOS Simulator,name=iPhone 14,OS=16.4" \
+          -derivedDataPath "DerivedData" \
+        | tee xcodebuild.log
+    
+    - name: Create test account for Sync and return the recovery code
+      uses: duckduckgo/sync_crypto/action@main
+      id: sync-recovery-code
+      with:
+        debug: true
+    
+    - name: Sync e2e tests
+      uses: mobile-dev-inc/action-maestro-cloud@v1.6.0
+      with:
+        api-key: ${{ secrets.MAESTRO_CLOUD_API_KEY }}
+        app-file: DerivedData/Build/Products/Debug-iphonesimulator/DuckDuckGo.app
+        workspace: .maestro
+        include-tags: sync
+        env: |
+            CODE=${{ steps.sync-recovery-code.outputs.recovery-code }}
+    
+    
diff --git a/.gitignore b/.gitignore
index d6fc1c4859..f723942232 100644
--- a/.gitignore
+++ b/.gitignore
@@ -70,9 +70,6 @@ fastlane/report.xml
 fastlane/Preview.html
 fastlane/test_output
 
-# Mestro
-.maestro/**/shared
-
 # DuckDuckGo
 
 Configuration/ExternalDeveloper.xcconfig
diff --git a/.maestro/shared/set_internal_user.yaml b/.maestro/shared/set_internal_user.yaml
new file mode 100644
index 0000000000..97d6e6c9c4
--- /dev/null
+++ b/.maestro/shared/set_internal_user.yaml
@@ -0,0 +1,10 @@
+appId: com.duckduckgo.mobile.ios
+---
+
+- scroll
+- scroll
+- scroll
+- assertVisible: Debug Menu
+- tapOn: Debug Menu
+- tapOn: Internal User State
+- tapOn: Settings
\ No newline at end of file
diff --git a/.maestro/shared/sync_create.yaml b/.maestro/shared/sync_create.yaml
new file mode 100644
index 0000000000..8164466ac3
--- /dev/null
+++ b/.maestro/shared/sync_create.yaml
@@ -0,0 +1,12 @@
+appId: com.duckduckgo.mobile.ios
+---
+
+- assertVisible: Sync
+- tapOn: Sync
+- assertVisible: Sync
+- tapOn: "0"
+- assertVisible: Turn on Sync?
+- tapOn: Turn on Sync
+- tapOn: Sync Another Device
+- tapOn: Show QR Code
+- assertVisible: "Go to Settings > Sync in the DuckDuckGo App on a different device and scan this QR code to sync."
\ No newline at end of file
diff --git a/.maestro/shared/sync_delete.yaml b/.maestro/shared/sync_delete.yaml
new file mode 100644
index 0000000000..a82919c953
--- /dev/null
+++ b/.maestro/shared/sync_delete.yaml
@@ -0,0 +1,9 @@
+appId: com.duckduckgo.mobile.ios
+---
+
+- assertVisible: Sync
+- scroll
+- tapOn:
+    point: 50%,91% # TODO: Revisit after new setup flow has been implemented. 
+- assertVisible: Delete Server Data?
+- tapOn: Delete Server Data
\ No newline at end of file
diff --git a/.maestro/sync_tests/01_create_account.yaml b/.maestro/sync_tests/01_create_account.yaml
new file mode 100644
index 0000000000..6e39ee2fd4
--- /dev/null
+++ b/.maestro/sync_tests/01_create_account.yaml
@@ -0,0 +1,29 @@
+appId: com.duckduckgo.mobile.ios
+tags:
+    - sync
+
+---
+
+- clearState
+- launchApp
+- runFlow: 
+    when: 
+      visible: 
+        text: "Let’s Do It!"
+        index: 0
+    file: ../shared/onboarding.yaml
+
+- tapOn: Settings
+- runFlow:
+    file: ../shared/set_internal_user.yaml
+- runFlow:
+    file: ../shared/sync_create.yaml
+
+
+# Clean up
+- tapOn: Back
+- tapOn: Cancel
+- tapOn: Not Now
+- assertVisible: Sync
+- runFlow:
+    file: ../shared/sync_delete.yaml
\ No newline at end of file
diff --git a/.maestro/sync_tests/02_login_account.yaml b/.maestro/sync_tests/02_login_account.yaml
new file mode 100644
index 0000000000..aef46f2912
--- /dev/null
+++ b/.maestro/sync_tests/02_login_account.yaml
@@ -0,0 +1,45 @@
+appId: com.duckduckgo.mobile.ios
+tags:
+    - sync
+
+---
+
+# Create an account
+- clearState
+- launchApp
+- runFlow: 
+    when: 
+      visible: 
+        text: "Let’s Do It!"
+        index: 0
+    file: ../shared/onboarding.yaml
+
+- tapOn: Settings
+- runFlow:
+    file: ../shared/set_internal_user.yaml
+- runFlow:
+    file: ../shared/sync_create.yaml
+
+# Copy Sync Code and Log Out
+- tapOn: Back
+- tapOn: Cancel
+- assertVisible: Save Recovery Key
+- tapOn: Copy Key
+- tapOn: Not Now
+- tapOn: "1"
+- assertVisible: Turn Off Sync?
+- tapOn: Remove
+
+# Login
+- tapOn: "0"
+- tapOn: Recover Your Synced Data
+- tapOn: Manually Enter Code
+- tapOn: Paste
+- assertVisible: Device Synced!
+- tapOn: Next
+- tapOn: Not Now
+
+# Clean up
+- assertVisible: Sync
+- runFlow:
+    file: ../shared/sync_delete.yaml
\ No newline at end of file
diff --git a/.maestro/sync_tests/03_recover_account.yaml b/.maestro/sync_tests/03_recover_account.yaml
new file mode 100644
index 0000000000..265684b884
--- /dev/null
+++ b/.maestro/sync_tests/03_recover_account.yaml
@@ -0,0 +1,51 @@
+appId: com.duckduckgo.mobile.ios
+tags:
+    - sync
+
+---
+
+- clearState
+- launchApp
+- runFlow: 
+    when: 
+      visible: 
+        text: "Let’s Do It!"
+        index: 0
+    file: ../shared/onboarding.yaml
+
+# <WORKAROUND>This is a workaround to:
+# - Put the code in the clipboard on Maestro Cloud
+# - Prevent iOS from showing the Paste permission alert as Maestro can't handle it
+- tapOn:
+    id: searchEntry
+- inputText: ${CODE}
+- longPressOn:
+    id: searchEntry
+- tapOn: Select All
+- tapOn: Cut
+- tapOn:
+    id: searchEntry
+- longPressOn:
+    id: searchEntry
+- tapOn: Paste
+- tapOn: Cancel
+#</WORKAROUND>
+
+# Recover Account test
+- tapOn: Settings
+- runFlow:
+    file: ../shared/set_internal_user.yaml
+- assertVisible: Sync
+- tapOn: Sync
+- assertVisible: Sync
+- tapOn: "0"
+- assertVisible: Turn on Sync?
+- tapOn: Recover Your Synced Data
+- assertVisible: Scan QR Code
+- tapOn: Manually Enter Code
+- tapOn: Paste
+- assertVisible: Device Synced!
+- tapOn: Next
+- tapOn: Not Now
+- tapOn: Settings
+- tapOn: Done
\ No newline at end of file
diff --git a/.maestro/sync_tests/04_sync_data.yaml b/.maestro/sync_tests/04_sync_data.yaml
new file mode 100644
index 0000000000..643cd1a431
--- /dev/null
+++ b/.maestro/sync_tests/04_sync_data.yaml
@@ -0,0 +1,162 @@
+appId: com.duckduckgo.mobile.ios
+tags:
+    - sync
+
+---
+
+- clearState
+- launchApp
+- runFlow: 
+    when: 
+      visible: 
+        text: "Let’s Do It!"
+        index: 0
+    file: ../shared/onboarding.yaml
+
+# Add local favorite and bookmark
+- tapOn:
+    id: searchEntry
+- inputText: www.duckduckgo.com
+- pressKey: Enter
+- runFlow:
+    when:
+      visible:
+        text: "Got It"
+    commands:
+      - tapOn: Got It
+- tapOn: Browsing Menu
+- tapOn: Add Favorite
+- tapOn:
+    id: searchEntry
+- inputText: www.spreadprivacy.com
+- pressKey: Enter
+- tapOn: Browsing Menu
+- tapOn: Add Bookmark
+
+# Add local login
+- tapOn: Browsing Menu
+- tapOn: Settings
+- tapOn: Logins
+- tapOn: Add 24
+- tapOn: Title
+- inputText: My Personal Website
+- tapOn: username@example.com
+- inputText: me@mypersonalwebsite.com
+- tapOn: example.com
+- inputText: mypersonalwebsite.com
+- tapOn: Save
+- tapOn: Logins
+- tapOn: Settings
+- tapOn: Done
+
+# Sync data
+# <WORKAROUND>This is a workaround to:
+# - Put the code in the clipboard on Maestro Cloud
+# - Prevent iOS from showing the Paste permission alert as Maestro can't handle it
+- tapOn:
+    id: searchEntry
+- inputText: ${CODE}
+- longPressOn:
+    id: searchEntry
+- runFlow:
+    when:
+      visible:
+        text: searchEntry
+    commands:
+      - tapOn: searchEntry
+- tapOn: Select All
+- tapOn: Cut
+- tapOn:
+    id: searchEntry
+- longPressOn:
+    id: searchEntry
+- tapOn: Paste
+- tapOn: Cancel
+
+- tapOn: Close Tabs and Clear Data
+- tapOn: Close Tabs and Clear Data
+- runFlow:
+    when:
+      visible:
+        text: "Cancel"
+    commands:
+      - tapOn: Cancel
+#</WORKAROUND>
+
+- tapOn: Settings
+- runFlow:
+    file: ../shared/set_internal_user.yaml
+- assertVisible: Sync
+- tapOn: Sync
+- assertVisible: Sync
+- tapOn: "0"
+- assertVisible: Turn on Sync?
+- tapOn: Recover Your Synced Data
+- assertVisible: Scan QR Code
+- tapOn: Manually Enter Code
+- tapOn: Paste
+- assertVisible: Device Synced!
+- tapOn: Next
+- tapOn: Not Now
+- tapOn: Settings
+- tapOn: Done
+
+# Verify bookmarks and favorites have been merged
+- tapOn: Bookmarks
+
+- assertVisible: Spread Privacy
+- assertVisible: Stack Overflow - Where Developers Learn, Share, & Build Careers
+- assertVisible: DuckDuckGo — Privacy, simplified.
+- assertVisible: DuckDuckGo · GitHub
+- assertVisible: "Wolfram|Alpha: Computational Intelligence"
+- assertVisible: news
+- assertVisible: code
+- assertVisible: sports
+- tapOn: news
+- assertVisible: Breaking News, Latest News and Videos | CNN
+- assertVisible: News, sport and opinion from the Guardian's global edition | The Guardian
+- tapOn: Bookmarks
+- tapOn: code
+- assertVisible: "GitHub - duckduckgo/Android: DuckDuckGo Android App"
+- assertVisible: "GitHub - duckduckgo/iOS: DuckDuckGo iOS Application"
+- tapOn: Bookmarks
+- tapOn: sports
+- assertVisible: NFL.com | Official Site of the National Football League
+- assertVisible: AS.com - Diario online deportivo. Fútbol, motor y mucho más
+- tapOn: Bookmarks
+- tapOn: Favorites
+- assertVisible: DuckDuckGo — Privacy, simplified.
+- assertVisible: NFL.com | Official Site of the National Football League
+- assertVisible: DuckDuckGo · GitHub
+- assertVisible: Stack Overflow - Where Developers Learn, Share, & Build Careers
+- tapOn: Done
+
+# Verify logins
+- tapOn: Settings
+- tapOn: Logins
+- assertVisible: Unlock device to access saved Logins
+- tapOn: Passcode field
+- inputText: "0000"
+- pressKey: Enter
+- assertVisible: Dax Login
+- tapOn: Dax Login
+- assertVisible: daxthetest
+- assertVisible: duckduckgo.com
+- tapOn: Logins
+- assertVisible: Github
+- tapOn: Github
+- assertVisible: githubusername
+- assertVisible: github.com
+- tapOn: Logins
+- assertVisible: StackOverflow
+- tapOn: StackOverflow
+- assertVisible: stacker
+- assertVisible: stackoverflow.com
+- tapOn: Logins
+- assertVisible: My Personal Website
+- tapOn: My Personal Website
+- assertVisible: me@mypersonalwebsite.com
+- assertVisible: mypersonalwebsite.com
+- tapOn: Logins
+- tapOn: Settings
+- tapOn: Done
\ No newline at end of file

From 02329f89dde9ae9481e2998aef3638a711a4da16 Mon Sep 17 00:00:00 2001
From: Dominik Kapusta <dkapusta@duckduckgo.com>
Date: Fri, 10 Nov 2023 17:01:53 +0100
Subject: [PATCH 13/16] Sync form factor specific favorites (#2029)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Task/Issue URL: https://app.asana.com/0/1201493110486074/1204926049616866/f
Tech Design URL: https://app.asana.com/0/481882893211075/1205418608802079/f

Description:
This change introduces form factor specific favorites to be used when Sync is enabled.
1 favorites folder is replaced by 3 folders – mobile, desktop and unified.
Users always see only 1 folder and it's their form-factor-specific one. Only users with Sync enabled
get to choose whether they want to see the form-factor-specific favorites or unified (desktop + mobile)
favorites. The setting itself is synced between devices in the Sync account.
BookmarkEntity's isFavorite is replaced with isFavorite(on:) taking folder as a parameter.
API for adding to favorites and removing from favorites was updated to take multiple favorites
folders as needed.
FavoritesDisplayMode enum is introduced to manage display mode in clients.
Bookmarks and Favorites related view models used on iOS are updated to take favorites display mode
and reload their data as the mode changes.
In SyncDataProviders, an abstract SettingSyncHandler class was added to support adding
an arbitrary setting (key-value pair) to Sync. It's subclassed by EmailProtectionSyncHandler
and FavoritesDisplayModeSyncHandlerBase (that needs to be subclassed in client apps due to differences
in User Defaults storage between iOS and macOS apps).
---
 Core/BookmarksCachingSearch.swift             |   4 +-
 Core/BookmarksExporter.swift                  |   6 +-
 Core/BookmarksImporter.swift                  |   4 +-
 Core/BookmarksModelsErrorHandling.swift       |  14 +-
 Core/LegacyBookmarksStoreMigration.swift      |   9 +-
 Core/PixelEvent.swift                         |  12 +
 Core/SyncBookmarksAdapter.swift               |  76 +++-
 Core/SyncCredentialsAdapter.swift             |  35 ++
 Core/SyncDataProviders.swift                  |   9 +-
 Core/SyncSettingsAdapter.swift                |   8 +-
 Core/UserDefaultsPropertyWrapper.swift        |   6 +-
 DuckDuckGo.xcodeproj/project.pbxproj          |  24 +-
 .../xcshareddata/swiftpm/Package.resolved     |   4 +-
 .../AddOrEditBookmarkViewController.swift     |  14 +-
 DuckDuckGo/AppDelegate.swift                  |  38 +-
 DuckDuckGo/AppSettings.swift                  |   7 +
 DuckDuckGo/AppUserDefaults.swift              |  31 +-
 DuckDuckGo/Base.lproj/Settings.storyboard     |   4 +-
 DuckDuckGo/BookmarkFolderCell.swift           |   2 +-
 .../BookmarkFoldersTableViewController.swift  |   4 +-
 DuckDuckGo/BookmarksDataSource.swift          |   2 +-
 DuckDuckGo/BookmarksViewController.swift      |  59 ++-
 .../FavoritesDisplayMode+UserDefaults.swift   |  36 ++
 DuckDuckGo/FavoritesDisplayModeStorage.swift  |  40 ++
 .../FavoritesDisplayModeSyncHandler.swift     |  50 +++
 DuckDuckGo/FavoritesViewController.swift      |  31 +-
 DuckDuckGo/MainViewController+Segues.swift    |  11 +-
 DuckDuckGo/MainViewController.swift           |  74 +++-
 DuckDuckGo/RemoteMessaging.swift              |  37 +-
 DuckDuckGo/SettingsViewController.swift       |   7 +-
 .../Contents.json                             |  15 +
 .../Device-Mobile-Upload-96.svg               |  17 +
 .../Sync-Pair-96.imageset/Contents.json       |  15 +
 .../Sync-Pair-96.imageset/Sync-Pair-96.svg    |  30 ++
 .../Sync-Start-128.imageset/Contents.json     |  15 +
 .../Sync-Start-128.svg                        |  15 +
 .../SyncAllDevices.imageset/Contents.json     |  16 +
 .../SyncAllDevices.svg                        |   9 +
 .../SyncFavicons.imageset/Contents.json       |  16 +
 .../SyncFavicons.imageset/SyncFavicons.svg    |   8 +
 DuckDuckGo/SyncDebugViewController.swift      |  23 ++
 ...cSettingsViewController+SyncDelegate.swift |  59 +--
 DuckDuckGo/SyncSettingsViewController.swift   |  77 +++-
 DuckDuckGo/TabSwitcherViewController.swift    |   2 +
 DuckDuckGo/TabViewController.swift            |   2 +
 ...bViewControllerBrowsingMenuExtension.swift |   2 +-
 DuckDuckGo/UserText.swift                     |  14 +-
 DuckDuckGo/en.lproj/Localizable.strings       |  30 ++
 DuckDuckGoTests/AppSettingsMock.swift         |   7 +
 .../BookmarkEditorViewModelTests.swift        |  15 +-
 DuckDuckGoTests/BookmarkEntityTests.swift     |  10 +-
 .../BookmarkListViewModelTests.swift          |  52 ++-
 DuckDuckGoTests/BookmarkUtilsTests.swift      |   4 +-
 DuckDuckGoTests/BookmarksExporterTests.swift  |   4 +-
 DuckDuckGoTests/BookmarksImporterTests.swift  |   2 +-
 DuckDuckGoTests/BookmarksMigrationTests.swift |  27 +-
 DuckDuckGoTests/BookmarksTestHelpers.swift    |  16 +-
 .../FavoriteListViewModelTests.swift          |  10 +-
 .../MenuBookmarksViewModelTests.swift         |  12 +-
 .../SyncManagementViewModelTests.swift        |  91 ++++-
 .../ViewModels/ScanOrPasteCodeViewModel.swift |   1 -
 .../ViewModels/SyncSettingsViewModel.swift    |  59 ++-
 .../ViewModels/TurnOnSyncViewModel.swift      |  61 ---
 .../SyncUI/Views/DeviceConnectedView.swift    | 109 ++++--
 .../Views/Internal/BackButtonModifier.swift   |  18 +
 .../Views/Internal/ConnectModeView.swift      |   2 +
 .../Views/Internal/QRCodeCopierView.swift     |   5 +-
 .../Views/Internal/RemoveDeviceView.swift     |   5 +-
 .../Views/Internal/SyncLabelButtonStyle.swift |   3 +-
 .../SyncUI/Views/Internal/UserText.swift      |  67 ++--
 .../Views/{Internal => }/PasteCodeView.swift  |  26 +-
 .../SyncUI/Views/SaveRecoveryKeyView.swift    |  19 +-
 .../SyncUI/Views/ScanOrPasteCodeView.swift    |  68 ++--
 .../SyncUI/Views/SyncSettingsView.swift       | 352 +++++++++++++-----
 .../Sources/SyncUI/Views/TurnOnSyncView.swift | 162 --------
 Widgets/Widgets.swift                         |  12 +-
 76 files changed, 1621 insertions(+), 621 deletions(-)
 create mode 100644 DuckDuckGo/FavoritesDisplayMode+UserDefaults.swift
 create mode 100644 DuckDuckGo/FavoritesDisplayModeStorage.swift
 create mode 100644 DuckDuckGo/FavoritesDisplayModeSyncHandler.swift
 create mode 100644 DuckDuckGo/SyncAssets.xcassets/Device-Mobile-Upload-96.imageset/Contents.json
 create mode 100644 DuckDuckGo/SyncAssets.xcassets/Device-Mobile-Upload-96.imageset/Device-Mobile-Upload-96.svg
 create mode 100644 DuckDuckGo/SyncAssets.xcassets/Sync-Pair-96.imageset/Contents.json
 create mode 100644 DuckDuckGo/SyncAssets.xcassets/Sync-Pair-96.imageset/Sync-Pair-96.svg
 create mode 100644 DuckDuckGo/SyncAssets.xcassets/Sync-Start-128.imageset/Contents.json
 create mode 100644 DuckDuckGo/SyncAssets.xcassets/Sync-Start-128.imageset/Sync-Start-128.svg
 create mode 100644 DuckDuckGo/SyncAssets.xcassets/SyncAllDevices.imageset/Contents.json
 create mode 100644 DuckDuckGo/SyncAssets.xcassets/SyncAllDevices.imageset/SyncAllDevices.svg
 create mode 100644 DuckDuckGo/SyncAssets.xcassets/SyncFavicons.imageset/Contents.json
 create mode 100644 DuckDuckGo/SyncAssets.xcassets/SyncFavicons.imageset/SyncFavicons.svg
 delete mode 100644 LocalPackages/SyncUI/Sources/SyncUI/ViewModels/TurnOnSyncViewModel.swift
 rename LocalPackages/SyncUI/Sources/SyncUI/Views/{Internal => }/PasteCodeView.swift (87%)
 delete mode 100644 LocalPackages/SyncUI/Sources/SyncUI/Views/TurnOnSyncView.swift

diff --git a/Core/BookmarksCachingSearch.swift b/Core/BookmarksCachingSearch.swift
index 17b264b198..c43c3f2712 100644
--- a/Core/BookmarksCachingSearch.swift
+++ b/Core/BookmarksCachingSearch.swift
@@ -70,8 +70,8 @@ public class CoreDataBookmarksSearchStore: BookmarksSearchStore {
         fetchRequest.resultType = .dictionaryResultType
         fetchRequest.propertiesToFetch = [#keyPath(BookmarkEntity.title),
                                           #keyPath(BookmarkEntity.url),
-                                          #keyPath(BookmarkEntity.favoriteFolder),
                                           #keyPath(BookmarkEntity.objectID)]
+        fetchRequest.relationshipKeyPathsForPrefetching = [#keyPath(BookmarkEntity.favoriteFolders)]
         
         context.perform {
             let result = try? context.fetch(fetchRequest) as? [Dictionary<String, Any>]
@@ -131,7 +131,7 @@ public class BookmarksCachingSearch: BookmarksStringSearch {
             self.init(objectID: objectID,
                       title: title,
                       url: url,
-                      isFavorite: bookmark[#keyPath(BookmarkEntity.favoriteFolder)] != nil)
+                      isFavorite: (bookmark[#keyPath(BookmarkEntity.favoriteFolders)] as? Set<NSManagedObject>)?.isEmpty != true)
         }
 
         public func togglingFavorite() -> BookmarksStringSearchResult {
diff --git a/Core/BookmarksExporter.swift b/Core/BookmarksExporter.swift
index 53fb563af9..294b59a076 100644
--- a/Core/BookmarksExporter.swift
+++ b/Core/BookmarksExporter.swift
@@ -29,9 +29,11 @@ public enum BookmarksExporterError: Error {
 public struct BookmarksExporter {
 
     private(set) var coreDataStorage: CoreDataDatabase
+    private let favoritesDisplayMode: FavoritesDisplayMode
 
-    public init(coreDataStore: CoreDataDatabase) {
+    public init(coreDataStore: CoreDataDatabase, favoritesDisplayMode: FavoritesDisplayMode) {
         coreDataStorage = coreDataStore
+        self.favoritesDisplayMode = favoritesDisplayMode
     }
 
     public func exportBookmarksTo(url: URL) throws {
@@ -64,7 +66,7 @@ public struct BookmarksExporter {
                 content.append(Template.bookmark(level: level,
                                                  title: entity.title!.escapedForHTML,
                                                  url: entity.url!,
-                                                 isFavorite: entity.isFavorite))
+                                                 isFavorite: entity.isFavorite(on: favoritesDisplayMode.displayedFolder)))
             }
         }
         return content
diff --git a/Core/BookmarksImporter.swift b/Core/BookmarksImporter.swift
index a98a7c6668..177dcf2955 100644
--- a/Core/BookmarksImporter.swift
+++ b/Core/BookmarksImporter.swift
@@ -42,8 +42,8 @@ final public class BookmarksImporter {
     private(set) var importedBookmarks: [BookmarkOrFolder] = []
     private(set) var coreDataStorage: BookmarkCoreDataImporter
 
-    public init(coreDataStore: CoreDataDatabase) {
-        coreDataStorage = BookmarkCoreDataImporter(database: coreDataStore)
+    public init(coreDataStore: CoreDataDatabase, favoritesDisplayMode: FavoritesDisplayMode) {
+        coreDataStorage = BookmarkCoreDataImporter(database: coreDataStore, favoritesDisplayMode: favoritesDisplayMode)
     }
 
     func isDocumentInSafariFormat(_ document: Document) -> Bool {
diff --git a/Core/BookmarksModelsErrorHandling.swift b/Core/BookmarksModelsErrorHandling.swift
index aad7935bbe..5d25ef7c80 100644
--- a/Core/BookmarksModelsErrorHandling.swift
+++ b/Core/BookmarksModelsErrorHandling.swift
@@ -82,18 +82,22 @@ public extension BookmarkEditorViewModel {
     
     convenience init(editingEntityID: NSManagedObjectID,
                      bookmarksDatabase: CoreDataDatabase,
+                     favoritesDisplayMode: FavoritesDisplayMode,
                      syncService: DDGSyncing?) {
         self.init(editingEntityID: editingEntityID,
                   bookmarksDatabase: bookmarksDatabase,
+                  favoritesDisplayMode: favoritesDisplayMode,
                   errorEvents: BookmarksModelsErrorHandling(syncService: syncService))
         
     }
     
     convenience init(creatingFolderWithParentID parentFolderID: NSManagedObjectID?,
                      bookmarksDatabase: CoreDataDatabase,
+                     favoritesDisplayMode: FavoritesDisplayMode,
                      syncService: DDGSyncing?) {
         self.init(creatingFolderWithParentID: parentFolderID,
                   bookmarksDatabase: bookmarksDatabase,
+                  favoritesDisplayMode: favoritesDisplayMode,
                   errorEvents: BookmarksModelsErrorHandling(syncService: syncService))
     }
 }
@@ -102,25 +106,25 @@ public extension BookmarkListViewModel {
     
     convenience init(bookmarksDatabase: CoreDataDatabase,
                      parentID: NSManagedObjectID?,
+                     favoritesDisplayMode: FavoritesDisplayMode,
                      syncService: DDGSyncing?) {
         self.init(bookmarksDatabase: bookmarksDatabase,
                   parentID: parentID,
+                  favoritesDisplayMode: favoritesDisplayMode,
                   errorEvents: BookmarksModelsErrorHandling(syncService: syncService))
     }
 }
 
 public extension FavoritesListViewModel {
     
-    convenience init(bookmarksDatabase: CoreDataDatabase) {
-        self.init(bookmarksDatabase: bookmarksDatabase,
-                  errorEvents: BookmarksModelsErrorHandling())
+    convenience init(bookmarksDatabase: CoreDataDatabase, favoritesDisplayMode: FavoritesDisplayMode) {
+        self.init(bookmarksDatabase: bookmarksDatabase, errorEvents: BookmarksModelsErrorHandling(), favoritesDisplayMode: favoritesDisplayMode)
     }
 }
 
 public extension MenuBookmarksViewModel {
     
     convenience init(bookmarksDatabase: CoreDataDatabase, syncService: DDGSyncing?) {
-        self.init(bookmarksDatabase: bookmarksDatabase,
-                  errorEvents: BookmarksModelsErrorHandling(syncService: syncService))
+        self.init(bookmarksDatabase: bookmarksDatabase, errorEvents: BookmarksModelsErrorHandling(syncService: syncService))
     }
 }
diff --git a/Core/LegacyBookmarksStoreMigration.swift b/Core/LegacyBookmarksStoreMigration.swift
index 248d96f12b..dfd6a4c371 100644
--- a/Core/LegacyBookmarksStoreMigration.swift
+++ b/Core/LegacyBookmarksStoreMigration.swift
@@ -39,7 +39,7 @@ public class LegacyBookmarksStoreMigration {
             }
         } else {
             // Initialize structure if needed
-            BookmarkUtils.prepareFoldersStructure(in: context)
+            BookmarkUtils.prepareLegacyFoldersStructure(in: context)
             if context.hasChanges {
                 do {
                     try context.save(onErrorFire: .bookmarksCouldNotPrepareDatabase)
@@ -82,7 +82,8 @@ public class LegacyBookmarksStoreMigration {
         BookmarkUtils.prepareFoldersStructure(in: destination)
         
         guard let newRoot = BookmarkUtils.fetchRootFolder(destination),
-              let newFavoritesRoot = BookmarkUtils.fetchFavoritesFolder(destination) else {
+              let newFavoritesRoot = BookmarkUtils.fetchFavoritesFolder(withUUID: FavoritesFolderID.unified.rawValue, in: destination),
+              let newMobileFavoritesRoot = BookmarkUtils.fetchFavoritesFolder(withUUID: FavoritesFolderID.mobile.rawValue, in: destination) else {
             Pixel.fire(pixel: .bookmarksMigrationCouldNotPrepareDatabase)
             Thread.sleep(forTimeInterval: 2)
             fatalError("Could not write to Bookmarks DB")
@@ -169,6 +170,8 @@ public class LegacyBookmarksStoreMigration {
             }()
             bookmark.addToFavorites(insertAt: 0,
                                     favoritesRoot: newFavoritesRoot)
+            bookmark.addToFavorites(insertAt: 0,
+                                    favoritesRoot: newMobileFavoritesRoot)
         }
         
         do {
@@ -176,7 +179,7 @@ public class LegacyBookmarksStoreMigration {
         } catch {
             destination.reset()
             
-            BookmarkUtils.prepareFoldersStructure(in: destination)
+            BookmarkUtils.prepareLegacyFoldersStructure(in: destination)
             do {
                 try destination.save(onErrorFire: .bookmarksMigrationCouldNotPrepareDatabaseOnFailedMigration)
             } catch {
diff --git a/Core/PixelEvent.swift b/Core/PixelEvent.swift
index e3b1b8dc82..a2005a22f2 100644
--- a/Core/PixelEvent.swift
+++ b/Core/PixelEvent.swift
@@ -473,10 +473,15 @@ extension Pixel {
         case bookmarksMigrationCouldNotPrepareDatabaseOnFailedMigration
         case bookmarksMigrationCouldNotValidateDatabase
         case bookmarksMigrationCouldNotRemoveOldStore
+        case bookmarksMigrationCouldNotPrepareMultipleFavoriteFolders
 
         case syncFailedToMigrate
         case syncFailedToLoadAccount
         case syncFailedToSetupEngine
+        case syncBookmarksCountLimitExceededDaily
+        case syncCredentialsCountLimitExceededDaily
+        case syncBookmarksRequestSizeLimitExceededDaily
+        case syncCredentialsRequestSizeLimitExceededDaily
 
         case syncSentUnauthenticatedRequest
         case syncMetadataCouldNotLoadDatabase
@@ -489,6 +494,7 @@ extension Pixel {
 
         case bookmarksCleanupFailed
         case bookmarksCleanupAttemptedWhileSyncWasEnabled
+        case favoritesCleanupFailed
 
         case credentialsDatabaseCleanupFailed
         case credentialsCleanupAttemptedWhileSyncWasEnabled
@@ -951,10 +957,15 @@ extension Pixel.Event {
             return "m_d_bookmarks_migration_could_not_prepare_database_on_failed_migration"
         case .bookmarksMigrationCouldNotValidateDatabase: return "m_d_bookmarks_migration_could_not_validate_database"
         case .bookmarksMigrationCouldNotRemoveOldStore: return "m_d_bookmarks_migration_could_not_remove_old_store"
+        case .bookmarksMigrationCouldNotPrepareMultipleFavoriteFolders: return "m_d_bookmarks_migration_could_not_prepare_multiple_favorite_folders"
 
         case .syncFailedToMigrate: return "m_d_sync_failed_to_migrate"
         case .syncFailedToLoadAccount: return "m_d_sync_failed_to_load_account"
         case .syncFailedToSetupEngine: return "m_d_sync_failed_to_setup_engine"
+        case .syncBookmarksCountLimitExceededDaily: return "m_d_sync_bookmarks_count_limit_exceeded_daily"
+        case .syncCredentialsCountLimitExceededDaily: return "m_d_sync_credentials_count_limit_exceeded_daily"
+        case .syncBookmarksRequestSizeLimitExceededDaily: return "m_d_sync_bookmarks_request_size_limit_exceeded_daily"
+        case .syncCredentialsRequestSizeLimitExceededDaily: return "m_d_sync_credentials_request_size_limit_exceeded_daily"
 
         case .syncSentUnauthenticatedRequest: return "m_d_sync_sent_unauthenticated_request"
         case .syncMetadataCouldNotLoadDatabase: return "m_d_sync_metadata_could_not_load_database"
@@ -968,6 +979,7 @@ extension Pixel.Event {
 
         case .bookmarksCleanupFailed: return "m_d_bookmarks_cleanup_failed"
         case .bookmarksCleanupAttemptedWhileSyncWasEnabled: return "m_d_bookmarks_cleanup_attempted_while_sync_was_enabled"
+        case .favoritesCleanupFailed: return "m_d_favorites_cleanup_failed"
 
         case .credentialsDatabaseCleanupFailed: return "m_d_credentials_database_cleanup_failed_2"
         case .credentialsCleanupAttemptedWhileSyncWasEnabled: return "m_d_credentials_cleanup_attempted_while_sync_was_enabled"
diff --git a/Core/SyncBookmarksAdapter.swift b/Core/SyncBookmarksAdapter.swift
index 5578e2422c..5752c090dc 100644
--- a/Core/SyncBookmarksAdapter.swift
+++ b/Core/SyncBookmarksAdapter.swift
@@ -26,14 +26,38 @@ import Persistence
 import SyncDataProviders
 import WidgetKit
 
+public protocol FavoritesDisplayModeStoring: AnyObject {
+    var favoritesDisplayMode: FavoritesDisplayMode { get set }
+}
+
 public final class SyncBookmarksAdapter {
 
     public private(set) var provider: BookmarksProvider?
     public let databaseCleaner: BookmarkDatabaseCleaner
     public let syncDidCompletePublisher: AnyPublisher<Void, Never>
     public let widgetRefreshCancellable: AnyCancellable
+    public static let syncBookmarksPausedStateChanged = Notification.Name("com.duckduckgo.app.SyncPausedStateChanged")
+    public static let bookmarksSyncLimitReached = Notification.Name("com.duckduckgo.app.SyncBookmarksLimitReached")
+
+    public var shouldResetBookmarksSyncTimestamp: Bool = false {
+        willSet {
+            assert(provider == nil, "Setting this value has no effect after provider has been instantiated")
+        }
+    }
 
-    public init(database: CoreDataDatabase) {
+    @UserDefaultsWrapper(key: .syncBookmarksPaused, defaultValue: false)
+    static public var isSyncBookmarksPaused: Bool {
+        didSet {
+            NotificationCenter.default.post(name: syncBookmarksPausedStateChanged, object: nil)
+        }
+    }
+
+    @UserDefaultsWrapper(key: .syncBookmarksPausedErrorDisplayed, defaultValue: false)
+    static private var didShowBookmarksSyncPausedError: Bool
+
+    public init(database: CoreDataDatabase, favoritesDisplayModeStorage: FavoritesDisplayModeStoring) {
+        self.database = database
+        self.favoritesDisplayModeStorage = favoritesDisplayModeStorage
         syncDidCompletePublisher = syncDidCompleteSubject.eraseToAnyPublisher()
         databaseCleaner = BookmarkDatabaseCleaner(
             bookmarkDatabase: database,
@@ -49,6 +73,7 @@ public final class SyncBookmarksAdapter {
         databaseCleaner.cleanUpDatabaseNow()
         if shouldEnable {
             databaseCleaner.scheduleRegularCleaning()
+            handleFavoritesAfterDisablingSync()
         } else {
             databaseCleaner.cancelCleaningSchedule()
         }
@@ -64,14 +89,33 @@ public final class SyncBookmarksAdapter {
             metadataStore: metadataStore,
             syncDidUpdateData: { [syncDidCompleteSubject] in
                 syncDidCompleteSubject.send()
+                Self.isSyncBookmarksPaused = false
+                Self.didShowBookmarksSyncPausedError = false
             }
         )
+        if shouldResetBookmarksSyncTimestamp {
+            provider.lastSyncTimestamp = nil
+        }
 
         syncErrorCancellable = provider.syncErrorPublisher
             .sink { error in
                 switch error {
                 case let syncError as SyncError:
                     Pixel.fire(pixel: .syncBookmarksFailed, error: syncError)
+                    switch syncError {
+                    case .unexpectedStatusCode(409):
+                        // If bookmarks count limit has been exceeded
+                        Self.isSyncBookmarksPaused = true
+                        DailyPixel.fire(pixel: .syncBookmarksCountLimitExceededDaily)
+                        Self.notifyBookmarksSyncLimitReached()
+                    case .unexpectedStatusCode(413):
+                        // If bookmarks request size limit has been exceeded
+                        Self.isSyncBookmarksPaused = true
+                        DailyPixel.fire(pixel: .syncBookmarksRequestSizeLimitExceededDaily)
+                        Self.notifyBookmarksSyncLimitReached()
+                    default:
+                        break
+                    }
                 default:
                     let nsError = error as NSError
                     if nsError.domain != NSURLErrorDomain {
@@ -86,6 +130,36 @@ public final class SyncBookmarksAdapter {
         self.provider = provider
     }
 
+    static private func notifyBookmarksSyncLimitReached() {
+        if !Self.didShowBookmarksSyncPausedError {
+            NotificationCenter.default.post(name: Self.bookmarksSyncLimitReached, object: nil)
+            Self.didShowBookmarksSyncPausedError = true
+        }
+    }
+
+    private func handleFavoritesAfterDisablingSync() {
+        let context = database.makeContext(concurrencyType: .privateQueueConcurrencyType)
+
+        context.performAndWait {
+            do {
+                if favoritesDisplayModeStorage.favoritesDisplayMode.isDisplayUnified {
+                    BookmarkUtils.copyFavorites(from: .unified, to: .mobile, clearingNonNativeFavoritesFolder: .desktop, in: context)
+                    favoritesDisplayModeStorage.favoritesDisplayMode = .displayNative(.mobile)
+                } else {
+                    BookmarkUtils.copyFavorites(from: .mobile, to: .unified, clearingNonNativeFavoritesFolder: .desktop, in: context)
+                }
+                try context.save()
+            } catch {
+                let nsError = error as NSError
+                let processedErrors = CoreDataErrorsParser.parse(error: nsError)
+                let params = processedErrors.errorPixelParameters
+                Pixel.fire(pixel: .favoritesCleanupFailed, error: error, withAdditionalParameters: params)
+            }
+        }
+    }
+
     private var syncDidCompleteSubject = PassthroughSubject<Void, Never>()
     private var syncErrorCancellable: AnyCancellable?
+    private let database: CoreDataDatabase
+    private let favoritesDisplayModeStorage: FavoritesDisplayModeStoring
 }
diff --git a/Core/SyncCredentialsAdapter.swift b/Core/SyncCredentialsAdapter.swift
index e4b96e01ef..e5c2101954 100644
--- a/Core/SyncCredentialsAdapter.swift
+++ b/Core/SyncCredentialsAdapter.swift
@@ -30,6 +30,17 @@ public final class SyncCredentialsAdapter {
     public private(set) var provider: CredentialsProvider?
     public let databaseCleaner: CredentialsDatabaseCleaner
     public let syncDidCompletePublisher: AnyPublisher<Void, Never>
+    public static let syncCredentialsPausedStateChanged = SyncBookmarksAdapter.syncBookmarksPausedStateChanged
+    public static let credentialsSyncLimitReached = Notification.Name("com.duckduckgo.app.SyncCredentialsLimitReached")
+
+    @UserDefaultsWrapper(key: .syncCredentialsPaused, defaultValue: false)
+    static public var isSyncCredentialsPaused: Bool {
+        didSet {
+            NotificationCenter.default.post(name: syncCredentialsPausedStateChanged, object: nil)
+        }
+    }
+    @UserDefaultsWrapper(key: .syncCredentialsPausedErrorDisplayed, defaultValue: false)
+    static private var didShowCredentialsSyncPausedError: Bool
 
     public init(secureVaultFactory: AutofillVaultFactory = AutofillSecureVaultFactory, secureVaultErrorReporter: SecureVaultErrorReporting) {
         syncDidCompletePublisher = syncDidCompleteSubject.eraseToAnyPublisher()
@@ -63,6 +74,8 @@ public final class SyncCredentialsAdapter {
                 metadataStore: metadataStore,
                 syncDidUpdateData: { [weak self] in
                     self?.syncDidCompleteSubject.send()
+                    Self.isSyncCredentialsPaused = false
+                    Self.didShowCredentialsSyncPausedError = false
                 }
             )
 
@@ -71,6 +84,21 @@ public final class SyncCredentialsAdapter {
                     switch error {
                     case let syncError as SyncError:
                         Pixel.fire(pixel: .syncCredentialsFailed, error: syncError)
+
+                        switch syncError {
+                        case .unexpectedStatusCode(409):
+                            // If credentials count limit has been exceeded
+                            Self.isSyncCredentialsPaused = true
+                            DailyPixel.fire(pixel: .syncCredentialsCountLimitExceededDaily)
+                            Self.notifyCredentialsSyncLimitReached()
+                        case .unexpectedStatusCode(413):
+                            // If credentials request size limit has been exceeded
+                            Self.isSyncCredentialsPaused = true
+                            DailyPixel.fire(pixel: .syncCredentialsRequestSizeLimitExceededDaily)
+                            Self.notifyCredentialsSyncLimitReached()
+                        default:
+                            break
+                        }
                     default:
                         let nsError = error as NSError
                         if nsError.domain != NSURLErrorDomain {
@@ -91,6 +119,13 @@ public final class SyncCredentialsAdapter {
        }
     }
 
+    static private func notifyCredentialsSyncLimitReached() {
+        if !Self.didShowCredentialsSyncPausedError {
+            NotificationCenter.default.post(name: Self.credentialsSyncLimitReached, object: nil)
+            Self.didShowCredentialsSyncPausedError = true
+        }
+    }
+
     private var syncDidCompleteSubject = PassthroughSubject<Void, Never>()
     private var syncErrorCancellable: AnyCancellable?
     private let secureVaultErrorReporter: SecureVaultErrorReporting
diff --git a/Core/SyncDataProviders.swift b/Core/SyncDataProviders.swift
index e705889a54..a70b4acd4f 100644
--- a/Core/SyncDataProviders.swift
+++ b/Core/SyncDataProviders.swift
@@ -17,6 +17,7 @@
 //  limitations under the License.
 //
 
+import Bookmarks
 import BrowserServicesKit
 import Combine
 import Common
@@ -84,14 +85,16 @@ public class SyncDataProviders: DataProvidersSource {
     public init(
         bookmarksDatabase: CoreDataDatabase,
         secureVaultFactory: AutofillVaultFactory = AutofillSecureVaultFactory,
-        secureVaultErrorReporter: SecureVaultErrorReporting
+        secureVaultErrorReporter: SecureVaultErrorReporting,
+        settingHandlers: [SettingSyncHandler],
+        favoritesDisplayModeStorage: FavoritesDisplayModeStoring
     ) {
         self.bookmarksDatabase = bookmarksDatabase
         self.secureVaultFactory = secureVaultFactory
         self.secureVaultErrorReporter = secureVaultErrorReporter
-        bookmarksAdapter = SyncBookmarksAdapter(database: bookmarksDatabase)
+        bookmarksAdapter = SyncBookmarksAdapter(database: bookmarksDatabase, favoritesDisplayModeStorage: favoritesDisplayModeStorage)
         credentialsAdapter = SyncCredentialsAdapter(secureVaultFactory: secureVaultFactory, secureVaultErrorReporter: secureVaultErrorReporter)
-        settingsAdapter = SyncSettingsAdapter()
+        settingsAdapter = SyncSettingsAdapter(settingHandlers: settingHandlers)
     }
 
     private func initializeMetadataDatabaseIfNeeded() {
diff --git a/Core/SyncSettingsAdapter.swift b/Core/SyncSettingsAdapter.swift
index b6b5fd80ef..9bfe132bb4 100644
--- a/Core/SyncSettingsAdapter.swift
+++ b/Core/SyncSettingsAdapter.swift
@@ -30,7 +30,8 @@ public final class SyncSettingsAdapter {
     public private(set) var emailManager: EmailManager?
     public let syncDidCompletePublisher: AnyPublisher<Void, Never>
 
-    public init() {
+    public init(settingHandlers: [SettingSyncHandler]) {
+        self.settingHandlers = settingHandlers
         syncDidCompletePublisher = syncDidCompleteSubject.eraseToAnyPublisher()
     }
 
@@ -41,12 +42,14 @@ public final class SyncSettingsAdapter {
         guard provider == nil else {
             return
         }
+
         let emailManager = EmailManager()
+        let emailProtectionSyncHandler = EmailProtectionSyncHandler(emailManager: emailManager)
 
         let provider = SettingsProvider(
             metadataDatabase: metadataDatabase,
             metadataStore: metadataStore,
-            emailManager: emailManager,
+            settingsHandlers: settingHandlers + [emailProtectionSyncHandler],
             syncDidUpdateData: { [weak self] in
                 self?.syncDidCompleteSubject.send()
             }
@@ -77,6 +80,7 @@ public final class SyncSettingsAdapter {
         self.emailManager = emailManager
     }
 
+    private let settingHandlers: [SettingSyncHandler]
     private var syncDidCompleteSubject = PassthroughSubject<Void, Never>()
     private var syncErrorCancellable: AnyCancellable?
 }
diff --git a/Core/UserDefaultsPropertyWrapper.swift b/Core/UserDefaultsPropertyWrapper.swift
index 7949c231c3..78a4507ba0 100644
--- a/Core/UserDefaultsPropertyWrapper.swift
+++ b/Core/UserDefaultsPropertyWrapper.swift
@@ -69,7 +69,7 @@ public struct UserDefaultsWrapper<T> {
         case downloadedTrackerDataSetCount = "com.duckduckgo.app.downloadedTrackerDataSetCount"
         case downloadedPrivacyConfigurationCount = "com.duckduckgo.app.downloadedPrivacyConfigurationCount"
         case textSize = "com.duckduckgo.ios.textSize"
-        
+
         case emailWaitlistShouldReceiveNotifications = "com.duckduckgo.ios.showWaitlistNotification"
         case unseenDownloadsAvailable = "com.duckduckgo.app.unseenDownloadsAvailable"
         
@@ -97,6 +97,10 @@ public struct UserDefaultsWrapper<T> {
         case defaultBrowserUsageLastSeen = "com.duckduckgo.ios.default-browser-usage-last-seen"
 
         case syncEnvironment = "com.duckduckgo.ios.sync-environment"
+        case syncBookmarksPaused = "com.duckduckgo.ios.sync-bookmarksPaused"
+        case syncCredentialsPaused = "com.duckduckgo.ios.sync-credentialsPaused"
+        case syncBookmarksPausedErrorDisplayed = "com.duckduckgo.ios.sync-bookmarksPausedErrorDisplayed"
+        case syncCredentialsPausedErrorDisplayed = "com.duckduckgo.ios.sync-credentialsPausedErrorDisplayed"
 
         case networkProtectionDebugOptionAlwaysOnDisabled = "com.duckduckgo.network-protection.always-on.disabled"
 
diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
index b79bb0ad72..aace48e673 100644
--- a/DuckDuckGo.xcodeproj/project.pbxproj
+++ b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -246,8 +246,12 @@
 		31DD208427395A5A008FB313 /* VoiceSearchHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31DD208327395A5A008FB313 /* VoiceSearchHelper.swift */; };
 		31E69A63280F4CB600478327 /* DuckUI in Frameworks */ = {isa = PBXBuildFile; productRef = 31E69A62280F4CB600478327 /* DuckUI */; };
 		31EF52E1281B3BDC0034796E /* AutofillLoginListItemViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31EF52E0281B3BDC0034796E /* AutofillLoginListItemViewModel.swift */; };
+		373608902ABB1E6C00629E7F /* FavoritesDisplayModeStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3736088F2ABB1E6C00629E7F /* FavoritesDisplayModeStorage.swift */; };
+		373608922ABB430D00629E7F /* FavoritesDisplayMode+UserDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = 373608912ABB430D00629E7F /* FavoritesDisplayMode+UserDefaults.swift */; };
+		373608932ABB432600629E7F /* FavoritesDisplayMode+UserDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = 373608912ABB430D00629E7F /* FavoritesDisplayMode+UserDefaults.swift */; };
 		37445F972A155F7C0029F789 /* SyncDataProviders.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37445F962A155F7C0029F789 /* SyncDataProviders.swift */; };
 		3760DFED299315EF0045A446 /* Waitlist in Frameworks */ = {isa = PBXBuildFile; productRef = 3760DFEC299315EF0045A446 /* Waitlist */; };
+		377D80222AB48554002AF251 /* FavoritesDisplayModeSyncHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 377D80212AB48554002AF251 /* FavoritesDisplayModeSyncHandler.swift */; };
 		379E877429E97C8D001C8BB0 /* BookmarksCleanupErrorHandling.swift in Sources */ = {isa = PBXBuildFile; fileRef = 379E877329E97C8D001C8BB0 /* BookmarksCleanupErrorHandling.swift */; };
 		37CBCA9E2A8A659C0050218F /* SyncSettingsAdapter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CBCA9D2A8A659C0050218F /* SyncSettingsAdapter.swift */; };
 		37CEFCAC2A673B90001EF741 /* CredentialsCleanupErrorHandling.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CEFCAB2A673B90001EF741 /* CredentialsCleanupErrorHandling.swift */; };
@@ -1259,7 +1263,10 @@
 		31CC224828369B38001654A4 /* AutofillLoginSettingsListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutofillLoginSettingsListViewController.swift; sourceTree = "<group>"; };
 		31DD208327395A5A008FB313 /* VoiceSearchHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VoiceSearchHelper.swift; sourceTree = "<group>"; };
 		31EF52E0281B3BDC0034796E /* AutofillLoginListItemViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutofillLoginListItemViewModel.swift; sourceTree = "<group>"; };
+		3736088F2ABB1E6C00629E7F /* FavoritesDisplayModeStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FavoritesDisplayModeStorage.swift; sourceTree = "<group>"; };
+		373608912ABB430D00629E7F /* FavoritesDisplayMode+UserDefaults.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "FavoritesDisplayMode+UserDefaults.swift"; sourceTree = "<group>"; };
 		37445F962A155F7C0029F789 /* SyncDataProviders.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SyncDataProviders.swift; sourceTree = "<group>"; };
+		377D80212AB48554002AF251 /* FavoritesDisplayModeSyncHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FavoritesDisplayModeSyncHandler.swift; sourceTree = "<group>"; };
 		379E877329E97C8D001C8BB0 /* BookmarksCleanupErrorHandling.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksCleanupErrorHandling.swift; sourceTree = "<group>"; };
 		37CBCA9D2A8A659C0050218F /* SyncSettingsAdapter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SyncSettingsAdapter.swift; sourceTree = "<group>"; };
 		37CEFCAB2A673B90001EF741 /* CredentialsCleanupErrorHandling.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CredentialsCleanupErrorHandling.swift; sourceTree = "<group>"; };
@@ -3329,6 +3336,14 @@
 			path = LocalPackages;
 			sourceTree = "<group>";
 		};
+		377D80202AB4853A002AF251 /* SettingSyncHandlers */ = {
+			isa = PBXGroup;
+			children = (
+				377D80212AB48554002AF251 /* FavoritesDisplayModeSyncHandler.swift */,
+			);
+			name = SettingSyncHandlers;
+			sourceTree = "<group>";
+		};
 		37DF000829F9C3F0002B7D3E /* Sync */ = {
 			isa = PBXGroup;
 			children = (
@@ -3985,6 +4000,7 @@
 		85F98F8C296F0ED100742F4A /* Sync */ = {
 			isa = PBXGroup;
 			children = (
+				377D80202AB4853A002AF251 /* SettingSyncHandlers */,
 				85F98F97296F4CB100742F4A /* SyncAssets.xcassets */,
 				85F0E97229952D7A003D5181 /* DuckDuckGo Recovery Document.pdf */,
 				85DD44232976C7A8005CC388 /* Controllers */,
@@ -4844,6 +4860,7 @@
 				F1D796EF1E7B07610019D451 /* BookmarksViewControllerCells.swift */,
 				85E58C2B28FDA94F006A801A /* FavoritesViewController.swift */,
 				F1D796EB1E7AB8930019D451 /* SaveBookmarkActivity.swift */,
+				3736088F2ABB1E6C00629E7F /* FavoritesDisplayModeStorage.swift */,
 			);
 			name = Bookmarks;
 			sourceTree = "<group>";
@@ -5038,6 +5055,7 @@
 				98B31291218CCB8C00E54DE1 /* AppDependencyProvider.swift */,
 				85BA58591F3506AE00C6E8CA /* AppSettings.swift */,
 				85BA58541F34F49E00C6E8CA /* AppUserDefaults.swift */,
+				373608912ABB430D00629E7F /* FavoritesDisplayMode+UserDefaults.swift */,
 				850250B220D803F4002199C7 /* AtbAndVariantCleanup.swift */,
 				983EABB7236198F6003948D1 /* DatabaseMigration.swift */,
 				853C5F6021C277C7001F7A05 /* global.swift */,
@@ -6244,6 +6262,7 @@
 				980891A52237D4F500313A70 /* FeedbackNavigator.swift in Sources */,
 				C1B7B52328941F2A0098FD6A /* RemoteMessagingStore.swift in Sources */,
 				1E8AD1C927BFAD1500ABA377 /* DirectoryMonitor.swift in Sources */,
+				377D80222AB48554002AF251 /* FavoritesDisplayModeSyncHandler.swift in Sources */,
 				1E8AD1D127C000AB00ABA377 /* OngoingDownloadRow.swift in Sources */,
 				85058366219AE9EA00ED4EDB /* HomePageConfiguration.swift in Sources */,
 				EE0153E12A6EABE0002A8B26 /* NetworkProtectionConvenienceInitialisers.swift in Sources */,
@@ -6298,6 +6317,7 @@
 				F46FEC5727987A5F0061D9DF /* KeychainItemsDebugViewController.swift in Sources */,
 				02341FA62A4379CC008A1531 /* OnboardingStepViewModel.swift in Sources */,
 				850365F323DE087800D0F787 /* UIImageViewExtension.swift in Sources */,
+				373608922ABB430D00629E7F /* FavoritesDisplayMode+UserDefaults.swift in Sources */,
 				C160544129D6044D00B715A1 /* AutofillInterfaceUsernameTruncator.swift in Sources */,
 				02A54A9A2A094A17000C8FED /* AppTPHomeView.swift in Sources */,
 				31C70B5528045E3500FB6AD1 /* SecureVaultErrorReporter.swift in Sources */,
@@ -6400,6 +6420,7 @@
 				85010502292FB1000033978F /* FireproofFaviconUpdater.swift in Sources */,
 				F1C4A70E1E57725800A6CA1B /* OmniBar.swift in Sources */,
 				981CA7EA2617797500E119D5 /* MainViewController+AddFavoriteFlow.swift in Sources */,
+				373608902ABB1E6C00629E7F /* FavoritesDisplayModeStorage.swift in Sources */,
 				9872D205247DCAC100CEF398 /* TabPreviewsSource.swift in Sources */,
 				F130D73A1E5776C500C45811 /* OmniBarDelegate.swift in Sources */,
 				85DFEDEF24C7EA3B00973FE7 /* SmallOmniBarState.swift in Sources */,
@@ -6642,6 +6663,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				853273AE24FEF49600E3C778 /* ColorExtension.swift in Sources */,
+				373608932ABB432600629E7F /* FavoritesDisplayMode+UserDefaults.swift in Sources */,
 				853273B324FF114700E3C778 /* DeepLinks.swift in Sources */,
 				853273B424FFB36100E3C778 /* UIColorExtension.swift in Sources */,
 				853273AB24FEF27500E3C778 /* WidgetViews.swift in Sources */,
@@ -9058,7 +9080,7 @@
 			repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit";
 			requirement = {
 				kind = exactVersion;
-				version = 82.3.0;
+				version = 83.0.0;
 			};
 		};
 		C14882EB27F211A000D59F0C /* XCRemoteSwiftPackageReference "SwiftSoup" */ = {
diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 129f2539b2..d9cc92bff7 100644
--- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -15,8 +15,8 @@
         "repositoryURL": "https://github.com/DuckDuckGo/BrowserServicesKit",
         "state": {
           "branch": null,
-          "revision": "c4d5f6df0340f0a5c109dcded9801ab676de7db5",
-          "version": "82.3.0"
+          "revision": "f7e20cd37bbc0d25ae3c3f25ef52d319366613e7",
+          "version": "83.0.0"
         }
       },
       {
diff --git a/DuckDuckGo/AddOrEditBookmarkViewController.swift b/DuckDuckGo/AddOrEditBookmarkViewController.swift
index 1b31051f25..188764d2ba 100644
--- a/DuckDuckGo/AddOrEditBookmarkViewController.swift
+++ b/DuckDuckGo/AddOrEditBookmarkViewController.swift
@@ -41,19 +41,23 @@ class AddOrEditBookmarkViewController: UIViewController {
     private let viewModel: BookmarkEditorViewModel
     private let bookmarksDatabase: CoreDataDatabase
     private let syncService: DDGSyncing
+    private let appSettings: AppSettings
 
     private var viewModelCancellable: AnyCancellable?
 
     init?(coder: NSCoder,
           editingEntityID: NSManagedObjectID,
           bookmarksDatabase: CoreDataDatabase,
-          syncService: DDGSyncing) {
+          syncService: DDGSyncing,
+          appSettings: AppSettings) {
         
         self.bookmarksDatabase = bookmarksDatabase
         self.viewModel = BookmarkEditorViewModel(editingEntityID: editingEntityID,
                                                  bookmarksDatabase: bookmarksDatabase,
+                                                 favoritesDisplayMode: appSettings.favoritesDisplayMode,
                                                  syncService: syncService)
         self.syncService = syncService
+        self.appSettings = appSettings
 
         super.init(coder: coder)
     }
@@ -61,13 +65,16 @@ class AddOrEditBookmarkViewController: UIViewController {
     init?(coder: NSCoder,
           parentFolderID: NSManagedObjectID?,
           bookmarksDatabase: CoreDataDatabase,
-          syncService: DDGSyncing) {
+          syncService: DDGSyncing,
+          appSettings: AppSettings) {
 
         self.bookmarksDatabase = bookmarksDatabase
         self.viewModel = BookmarkEditorViewModel(creatingFolderWithParentID: parentFolderID,
                                                  bookmarksDatabase: bookmarksDatabase,
+                                                 favoritesDisplayMode: appSettings.favoritesDisplayMode,
                                                  syncService: syncService)
         self.syncService = syncService
+        self.appSettings = appSettings
 
         super.init(coder: coder)
     }
@@ -138,7 +145,8 @@ class AddOrEditBookmarkViewController: UIViewController {
             coder: coder,
             parentFolderID: viewModel.bookmark.parent?.objectID,
             bookmarksDatabase: bookmarksDatabase,
-            syncService: syncService
+            syncService: syncService,
+            appSettings: appSettings
         ) else {
             fatalError("Failed to create controller")
         }
diff --git a/DuckDuckGo/AppDelegate.swift b/DuckDuckGo/AppDelegate.swift
index d49f873e3d..9b3a32e512 100644
--- a/DuckDuckGo/AppDelegate.swift
+++ b/DuckDuckGo/AppDelegate.swift
@@ -161,7 +161,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
             DatabaseMigration.migrate(to: context)
         }
 
-        bookmarksDatabase.loadStore { context, error in
+        var shouldResetBookmarksSyncTimestamp = false
+
+        bookmarksDatabase.loadStore { [weak self] context, error in
             guard let context = context else {
                 if let error = error {
                     Pixel.fire(pixel: .bookmarksCouldNotLoadDatabase,
@@ -184,6 +186,21 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
                                                   to: context)
             legacyStorage?.removeStore()
 
+            do {
+                BookmarkUtils.migrateToFormFactorSpecificFavorites(byCopyingExistingTo: .mobile, in: context)
+                if context.hasChanges {
+                    try context.save(onErrorFire: .bookmarksMigrationCouldNotPrepareMultipleFavoriteFolders)
+                    if let syncDataProviders = self?.syncDataProviders {
+                        syncDataProviders.bookmarksAdapter.shouldResetBookmarksSyncTimestamp = true
+                    } else {
+                        shouldResetBookmarksSyncTimestamp = true
+                    }
+                }
+            } catch {
+                Thread.sleep(forTimeInterval: 1)
+                fatalError("Could not prepare Bookmarks DB structure")
+            }
+
             WidgetCenter.shared.reloadAllTimelines()
         }
 
@@ -235,7 +252,14 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
             ).wrappedValue
         ) ?? defaultEnvironment
 
-        syncDataProviders = SyncDataProviders(bookmarksDatabase: bookmarksDatabase, secureVaultErrorReporter: SecureVaultErrorReporter.shared)
+        syncDataProviders = SyncDataProviders(
+            bookmarksDatabase: bookmarksDatabase,
+            secureVaultErrorReporter: SecureVaultErrorReporter.shared,
+            settingHandlers: [FavoritesDisplayModeSyncHandler()],
+            favoritesDisplayModeStorage: FavoritesDisplayModeStorage()
+        )
+        syncDataProviders.bookmarksAdapter.shouldResetBookmarksSyncTimestamp = shouldResetBookmarksSyncTimestamp
+
         let syncService = DDGSync(dataProvidersSource: syncDataProviders, errorEvents: SyncErrorHandler(), log: .syncLog, environment: environment)
         syncService.initializeIfNeeded()
         self.syncService = syncService
@@ -275,7 +299,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         // Having both in `didBecomeActive` can sometimes cause the exception when running on a physical device, so registration happens here.
         AppConfigurationFetch.registerBackgroundRefreshTaskHandler()
         WindowsBrowserWaitlist.shared.registerBackgroundRefreshTaskHandler()
-        RemoteMessaging.registerBackgroundRefreshTaskHandler(bookmarksDatabase: bookmarksDatabase)
+        RemoteMessaging.registerBackgroundRefreshTaskHandler(
+            bookmarksDatabase: bookmarksDatabase,
+            favoritesDisplayMode: AppDependencyProvider.shared.appSettings.favoritesDisplayMode
+        )
 
         UNUserNotificationCenter.current().delegate = self
         
@@ -479,7 +506,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     private func refreshRemoteMessages() {
         Task {
-            try? await RemoteMessaging.fetchAndProcess(bookmarksDatabase: self.bookmarksDatabase)
+            try? await RemoteMessaging.fetchAndProcess(
+                bookmarksDatabase: self.bookmarksDatabase,
+                favoritesDisplayMode: AppDependencyProvider.shared.appSettings.favoritesDisplayMode
+            )
         }
     }
 
diff --git a/DuckDuckGo/AppSettings.swift b/DuckDuckGo/AppSettings.swift
index 45b1354046..0c3f6dd748 100644
--- a/DuckDuckGo/AppSettings.swift
+++ b/DuckDuckGo/AppSettings.swift
@@ -17,6 +17,8 @@
 //  limitations under the License.
 //
 
+import Bookmarks
+
 protocol AppSettings: AnyObject {
     var autocomplete: Bool { get set }
     var currentThemeName: ThemeName { get set }
@@ -34,6 +36,8 @@ protocol AppSettings: AnyObject {
     var currentAddressBarPosition: AddressBarPosition { get set }
 
     var textSize: Int { get set }
+
+    var favoritesDisplayMode: FavoritesDisplayMode { get set }
     
     var autofillCredentialsEnabled: Bool { get set }
     var autofillCredentialsSavePromptShowAtLeastOnce: Bool { get set }
@@ -47,4 +51,7 @@ protocol AppSettings: AnyObject {
     
     var autoconsentPromptSeen: Bool { get set }
     var autoconsentEnabled: Bool { get set }
+
+    var isSyncBookmarksPaused: Bool { get }
+    var isSyncCredentialsPaused: Bool { get }
 }
diff --git a/DuckDuckGo/AppUserDefaults.swift b/DuckDuckGo/AppUserDefaults.swift
index efbfe51d59..f06c8d7180 100644
--- a/DuckDuckGo/AppUserDefaults.swift
+++ b/DuckDuckGo/AppUserDefaults.swift
@@ -18,6 +18,7 @@
 //
 
 import Foundation
+import Bookmarks
 import Core
 import WidgetKit
 
@@ -27,6 +28,9 @@ public class AppUserDefaults: AppSettings {
         public static let doNotSellStatusChange = Notification.Name("com.duckduckgo.app.DoNotSellStatusChange")
         public static let currentFireButtonAnimationChange = Notification.Name("com.duckduckgo.app.CurrentFireButtonAnimationChange")
         public static let textSizeChange = Notification.Name("com.duckduckgo.app.TextSizeChange")
+        public static let favoritesDisplayModeChange = Notification.Name("com.duckduckgo.app.FavoritesDisplayModeChange")
+        public static let syncPausedStateChanged = SyncBookmarksAdapter.syncBookmarksPausedStateChanged
+        public static let syncCredentialsPausedStateChanged = SyncCredentialsAdapter.syncCredentialsPausedStateChanged
         public static let autofillEnabledChange = Notification.Name("com.duckduckgo.app.AutofillEnabledChange")
         public static let didVerifyInternalUser = Notification.Name("com.duckduckgo.app.DidVerifyInternalUser")
         public static let inspectableWebViewsToggled = Notification.Name("com.duckduckgo.app.DidToggleInspectableWebViews")
@@ -35,7 +39,7 @@ public class AppUserDefaults: AppSettings {
 
     private let groupName: String
 
-    private struct Keys {
+    struct Keys {
         static let autocompleteKey = "com.duckduckgo.app.autocompleteDisabledKey"
         static let currentThemeNameKey = "com.duckduckgo.app.currentThemeNameKey"
         
@@ -62,6 +66,8 @@ public class AppUserDefaults: AppSettings {
         
         static let autofillCredentialsEnabled = "com.duckduckgo.ios.autofillCredentialsEnabled"
         static let autofillIsNewInstallForOnByDefault = "com.duckduckgo.ios.autofillIsNewInstallForOnByDefault"
+
+        static let favoritesDisplayMode = "com.duckduckgo.ios.favoritesDisplayMode"
     }
 
     private struct DebugKeys {
@@ -72,6 +78,10 @@ public class AppUserDefaults: AppSettings {
         return UserDefaults(suiteName: groupName)
     }
 
+    private var bookmarksUserDefaults: UserDefaults? {
+        UserDefaults(suiteName: "group.com.duckduckgo.bookmarks")
+    }
+
     lazy var featureFlagger = AppDependencyProvider.shared.featureFlagger
 
     init(groupName: String = "group.com.duckduckgo.app") {
@@ -195,6 +205,25 @@ public class AppUserDefaults: AppSettings {
     @UserDefaultsWrapper(key: .textSize, defaultValue: 100)
     var textSize: Int
 
+    @UserDefaultsWrapper(key: .syncBookmarksPaused, defaultValue: false)
+    var isSyncBookmarksPaused: Bool
+
+    @UserDefaultsWrapper(key: .syncCredentialsPaused, defaultValue: false)
+    var isSyncCredentialsPaused: Bool
+
+    public var favoritesDisplayMode: FavoritesDisplayMode {
+        get {
+            guard let string = userDefaults?.string(forKey: Keys.favoritesDisplayMode), let favoritesDisplayMode = FavoritesDisplayMode(string) else {
+                return .default
+            }
+            return favoritesDisplayMode
+        }
+        set {
+            userDefaults?.setValue(newValue.description, forKey: Keys.favoritesDisplayMode)
+            bookmarksUserDefaults?.setValue(newValue.description, forKey: Keys.favoritesDisplayMode)
+        }
+    }
+
     private func setAutofillCredentialsEnabledAutomaticallyIfNecessary() {
         if autofillCredentialsHasBeenEnabledAutomaticallyIfNecessary {
             return
diff --git a/DuckDuckGo/Base.lproj/Settings.storyboard b/DuckDuckGo/Base.lproj/Settings.storyboard
index ac8a7668d7..679524ecd2 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" 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; Back Up" 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">
@@ -540,7 +540,7 @@
                                         <rect key="frame" x="20" y="876.66666793823242" width="374" height="44.333332061767578"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" tableViewCell="mSQ-M3-da5" id="uF1-dD-wAq">
-                                            <rect key="frame" x="0.0" y="0.0" width="374" height="44.333332061767578"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="374" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" ambiguous="YES" text="Application Lock" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dBZ-yq-FYj">
diff --git a/DuckDuckGo/BookmarkFolderCell.swift b/DuckDuckGo/BookmarkFolderCell.swift
index acf03631aa..ae02cce8e8 100644
--- a/DuckDuckGo/BookmarkFolderCell.swift
+++ b/DuckDuckGo/BookmarkFolderCell.swift
@@ -36,7 +36,7 @@ class BookmarkFolderCell: UITableViewCell {
 
             if folder.uuid == BookmarkEntity.Constants.rootFolderID {
                 title.text = UserText.sectionTitleBookmarks
-            } else if folder.uuid == BookmarkEntity.Constants.favoritesFolderID {
+            } else if folder.uuid.flatMap({ FavoritesFolderID.allCases.map(\.rawValue).contains($0) }) == true {
                 title.text = "Favorites"
                 assertionFailure("Favorites folder in UI")
             } else {
diff --git a/DuckDuckGo/BookmarkFoldersTableViewController.swift b/DuckDuckGo/BookmarkFoldersTableViewController.swift
index ebe5d41258..eef6dcf376 100644
--- a/DuckDuckGo/BookmarkFoldersTableViewController.swift
+++ b/DuckDuckGo/BookmarkFoldersTableViewController.swift
@@ -185,7 +185,9 @@ class BookmarkFoldersViewController: UITableViewController {
             fatalError("Failed to dequeue \(FavoriteCell.reuseIdentifier) as FavoriteCell")
         }
 
-        cell.favoriteToggle.isOn = viewModel?.bookmark.isFavorite == true
+        let displayedFolder = viewModel?.favoritesDisplayMode.displayedFolder ?? .mobile
+
+        cell.favoriteToggle.isOn = viewModel?.bookmark.isFavorite(on: displayedFolder) == true
         cell.favoriteToggle.removeTarget(self, action: #selector(favoriteToggleDidChange(_:)), for: .valueChanged)
         cell.favoriteToggle.addTarget(self, action: #selector(favoriteToggleDidChange(_:)), for: .valueChanged)
         cell.favoriteToggle.onTintColor = ThemeManager.shared.currentTheme.buttonTintColor
diff --git a/DuckDuckGo/BookmarksDataSource.swift b/DuckDuckGo/BookmarksDataSource.swift
index 2f7b35d626..13f2834691 100644
--- a/DuckDuckGo/BookmarksDataSource.swift
+++ b/DuckDuckGo/BookmarksDataSource.swift
@@ -52,7 +52,7 @@ class BookmarksDataSource: NSObject, UITableViewDataSource {
             let cell = BookmarksViewControllerCellFactory.makeBookmarkCell(tableView, forIndexPath: indexPath)
             cell.faviconImageView.loadFavicon(forDomain: bookmark.urlObject?.host, usingCache: .fireproof)
             cell.titleLabel.text = bookmark.title
-            cell.favoriteImageViewContainer.isHidden = !bookmark.isFavorite
+            cell.favoriteImageViewContainer.isHidden = !bookmark.isFavorite(on: viewModel.favoritesDisplayMode.displayedFolder)
             return cell
         }
     }
diff --git a/DuckDuckGo/BookmarksViewController.swift b/DuckDuckGo/BookmarksViewController.swift
index 78a5dca1d0..8363a61384 100644
--- a/DuckDuckGo/BookmarksViewController.swift
+++ b/DuckDuckGo/BookmarksViewController.swift
@@ -56,8 +56,10 @@ class BookmarksViewController: UIViewController, UITableViewDelegate {
     private let favicons: Favicons
     private let syncService: DDGSyncing
     private let syncDataProviders: SyncDataProviders
+    private let appSettings: AppSettings
     private var localUpdatesCancellable: AnyCancellable?
     private var syncUpdatesCancellable: AnyCancellable?
+    private var favoritesDisplayModeCancellable: AnyCancellable?
 
     /// Creating left and right toolbar UIBarButtonItems with customView so that 'Edit' button is centered
     private lazy var addFolderButton: UIButton = {
@@ -111,14 +113,21 @@ class BookmarksViewController: UIViewController, UITableViewDelegate {
                    parentID: NSManagedObjectID? = nil,
                    favicons: Favicons = Favicons.shared,
                    syncService: DDGSyncing,
-                   syncDataProviders: SyncDataProviders
+                   syncDataProviders: SyncDataProviders,
+                   appSettings: AppSettings
     ) {
         self.bookmarksDatabase = bookmarksDatabase
         self.searchDataSource = SearchBookmarksDataSource(searchEngine: bookmarksSearch)
-        self.viewModel = BookmarkListViewModel(bookmarksDatabase: bookmarksDatabase, parentID: parentID, syncService: syncService)
+        self.viewModel = BookmarkListViewModel(
+            bookmarksDatabase: bookmarksDatabase,
+            parentID: parentID,
+            favoritesDisplayMode: appSettings.favoritesDisplayMode,
+            syncService: syncService
+        )
         self.favicons = favicons
         self.syncService = syncService
         self.syncDataProviders = syncDataProviders
+        self.appSettings = appSettings
         super.init(coder: coder)
 
         bindSyncService()
@@ -143,6 +152,18 @@ class BookmarksViewController: UIViewController, UITableViewDelegate {
             }
     }
 
+    private func bindFavoritesDisplayMode() {
+        favoritesDisplayModeCancellable = NotificationCenter.default.publisher(for: AppUserDefaults.Notifications.favoritesDisplayModeChange)
+            .receive(on: DispatchQueue.main)
+            .sink { [weak self] _ in
+                guard let self else {
+                    return
+                }
+                self.viewModel.favoritesDisplayMode = self.appSettings.favoritesDisplayMode
+                self.tableView.reloadData()
+            }
+    }
+
     override func viewDidLoad() {
         super.viewDidLoad()
 
@@ -150,6 +171,7 @@ class BookmarksViewController: UIViewController, UITableViewDelegate {
             self?.tableView.reloadData()
             self?.refreshAll()
         }
+        bindFavoritesDisplayMode()
 
         syncService.scheduler.requestSyncImmediately()
 
@@ -261,7 +283,8 @@ class BookmarksViewController: UIViewController, UITableViewDelegate {
                                                      bookmarksSearch: self.searchDataSource.searchEngine,
                                                      parentID: parent.objectID,
                                                      syncService: self.syncService,
-                                                     syncDataProviders: self.syncDataProviders)
+                                                     syncDataProviders: self.syncDataProviders,
+                                                     appSettings: self.appSettings)
             controller?.delegate = self.delegate
             return controller
         })
@@ -278,8 +301,8 @@ class BookmarksViewController: UIViewController, UITableViewDelegate {
         let cell = tableView.cellForRow(at: indexPath)
         cell?.tintColor = .black
 
-        let title = bookmark.isFavorite ? UserText.actionRemoveFavorite : UserText.favorite
-        let iconName = bookmark.isFavorite ? "Favorite-Remove-24" : "Favorite-24"
+        let title = bookmark.isFavorite(on: viewModel.favoritesDisplayMode.displayedFolder) ? UserText.actionRemoveFavorite : UserText.favorite
+        let iconName = bookmark.isFavorite(on: viewModel.favoritesDisplayMode.displayedFolder) ? "Favorite-Remove-24" : "Favorite-24"
 
         let toggleFavoriteAction = UIContextualAction(style: .normal, title: title) { [weak self] (_, _, completionHandler) in
             completionHandler(true)
@@ -540,7 +563,8 @@ class BookmarksViewController: UIViewController, UITableViewDelegate {
             guard let controller = AddOrEditBookmarkViewController(coder: coder,
                                                                    editingEntityID: id,
                                                                    bookmarksDatabase: bookmarksDatabase,
-                                                                   syncService: syncService) else {
+                                                                   syncService: syncService,
+                                                                   appSettings: appSettings) else {
                 assertionFailure("Failed to create controller")
                 return nil
             }
@@ -551,7 +575,8 @@ class BookmarksViewController: UIViewController, UITableViewDelegate {
             guard let controller = AddOrEditBookmarkViewController(coder: coder,
                                                                    parentFolderID: viewModel.currentFolder?.objectID,
                                                                    bookmarksDatabase: bookmarksDatabase,
-                                                                   syncService: syncService) else {
+                                                                   syncService: syncService,
+                                                                   appSettings: appSettings) else {
                 assertionFailure("Failed to create controller")
                 return nil
             }
@@ -565,7 +590,8 @@ class BookmarksViewController: UIViewController, UITableViewDelegate {
             coder: coder,
             bookmarksDatabase: bookmarksDatabase,
             syncService: syncService,
-            syncDataProviders: syncDataProviders
+            syncDataProviders: syncDataProviders,
+            appSettings: appSettings
         ) else {
             fatalError("Failed to create controller")
         }
@@ -597,7 +623,10 @@ class BookmarksViewController: UIViewController, UITableViewDelegate {
         let bookmarksDatabase = bookmarksDatabase
         Task {
 
-            let result = await BookmarksImporter(coreDataStore: bookmarksDatabase).parseAndSave(html: html)
+            let result = await BookmarksImporter(
+                coreDataStore: bookmarksDatabase,
+                favoritesDisplayMode: appSettings.favoritesDisplayMode
+            ).parseAndSave(html: html)
             switch result {
             case .success:
                 WidgetCenter.shared.reloadAllTimelines()
@@ -632,7 +661,8 @@ class BookmarksViewController: UIViewController, UITableViewDelegate {
         // create file to export
         let tempFileUrl = FileManager.default.temporaryDirectory.appendingPathComponent(Constants.bookmarksFileName)
         do {
-            try BookmarksExporter(coreDataStore: bookmarksDatabase).exportBookmarksTo(url: tempFileUrl)
+            try BookmarksExporter(coreDataStore: bookmarksDatabase, favoritesDisplayMode: viewModel.favoritesDisplayMode)
+                .exportBookmarksTo(url: tempFileUrl)
         } catch {
             os_log("bookmarks failed to export %s", type: .debug, error.localizedDescription)
             ActionMessageView.present(message: UserText.exportBookmarksFailedMessage)
@@ -904,8 +934,10 @@ extension BookmarksViewController: AddOrEditBookmarkViewControllerDelegate {
         }
 
         // capture the optional details
-        let favoritesFolder = bookmark.favoriteFolder
-        let favoritesIndex = favoritesFolder?.favoritesArray.firstIndex(of: bookmark)
+        var favoritesFoldersAndIndexes: [BookmarkEntity: Int] = [:]
+        for favoritesFolder in bookmark.favoriteFoldersSet {
+            favoritesFoldersAndIndexes[favoritesFolder] = favoritesFolder.favoritesArray.firstIndex(of: bookmark) ?? 0
+        }
 
         // capture this locally because this VC might have been closed when undo gets pressed
         let localViewModel = self.viewModel
@@ -916,8 +948,7 @@ extension BookmarksViewController: AddOrEditBookmarkViewControllerDelegate {
                                           url: url,
                                           folder: parent,
                                           folderIndex: index,
-                                          favoritesFolder: favoritesFolder,
-                                          favoritesIndex: favoritesIndex)
+                                          favoritesFoldersAndIndexes: favoritesFoldersAndIndexes)
 
             self?.tableView.reloadData()
             self?.refreshAll()
diff --git a/DuckDuckGo/FavoritesDisplayMode+UserDefaults.swift b/DuckDuckGo/FavoritesDisplayMode+UserDefaults.swift
new file mode 100644
index 0000000000..82e1bf4274
--- /dev/null
+++ b/DuckDuckGo/FavoritesDisplayMode+UserDefaults.swift
@@ -0,0 +1,36 @@
+//
+//  FavoritesDisplayMode+UserDefaults.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 Bookmarks
+import Foundation
+
+extension FavoritesDisplayMode: LosslessStringConvertible {
+    static let `default` = FavoritesDisplayMode.displayNative(.mobile)
+
+    public init?(_ description: String) {
+        switch description {
+        case FavoritesDisplayMode.displayNative(.mobile).description:
+            self = .displayNative(.mobile)
+        case FavoritesDisplayMode.displayUnified(native: .mobile).description:
+            self = .displayUnified(native: .mobile)
+        default:
+            return nil
+        }
+    }
+}
diff --git a/DuckDuckGo/FavoritesDisplayModeStorage.swift b/DuckDuckGo/FavoritesDisplayModeStorage.swift
new file mode 100644
index 0000000000..f71e02014d
--- /dev/null
+++ b/DuckDuckGo/FavoritesDisplayModeStorage.swift
@@ -0,0 +1,40 @@
+//
+//  FavoritesDisplayModeStorage.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 Bookmarks
+import Core
+import Foundation
+
+final class FavoritesDisplayModeStorage: FavoritesDisplayModeStoring {
+    var favoritesDisplayMode: FavoritesDisplayMode {
+        get {
+            appSettings.favoritesDisplayMode
+        }
+        set {
+            appSettings.favoritesDisplayMode = newValue
+            NotificationCenter.default.post(name: AppUserDefaults.Notifications.favoritesDisplayModeChange, object: nil)
+        }
+    }
+
+    init(appSettings: AppSettings = AppDependencyProvider.shared.appSettings) {
+        self.appSettings = appSettings
+    }
+
+    private let appSettings: AppSettings
+}
diff --git a/DuckDuckGo/FavoritesDisplayModeSyncHandler.swift b/DuckDuckGo/FavoritesDisplayModeSyncHandler.swift
new file mode 100644
index 0000000000..3622af2270
--- /dev/null
+++ b/DuckDuckGo/FavoritesDisplayModeSyncHandler.swift
@@ -0,0 +1,50 @@
+//
+//  FavoritesDisplayModeSyncHandler.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 Bookmarks
+import Combine
+import Foundation
+import SyncDataProviders
+
+final class FavoritesDisplayModeSyncHandler: FavoritesDisplayModeSyncHandlerBase {
+
+    override func getValue() throws -> String? {
+        appSettings.favoritesDisplayMode.description
+    }
+
+    override func setValue(_ value: String?) throws {
+        if let value, let displayMode = FavoritesDisplayMode(value) {
+            appSettings.favoritesDisplayMode = displayMode
+            NotificationCenter.default.post(name: AppUserDefaults.Notifications.favoritesDisplayModeChange, object: nil)
+        }
+    }
+
+    override var valueDidChangePublisher: AnyPublisher<Void, Never> {
+        NotificationCenter.default
+            .publisher(for: AppUserDefaults.Notifications.favoritesDisplayModeChange)
+            .map { _ in }
+            .eraseToAnyPublisher()
+    }
+
+    init(_ appSettings: AppSettings = AppDependencyProvider.shared.appSettings) {
+        self.appSettings = appSettings
+    }
+
+    private let appSettings: AppSettings
+}
diff --git a/DuckDuckGo/FavoritesViewController.swift b/DuckDuckGo/FavoritesViewController.swift
index ad8c58cd9a..54e6b883d0 100644
--- a/DuckDuckGo/FavoritesViewController.swift
+++ b/DuckDuckGo/FavoritesViewController.swift
@@ -52,10 +52,12 @@ class FavoritesViewController: UIViewController {
     private let bookmarksDatabase: CoreDataDatabase
     private let syncService: DDGSyncing
     private let syncDataProviders: SyncDataProviders
+    private let appSettings: AppSettings
     
     fileprivate var viewModelCancellable: AnyCancellable?
     private var localUpdatesCancellable: AnyCancellable?
     private var syncUpdatesCancellable: AnyCancellable?
+    private var favoritesDisplayModeCancellable: AnyCancellable?
 
     var hasFavorites: Bool {
         renderer.viewModel.favorites.count > 0
@@ -68,10 +70,17 @@ class FavoritesViewController: UIViewController {
         }
     }
     
-    init?(coder: NSCoder, bookmarksDatabase: CoreDataDatabase, syncService: DDGSyncing, syncDataProviders: SyncDataProviders) {
+    init?(
+        coder: NSCoder,
+        bookmarksDatabase: CoreDataDatabase,
+        syncService: DDGSyncing,
+        syncDataProviders: SyncDataProviders,
+        appSettings: AppSettings
+    ) {
         self.bookmarksDatabase = bookmarksDatabase
         self.syncService = syncService
         self.syncDataProviders = syncDataProviders
+        self.appSettings = appSettings
         super.init(coder: coder)
     }
 
@@ -93,9 +102,13 @@ class FavoritesViewController: UIViewController {
         collectionView.backgroundColor = .clear
 
         view.addSubview(collectionView)
-        
-        renderer = FavoritesHomeViewSectionRenderer(allowsEditing: true,
-                                                    viewModel: FavoritesListViewModel(bookmarksDatabase: bookmarksDatabase))
+
+        let favoritesListViewModel = FavoritesListViewModel(
+            bookmarksDatabase: bookmarksDatabase,
+            favoritesDisplayMode: appSettings.favoritesDisplayMode
+        )
+
+        renderer = FavoritesHomeViewSectionRenderer(allowsEditing: true, viewModel: favoritesListViewModel)
         renderer.install(into: self)
 
         // Has to happen after the renderer is installed
@@ -106,6 +119,16 @@ class FavoritesViewController: UIViewController {
             self?.updateHeroImage()
         }
 
+        favoritesDisplayModeCancellable = NotificationCenter.default.publisher(for: AppUserDefaults.Notifications.favoritesDisplayModeChange)
+            .receive(on: DispatchQueue.main)
+            .sink { [weak self] _ in
+                guard let self else {
+                    return
+                }
+                self.renderer.viewModel.favoritesDisplayMode = self.appSettings.favoritesDisplayMode
+                self.collectionView.reloadData()
+            }
+
         registerForKeyboardNotifications()
 
         updateHeroImage()
diff --git a/DuckDuckGo/MainViewController+Segues.swift b/DuckDuckGo/MainViewController+Segues.swift
index e1dddc6396..4eb01f301a 100644
--- a/DuckDuckGo/MainViewController+Segues.swift
+++ b/DuckDuckGo/MainViewController+Segues.swift
@@ -87,7 +87,8 @@ extension MainViewController {
                                     bookmarksDatabase: self.bookmarksDatabase,
                                     bookmarksSearch: self.bookmarksCachingSearch,
                                     syncService: self.syncService,
-                                    syncDataProviders: self.syncDataProviders)
+                                    syncDataProviders: self.syncDataProviders,
+                                    appSettings: self.appSettings)
         }
         bookmarks.delegate = self
 
@@ -198,6 +199,14 @@ extension MainViewController {
         }
     }
 
+    func segueToSettingsSync() {
+        os_log(#function, log: .generalLog, type: .debug)
+        hideAllHighlightsIfNeeded()
+        launchSettings {
+            $0.showSync()
+        }
+    }
+
     private func launchSettings(completion: ((SettingsViewController) -> Void)? = nil) {
         os_log(#function, log: .generalLog, type: .debug)
         let storyboard = UIStoryboard(name: "Settings", bundle: nil)
diff --git a/DuckDuckGo/MainViewController.swift b/DuckDuckGo/MainViewController.swift
index df77c8acc5..ebd8cfd37a 100644
--- a/DuckDuckGo/MainViewController.swift
+++ b/DuckDuckGo/MainViewController.swift
@@ -19,6 +19,7 @@
 
 import UIKit
 import WebKit
+import WidgetKit
 import Combine
 import Common
 import Core
@@ -85,14 +86,19 @@ class MainViewController: UIViewController {
 
     let bookmarksDatabase: CoreDataDatabase
     private weak var bookmarksDatabaseCleaner: BookmarkDatabaseCleaner?
-    private let favoritesViewModel: FavoritesListInteracting
+    private var favoritesViewModel: FavoritesListInteracting
     let syncService: DDGSyncing
     let syncDataProviders: SyncDataProviders
     private var localUpdatesCancellable: AnyCancellable?
     private var syncUpdatesCancellable: AnyCancellable?
+    private var favoritesDisplayModeCancellable: AnyCancellable?
     private var emailCancellables = Set<AnyCancellable>()
 
-    lazy var menuBookmarksViewModel: MenuBookmarksInteracting = MenuBookmarksViewModel(bookmarksDatabase: bookmarksDatabase, syncService: syncService)
+    lazy var menuBookmarksViewModel: MenuBookmarksInteracting = {
+        let viewModel = MenuBookmarksViewModel(bookmarksDatabase: bookmarksDatabase, syncService: syncService)
+        viewModel.favoritesDisplayMode = appSettings.favoritesDisplayMode
+        return viewModel
+    }()
 
     weak var tabSwitcherController: TabSwitcherViewController?
     let tabSwitcherButton = TabSwitcherButton()
@@ -138,19 +144,20 @@ class MainViewController: UIViewController {
         appTrackingProtectionDatabase: CoreDataDatabase,
         syncService: DDGSyncing,
         syncDataProviders: SyncDataProviders,
-        appSettings: AppSettings
+        appSettings: AppSettings = AppUserDefaults()
     ) {
         self.appTrackingProtectionDatabase = appTrackingProtectionDatabase
         self.bookmarksDatabase = bookmarksDatabase
         self.bookmarksDatabaseCleaner = bookmarksDatabaseCleaner
         self.syncService = syncService
         self.syncDataProviders = syncDataProviders
-        self.favoritesViewModel = FavoritesListViewModel(bookmarksDatabase: bookmarksDatabase)
+        self.favoritesViewModel = FavoritesListViewModel(bookmarksDatabase: bookmarksDatabase, favoritesDisplayMode: appSettings.favoritesDisplayMode)
         self.bookmarksCachingSearch = BookmarksCachingSearch(bookmarksStore: CoreDataBookmarksSearchStore(bookmarksStore: bookmarksDatabase))
         self.appSettings = appSettings
 
         super.init(nibName: nil, bundle: nil)
 
+        bindFavoritesDisplayMode()
         bindSyncService()
     }
 #else
@@ -165,7 +172,7 @@ class MainViewController: UIViewController {
         self.bookmarksDatabaseCleaner = bookmarksDatabaseCleaner
         self.syncService = syncService
         self.syncDataProviders = syncDataProviders
-        self.favoritesViewModel = FavoritesListViewModel(bookmarksDatabase: bookmarksDatabase)
+        self.favoritesViewModel = FavoritesListViewModel(bookmarksDatabase: bookmarksDatabase, favoritesDisplayMode: appSettings.favoritesDisplayMode)
         self.bookmarksCachingSearch = BookmarksCachingSearch(bookmarksStore: CoreDataBookmarksSearchStore(bookmarksStore: bookmarksDatabase))
         self.appSettings = appSettings
         
@@ -231,6 +238,7 @@ class MainViewController: UIViewController {
         findInPageView.delegate = self
         findInPageBottomLayoutConstraint.constant = 0
         registerForKeyboardNotifications()
+        registerForSyncPausedNotifications()
 
         applyTheme(ThemeManager.shared.currentTheme)
 
@@ -342,6 +350,46 @@ class MainViewController: UIViewController {
                                                object: nil)
     }
 
+    private func registerForSyncPausedNotifications() {
+        NotificationCenter.default.addObserver(
+            self,
+            selector: #selector(showSyncPausedError),
+            name: SyncBookmarksAdapter.bookmarksSyncLimitReached,
+            object: nil)
+        NotificationCenter.default.addObserver(
+            self,
+            selector: #selector(showSyncPausedError),
+            name: SyncCredentialsAdapter.credentialsSyncLimitReached,
+            object: nil)
+    }
+
+    @objc private func showSyncPausedError(_ notification: Notification) {
+        Task {
+            await MainActor.run {
+                var title = UserText.syncBookmarkPausedAlertTitle
+                var description = UserText.syncBookmarkPausedAlertDescription
+                if notification.name == SyncCredentialsAdapter.credentialsSyncLimitReached {
+                    title = UserText.syncCredentialsPausedAlertTitle
+                    description = UserText.syncCredentialsPausedAlertDescription
+                }
+                if self.presentedViewController is SyncSettingsViewController {
+                    return
+                }
+                self.presentedViewController?.dismiss(animated: true)
+                let alert = UIAlertController(title: title,
+                                              message: description,
+                                              preferredStyle: .alert)
+                let learnMoreAction = UIAlertAction(title: UserText.syncPausedAlertLearnMoreButton, style: .default) { _ in
+                    self.segueToSettingsSync()
+                }
+                let okAction = UIAlertAction(title: UserText.syncPausedAlertOkButton, style: .cancel)
+                alert.addAction(learnMoreAction)
+                alert.addAction(okAction)
+                self.present(alert, animated: true)
+            }
+        }
+    }
+
     func registerForSettingsChangeNotifications() {
         NotificationCenter.default.addObserver(self, selector:
                                                 #selector(onAddressBarPositionChanged),
@@ -448,6 +496,20 @@ class MainViewController: UIViewController {
         gestureBookmarksButton.image = UIImage(named: "Bookmarks")
     }
 
+    private func bindFavoritesDisplayMode() {
+        favoritesDisplayModeCancellable = NotificationCenter.default.publisher(for: AppUserDefaults.Notifications.favoritesDisplayModeChange)
+            .receive(on: DispatchQueue.main)
+            .sink { [weak self] _ in
+                guard let self else {
+                    return
+                }
+                self.menuBookmarksViewModel.favoritesDisplayMode = self.appSettings.favoritesDisplayMode
+                self.favoritesViewModel.favoritesDisplayMode = self.appSettings.favoritesDisplayMode
+                self.homeController?.collectionView.reloadData()
+                WidgetCenter.shared.reloadAllTimelines()
+            }
+    }
+
     private func bindSyncService() {
         localUpdatesCancellable = favoritesViewModel.localUpdates
             .sink { [weak self] in
@@ -941,7 +1003,7 @@ class MainViewController: UIViewController {
         suggestionTrayController?.didHide()
     }
     
-    fileprivate func launchAutofillLogins(with currentTabUrl: URL? = nil) {
+    func launchAutofillLogins(with currentTabUrl: URL? = nil) {
         let appSettings = AppDependencyProvider.shared.appSettings
         let autofillSettingsViewController = AutofillLoginSettingsListViewController(
             appSettings: appSettings,
diff --git a/DuckDuckGo/RemoteMessaging.swift b/DuckDuckGo/RemoteMessaging.swift
index dd0efb9808..ee6c3d897c 100644
--- a/DuckDuckGo/RemoteMessaging.swift
+++ b/DuckDuckGo/RemoteMessaging.swift
@@ -44,14 +44,17 @@ struct RemoteMessaging {
         return Date().timeIntervalSince(Self.lastRemoteMessagingRefreshDate) > Constants.minimumConfigurationRefreshInterval
     }
 
-    static func registerBackgroundRefreshTaskHandler(bookmarksDatabase: CoreDataDatabase) {
+    static func registerBackgroundRefreshTaskHandler(
+        bookmarksDatabase: CoreDataDatabase,
+        favoritesDisplayMode: @escaping @autoclosure () -> FavoritesDisplayMode
+    ) {
         BGTaskScheduler.shared.register(forTaskWithIdentifier: Constants.backgroundRefreshTaskIdentifier, using: nil) { task in
             guard shouldRefresh else {
                 task.setTaskCompleted(success: true)
                 scheduleBackgroundRefreshTask()
                 return
             }
-            backgroundRefreshTaskHandler(bgTask: task, bookmarksDatabase: bookmarksDatabase)
+            backgroundRefreshTaskHandler(bgTask: task, bookmarksDatabase: bookmarksDatabase, favoritesDisplayMode: favoritesDisplayMode())
         }
     }
 
@@ -77,10 +80,14 @@ struct RemoteMessaging {
         #endif
     }
 
-    static func backgroundRefreshTaskHandler(bgTask: BGTask, bookmarksDatabase: CoreDataDatabase) {
+    static func backgroundRefreshTaskHandler(
+        bgTask: BGTask,
+        bookmarksDatabase: CoreDataDatabase,
+        favoritesDisplayMode: @escaping @autoclosure () -> FavoritesDisplayMode
+    ) {
         let fetchAndProcessTask = Task {
             do {
-                try await Self.fetchAndProcess(bookmarksDatabase: bookmarksDatabase)
+                try await Self.fetchAndProcess(bookmarksDatabase: bookmarksDatabase, favoritesDisplayMode: favoritesDisplayMode())
                 Self.lastRemoteMessagingRefreshDate = Date()
                 scheduleBackgroundRefreshTask()
                 bgTask.setTaskCompleted(success: true)
@@ -97,24 +104,28 @@ struct RemoteMessaging {
     }
 
     /// Convenience function
-    static func fetchAndProcess(bookmarksDatabase: CoreDataDatabase) async throws {
+    static func fetchAndProcess(bookmarksDatabase: CoreDataDatabase, favoritesDisplayMode: FavoritesDisplayMode) async throws {
         
         var bookmarksCount = 0
         var favoritesCount = 0
         let context = bookmarksDatabase.makeContext(concurrencyType: .privateQueueConcurrencyType)
         context.performAndWait {
+            let displayedFavoritesFolder = BookmarkUtils.fetchFavoritesFolder(withUUID: favoritesDisplayMode.displayedFolder.rawValue, in: context)!
+
             let bookmarksCountRequest = BookmarkEntity.fetchRequest()
-            bookmarksCountRequest.predicate = NSPredicate(format: "%K == nil AND %K == false AND %K == false",
-                                                 #keyPath(BookmarkEntity.favoriteFolder),
-                                                 #keyPath(BookmarkEntity.isFolder),
-                                                 #keyPath(BookmarkEntity.isPendingDeletion))
+            bookmarksCountRequest.predicate = NSPredicate(format: "SUBQUERY(%K, $x, $x CONTAINS %@).@count == 0 AND %K == false AND %K == false",
+                                                          #keyPath(BookmarkEntity.favoriteFolders),
+                                                          displayedFavoritesFolder,
+                                                          #keyPath(BookmarkEntity.isFolder),
+                                                          #keyPath(BookmarkEntity.isPendingDeletion))
             bookmarksCount = (try? context.count(for: bookmarksCountRequest)) ?? 0
             
             let favoritesCountRequest = BookmarkEntity.fetchRequest()
-            bookmarksCountRequest.predicate = NSPredicate(format: "%K != nil AND %K == false AND %K == false",
-                                                 #keyPath(BookmarkEntity.favoriteFolder),
-                                                 #keyPath(BookmarkEntity.isFolder),
-                                                 #keyPath(BookmarkEntity.isPendingDeletion))
+            favoritesCountRequest.predicate = NSPredicate(format: "%K CONTAINS %@ AND %K == false AND %K == false",
+                                                          #keyPath(BookmarkEntity.favoriteFolders),
+                                                          displayedFavoritesFolder,
+                                                          #keyPath(BookmarkEntity.isFolder),
+                                                          #keyPath(BookmarkEntity.isPendingDeletion))
             favoritesCount = (try? context.count(for: favoritesCountRequest)) ?? 0
         }
         
diff --git a/DuckDuckGo/SettingsViewController.swift b/DuckDuckGo/SettingsViewController.swift
index 673a4da738..b23c8f3473 100644
--- a/DuckDuckGo/SettingsViewController.swift
+++ b/DuckDuckGo/SettingsViewController.swift
@@ -182,6 +182,7 @@ class SettingsViewController: UITableViewController {
         configureEmailProtectionAccessoryText()
         configureMacBrowserWaitlistCell()
         configureWindowsBrowserWaitlistCell()
+        configureSyncCell()
 
         // Make sure multiline labels are correctly presented
         tableView.setNeedsLayout()
@@ -253,6 +254,10 @@ class SettingsViewController: UITableViewController {
     }
 
     private func configureSyncCell() {
+        syncCell.textLabel?.text = "Sync & Back Up"
+        if SyncBookmarksAdapter.isSyncBookmarksPaused || SyncCredentialsAdapter.isSyncCredentialsPaused {
+            syncCell.textLabel?.text = "⚠️ " + "Sync & Back Up"
+        }
         syncCell.isHidden = !shouldShowSyncCell
     }
 
@@ -370,7 +375,7 @@ class SettingsViewController: UITableViewController {
         debugCell.isHidden = !shouldShowDebugCell
     }
 
-    private func showSync(animated: Bool = true) {
+    func showSync(animated: Bool = true) {
         let controller = SyncSettingsViewController()
         navigationController?.pushViewController(controller, animated: animated)
     }
diff --git a/DuckDuckGo/SyncAssets.xcassets/Device-Mobile-Upload-96.imageset/Contents.json b/DuckDuckGo/SyncAssets.xcassets/Device-Mobile-Upload-96.imageset/Contents.json
new file mode 100644
index 0000000000..44ce0b2a59
--- /dev/null
+++ b/DuckDuckGo/SyncAssets.xcassets/Device-Mobile-Upload-96.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "Device-Mobile-Upload-96.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
diff --git a/DuckDuckGo/SyncAssets.xcassets/Device-Mobile-Upload-96.imageset/Device-Mobile-Upload-96.svg b/DuckDuckGo/SyncAssets.xcassets/Device-Mobile-Upload-96.imageset/Device-Mobile-Upload-96.svg
new file mode 100644
index 0000000000..206edb4762
--- /dev/null
+++ b/DuckDuckGo/SyncAssets.xcassets/Device-Mobile-Upload-96.imageset/Device-Mobile-Upload-96.svg
@@ -0,0 +1,17 @@
+<svg width="96" height="72" viewBox="0 0 96 72" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.2" d="M79.2214 28.65L80.3786 28.35C80.5929 28.3071 80.8072 28.0929 80.85 27.8786L81.15 26.7214C81.2357 26.4214 81.4929 26.25 81.75 26.25C82.05 26.25 82.3072 26.4643 82.35 26.7214L82.65 27.8786C82.6928 28.0929 82.9071 28.3071 83.1214 28.35L84.2786 28.65C84.5786 28.7357 84.75 28.9929 84.75 29.25C84.75 29.55 84.5357 29.8071 84.2786 29.85L83.1214 30.15C82.9071 30.1929 82.6928 30.4071 82.65 30.6214L82.35 31.7786C82.2643 32.0786 82.0071 32.25 81.75 32.25C81.45 32.25 81.1928 32.0357 81.15 31.7786L80.85 30.6214C80.8072 30.4071 80.5929 30.1929 80.3786 30.15L79.2214 29.85C78.9214 29.7643 78.75 29.5071 78.75 29.25C78.75 28.95 78.9643 28.6929 79.2214 28.65Z" fill="#888888"/>
+<path opacity="0.2" d="M11.9571 23.85L13.6928 23.4C14.0143 23.3357 14.3357 23.0143 14.4 22.6929L14.85 20.9571C14.9786 20.5071 15.3643 20.25 15.75 20.25C16.2 20.25 16.5857 20.5714 16.65 20.9571L17.1 22.6929C17.1643 23.0143 17.4857 23.3357 17.8072 23.4L19.5429 23.85C19.9929 23.9786 20.25 24.3643 20.25 24.75C20.25 25.2 19.9286 25.5857 19.5429 25.65L17.8072 26.1C17.4857 26.1643 17.1643 26.4857 17.1 26.8071L16.65 28.5429C16.5214 28.9929 16.1357 29.25 15.75 29.25C15.3 29.25 14.9143 28.9286 14.85 28.5429L14.4 26.8071C14.3357 26.4857 14.0143 26.1643 13.6928 26.1L11.9571 25.65C11.5071 25.5214 11.25 25.1357 11.25 24.75C11.25 24.3 11.5714 23.9143 11.9571 23.85Z" fill="#888888"/>
+<path opacity="0.2" d="M0.471418 39.9L1.62857 39.6C1.84285 39.5571 2.05715 39.3429 2.10001 39.1286L2.39999 37.9714C2.4857 37.6714 2.74286 37.5 3 37.5C3.3 37.5 3.55715 37.7143 3.60001 37.9714L3.89999 39.1286C3.94285 39.3429 4.15715 39.5571 4.37143 39.6L5.52858 39.9C5.82858 39.9857 6 40.2429 6 40.5C6 40.8 5.78572 41.0571 5.52858 41.1L4.37143 41.4C4.15715 41.4429 3.94285 41.6571 3.89999 41.8714L3.60001 43.0286C3.5143 43.3286 3.25714 43.5 3 43.5C2.7 43.5 2.44285 43.2857 2.39999 43.0286L2.10001 41.8714C2.05715 41.6571 1.84285 41.4429 1.62857 41.4L0.471418 41.1C0.171418 41.0143 0 40.7571 0 40.5C0 40.2 0.214275 39.9429 0.471418 39.9Z" fill="#888888"/>
+<path opacity="0.2" d="M94.875 39C94.2562 39 93.75 38.4937 93.75 37.875C93.75 37.2562 94.2562 36.75 94.875 36.75C95.4937 36.75 96 37.2562 96 37.875C96 38.4937 95.4937 39 94.875 39Z" fill="#888888"/>
+<path opacity="0.2" d="M17.25 52.5C16.425 52.5 15.75 51.825 15.75 51C15.75 50.175 16.425 49.5 17.25 49.5C18.075 49.5 18.75 50.175 18.75 51C18.75 51.825 18.075 52.5 17.25 52.5Z" fill="#888888"/>
+<path d="M40 12H61C62.6569 12 64 13.3431 64 15V35.2238C64 36.8041 62.76 38.0817 61.2301 38.4777C54.7706 40.1498 50 46.0178 50 53V57C49.5907 57.2037 49.1344 58 48.6634 58H40C38.3431 58 37 56.6569 37 55V15C37 13.3431 38.3431 12 40 12Z" fill="#666666"/>
+<path d="M35 12H58C59.6569 12 61 13.3431 61 15V38.5392C54.6576 40.2897 50 46.1009 50 53V57C50 58.6569 48.6569 60 47 60H35C33.3431 60 32 58.6569 32 57V15C32 13.3431 33.3431 12 35 12Z" fill="#888888"/>
+<path d="M40.25 15.1382V14H35.2829C34.5724 14 34 14.5864 34 15.303V55.697C34 56.4136 34.5724 57 35.2829 57H50V53C50 46.849 53.7023 41.5628 59 39.2481V15.303C59 14.5864 58.4276 14 57.7171 14H52.75V15.1381C52.75 15.7595 52.2463 16.2631 51.625 16.2631H41.375C40.7537 16.2631 40.25 15.7595 40.25 15.1382Z" fill="#FFD65C"/>
+<path d="M50.9703 33.8604C49.5146 36.2083 46.3954 37.07 43.8508 35.8832C43.6537 35.7903 43.5881 35.5529 43.6975 35.3723L44.4199 34.2113C44.595 33.9326 44.3214 33.5921 43.9876 33.6746L39.2868 34.8357C39.0788 34.8873 38.9585 35.0885 39.0132 35.2794L40.239 39.7275C40.3265 40.0423 40.7698 40.099 40.9449 39.8204L41.6508 38.68C41.7548 38.5097 41.9847 38.4529 42.1707 38.5458C46.2805 40.6099 51.419 39.2579 53.7995 35.4239C54.7681 33.8655 55.1293 32.1317 54.9596 30.4598C54.9268 30.1502 54.6149 29.9386 54.2975 30.016L52.4861 30.465C52.0319 30.5785 51.731 30.9604 51.72 31.4041C51.6927 32.2401 51.4573 33.0812 50.9758 33.8552L50.9703 33.8604Z" fill="#F9BE1A"/>
+<path d="M41.7779 28.1396C43.1425 25.7917 46.0668 24.93 48.4524 26.1168C48.6371 26.2097 48.6987 26.4471 48.5961 26.6277L47.9189 27.7887C47.7547 28.0674 48.0112 28.4079 48.3242 28.3254L52.7311 27.1643C52.9261 27.1127 53.0389 26.9115 52.9876 26.7206L51.8385 22.2725C51.7564 21.9577 51.3408 21.901 51.1766 22.1796L50.5148 23.32C50.4174 23.4903 50.2019 23.5471 50.0274 23.4542C46.1746 21.3901 41.3572 22.7421 39.1255 26.5761C38.2174 28.1345 37.8788 29.8683 38.0378 31.5402C38.0686 31.8498 38.361 32.0614 38.6586 31.984L40.3567 31.535C40.7826 31.4215 41.0647 31.0396 41.075 30.5959C41.1006 29.7599 41.3213 28.9188 41.7727 28.1448L41.7779 28.1396Z" fill="#F9BE1A"/>
+<path d="M65.25 65.25C71.8774 65.25 77.25 59.8774 77.25 53.25C77.25 46.6226 71.8774 41.25 65.25 41.25C58.6226 41.25 53.25 46.6226 53.25 53.25C53.25 59.8774 58.6226 65.25 65.25 65.25Z" fill="#4CBA3C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M66.75 60.75C67.1642 60.75 67.5 60.4142 67.5 60V53.2667C67.5 52.9547 67.8589 52.7791 68.1052 52.9707L70.2725 54.6564C70.6035 54.9139 71.0813 54.8499 71.333 54.5144L72.6828 52.7147C72.9282 52.3874 72.8661 51.9237 72.5431 51.6726L66.3397 46.8492C65.6878 46.3836 64.812 46.3836 64.1601 46.8492L57.9569 51.6726C57.6339 51.9237 57.5718 52.3873 57.8172 52.7146L59.167 54.5144C59.4187 54.8499 59.8965 54.9139 60.2275 54.6564L62.3948 52.9707C62.6411 52.7791 63 52.9547 63 53.2667V60C63 60.4142 63.3358 60.75 63.75 60.75H66.75Z" fill="white"/>
+<path d="M81.5739 44.2891C81.8035 44.2891 82.0331 44.3791 82.2087 44.5547C82.5599 44.9059 82.5599 45.4777 82.2087 45.8289L80.4077 47.6299C80.0565 47.9811 79.4847 47.9811 79.1335 47.6299C78.7823 47.2788 78.7823 46.7069 79.1335 46.3557L80.9345 44.5547C81.1101 44.3791 81.3398 44.2891 81.5694 44.2891H81.5739Z" fill="#CCCCCC"/>
+<path d="M80.6733 52.3937H83.3749C83.8701 52.3937 84.2754 52.7989 84.2754 53.2942C84.2754 53.7895 83.8701 54.1947 83.3749 54.1947H80.6733C80.1781 54.1947 79.7728 53.7895 79.7728 53.2942C79.7728 52.7989 80.1781 52.3937 80.6733 52.3937Z" fill="#CCCCCC"/>
+<path d="M79.1427 58.9636C79.3183 58.788 79.5479 58.698 79.7775 58.698H79.782C80.0117 58.698 80.2413 58.788 80.4169 58.9636L82.2179 60.7647C82.5691 61.1159 82.5691 61.6877 82.2179 62.0389C81.8667 62.3901 81.2949 62.3901 80.9437 62.0389L79.1427 60.2379C78.7915 59.8867 78.7915 59.3148 79.1427 58.9636Z" fill="#CCCCCC"/>
+</svg>
diff --git a/DuckDuckGo/SyncAssets.xcassets/Sync-Pair-96.imageset/Contents.json b/DuckDuckGo/SyncAssets.xcassets/Sync-Pair-96.imageset/Contents.json
new file mode 100644
index 0000000000..3aa6516022
--- /dev/null
+++ b/DuckDuckGo/SyncAssets.xcassets/Sync-Pair-96.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "Sync-Pair-96.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
diff --git a/DuckDuckGo/SyncAssets.xcassets/Sync-Pair-96.imageset/Sync-Pair-96.svg b/DuckDuckGo/SyncAssets.xcassets/Sync-Pair-96.imageset/Sync-Pair-96.svg
new file mode 100644
index 0000000000..ca10b82be7
--- /dev/null
+++ b/DuckDuckGo/SyncAssets.xcassets/Sync-Pair-96.imageset/Sync-Pair-96.svg
@@ -0,0 +1,30 @@
+<svg width="96" height="72" viewBox="0 0 96 72" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.2" d="M79.2214 28.65L80.3786 28.35C80.5929 28.3071 80.8072 28.0929 80.85 27.8786L81.15 26.7214C81.2357 26.4214 81.4929 26.25 81.75 26.25C82.05 26.25 82.3072 26.4643 82.35 26.7214L82.65 27.8786C82.6928 28.0929 82.9071 28.3071 83.1214 28.35L84.2786 28.65C84.5786 28.7357 84.75 28.9929 84.75 29.25C84.75 29.55 84.5357 29.8071 84.2786 29.85L83.1214 30.15C82.9071 30.1929 82.6928 30.4071 82.65 30.6214L82.35 31.7786C82.2643 32.0786 82.0071 32.25 81.75 32.25C81.45 32.25 81.1928 32.0357 81.15 31.7786L80.85 30.6214C80.8072 30.4071 80.5929 30.1929 80.3786 30.15L79.2214 29.85C78.9214 29.7643 78.75 29.5071 78.75 29.25C78.75 28.95 78.9643 28.6929 79.2214 28.65Z" fill="#888888"/>
+<path opacity="0.2" d="M11.9571 23.85L13.6928 23.4C14.0143 23.3357 14.3357 23.0143 14.4 22.6929L14.85 20.9571C14.9786 20.5071 15.3643 20.25 15.75 20.25C16.2 20.25 16.5857 20.5714 16.65 20.9571L17.1 22.6929C17.1643 23.0143 17.4857 23.3357 17.8072 23.4L19.5429 23.85C19.9929 23.9786 20.25 24.3643 20.25 24.75C20.25 25.2 19.9286 25.5857 19.5429 25.65L17.8072 26.1C17.4857 26.1643 17.1643 26.4857 17.1 26.8071L16.65 28.5429C16.5214 28.9929 16.1357 29.25 15.75 29.25C15.3 29.25 14.9143 28.9286 14.85 28.5429L14.4 26.8071C14.3357 26.4857 14.0143 26.1643 13.6928 26.1L11.9571 25.65C11.5071 25.5214 11.25 25.1357 11.25 24.75C11.25 24.3 11.5714 23.9143 11.9571 23.85Z" fill="#888888"/>
+<path opacity="0.2" d="M0.471418 39.9L1.62857 39.6C1.84285 39.5571 2.05715 39.3429 2.10001 39.1286L2.39999 37.9714C2.4857 37.6714 2.74286 37.5 3 37.5C3.3 37.5 3.55715 37.7143 3.60001 37.9714L3.89999 39.1286C3.94285 39.3429 4.15715 39.5571 4.37143 39.6L5.52858 39.9C5.82858 39.9857 6 40.2429 6 40.5C6 40.8 5.78572 41.0571 5.52858 41.1L4.37143 41.4C4.15715 41.4429 3.94285 41.6571 3.89999 41.8714L3.60001 43.0286C3.5143 43.3286 3.25714 43.5 3 43.5C2.7 43.5 2.44285 43.2857 2.39999 43.0286L2.10001 41.8714C2.05715 41.6571 1.84285 41.4429 1.62857 41.4L0.471418 41.1C0.171418 41.0143 0 40.7571 0 40.5C0 40.2 0.214275 39.9429 0.471418 39.9Z" fill="#888888"/>
+<path opacity="0.2" d="M94.875 39C94.2562 39 93.75 38.4937 93.75 37.875C93.75 37.2562 94.2562 36.75 94.875 36.75C95.4937 36.75 96 37.2562 96 37.875C96 38.4937 95.4937 39 94.875 39Z" fill="#888888"/>
+<path opacity="0.2" d="M17.25 52.5C16.425 52.5 15.75 51.825 15.75 51C15.75 50.175 16.425 49.5 17.25 49.5C18.075 49.5 18.75 50.175 18.75 51C18.75 51.825 18.075 52.5 17.25 52.5Z" fill="#888888"/>
+<path d="M55 49L42 48.75V59.25L55 57V49Z" fill="#ABABAB"/>
+<path d="M26.25 14C26.25 12.8954 27.1454 12 28.25 12H70C71.1046 12 72 12.8954 72 14V28C72 29.1046 71.1046 30 70 30H28.25C27.1454 30 26.25 29.1046 26.25 28V14Z" fill="#888888"/>
+<path d="M34 58.5C34 57.6716 34.6716 57 35.5 57H55V57.75C55 58.9926 53.9926 60 52.75 60H35.5C34.6716 60 34 59.3284 34 58.5Z" fill="#888888"/>
+<path d="M68.5954 12H25.4046C24.6289 12 24 12.6805 24 13.52V48.48C24 49.3195 24.6289 50 25.4046 50H55V36C55 32.6863 57.6863 30 61 30H70V13.52C70 12.6805 69.3711 12 68.5954 12Z" fill="#CCCCCC"/>
+<path d="M66.9587 15H27.0413C26.4662 15 26 15.5117 26 16.1429V45.8571C26 46.4883 26.4662 47 27.0413 47H55V36C55 32.6863 57.6863 30 61 30H68V16.1429C68 15.5117 67.5338 15 66.9587 15Z" fill="#FFD65C"/>
+<path d="M40.25 26.5C39.8358 26.5 39.5 26.1642 39.5 25.75V24.25C39.5 23.8358 39.8358 23.5 40.25 23.5H41.75C42.1642 23.5 42.5 23.8358 42.5 24.25V25.75C42.5 26.1642 42.1642 26.5 41.75 26.5H40.25Z" fill="#F9BE1A"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M39.3125 29.875C37.5521 29.875 36.125 28.4479 36.125 26.6875V23.3125C36.125 21.5521 37.5521 20.125 39.3125 20.125H42.6875C44.4479 20.125 45.875 21.5521 45.875 23.3125V26.6875C45.875 28.4479 44.4479 29.875 42.6875 29.875H39.3125ZM38 26.6875C38 27.4124 38.5876 28 39.3125 28H42.6875C43.4124 28 44 27.4124 44 26.6875V23.3125C44 22.5876 43.4124 22 42.6875 22H39.3125C38.5876 22 38 22.5876 38 23.3125V26.6875Z" fill="#F9BE1A"/>
+<path d="M40.25 38.5C39.8358 38.5 39.5 38.1642 39.5 37.75V36.25C39.5 35.8358 39.8358 35.5 40.25 35.5H41.75C42.1642 35.5 42.5 35.8358 42.5 36.25V37.75C42.5 38.1642 42.1642 38.5 41.75 38.5H40.25Z" fill="#F9BE1A"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M39.3125 41.875C37.5521 41.875 36.125 40.4479 36.125 38.6875V35.3125C36.125 33.5521 37.5521 32.125 39.3125 32.125H42.6875C44.4479 32.125 45.875 33.5521 45.875 35.3125V38.6875C45.875 40.4479 44.4479 41.875 42.6875 41.875H39.3125ZM38 38.6875C38 39.4124 38.5876 40 39.3125 40H42.6875C43.4124 40 44 39.4124 44 38.6875V35.3125C44 34.5876 43.4124 34 42.6875 34H39.3125C38.5876 34 38 34.5876 38 35.3125V38.6875Z" fill="#F9BE1A"/>
+<path d="M51.5 37.75C51.5 38.1642 51.8358 38.5 52.25 38.5H53.75C54.1642 38.5 54.5 38.1642 54.5 37.75V36.25C54.5 35.8358 54.1642 35.5 53.75 35.5H52.25C51.8358 35.5 51.5 35.8358 51.5 36.25V37.75Z" fill="#F9BE1A"/>
+<path d="M48.125 38.6875C48.125 40.4479 49.5521 41.875 51.3125 41.875H54.6875C54.7929 41.875 54.8972 41.8699 55 41.8599V39.9626C54.8998 39.987 54.7952 40 54.6875 40H51.3125C50.5876 40 50 39.4124 50 38.6875V35.3125C50 34.5876 50.5876 34 51.3125 34H54.6875C54.9053 34 55.1108 34.0531 55.2916 34.147C55.4878 33.5423 55.7773 32.9796 56.1433 32.4761C55.7069 32.2517 55.212 32.125 54.6875 32.125H51.3125C49.5521 32.125 48.125 33.5521 48.125 35.3125V38.6875Z" fill="#F9BE1A"/>
+<path d="M56.9375 29.875C57.4553 29.875 57.875 29.4553 57.875 28.9375V25.9375C57.875 25.4197 57.4553 25 56.9375 25C56.4197 25 56 25.4197 56 25.9375V28H55.4375C54.9197 28 54.5 28.4197 54.5 28.9375C54.5 29.4553 54.9197 29.875 55.4375 29.875H56.9375Z" fill="#F9BE1A"/>
+<path d="M49.0625 25C49.5803 25 50 24.5803 50 24.0625V22.1875H50.5625C51.0803 22.1875 51.5 21.7678 51.5 21.25C51.5 20.7322 51.0803 20.3125 50.5625 20.3125H49.0625C48.5447 20.3125 48.125 20.7322 48.125 21.25V24.0625C48.125 24.5803 48.5447 25 49.0625 25Z" fill="#F9BE1A"/>
+<path d="M53.9375 22.1875C53.4197 22.1875 53 21.7678 53 21.25C53 20.7322 53.4197 20.3125 53.9375 20.3125H56.9375C57.4553 20.3125 57.875 20.7322 57.875 21.25V22.5625C57.875 23.0803 57.4553 23.5 56.9375 23.5C56.4197 23.5 56 23.0803 56 22.5625V22.1875H53.9375Z" fill="#F9BE1A"/>
+<path d="M49.25 29.6875C49.2184 29.6875 49.1871 29.6859 49.1562 29.6829C49.1254 29.6859 49.0941 29.6875 49.0625 29.6875C48.5447 29.6875 48.125 29.2678 48.125 28.75V27.4375C48.125 26.9197 48.5447 26.5 49.0625 26.5C49.5803 26.5 50 26.9197 50 27.4375V27.8125H52.0625C52.5803 27.8125 53 28.2322 53 28.75C53 29.2678 52.5803 29.6875 52.0625 29.6875H49.25Z" fill="#F9BE1A"/>
+<path d="M51.5 25.5625C51.5 26.0803 51.9197 26.5 52.4375 26.5H53.5625C54.0803 26.5 54.5 26.0803 54.5 25.5625V24.4375C54.5 23.9197 54.0803 23.5 53.5625 23.5H52.4375C51.9197 23.5 51.5 23.9197 51.5 24.4375V25.5625Z" fill="#F9BE1A"/>
+<path d="M61 33H67C68.6569 33 70 34.3431 70 36V53.25V63C70 64.6569 68.6569 66 67 66H62.4605H61C59.3431 66 58 64.6569 58 63V36C58 34.3431 59.3431 33 61 33Z" fill="#444444"/>
+<path d="M63 33H77C78.6569 33 80 34.3431 80 36V63C80 64.6569 78.6569 66 77 66H63C61.3431 66 60 64.6569 60 63V57.1154V36C60 34.3431 61.3431 33 63 33Z" fill="#666666"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M77.1789 64H62.8211C62.3663 64 62 63.6045 62 63.1212V35.8788C62 35.3955 62.3663 35 62.8211 35H77.1789C77.6337 35 78 35.3955 78 35.8788V63.1212C78 63.6045 77.6337 64 77.1789 64ZM68 36C67.4477 36 67 36.4477 67 37C67 37.5523 67.4477 38 68 38H72C72.5523 38 73 37.5523 73 37C73 36.4477 72.5523 36 72 36H68Z" fill="#ADC2FC"/>
+<path d="M87.7038 39.5391C87.9334 39.5391 88.163 39.6291 88.3386 39.8047C88.6898 40.1559 88.6898 40.7277 88.3386 41.0789L86.5376 42.8799C86.1864 43.2311 85.6146 43.2311 85.2634 42.8799C84.9122 42.5288 84.9122 41.9569 85.2634 41.6057L87.0644 39.8047C87.24 39.6291 87.4696 39.5391 87.6993 39.5391H87.7038Z" fill="#CCCCCC"/>
+<path d="M86.8033 47.6436H89.5049C90.0001 47.6436 90.4054 48.0488 90.4054 48.5441C90.4054 49.0393 90.0001 49.4446 89.5049 49.4446H86.8033C86.3081 49.4446 85.9028 49.0393 85.9028 48.5441C85.9028 48.0488 86.3081 47.6436 86.8033 47.6436Z" fill="#CCCCCC"/>
+<path d="M85.2727 54.2136C85.4483 54.038 85.6779 53.948 85.9075 53.948H85.912C86.1417 53.948 86.3713 54.038 86.5469 54.2136L88.3479 56.0147C88.6991 56.3659 88.6991 56.9377 88.3479 57.2889C87.9967 57.6401 87.4249 57.6401 87.0737 57.2889L85.2727 55.4879C84.9215 55.1367 84.9215 54.5648 85.2727 54.2136Z" fill="#CCCCCC"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M64 46.8541V52C64 53.1046 64.8954 54 66 54H74C75.1046 54 76 53.1046 76 52V46.8541C76 45.8301 75.1525 45 74.1285 45C73.4433 45 72.8064 44.6129 72.5 44C72.1936 43.3871 71.5672 43 70.882 43H69.118C68.4328 43 67.8064 43.3871 67.5 44C67.1936 44.6129 66.5567 45 65.8715 45C64.8475 45 64 45.8301 64 46.8541ZM70 52C71.6569 52 73 50.6569 73 49C73 47.3431 71.6569 46 70 46C68.3431 46 67 47.3431 67 49C67 50.6569 68.3431 52 70 52Z" fill="#8FABF9"/>
+</svg>
diff --git a/DuckDuckGo/SyncAssets.xcassets/Sync-Start-128.imageset/Contents.json b/DuckDuckGo/SyncAssets.xcassets/Sync-Start-128.imageset/Contents.json
new file mode 100644
index 0000000000..38c819bd10
--- /dev/null
+++ b/DuckDuckGo/SyncAssets.xcassets/Sync-Start-128.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "Sync-Start-128.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
diff --git a/DuckDuckGo/SyncAssets.xcassets/Sync-Start-128.imageset/Sync-Start-128.svg b/DuckDuckGo/SyncAssets.xcassets/Sync-Start-128.imageset/Sync-Start-128.svg
new file mode 100644
index 0000000000..8f38d1c2e7
--- /dev/null
+++ b/DuckDuckGo/SyncAssets.xcassets/Sync-Start-128.imageset/Sync-Start-128.svg
@@ -0,0 +1,15 @@
+<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.866L107.171 38.466C107.457 38.4089 107.743 38.1232 107.8 37.8374L108.2 36.2946C108.314 35.8946 108.657 35.666 109 35.666C109.4 35.666 109.743 35.9517 109.8 36.2946L110.2 37.8374C110.257 38.1232 110.543 38.4089 110.829 38.466L112.371 38.866C112.771 38.9803 113 39.3232 113 39.666C113 40.066 112.714 40.4089 112.371 40.466L110.829 40.866C110.543 40.9232 110.257 41.2089 110.2 41.4946L109.8 43.0374C109.686 43.4374 109.343 43.666 109 43.666C108.6 43.666 108.257 43.3803 108.2 43.0374L107.8 41.4946C107.743 41.2089 107.457 40.9232 107.171 40.866L105.629 40.466C105.229 40.3517 105 40.0089 105 39.666C105 39.266 105.286 38.9232 105.629 38.866Z" fill="#888888"/>
+<path opacity="0.2" d="M15.9428 32.466L18.2571 31.866C18.6857 31.7803 19.1143 31.3517 19.2 30.9232L19.8 28.6089C19.9714 28.0089 20.4857 27.666 21 27.666C21.6 27.666 22.1143 28.0946 22.2 28.6089L22.8 30.9232C22.8857 31.3517 23.3143 31.7803 23.7429 31.866L26.0572 32.466C26.6572 32.6374 27 33.1517 27 33.666C27 34.266 26.5714 34.7803 26.0572 34.866L23.7429 35.466C23.3143 35.5517 22.8857 35.9803 22.8 36.4089L22.2 38.7232C22.0286 39.3232 21.5143 39.666 21 39.666C20.4 39.666 19.8857 39.2374 19.8 38.7232L19.2 36.4089C19.1143 35.9803 18.6857 35.5517 18.2571 35.466L15.9428 34.866C15.3428 34.6946 15 34.1803 15 33.666C15 33.066 15.4286 32.5517 15.9428 32.466Z" fill="#888888"/>
+<path opacity="0.2" d="M0.628558 53.866L2.17142 53.466C2.45714 53.4089 2.74287 53.1232 2.80001 52.8374L3.19999 51.2946C3.31427 50.8946 3.65714 50.666 4 50.666C4.4 50.666 4.74287 50.9517 4.80001 51.2946L5.19999 52.8374C5.25713 53.1232 5.54286 53.4089 5.82858 53.466L7.37144 53.866C7.77144 53.9803 8 54.3232 8 54.666C8 55.066 7.7143 55.4089 7.37144 55.466L5.82858 55.866C5.54286 55.9232 5.25713 56.2089 5.19999 56.4946L4.80001 58.0374C4.68573 58.4374 4.34286 58.666 4 58.666C3.6 58.666 3.25713 58.3803 3.19999 58.0374L2.80001 56.4946C2.74287 56.2089 2.45714 55.9232 2.17142 55.866L0.628558 55.466C0.228558 55.3517 4.76837e-07 55.0089 4.76837e-07 54.666C4.76837e-07 54.266 0.285701 53.9232 0.628558 53.866Z" fill="#888888"/>
+<path opacity="0.2" d="M126.5 52.666C125.675 52.666 125 51.991 125 51.166C125 50.341 125.675 49.666 126.5 49.666C127.325 49.666 128 50.341 128 51.166C128 51.991 127.325 52.666 126.5 52.666Z" fill="#888888"/>
+<path opacity="0.2" d="M23 70.666C21.9 70.666 21 69.766 21 68.666C21 67.566 21.9 66.666 23 66.666C24.1 66.666 25 67.566 25 68.666C25 69.766 24.1 70.666 23 70.666Z" fill="#888888"/>
+<path d="M67.4213 65.8719C66.9296 67.608 66.6665 69.44 66.6665 71.3335V73.4874C66.6665 76.0067 64.7873 78.1776 62.2684 78.138C57.4868 78.0628 52.6628 76.8838 48.1814 74.5004C47.5169 74.1491 46.696 74.3638 46.3247 75.0078L43.8035 79.3206C43.1781 80.3744 41.595 80.1598 41.2823 78.9693L36.9045 62.1475C36.7091 61.4255 37.139 60.6644 37.8817 60.4692L54.67 56.0784C55.8622 55.7661 56.8394 57.0541 56.214 58.1079L53.6342 62.4988C53.2433 63.1818 53.4778 64.0795 54.1814 64.4308C58.4187 66.5235 63.1021 66.932 67.4213 65.8719Z" fill="#DE5833"/>
+<path d="M81.6313 51.9727C82.0261 50.4941 82.2394 48.9908 82.2858 47.4918C82.3249 45.8135 83.3998 44.3695 85.0219 43.9401L91.491 42.2423C92.6246 41.9496 93.7386 42.7497 93.8558 43.9206C93.954 44.9453 94.0024 45.9761 93.9998 47.0093C93.9937 49.4986 91.8393 51.3335 89.3501 51.3335H86.6665C84.9273 51.3335 83.24 51.5555 81.6313 51.9727Z" fill="#DE5833"/>
+<path d="M47.3124 37.4329C52.1212 29.2366 62.4257 26.2283 70.8321 30.3715C71.4829 30.6957 71.6999 31.5244 71.3383 32.1549L68.952 36.2079C68.3735 37.1807 69.2774 38.3696 70.3802 38.0814L85.9094 34.0283C86.5964 33.8481 86.9941 33.1456 86.8133 32.4791L82.7638 16.9512C82.4745 15.8524 81.0102 15.6543 80.4317 16.627L78.0996 20.608C77.7561 21.2025 76.9968 21.4007 76.3822 21.0764C62.8054 13.8709 45.8299 18.5905 37.9659 31.9747C34.766 37.4149 33.5729 43.4675 34.1333 49.3039C34.2418 50.3848 35.2722 51.1233 36.3208 50.8531L42.3047 49.2859C43.8052 48.8896 44.7994 47.5566 44.8356 46.0074C44.926 43.0892 45.7034 40.153 47.2943 37.4509L47.3124 37.4329Z" fill="#3969EF"/>
+<path d="M87 87C95.8366 87 103 79.8366 103 71C103 62.1634 95.8366 55 87 55C78.1634 55 71 62.1634 71 71C71 79.8366 78.1634 87 87 87Z" fill="#21C000"/>
+<path d="M96.0408 68.7127C96.5687 68.1909 96.5687 67.3385 96.0408 66.8168L94.1273 64.9258C93.6082 64.4127 92.7729 64.4127 92.2537 64.9258L85.556 71.5448C85.0369 72.0579 84.2016 72.0579 83.6824 71.5448L81.7464 69.6316C81.2272 69.1186 80.3919 69.1186 79.8728 69.6317L77.9593 71.5226C77.4314 72.0443 77.4314 72.8968 77.9594 73.4185L83.6824 79.0742C84.2016 79.5873 85.0369 79.5873 85.556 79.0742L96.0408 68.7127Z" fill="white"/>
+<path d="M108.605 59C108.911 59 109.217 59.1201 109.452 59.3542C109.92 59.8225 109.92 60.5849 109.452 61.0532L107.05 63.4545C106.582 63.9228 105.819 63.9228 105.351 63.4545C104.883 62.9863 104.883 62.2238 105.351 61.7556L107.753 59.3542C107.987 59.1201 108.293 59 108.599 59H108.605Z" fill="#CCCCCC"/>
+<path d="M107.404 69.8062H111.006C111.667 69.8062 112.207 70.3465 112.207 71.0068C112.207 71.6672 111.667 72.2075 111.006 72.2075H107.404C106.744 72.2075 106.204 71.6672 106.204 71.0068C106.204 70.3465 106.744 69.8062 107.404 69.8062Z" fill="#CCCCCC"/>
+<path d="M105.363 78.5661C105.598 78.332 105.904 78.2119 106.21 78.2119H106.216C106.522 78.2119 106.828 78.332 107.062 78.5661L109.464 80.9675C109.932 81.4357 109.932 82.1982 109.464 82.6664C108.995 83.1347 108.233 83.1347 107.765 82.6664L105.363 80.2651C104.895 79.7968 104.895 79.0344 105.363 78.5661Z" fill="#CCCCCC"/>
+</svg>
diff --git a/DuckDuckGo/SyncAssets.xcassets/SyncAllDevices.imageset/Contents.json b/DuckDuckGo/SyncAssets.xcassets/SyncAllDevices.imageset/Contents.json
new file mode 100644
index 0000000000..9411745913
--- /dev/null
+++ b/DuckDuckGo/SyncAssets.xcassets/SyncAllDevices.imageset/Contents.json
@@ -0,0 +1,16 @@
+{
+  "images" : [
+    {
+      "filename" : "SyncAllDevices.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true,
+    "template-rendering-intent" : "template"
+  }
+}
diff --git a/DuckDuckGo/SyncAssets.xcassets/SyncAllDevices.imageset/SyncAllDevices.svg b/DuckDuckGo/SyncAssets.xcassets/SyncAllDevices.imageset/SyncAllDevices.svg
new file mode 100644
index 0000000000..b0680e4703
--- /dev/null
+++ b/DuckDuckGo/SyncAssets.xcassets/SyncAllDevices.imageset/SyncAllDevices.svg
@@ -0,0 +1,9 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Device-All-24">
+<g id="Union">
+<path d="M19.1582 2.84238C19.637 3.32128 19.1728 4 18.4956 4H4.875C4.39175 4 4 4.39175 4 4.875V12.125C4 12.6082 4.39175 13 4.875 13H9V19C9 19.5523 8.55228 20 8 20H5C4.44771 20 4 19.5523 4 19C4 18.4477 4.44771 18 5 18H8V16H4.875C3.28718 16 2 14.7128 2 13.125V4.875C2 3.28718 3.28718 2 4.875 2H17.125C17.9191 2 18.6379 2.32192 19.1582 2.84238Z" fill="black"/>
+<path d="M15 8.5C15 8.22386 15.2239 8 15.5 8H16.5C16.7761 8 17 8.22386 17 8.5C17 8.77614 16.7761 9 16.5 9H15.5C15.2239 9 15 8.77614 15 8.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10 7.875C10 6.28718 11.2872 5 12.875 5H19.125C20.7128 5 22 6.28718 22 7.875V19.125C22 20.7128 20.7128 22 19.125 22H12.875C11.2872 22 10 20.7128 10 19.125V7.875ZM12.875 7C12.3918 7 12 7.39175 12 7.875V19.125C12 19.6082 12.3918 20 12.875 20H19.125C19.6082 20 20 19.6082 20 19.125V7.875C20 7.39175 19.6082 7 19.125 7H12.875Z" fill="black"/>
+</g>
+</g>
+</svg>
diff --git a/DuckDuckGo/SyncAssets.xcassets/SyncFavicons.imageset/Contents.json b/DuckDuckGo/SyncAssets.xcassets/SyncFavicons.imageset/Contents.json
new file mode 100644
index 0000000000..5428663cb2
--- /dev/null
+++ b/DuckDuckGo/SyncAssets.xcassets/SyncFavicons.imageset/Contents.json
@@ -0,0 +1,16 @@
+{
+  "images" : [
+    {
+      "filename" : "SyncFavicons.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true,
+    "template-rendering-intent" : "template"
+  }
+}
diff --git a/DuckDuckGo/SyncAssets.xcassets/SyncFavicons.imageset/SyncFavicons.svg b/DuckDuckGo/SyncAssets.xcassets/SyncFavicons.imageset/SyncFavicons.svg
new file mode 100644
index 0000000000..e78a97101f
--- /dev/null
+++ b/DuckDuckGo/SyncAssets.xcassets/SyncFavicons.imageset/SyncFavicons.svg
@@ -0,0 +1,8 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Convert-24">
+<g id="Union">
+<path d="M6.7955 4.7955C7.23484 4.35616 7.23484 3.64384 6.7955 3.2045C6.35616 2.76517 5.64384 2.76517 5.2045 3.2045L2.2045 6.2045C1.76517 6.64384 1.76517 7.35616 2.2045 7.7955L5.2045 10.7955C5.64384 11.2348 6.35616 11.2348 6.7955 10.7955C7.23484 10.3562 7.23484 9.64384 6.7955 9.2045L5.59099 8H18C19.1046 8 20 8.89543 20 10V11C20 11.5523 20.4477 12 21 12C21.5523 12 22 11.5523 22 11V10C22 7.79086 20.2091 6 18 6H5.59099L6.7955 4.7955Z" fill="black" fill-opacity="0.84"/>
+<path d="M17.2045 14.7955C16.7652 14.3562 16.7652 13.6438 17.2045 13.2045C17.6438 12.7652 18.3562 12.7652 18.7955 13.2045L21.7955 16.2045C22.2348 16.6438 22.2348 17.3562 21.7955 17.7955L18.7955 20.7955C18.3562 21.2348 17.6438 21.2348 17.2045 20.7955C16.7652 20.3562 16.7652 19.6438 17.2045 19.2045L18.409 18H6C3.79086 18 2 16.2091 2 14L2 13C2 12.4477 2.44772 12 3 12C3.55228 12 4 12.4477 4 13L4 14C4 15.1046 4.89543 16 6 16H18.409L17.2045 14.7955Z" fill="black" fill-opacity="0.84"/>
+</g>
+</g>
+</svg>
diff --git a/DuckDuckGo/SyncDebugViewController.swift b/DuckDuckGo/SyncDebugViewController.swift
index cac0672300..b5fe9f351a 100644
--- a/DuckDuckGo/SyncDebugViewController.swift
+++ b/DuckDuckGo/SyncDebugViewController.swift
@@ -44,6 +44,8 @@ class SyncDebugViewController: UITableViewController {
     enum InfoRows: Int, CaseIterable {
 
         case syncNow
+        case logOut
+        case toggleFavoritesDisplayMode
 
     }
 
@@ -105,6 +107,10 @@ class SyncDebugViewController: UITableViewController {
             switch InfoRows(rawValue: indexPath.row) {
             case .syncNow:
                 cell.textLabel?.text = "Sync now"
+            case .logOut:
+                cell.textLabel?.text = "Log out of sync in 10 seconds"
+            case .toggleFavoritesDisplayMode:
+                cell.textLabel?.text = "Toggle favorites display mode in 10 seconds"
             case .none:
                 break
             }
@@ -161,6 +167,23 @@ class SyncDebugViewController: UITableViewController {
             switch InfoRows(rawValue: indexPath.row) {
             case .syncNow:
                 sync.scheduler.requestSyncImmediately()
+            case .logOut:
+                Task {
+                    try await Task.sleep(nanoseconds: UInt64(10e9))
+                    try await sync.disconnect()
+                }
+            case .toggleFavoritesDisplayMode:
+                Task { @MainActor in
+                    try await Task.sleep(nanoseconds: UInt64(10e9))
+                    var displayMode = AppDependencyProvider.shared.appSettings.favoritesDisplayMode
+                    if displayMode.isDisplayUnified {
+                        displayMode = .displayNative(.mobile)
+                    } else {
+                        displayMode = .displayUnified(native: .mobile)
+                    }
+                    AppDependencyProvider.shared.appSettings.favoritesDisplayMode = displayMode
+                    NotificationCenter.default.post(name: AppUserDefaults.Notifications.favoritesDisplayModeChange, object: nil)
+                }
             default: break
             }
         case .environment:
diff --git a/DuckDuckGo/SyncSettingsViewController+SyncDelegate.swift b/DuckDuckGo/SyncSettingsViewController+SyncDelegate.swift
index da16752a59..082b312ace 100644
--- a/DuckDuckGo/SyncSettingsViewController+SyncDelegate.swift
+++ b/DuckDuckGo/SyncSettingsViewController+SyncDelegate.swift
@@ -25,6 +25,18 @@ import AVFoundation
 
 extension SyncSettingsViewController: SyncManagementViewModelDelegate {
 
+    func launchAutofillViewController() {
+        guard let mainVC = view.window?.rootViewController as? MainViewController else { return }
+        self.dismiss(animated: true)
+        mainVC.launchAutofillLogins()
+    }
+
+    func launchBookmarksViewController() {
+        guard let mainVC = view.window?.rootViewController as? MainViewController else { return }
+        self.dismiss(animated: true)
+        mainVC.segueToBookmarks()
+    }
+
     func updateDeviceName(_ name: String) {
         Task { @MainActor in
             rootView.model.devices = []
@@ -37,13 +49,13 @@ extension SyncSettingsViewController: SyncManagementViewModelDelegate {
         }
     }
 
-    func createAccountAndStartSyncing() {
+    func createAccountAndStartSyncing(optionsViewModel: SyncSettingsViewModel) {
         Task { @MainActor in
             do {
                 try await syncService.createAccount(deviceName: deviceName, deviceType: deviceType)
                 self.rootView.model.syncEnabled(recoveryCode: recoveryCode)
                 self.refreshDevices()
-                self.showRecoveryPDF()
+                self.showDeviceConnected([], optionsModel: optionsViewModel, isSingleSetUp: true, shouldShowOptions: false)
             } catch {
                 handleError(error)
             }
@@ -56,33 +68,28 @@ extension SyncSettingsViewController: SyncManagementViewModelDelegate {
         assertionFailure(error.localizedDescription)
     }
 
-    func showSyncSetup() {
-        let model = TurnOnSyncViewModel { [weak self] in
-            self?.dismissPresentedViewController()
-            // Handle the finished logic in the closing of the view controller so that we also handle the
-            //  user dismissing it (cancel, swipe down, etc)
-        }
-
-        let controller = DismissibleHostingController(rootView: TurnOnSyncView(model: model)) { [weak self] in
-            self?.rootView.model.setupFinished(model)
-        }
-
-        navigationController?.present(controller, animated: true)
-    }
-
     func showSyncWithAnotherDevice() {
         collectCode(showConnectMode: syncService.account == nil)
     }
 
+    func showSyncWithAnotherDeviceEnterText() {
+        collectCode(showConnectMode: syncService.account == nil, showEnterTextCode: true)
+    }
+
     func showRecoverData() {
-        collectCode(showConnectMode: true)
+        collectCode(showConnectMode: false)
     }
 
-    func showDeviceConnected(_ devices: [SyncSettingsViewModel.Device]) {
+    func showDeviceConnected(_ devices: [SyncSettingsViewModel.Device], optionsModel: SyncSettingsViewModel, isSingleSetUp: Bool, shouldShowOptions: Bool) {
         let model = SaveRecoveryKeyViewModel(key: recoveryCode) { [weak self] in
             self?.shareRecoveryPDF()
         }
-        let controller = UIHostingController(rootView: DeviceConnectedView(model, devices: devices))
+        let controller = UIHostingController(
+            rootView: DeviceConnectedView(model,
+                                        optionsViewModel: optionsModel,
+                                          devices: devices,
+                                          isSingleSetUp: isSingleSetUp,
+                                          shouldShowOptions: shouldShowOptions))
         navigationController?.present(controller, animated: true) { [weak self] in
             self?.rootView.model.syncEnabled(recoveryCode: self!.recoveryCode)
             self?.refreshDevices()
@@ -97,17 +104,23 @@ extension SyncSettingsViewController: SyncManagementViewModelDelegate {
         navigationController?.present(controller, animated: true)
     }
 
-    private func collectCode(showConnectMode: Bool) {
+    private func collectCode(showConnectMode: Bool, showEnterTextCode: Bool = false) {
         let model = ScanOrPasteCodeViewModel(showConnectMode: showConnectMode)
         model.delegate = self
 
-        let controller = UIHostingController(rootView: ScanOrPasteCodeView(model: model))
+        var controller: UIHostingController<AnyView>
+        if showEnterTextCode {
+            controller = UIHostingController(rootView: AnyView(PasteCodeView(model: model, isfirstScreen: true)))
+        } else {
+            controller = UIHostingController(rootView: AnyView(ScanOrPasteCodeView(model: model)))
+        }
 
         let navController = UIDevice.current.userInterfaceIdiom == .phone
         ? PortraitNavigationController(rootViewController: controller)
         : UINavigationController(rootViewController: controller)
 
         navController.overrideUserInterfaceStyle = .dark
+        navController.setNeedsStatusBarAppearanceUpdate()
         navController.modalPresentationStyle = .fullScreen
         navigationController?.present(navController, animated: true) {
             self.checkCameraPermission(model: model)
@@ -144,6 +157,8 @@ extension SyncSettingsViewController: SyncManagementViewModelDelegate {
                     do {
                         self.rootView.model.isSyncEnabled = false
                         try await self.syncService.disconnect()
+                        AppUserDefaults().isSyncBookmarksPaused = false
+                        AppUserDefaults().isSyncCredentialsPaused = false
                     } catch {
                         self.handleError(error)
                     }
@@ -167,6 +182,8 @@ extension SyncSettingsViewController: SyncManagementViewModelDelegate {
                     do {
                         self.rootView.model.isSyncEnabled = false
                         try await self.syncService.deleteAccount()
+                        AppUserDefaults().isSyncBookmarksPaused = false
+                        AppUserDefaults().isSyncCredentialsPaused = false
                     } catch {
                         self.handleError(error)
                     }
diff --git a/DuckDuckGo/SyncSettingsViewController.swift b/DuckDuckGo/SyncSettingsViewController.swift
index 1ba341015b..6bba63102b 100644
--- a/DuckDuckGo/SyncSettingsViewController.swift
+++ b/DuckDuckGo/SyncSettingsViewController.swift
@@ -50,9 +50,13 @@ class SyncSettingsViewController: UIHostingController<SyncSettingsView> {
     var cancellables = Set<AnyCancellable>()
 
     // For some reason, on iOS 14, the viewDidLoad wasn't getting called so do some setup here
-    convenience init() {
-        self.init(rootView: SyncSettingsView(model: SyncSettingsViewModel()))
+    convenience init(appSettings: AppSettings = AppDependencyProvider.shared.appSettings) {
+        let viewModel = SyncSettingsViewModel()
 
+        self.init(rootView: SyncSettingsView(model: viewModel))
+
+        setUpFavoritesDisplayModeSwitch(viewModel, appSettings)
+        setUpSyncPaused(viewModel, appSettings)
         refreshForState(syncService.authState)
 
         syncService.authStatePublisher
@@ -67,6 +71,43 @@ class SyncSettingsViewController: UIHostingController<SyncSettingsView> {
         navigationItem.title = UserText.syncTitle
     }
 
+    private func setUpFavoritesDisplayModeSwitch(_ viewModel: SyncSettingsViewModel, _ appSettings: AppSettings) {
+        viewModel.isUnifiedFavoritesEnabled = appSettings.favoritesDisplayMode.isDisplayUnified
+
+        viewModel.$isUnifiedFavoritesEnabled.dropFirst()
+            .sink { [weak self] isEnabled in
+                appSettings.favoritesDisplayMode = isEnabled ? .displayUnified(native: .mobile) : .displayNative(.mobile)
+                NotificationCenter.default.post(name: AppUserDefaults.Notifications.favoritesDisplayModeChange, object: self)
+                self?.syncService.scheduler.notifyDataChanged()
+            }
+            .store(in: &cancellables)
+
+        NotificationCenter.default.publisher(for: AppUserDefaults.Notifications.favoritesDisplayModeChange)
+            .filter { [weak self] notification in
+                guard let viewController = notification.object as? SyncSettingsViewController else {
+                    return true
+                }
+                return viewController !== self
+            }
+            .receive(on: DispatchQueue.main)
+            .sink { _ in
+                viewModel.isUnifiedFavoritesEnabled = appSettings.favoritesDisplayMode.isDisplayUnified
+            }
+            .store(in: &cancellables)
+    }
+
+    private func setUpSyncPaused(_ viewModel: SyncSettingsViewModel, _ appSettings: AppSettings) {
+        viewModel.isSyncBookmarksPaused = appSettings.isSyncBookmarksPaused
+        viewModel.isSyncCredentialsPaused = appSettings.isSyncCredentialsPaused
+        NotificationCenter.default.publisher(for: AppUserDefaults.Notifications.syncPausedStateChanged)
+            .receive(on: DispatchQueue.main)
+            .sink { _ in
+                viewModel.isSyncBookmarksPaused = appSettings.isSyncBookmarksPaused
+                viewModel.isSyncCredentialsPaused = appSettings.isSyncCredentialsPaused
+            }
+            .store(in: &cancellables)
+    }
+
     override func viewDidLoad() {
         super.viewDidLoad()
         applyTheme(ThemeManager.shared.currentTheme)
@@ -75,6 +116,11 @@ class SyncSettingsViewController: UIHostingController<SyncSettingsView> {
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         connector = nil
+        syncService.scheduler.requestSyncImmediately()
+    }
+
+    func updateOptions() {
+        syncService.scheduler.requestSyncImmediately()
     }
 
     func refreshForState(_ authState: SyncAuthState) {
@@ -139,20 +185,21 @@ extension SyncSettingsViewController: ScanOrPasteCodeViewModelDelegate {
         }
     }
 
-    func loginAndShowDeviceConnected(recoveryKey: SyncCode.RecoveryKey) async throws {
+    func loginAndShowDeviceConnected(recoveryKey: SyncCode.RecoveryKey, isActiveSyncDevice: Bool) async throws {
         let knownDevices = Set(self.rootView.model.devices.map { $0.id })
         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 }
-        showDeviceConnected(devices)
+        let isSecondDevice = devices.count == 1
+        showDeviceConnected(devices, optionsModel: self.rootView.model, isSingleSetUp: false, shouldShowOptions: isActiveSyncDevice && isSecondDevice)
     }
 
     func startPolling() {
         Task { @MainActor in
             do {
                 if let recoveryKey = try await connector?.pollForRecoveryKey() {
-                    try await loginAndShowDeviceConnected(recoveryKey: recoveryKey)
+                    try await loginAndShowDeviceConnected(recoveryKey: recoveryKey, isActiveSyncDevice: false)
                 } else {
                     // Likely cancelled elsewhere
                     return
@@ -170,22 +217,31 @@ extension SyncSettingsViewController: ScanOrPasteCodeViewModelDelegate {
             }
 
             if let recoveryKey = syncCode.recovery {
-                try await loginAndShowDeviceConnected(recoveryKey: recoveryKey)
+                try await loginAndShowDeviceConnected(recoveryKey: recoveryKey, isActiveSyncDevice: true)
                 return true
             } else if let connectKey = syncCode.connect {
                 if syncService.account == nil {
                     try await syncService.createAccount(deviceName: deviceName, deviceType: deviceType)
                     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
-                        self?.dismissPresentedViewController()
-                        self?.showDeviceConnected(devices.filter { !$0.isThisDevice })
+                        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
                     }.store(in: &cancellables)
-                try await syncService.transmitRecoveryKey(connectKey)
+
                 return true
             }
 
@@ -196,9 +252,8 @@ extension SyncSettingsViewController: ScanOrPasteCodeViewModelDelegate {
     }
 
     func codeCollectionCancelled() {
-        assert(navigationController?.visibleViewController is UIHostingController<ScanOrPasteCodeView>)
+        assert(navigationController?.visibleViewController is UIHostingController<AnyView>)
         dismissPresentedViewController()
-        rootView.model.codeCollectionCancelled()
     }
 
     func gotoSettings() {
diff --git a/DuckDuckGo/TabSwitcherViewController.swift b/DuckDuckGo/TabSwitcherViewController.swift
index 29833eb944..59d82f551c 100644
--- a/DuckDuckGo/TabSwitcherViewController.swift
+++ b/DuckDuckGo/TabSwitcherViewController.swift
@@ -26,6 +26,7 @@ import Bookmarks
 import Persistence
 
 // swiftlint:disable file_length
+// swiftlint:disable:next type_body_length
 class TabSwitcherViewController: UIViewController {
     
     struct Constants {
@@ -247,6 +248,7 @@ class TabSwitcherViewController: UIViewController {
         alert.addAction(UIAlertAction(title: UserText.actionCancel, style: .cancel))
         alert.addAction(title: UserText.actionBookmark, style: .default) {
             let model = MenuBookmarksViewModel(bookmarksDatabase: self.bookmarksDatabase, syncService: self.syncService)
+            model.favoritesDisplayMode = AppDependencyProvider.shared.appSettings.favoritesDisplayMode
             let result = self.bookmarkAll(viewModel: model)
             self.displayBookmarkAllStatusMessage(with: result, openTabsCount: self.tabsModel.tabs.count)
         }
diff --git a/DuckDuckGo/TabViewController.swift b/DuckDuckGo/TabViewController.swift
index 6962907e0e..2220dbebe6 100644
--- a/DuckDuckGo/TabViewController.swift
+++ b/DuckDuckGo/TabViewController.swift
@@ -335,6 +335,8 @@ class TabViewController: UIViewController {
 
     override func buildActivities() -> [UIActivity] {
         let viewModel = MenuBookmarksViewModel(bookmarksDatabase: bookmarksDatabase, syncService: syncService)
+        viewModel.favoritesDisplayMode = appSettings.favoritesDisplayMode
+
         var activities: [UIActivity] = [SaveBookmarkActivity(controller: self,
                                                              viewModel: viewModel)]
 
diff --git a/DuckDuckGo/TabViewControllerBrowsingMenuExtension.swift b/DuckDuckGo/TabViewControllerBrowsingMenuExtension.swift
index 5803357ea7..8c9e3a274b 100644
--- a/DuckDuckGo/TabViewControllerBrowsingMenuExtension.swift
+++ b/DuckDuckGo/TabViewControllerBrowsingMenuExtension.swift
@@ -238,7 +238,7 @@ extension TabViewController {
     private func buildFavoriteEntry(for link: Link,
                                     bookmark: BookmarkEntity?,
                                     with bookmarksInterface: MenuBookmarksInteracting) -> BrowsingMenuEntry {
-        if bookmark?.isFavorite ?? false {
+        if bookmark?.isFavorite(on: .mobile) ?? false {
             let action: () -> Void = { [weak self] in
                 Pixel.fire(pixel: .browsingMenuRemoveFromFavorites)
                 self?.performRemoveFavoriteAction(for: link, with: bookmarksInterface)
diff --git a/DuckDuckGo/UserText.swift b/DuckDuckGo/UserText.swift
index b4e0794927..afb25e0e08 100644
--- a/DuckDuckGo/UserText.swift
+++ b/DuckDuckGo/UserText.swift
@@ -677,7 +677,11 @@ In addition to the details entered into this form, your app issue report will co
     
     public static let emailSettingsSubtitle = NSLocalizedString("email.settings.subtitle", value: "Block email trackers and hide your address", comment: "Subtitle for the email settings cell")
     public static let macWaitlistBrowsePrivately = NSLocalizedString("mac-waitlist.settings.browse-privately", value: "Browse privately with our app for Mac", comment: "Title for the settings subtitle")
-    
+    public static let favoritesDisplayPreferencesHeader = NSLocalizedString("favorites.settings.header", value: "Display Preferences", comment: "Header of the favorites settings table")
+    public static let favoritesDisplayPreferencesFooter = NSLocalizedString("favorites.settings.footer", value: "Choose which favorites to display on a new tab based on their origin.", comment: "Footer of the favorites settings table")
+    public static let favoritesDisplayPreferencesMobileOnly = NSLocalizedString("favorites.settings.mobile-only", value: "Mobile Favorites Only", comment: "Display Mode for favorites")
+    public static let favoritesDisplayPreferencesAllDevices = NSLocalizedString("favorites.settings.all-devices", value: "All Device Favorites", comment: "Display Mode for favorites")
+
     // MARK: Share Sheet
     
     public static let macWaitlistShareSheetTitle = NSLocalizedString("mac-waitlist.share-sheet.title", value: "DuckDuckGo for Mac", comment: "Title for the share sheet entry")
@@ -838,11 +842,17 @@ In addition to the details entered into this form, your app issue report will co
     }
     public static let syncRemoveDeviceConfirmAction = "Remove"
     public static let syncCodeCopied = "Recovery Code copied"
-    public static let syncTitle = "Sync"
+    public static let syncTitle = "Sync & Back Up"
 
     // MARK: Errors
 
     static let unknownErrorTryAgainMessage = NSLocalizedString("error.unknown.try.again", value: "An unknown error has occurred", comment: "Generic error message on a dialog for when the cause is not known.")
+    static let syncBookmarkPausedAlertTitle = NSLocalizedString("alert.sync-bookmarks-paused-title", value: "Bookmarks Sync is Paused", comment: "Title for alert shown when sync bookmarks paused for too many items")
+    static let syncBookmarkPausedAlertDescription = NSLocalizedString("alert.sync-bookmarks-paused-description", value: "You have exceeded the bookmarks sync limit. Try deleting some bookmarks. Until this is resolved your bookmarks will not be backed up.", comment: "Description for alert shown when sync bookmarks paused for too many items")
+    static let syncCredentialsPausedAlertTitle = NSLocalizedString("alert.sync-credentials-paused-title", value: "Passwords Sync is Paused", comment: "Title for alert shown when sync credentials paused for too many items")
+    static let syncCredentialsPausedAlertDescription = NSLocalizedString("alert.sync-credentials-paused-description", value: "You have exceeded the passwords sync limit. Try deleting some passwords. Until this is resolved your passwords will not be backed up.", comment: "Description for alert shown when sync credentials paused for too many items")
+    public static let syncPausedAlertOkButton = NSLocalizedString("alert.sync-paused-alert-ok-button", value: "OK", comment: "Confirmation button in alert")
+    public static let syncPausedAlertLearnMoreButton = NSLocalizedString("alert.sync-paused-alert-learn-more-button", value: "Learn More", comment: "Learn more button in alert")
 
     static let preemptiveCrashTitle = NSLocalizedString("error.preemptive-crash.title", value: "App issue detected", comment: "Alert title")
     static let preemptiveCrashBody = NSLocalizedString("error.preemptive-crash.body", value: "Looks like there's an issue with the app and it needs to close. Please reopen to continue.", comment: "Alert message")
diff --git a/DuckDuckGo/en.lproj/Localizable.strings b/DuckDuckGo/en.lproj/Localizable.strings
index bb93c7a4d3..aeac08a7bc 100644
--- a/DuckDuckGo/en.lproj/Localizable.strings
+++ b/DuckDuckGo/en.lproj/Localizable.strings
@@ -127,6 +127,24 @@
 /* No comment provided by engineer. */
 "alert.message.bookmarkAll" = "Existing bookmarks will not be duplicated.";
 
+/* Description for alert shown when sync bookmarks paused for too many items */
+"alert.sync-bookmarks-paused-description" = "You have exceeded the bookmarks sync limit. Try deleting some bookmarks. Until this is resolved your bookmarks will not be backed up.";
+
+/* Title for alert shown when sync bookmarks paused for too many items */
+"alert.sync-bookmarks-paused-title" = "Bookmarks Sync is Paused";
+
+/* Description for alert shown when sync credentials paused for too many items */
+"alert.sync-credentials-paused-description" = "You have exceeded the passwords sync limit. Try deleting some passwords. Until this is resolved your passwords will not be backed up.";
+
+/* Title for alert shown when sync credentials paused for too many items */
+"alert.sync-credentials-paused-title" = "Passwords Sync is Paused";
+
+/* Learn more button in alert */
+"alert.sync-paused-alert-learn-more-button" = "Learn More";
+
+/* Confirmation button in alert */
+"alert.sync-paused-alert-ok-button" = "OK";
+
 /* Question from confirmation dialog */
 "alert.title.bookmarkAll" = "Bookmark All Tabs?";
 
@@ -1051,6 +1069,18 @@
 /* No comment provided by engineer. */
 "favorite.menu.remove" = "Remove";
 
+/* Display Mode for favorites */
+"favorites.settings.all-devices" = "All Device Favorites";
+
+/* Footer of the favorites settings table */
+"favorites.settings.footer" = "Choose which favorites to display on a new tab based on their origin.";
+
+/* Header of the favorites settings table */
+"favorites.settings.header" = "Display Preferences";
+
+/* Display Mode for favorites */
+"favorites.settings.mobile-only" = "Mobile Favorites Only";
+
 /* No comment provided by engineer. */
 "feedback.browserFeatures.ads" = "Ad and pop-up blocking";
 
diff --git a/DuckDuckGoTests/AppSettingsMock.swift b/DuckDuckGoTests/AppSettingsMock.swift
index 19df581ccc..72ec6924a2 100644
--- a/DuckDuckGoTests/AppSettingsMock.swift
+++ b/DuckDuckGoTests/AppSettingsMock.swift
@@ -17,11 +17,16 @@
 //  limitations under the License.
 //
 
+import Bookmarks
 import Foundation
 @testable import DuckDuckGo
 
 class AppSettingsMock: AppSettings {
 
+    var isSyncBookmarksPaused: Bool = false
+
+    var isSyncCredentialsPaused: Bool = false
+
     var currentAddressBarPosition: DuckDuckGo.AddressBarPosition = .top
 
     var showFullSiteAddress: Bool = false
@@ -54,6 +59,8 @@ class AppSettingsMock: AppSettings {
 
     var textSize: Int = 14
 
+    var favoritesDisplayMode: FavoritesDisplayMode = .displayNative(.mobile)
+
     var autofill: Bool = false
 
     var voiceSearchEnabled: Bool = false
diff --git a/DuckDuckGoTests/BookmarkEditorViewModelTests.swift b/DuckDuckGoTests/BookmarkEditorViewModelTests.swift
index a293c8fc3a..6e4dbb5e7e 100644
--- a/DuckDuckGoTests/BookmarkEditorViewModelTests.swift
+++ b/DuckDuckGoTests/BookmarkEditorViewModelTests.swift
@@ -55,6 +55,7 @@ class BookmarkEditorViewModelTests: XCTestCase {
     func testWhenCreatingFolderWithoutParentThenModelCanSave() {
         let model = BookmarkEditorViewModel(creatingFolderWithParentID: nil,
                                             bookmarksDatabase: db,
+                                            favoritesDisplayMode: .displayNative(.mobile),
                                             errorEvents: errorValidatingHandler())
         
         XCTAssertFalse(model.canAddNewFolder)
@@ -72,6 +73,7 @@ class BookmarkEditorViewModelTests: XCTestCase {
         XCTAssertNotNil(root)
         let model = BookmarkEditorViewModel(creatingFolderWithParentID: root?.objectID,
                                             bookmarksDatabase: db,
+                                            favoritesDisplayMode: .displayNative(.mobile),
                                             errorEvents: errorValidatingHandler())
         
         XCTAssertFalse(model.canAddNewFolder)
@@ -95,6 +97,7 @@ class BookmarkEditorViewModelTests: XCTestCase {
         
         let model = BookmarkEditorViewModel(editingEntityID: firstBookmark.objectID,
                                             bookmarksDatabase: db,
+                                            favoritesDisplayMode: .displayNative(.mobile),
                                             errorEvents: errorValidatingHandler())
         
         XCTAssertFalse(model.isNew)
@@ -115,6 +118,7 @@ class BookmarkEditorViewModelTests: XCTestCase {
         
         let model = BookmarkEditorViewModel(editingEntityID: firstBookmark.objectID,
                                             bookmarksDatabase: db,
+                                            favoritesDisplayMode: .displayNative(.mobile),
                                             errorEvents: errorValidatingHandler())
         
         XCTAssertFalse(model.isNew)
@@ -136,15 +140,16 @@ class BookmarkEditorViewModelTests: XCTestCase {
         
         let model = BookmarkEditorViewModel(editingEntityID: firstBookmark.objectID,
                                             bookmarksDatabase: db,
+                                            favoritesDisplayMode: .displayNative(.mobile),
                                             errorEvents: errorValidatingHandler())
         
         let folders = model.locations
         
         let fetchFolders = BookmarkEntity.fetchRequest()
-        fetchFolders.predicate = NSPredicate(format: "%K == true AND %K != %@ AND %K == false",
+        fetchFolders.predicate = NSPredicate(format: "%K == true AND NOT %K IN %@ AND %K == false",
                                              #keyPath(BookmarkEntity.isFolder),
                                              #keyPath(BookmarkEntity.uuid),
-                                             BookmarkEntity.Constants.favoritesFolderID,
+                                             FavoritesFolderID.allCases.map(\.rawValue),
                                              #keyPath(BookmarkEntity.isPendingDeletion))
         let allFolders = (try? context.fetch(fetchFolders)) ?? []
         
@@ -179,11 +184,12 @@ class BookmarkEditorViewModelTests: XCTestCase {
         
         let model = BookmarkEditorViewModel(editingEntityID: firstBookmark.objectID,
                                             bookmarksDatabase: db,
+                                            favoritesDisplayMode: .displayNative(.mobile),
                                             errorEvents: errorValidatingHandler())
         
-        XCTAssert(model.bookmark.isFavorite)
+        XCTAssert(model.bookmark.isFavorite(on: .mobile))
         model.removeFromFavorites()
-        XCTAssertFalse(model.bookmark.isFavorite)
+        XCTAssertFalse(model.bookmark.isFavorite(on: .mobile))
         XCTAssert(model.canSave)
         model.save()
     }
@@ -194,6 +200,7 @@ class BookmarkEditorViewModelTests: XCTestCase {
         let errorReported = expectation(description: "Error reported")
         let model = BookmarkEditorViewModel(creatingFolderWithParentID: nil,
                                             bookmarksDatabase: db,
+                                            favoritesDisplayMode: .displayNative(.mobile),
                                             errorEvents: .init(mapping: { event, _, _, _ in
             XCTAssertEqual(event, .saveFailed(.edit))
             errorReported.fulfill()
diff --git a/DuckDuckGoTests/BookmarkEntityTests.swift b/DuckDuckGoTests/BookmarkEntityTests.swift
index 3a9cf3aad9..6b7ba6989b 100644
--- a/DuckDuckGoTests/BookmarkEntityTests.swift
+++ b/DuckDuckGoTests/BookmarkEntityTests.swift
@@ -28,7 +28,7 @@ class BookmarkEntityTests: XCTestCase {
     var db: CoreDataDatabase!
     var context: NSManagedObjectContext!
     var root: BookmarkEntity!
-    var favorites: BookmarkEntity!
+    var favoritesFolders: [BookmarkEntity] = []
 
     override func setUpWithError() throws {
         try super.setUpWithError()
@@ -45,15 +45,15 @@ class BookmarkEntityTests: XCTestCase {
         root = BookmarkUtils.fetchRootFolder(context)
         XCTAssertNotNil(root)
 
-        favorites = BookmarkUtils.fetchFavoritesFolder(context)
-        XCTAssertNotNil(favorites)
+        favoritesFolders = BookmarkUtils.fetchFavoritesFolders(for: .displayNative(.mobile), in: context)
+        XCTAssertNotNil(favoritesFolders)
     }
 
     override func tearDownWithError() throws {
         try super.tearDownWithError()
 
         root = nil
-        favorites = nil
+        favoritesFolders = []
         context = nil
 
         try db.tearDown(deleteStores: true)
@@ -73,7 +73,7 @@ class BookmarkEntityTests: XCTestCase {
                                                    url: "u",
                                                    parent: root,
                                                    context: context)
-        favorite.addToFavorites(favoritesRoot: favorites)
+        favorite.addToFavorites(folders: favoritesFolders)
 
         try context.save()
     }
diff --git a/DuckDuckGoTests/BookmarkListViewModelTests.swift b/DuckDuckGoTests/BookmarkListViewModelTests.swift
index a2ff0e6108..195ea53bc0 100644
--- a/DuckDuckGoTests/BookmarkListViewModelTests.swift
+++ b/DuckDuckGoTests/BookmarkListViewModelTests.swift
@@ -27,9 +27,11 @@ import DuckDuckGo
 private extension BookmarkListViewModel {
     
     convenience init(bookmarksDatabase: CoreDataDatabase,
-                     parentID: NSManagedObjectID?) {
+                     parentID: NSManagedObjectID?,
+                     favoritesDisplayMode: FavoritesDisplayMode) {
         self.init(bookmarksDatabase: bookmarksDatabase,
                   parentID: parentID,
+                  favoritesDisplayMode: favoritesDisplayMode,
                   errorEvents: .init(mapping: { event, _, _, _ in
             XCTFail("Unexpected error: \(event)")
         }))
@@ -65,7 +67,8 @@ class BookmarkListViewModelTests: XCTestCase {
     func testWhenFolderIsSetThenBookmarksFetchedFromThatLocation() {
         
         let viewModel = BookmarkListViewModel(bookmarksDatabase: db,
-                                              parentID: nil)
+                                              parentID: nil,
+                                              favoritesDisplayMode: .displayNative(.mobile))
         let context = db.makeContext(concurrencyType: .mainQueueConcurrencyType)
         XCTAssertNotNil(viewModel.currentFolder?.objectID)
         XCTAssertEqual(viewModel.currentFolder?.objectID, BookmarkUtils.fetchRootFolder(context)?.objectID)
@@ -77,7 +80,8 @@ class BookmarkListViewModelTests: XCTestCase {
         XCTAssertEqual(names, BasicBookmarksStructure.topLevelTitles)
         
         let nestedViewModel = BookmarkListViewModel(bookmarksDatabase: db,
-                                                    parentID: result[1].objectID)
+                                                    parentID: result[1].objectID,
+                                                    favoritesDisplayMode: .displayNative(.mobile))
         XCTAssertEqual(nestedViewModel.currentFolder?.objectID, result[1].objectID)
         
         let result2 = nestedViewModel.bookmarks
@@ -89,7 +93,8 @@ class BookmarkListViewModelTests: XCTestCase {
     func testWhenDeletingABookmarkItIsRemoved() {
         
         let viewModel = BookmarkListViewModel(bookmarksDatabase: db,
-                                              parentID: nil)
+                                              parentID: nil,
+                                              favoritesDisplayMode: .displayNative(.mobile))
         let result = viewModel.bookmarks
         let idSet = Set(result.map { $0.objectID })
         
@@ -99,7 +104,8 @@ class BookmarkListViewModelTests: XCTestCase {
         viewModel.softDeleteBookmark(bookmark)
         
         let newViewModel = BookmarkListViewModel(bookmarksDatabase: db,
-                                               parentID: nil)
+                                                 parentID: nil,
+                                                 favoritesDisplayMode: .displayNative(.mobile))
         let newResult = newViewModel.bookmarks
         let newIdSet = Set(newResult.map { $0.objectID })
         
@@ -112,7 +118,8 @@ class BookmarkListViewModelTests: XCTestCase {
     func testWhenDeletingABookmarkFolderItIsRemovedWithContents() {
         
         let viewModel = BookmarkListViewModel(bookmarksDatabase: db,
-                                              parentID: nil)
+                                              parentID: nil,
+                                              favoritesDisplayMode: .displayNative(.mobile))
         let result = viewModel.bookmarks
         let idSet = Set(result.map { $0.objectID })
         
@@ -125,7 +132,8 @@ class BookmarkListViewModelTests: XCTestCase {
         viewModel.softDeleteBookmark(folder)
         
         let newViewModel = BookmarkListViewModel(bookmarksDatabase: db,
-                                               parentID: nil)
+                                                 parentID: nil,
+                                                 favoritesDisplayMode: .displayNative(.mobile))
         let newResult = newViewModel.bookmarks
         let newIdSet = Set(newResult.map { $0.objectID })
         
@@ -139,15 +147,17 @@ class BookmarkListViewModelTests: XCTestCase {
     func testWhenGettingTotalCountThenFoldersAreNotTakenIntoAccount() {
         
         let viewModel = BookmarkListViewModel(bookmarksDatabase: db,
-                                              parentID: nil)
-        
+                                              parentID: nil,
+                                              favoritesDisplayMode: .displayNative(.mobile))
+
         XCTAssertEqual(viewModel.totalBookmarksCount, 5)
     }
     
     func testWhenMovingBookmarkItGoesToNewPosition() {
         
         let viewModel = BookmarkListViewModel(bookmarksDatabase: db,
-                                              parentID: nil)
+                                              parentID: nil,
+                                              favoritesDisplayMode: .displayNative(.mobile))
         let result = viewModel.bookmarks
         
         let first = result[0]
@@ -158,7 +168,8 @@ class BookmarkListViewModelTests: XCTestCase {
                                toIndex: 1)
         
         let newViewModel = BookmarkListViewModel(bookmarksDatabase: db,
-                                               parentID: nil)
+                                                 parentID: nil,
+                                                 favoritesDisplayMode: .displayNative(.mobile))
         let newResult = newViewModel.bookmarks
         let newFirst = newResult[0]
         let newSecond = newResult[1]
@@ -171,9 +182,11 @@ class BookmarkListViewModelTests: XCTestCase {
     func testWhenContextSavesThenChangesArePropagated() {
         
         let viewModel = BookmarkListViewModel(bookmarksDatabase: db,
-                                                   parentID: nil)
+                                              parentID: nil,
+                                              favoritesDisplayMode: .displayNative(.mobile))
         let listeningViewModel = BookmarkListViewModel(bookmarksDatabase: db,
-                                                       parentID: nil)
+                                                       parentID: nil,
+                                                       favoritesDisplayMode: .displayNative(.mobile))
         
         let expectation = expectation(description: "Changes propagated")
         
@@ -203,6 +216,7 @@ class BookmarkListViewModelTests: XCTestCase {
         expectation.expectedFulfillmentCount = 3
         let viewModel = BookmarkListViewModel(bookmarksDatabase: db,
                                               parentID: nil,
+                                              favoritesDisplayMode: .displayNative(.mobile),
                                               errorEvents: .init(mapping: { event, _, _, _ in
             let expectedEvent = expectedEvents.popLast()
             XCTAssertEqual(event, expectedEvent)
@@ -230,7 +244,8 @@ class BookmarkListViewModelTests: XCTestCase {
                                toIndex: 10)
         
         let newViewModel = BookmarkListViewModel(bookmarksDatabase: db,
-                                                 parentID: nil)
+                                                 parentID: nil,
+                                                 favoritesDisplayMode: .displayNative(.mobile))
         let newResult = newViewModel.bookmarks
         let newFirst = newResult[0]
         let newSecond = newResult[1]
@@ -245,7 +260,8 @@ class BookmarkListViewModelTests: XCTestCase {
     func testWhenFolderIsNotAFolderThenErrorIsReported() {
         
         let viewModel = BookmarkListViewModel(bookmarksDatabase: db,
-                                              parentID: nil)
+                                              parentID: nil,
+                                              favoritesDisplayMode: .displayNative(.mobile))
 
         let result = viewModel.bookmarks
         let bookmark = result[0]
@@ -254,6 +270,7 @@ class BookmarkListViewModelTests: XCTestCase {
         let errorReported = expectation(description: "Error reported")
         let brokenViewModel = BookmarkListViewModel(bookmarksDatabase: db,
                                                     parentID: bookmark.objectID,
+                                                    favoritesDisplayMode: .displayNative(.mobile),
                                                     errorEvents: .init(mapping: { event, _, _, _ in
             errorReported.fulfill()
             XCTAssertEqual(event, .bookmarkFolderExpected)
@@ -267,7 +284,8 @@ class BookmarkListViewModelTests: XCTestCase {
     func testWhenFolderIsMissingThenErrorIsReported() {
         
         let viewModel = BookmarkListViewModel(bookmarksDatabase: db,
-                                              parentID: nil)
+                                              parentID: nil,
+                                              favoritesDisplayMode: .displayNative(.mobile))
 
         let result = viewModel.bookmarks
         let bookmark = result[0]
@@ -282,6 +300,7 @@ class BookmarkListViewModelTests: XCTestCase {
         let errorReported = expectation(description: "Error reported")
         let brokenViewModel = BookmarkListViewModel(bookmarksDatabase: db,
                                                     parentID: tmpFolder.objectID,
+                                                    favoritesDisplayMode: .displayNative(.mobile),
                                                     errorEvents: .init(mapping: { event, _, _, _ in
             errorReported.fulfill()
             XCTAssertEqual(event, .bookmarksListMissingFolder)
@@ -300,6 +319,7 @@ class BookmarkListViewModelTests: XCTestCase {
         let expectation = expectation(description: "Error reported")
         _ = BookmarkListViewModel(bookmarksDatabase: db,
                                   parentID: nil,
+                                  favoritesDisplayMode: .displayNative(.mobile),
                                   errorEvents: .init(mapping: { event, _, _, _ in
             XCTAssertEqual(event, .fetchingRootItemFailed(.bookmarks))
             expectation.fulfill()
diff --git a/DuckDuckGoTests/BookmarkUtilsTests.swift b/DuckDuckGoTests/BookmarkUtilsTests.swift
index 1c7314e273..5930ce4a46 100644
--- a/DuckDuckGoTests/BookmarkUtilsTests.swift
+++ b/DuckDuckGoTests/BookmarkUtilsTests.swift
@@ -54,12 +54,12 @@ class BookmarkUtilsTests: XCTestCase {
         BookmarkUtils.prepareFoldersStructure(in: context)
         
         count = try context.count(for: countRequest)
-        XCTAssertEqual(count, 2)
+        XCTAssertEqual(count, 4)
         
         BookmarkUtils.prepareFoldersStructure(in: context)
         
         count = try context.count(for: countRequest)
-        XCTAssertEqual(count, 2)
+        XCTAssertEqual(count, 4)
     }
  
 }
diff --git a/DuckDuckGoTests/BookmarksExporterTests.swift b/DuckDuckGoTests/BookmarksExporterTests.swift
index 4606ecc4a4..5d68848704 100644
--- a/DuckDuckGoTests/BookmarksExporterTests.swift
+++ b/DuckDuckGoTests/BookmarksExporterTests.swift
@@ -33,8 +33,8 @@ class BookmarksExporterTests: XCTestCase {
 
         htmlLoader = HtmlTestDataLoader()
 
-        importer = BookmarksImporter(coreDataStore: storage)
-        exporter = BookmarksExporter(coreDataStore: storage)
+        importer = BookmarksImporter(coreDataStore: storage, favoritesDisplayMode: .displayNative(.mobile))
+        exporter = BookmarksExporter(coreDataStore: storage, favoritesDisplayMode: .displayNative(.mobile))
     }
 
     override func tearDownWithError() throws {
diff --git a/DuckDuckGoTests/BookmarksImporterTests.swift b/DuckDuckGoTests/BookmarksImporterTests.swift
index 001a488c3d..e8a4dc44ee 100644
--- a/DuckDuckGoTests/BookmarksImporterTests.swift
+++ b/DuckDuckGoTests/BookmarksImporterTests.swift
@@ -33,7 +33,7 @@ class BookmarksImporterTests: XCTestCase {
         try super.setUpWithError()
 
         htmlLoader = HtmlTestDataLoader()
-        importer = BookmarksImporter(coreDataStore: storage)
+        importer = BookmarksImporter(coreDataStore: storage, favoritesDisplayMode: .displayNative(.mobile))
     }
 
     override func tearDownWithError() throws {
diff --git a/DuckDuckGoTests/BookmarksMigrationTests.swift b/DuckDuckGoTests/BookmarksMigrationTests.swift
index fd6a1a6e44..7ffeddde97 100644
--- a/DuckDuckGoTests/BookmarksMigrationTests.swift
+++ b/DuckDuckGoTests/BookmarksMigrationTests.swift
@@ -100,7 +100,7 @@ class BookmarksMigrationTests: XCTestCase {
         LegacyBookmarksStoreMigration.migrate(from: nil, to: context)
         
         XCTAssertNotNil(BookmarkUtils.fetchRootFolder(context))
-        XCTAssertNotNil(BookmarkUtils.fetchFavoritesFolder(context))
+        XCTAssertEqual(BookmarkUtils.fetchFavoritesFolders(withUUIDs: Set(FavoritesFolderID.allCases.map(\.rawValue)), in: context).count, 1)
         
         // Simulate subsequent app instantiations
         LegacyBookmarksStoreMigration.migrate(from: nil, to: context)
@@ -119,9 +119,18 @@ class BookmarksMigrationTests: XCTestCase {
         LegacyBookmarksStoreMigration.migrate(from: sourceStack, to: context)
         
         XCTAssertNotNil(BookmarkUtils.fetchRootFolder(context))
-        XCTAssertNotNil(BookmarkUtils.fetchFavoritesFolder(context))
-        
-        let topLevel = BookmarkListViewModel(bookmarksDatabase: destinationStack, parentID: nil, syncService: nil)
+        XCTAssertEqual(
+            BookmarkUtils.fetchFavoritesFolders(withUUIDs: Set(FavoritesFolderID.allCases.map(\.rawValue)), in: context).count,
+            FavoritesFolderID.allCases.count
+        )
+
+        let topLevel = BookmarkListViewModel(
+            bookmarksDatabase: destinationStack,
+            parentID: nil,
+            favoritesDisplayMode: .displayNative(.mobile),
+            syncService: nil
+        )
+
         XCTAssertEqual(topLevel.bookmarks.count, 4)
         
         let topLevelNames = topLevel.bookmarks.map { $0.title }
@@ -130,18 +139,18 @@ class BookmarksMigrationTests: XCTestCase {
         
         let favFirst = topLevel.bookmarks[0]
         XCTAssertEqual(favFirst.isFolder, false)
-        XCTAssertEqual(favFirst.isFavorite, true)
+        XCTAssertEqual(favFirst.isFavorite(on: .mobile), true)
         XCTAssertEqual(favFirst.title, "First")
         XCTAssertEqual(favFirst.url, url(for: "first").absoluteString)
 
         let favThird = topLevel.bookmarks[1]
         XCTAssertEqual(favThird.isFolder, false)
-        XCTAssertEqual(favThird.isFavorite, true)
+        XCTAssertEqual(favThird.isFavorite(on: .mobile), true)
         XCTAssertEqual(favThird.title, "Third")
         
         let bookOne = topLevel.bookmarks[2]
         XCTAssertEqual(bookOne.isFolder, false)
-        XCTAssertEqual(bookOne.isFavorite, false)
+        XCTAssertEqual(bookOne.isFavorite(on: .mobile), false)
         XCTAssertEqual(bookOne.title, "One")
 
         let folderA = topLevel.bookmarks[3]
@@ -150,7 +159,7 @@ class BookmarksMigrationTests: XCTestCase {
 
         let folderAContents = folderA.childrenArray
         XCTAssertEqual(folderAContents[0].isFolder, false)
-        XCTAssertEqual(folderAContents[0].isFavorite, true)
+        XCTAssertEqual(folderAContents[0].isFavorite(on: .mobile), true)
         XCTAssertEqual(folderAContents[0].title, "Two")
 
         let folderB = folderAContents[1]
@@ -160,7 +169,7 @@ class BookmarksMigrationTests: XCTestCase {
         let folderBContents = folderB.childrenArray
         XCTAssertEqual(folderBContents.count, 1)
         XCTAssertEqual(folderBContents[0].isFolder, false)
-        XCTAssertEqual(folderBContents[0].isFavorite, false)
+        XCTAssertEqual(folderBContents[0].isFavorite(on: .mobile), false)
         XCTAssertEqual(folderBContents[0].title, "Three")
     }
     
diff --git a/DuckDuckGoTests/BookmarksTestHelpers.swift b/DuckDuckGoTests/BookmarksTestHelpers.swift
index 698e6866c5..03b91bfa81 100644
--- a/DuckDuckGoTests/BookmarksTestHelpers.swift
+++ b/DuckDuckGoTests/BookmarksTestHelpers.swift
@@ -63,12 +63,14 @@ struct BasicBookmarksStructure {
         
         BookmarkUtils.prepareFoldersStructure(in: context)
         
-        guard let rootFolder = BookmarkUtils.fetchRootFolder(context),
-              let favoritesFolder = BookmarkUtils.fetchFavoritesFolder(context) else {
+        guard let rootFolder = BookmarkUtils.fetchRootFolder(context)
+        else {
             XCTFail("Couldn't find required folders")
             return
         }
-        
+
+        let favoritesFolders = BookmarkUtils.fetchFavoritesFolders(for: .displayNative(.mobile), in: context)
+
         let topLevel = createBookmarksList(usingNames: topLevelTitles, parent: rootFolder, in: context)
         
         let parent = topLevel[1]
@@ -80,10 +82,10 @@ struct BasicBookmarksStructure {
         nestedLevel[0].url = nil
         nestedLevel[0].isFolder = true
         
-        topLevel[0].addToFavorites(favoritesRoot: favoritesFolder)
-        topLevel[2].addToFavorites(favoritesRoot: favoritesFolder)
-        nestedLevel[1].addToFavorites(favoritesRoot: favoritesFolder)
-        topLevel[3].addToFavorites(favoritesRoot: favoritesFolder)
+        topLevel[0].addToFavorites(folders: favoritesFolders)
+        topLevel[2].addToFavorites(folders: favoritesFolders)
+        nestedLevel[1].addToFavorites(folders: favoritesFolders)
+        topLevel[3].addToFavorites(folders: favoritesFolders)
         
         do {
             try context.save()
diff --git a/DuckDuckGoTests/FavoriteListViewModelTests.swift b/DuckDuckGoTests/FavoriteListViewModelTests.swift
index 4285b8780a..92b662145e 100644
--- a/DuckDuckGoTests/FavoriteListViewModelTests.swift
+++ b/DuckDuckGoTests/FavoriteListViewModelTests.swift
@@ -30,7 +30,8 @@ private extension FavoritesListViewModel {
         self.init(bookmarksDatabase: bookmarksDatabase,
                   errorEvents: .init(mapping: { event, _, _, _ in
             XCTFail("Unexpected error: \(event)")
-        }))
+        }),
+                  favoritesDisplayMode: .displayNative(.mobile))
     }
 }
 
@@ -135,7 +136,8 @@ class FavoriteListViewModelTests: XCTestCase {
             let expectedEvent = expectedEvents.popLast()
             XCTAssertEqual(event, expectedEvent)
             expectation.fulfill()
-        }))
+        }),
+                                               favoritesDisplayMode: .displayNative(.mobile))
                                               
         let result = viewModel.favorites
         
@@ -175,11 +177,13 @@ class FavoriteListViewModelTests: XCTestCase {
         try context.save()
         
         let expectation = expectation(description: "Error reported")
+        expectation.assertForOverFulfill = false
         _ = FavoritesListViewModel(bookmarksDatabase: db,
                                    errorEvents: .init(mapping: { event, _, _, _ in
             XCTAssertEqual(event, .fetchingRootItemFailed(.favorites))
             expectation.fulfill()
-        }))
+        }),
+                                   favoritesDisplayMode: .displayNative(.mobile))
         
         waitForExpectations(timeout: 1)
     }
diff --git a/DuckDuckGoTests/MenuBookmarksViewModelTests.swift b/DuckDuckGoTests/MenuBookmarksViewModelTests.swift
index 62a690304e..d2bce8cb21 100644
--- a/DuckDuckGoTests/MenuBookmarksViewModelTests.swift
+++ b/DuckDuckGoTests/MenuBookmarksViewModelTests.swift
@@ -59,17 +59,19 @@ class MenuBookmarksViewModelTests: XCTestCase {
     private func validateNewBookmark(_ bookmark: BookmarkEntity?) {
         guard let bookmark = bookmark else { XCTFail("Missing bookmark"); return }
         XCTAssertNotNil(bookmark)
-        XCTAssertFalse(bookmark.isFavorite)
-        XCTAssertNil(bookmark.favoriteFolder)
+        XCTAssertFalse(bookmark.isFavorite(on: .mobile))
+        XCTAssertTrue(bookmark.favoriteFoldersSet.isEmpty)
         XCTAssertEqual(bookmark, bookmark.parent?.childrenArray.last)
     }
     
     private func validateNewFavorite(_ favorite: BookmarkEntity?) {
         guard let favorite = favorite else { XCTFail("Missing favorite"); return }
-        XCTAssert(favorite.isFavorite)
-        XCTAssertNotNil(favorite.favoriteFolder)
+        XCTAssert(favorite.isFavorite(on: .mobile))
+        XCTAssertFalse(favorite.favoriteFoldersSet.isEmpty)
         XCTAssertEqual(favorite, favorite.parent?.childrenArray.last)
-        XCTAssertEqual(favorite, favorite.favoriteFolder?.favorites?.lastObject as? BookmarkEntity)
+        XCTAssertEqual(favorite, favorite.favoriteFoldersSet
+            .first(where: { $0.uuid == FavoritesFolderID.mobile.rawValue })?
+            .favorites?.lastObject as? BookmarkEntity)
     }
 
     func testWhenCheckingBookmarkStatusThenReturnOneIfFound() {
diff --git a/DuckDuckGoTests/SyncManagementViewModelTests.swift b/DuckDuckGoTests/SyncManagementViewModelTests.swift
index 09c1f6338e..7964c0910c 100644
--- a/DuckDuckGoTests/SyncManagementViewModelTests.swift
+++ b/DuckDuckGoTests/SyncManagementViewModelTests.swift
@@ -31,23 +31,88 @@ class SyncManagementViewModelTests: XCTestCase, SyncManagementViewModelDelegate
         return model
     }()
 
-    func test_WhenSyncIsNotSetup_AndEnableSyncIsTriggered_ThenManagerBecomesBusy_AndSetupIsShown() {
-        model.enableSync()
+    var createAccountAndStartSyncingCalled = false
+    var caprturedOptionModel: SyncSettingsViewModel?
+
+    func testWhenSingleDeviceSetUpPressed_ThenManagerBecomesBusy_AndAccounCreationRequested() {
+        model.startSyncPressed()
         XCTAssertTrue(model.isBusy)
 
+        XCTAssertTrue(createAccountAndStartSyncingCalled)
+        XCTAssertNotNil(caprturedOptionModel)
+    }
+
+    func testWhenScanQRCodePressed_ThenSyncWithAnotherDeviceViewIsShown() {
+        model.scanQRCode()
+
+        // You can either test one individual call was made x number of times or check for a whole number of calls
+        monitor.assert(#selector(showSyncWithAnotherDevice).description, calls: 1)
+        monitor.assertCalls([
+            #selector(showSyncWithAnotherDevice).description: 1
+        ])
+    }
+
+    func testWhenSyncIsNotSetup_EnterTextCodePressed_ThenSyncWithAnotherDeviceEnterTextViewIsShown() {
+        model.showEnterTextView()
+
+        // 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.assertCalls([
+            #selector(showSyncWithAnotherDeviceEnterText).description: 1
+        ])
+    }
+
+    func testWhenRecoverYourDataPressed_RecoverDataViewIsShown() {
+        model.showRecoverDataView()
+
+        // 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
+        ])
+    }
+
+    func testWhenSaveRecoveryPDFPressed_recoveryMethodShown() {
+        model.saveRecoveryPDF()
+
+        // You can either test one individual call was made x number of times or check for a whole number of calls
+        monitor.assert(#selector(shareRecoveryPDF).description, calls: 1)
+        monitor.assertCalls([
+            #selector(shareRecoveryPDF).description: 1
+        ])
+    }
+
+    func testWhenManageBookmarksCalled_BookmarksVCIsLaunched() {
+        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(launchBookmarksViewController).description, calls: 1)
+        monitor.assertCalls([
+            #selector(launchBookmarksViewController).description: 1
+        ])
+    }
+
+    func testWhenManageLogindCalled_AutofillVCIsLaunched() {
+        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(showSyncSetup).description, calls: 1)
+        monitor.assert(#selector(launchAutofillViewController).description, calls: 1)
         monitor.assertCalls([
-            #selector(showSyncSetup).description: 1
+            #selector(launchAutofillViewController).description: 1
         ])
     }
 
     // MARK: Delegate functions
 
-    func showSyncSetup() {
+    func showSyncWithAnotherDeviceEnterText() {
         monitor.incrementCalls(function: #function.cleaningFunctionName())
     }
 
+    func createAccountAndStartSyncing(optionsViewModel: SyncSettingsViewModel) {
+        createAccountAndStartSyncingCalled = true
+        caprturedOptionModel = optionsViewModel
+    }
+
     func showRecoverData() {
         monitor.incrementCalls(function: #function.cleaningFunctionName())
     }
@@ -64,10 +129,6 @@ class SyncManagementViewModelTests: XCTestCase, SyncManagementViewModelDelegate
         monitor.incrementCalls(function: #function.cleaningFunctionName())
     }
 
-    func createAccountAndStartSyncing() {
-        monitor.incrementCalls(function: #function.cleaningFunctionName())
-    }
-
     func confirmAndDisableSync() async -> Bool {
         monitor.incrementCalls(function: #function.cleaningFunctionName())
         return true
@@ -103,6 +164,18 @@ class SyncManagementViewModelTests: XCTestCase, SyncManagementViewModelDelegate
         monitor.incrementCalls(function: #function.cleaningFunctionName())
     }
 
+    func updateOptions() {
+        monitor.incrementCalls(function: #function.cleaningFunctionName())
+    }
+
+    func launchBookmarksViewController() {
+        monitor.incrementCalls(function: #function.cleaningFunctionName())
+    }
+
+    func launchAutofillViewController() {
+        monitor.incrementCalls(function: #function.cleaningFunctionName())
+    }
+
 }
 
 // MARK: An idea... can be made more public if works out
diff --git a/LocalPackages/SyncUI/Sources/SyncUI/ViewModels/ScanOrPasteCodeViewModel.swift b/LocalPackages/SyncUI/Sources/SyncUI/ViewModels/ScanOrPasteCodeViewModel.swift
index 3c3c00e315..7c5d1f181a 100644
--- a/LocalPackages/SyncUI/Sources/SyncUI/ViewModels/ScanOrPasteCodeViewModel.swift
+++ b/LocalPackages/SyncUI/Sources/SyncUI/ViewModels/ScanOrPasteCodeViewModel.swift
@@ -91,7 +91,6 @@ public class ScanOrPasteCodeViewModel: ObservableObject {
 
         Task { @MainActor in
             let codeUsed = await delegate?.syncCodeEntered(code: string) == true
-            isValidating = false
             if !codeUsed {
                 invalidCode = true
             }
diff --git a/LocalPackages/SyncUI/Sources/SyncUI/ViewModels/SyncSettingsViewModel.swift b/LocalPackages/SyncUI/Sources/SyncUI/ViewModels/SyncSettingsViewModel.swift
index bf607ec063..3e13d1c9a1 100644
--- a/LocalPackages/SyncUI/Sources/SyncUI/ViewModels/SyncSettingsViewModel.swift
+++ b/LocalPackages/SyncUI/Sources/SyncUI/ViewModels/SyncSettingsViewModel.swift
@@ -22,12 +22,12 @@ import UIKit
 
 public protocol SyncManagementViewModelDelegate: AnyObject {
 
-    func showSyncSetup()
     func showRecoverData()
     func showSyncWithAnotherDevice()
+    func showSyncWithAnotherDeviceEnterText()
     func showRecoveryPDF()
     func shareRecoveryPDF()
-    func createAccountAndStartSyncing()
+    func createAccountAndStartSyncing(optionsViewModel: SyncSettingsViewModel)
     func confirmAndDisableSync() async -> Bool
     func confirmAndDeleteAllData() async -> Bool
     func copyCode()
@@ -35,7 +35,9 @@ public protocol SyncManagementViewModelDelegate: AnyObject {
     func removeDevice(_ device: SyncSettingsViewModel.Device)
     func updateDeviceName(_ name: String)
     func refreshDevices(clearDevices: Bool)
-
+    func updateOptions()
+    func launchBookmarksViewController()
+    func launchAutofillViewController()
 }
 
 public class SyncSettingsViewModel: ObservableObject {
@@ -74,20 +76,19 @@ public class SyncSettingsViewModel: ObservableObject {
     }
 
     @Published public var devices = [Device]()
+    @Published public var isFaviconsSyncEnabled = false
+    @Published public var isUnifiedFavoritesEnabled = true
+    @Published public var isSyncingDevices = false
+    @Published public var isSyncBookmarksPaused = false
+    @Published public var isSyncCredentialsPaused = false
+
     @Published var isBusy = false
     @Published var recoveryCode = ""
 
-    var setupFinishedState: TurnOnSyncViewModel.Result?
-
     public weak var delegate: SyncManagementViewModelDelegate?
 
     public init() { }
 
-    func enableSync() {
-        isBusy = true
-        delegate!.showSyncSetup()
-    }
-
     func disableSync() {
         isBusy = true
         Task { @MainActor in
@@ -120,6 +121,14 @@ 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)
@@ -132,37 +141,23 @@ public class SyncSettingsViewModel: ObservableObject {
         }
     }
 
-    // MARK: Called by the view controller
-
     public func syncEnabled(recoveryCode: String) {
         isBusy = false
         isSyncEnabled = true
         self.recoveryCode = recoveryCode
     }
 
-    public func setupFinished(_ model: TurnOnSyncViewModel) {
-        setupFinishedState = model.state
-        switch model.state {
-        case .turnOn:
-            delegate?.createAccountAndStartSyncing()
-
-        case .syncWithAnotherDevice:
-            delegate?.showSyncWithAnotherDevice()
-
-        case .recoverData:
-            delegate?.showRecoverData()
+    public func startSyncPressed() {
+        isBusy = true
+        delegate?.createAccountAndStartSyncing(optionsViewModel: self)
+    }
 
-        default:
-            isBusy = false
-        }
+    public func manageBookmarks() {
+        delegate?.launchBookmarksViewController()
     }
 
-    public func codeCollectionCancelled() {
-        if setupFinishedState == .syncWithAnotherDevice {
-            delegate?.createAccountAndStartSyncing()
-        } else {
-            isBusy = false
-        }
+    public func manageLogins() {
+        delegate?.launchAutofillViewController()
     }
 
 }
diff --git a/LocalPackages/SyncUI/Sources/SyncUI/ViewModels/TurnOnSyncViewModel.swift b/LocalPackages/SyncUI/Sources/SyncUI/ViewModels/TurnOnSyncViewModel.swift
deleted file mode 100644
index a73404eacd..0000000000
--- a/LocalPackages/SyncUI/Sources/SyncUI/ViewModels/TurnOnSyncViewModel.swift
+++ /dev/null
@@ -1,61 +0,0 @@
-//
-//  TurnOnSyncViewModel.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 Foundation
-
-public class TurnOnSyncViewModel: ObservableObject {
-
-    let finished: () -> Void
-
-    public init(finished: @escaping () -> Void) {
-        self.finished = finished
-    }
-
-    @Published var state: Result = .doNothing
-
-    enum Result {
-
-        case doNothing, turnOn, syncWithAnotherDevice, recoverData
-
-    }
-
-    func turnOnSyncAction() {
-        state = .turnOn
-    }
-
-    func syncWithAnotherDeviceAction() {
-        state = .syncWithAnotherDevice
-        finished()
-    }
-
-    func notNowAction() {
-        finished()
-    }
-
-    func recoverDataAction() {
-        state = .recoverData
-        finished()
-    }
-
-    func cancelAction() {
-        state = .doNothing
-        finished()
-    }
-    
-}
diff --git a/LocalPackages/SyncUI/Sources/SyncUI/Views/DeviceConnectedView.swift b/LocalPackages/SyncUI/Sources/SyncUI/Views/DeviceConnectedView.swift
index 7d1901dae4..2adec5fc5c 100644
--- a/LocalPackages/SyncUI/Sources/SyncUI/Views/DeviceConnectedView.swift
+++ b/LocalPackages/SyncUI/Sources/SyncUI/Views/DeviceConnectedView.swift
@@ -19,6 +19,8 @@
 
 import SwiftUI
 import DuckUI
+import DesignResourcesKit
+
 
 public struct DeviceConnectedView: View {
 
@@ -27,58 +29,66 @@ public struct DeviceConnectedView: View {
     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, 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
     }
 
     @ViewBuilder
     func deviceSyncedView() -> some View {
         UnderflowContainer {
             VStack(spacing: 0) {
-                Image("SyncSuccess")
+                Image("Sync-Start-128")
                     .padding(.bottom, 20)
 
-                Text(UserText.deviceSyncedTitle)
-                    .font(.system(size: 28, weight: .bold))
+                Text(title)
+                    .daxTitle1()
                     .padding(.bottom, 24)
 
-                ZStack {
-                    RoundedRectangle(cornerRadius: 8)
-                        .stroke(.black.opacity(0.14))
-
-                    ScrollView {
-                        VStack(spacing: 0) {
-                            ForEach(devices.indices, id: \.self) { deviceIndex in
-
-                                HStack(spacing: 0) {
-                                    Image(systemName: "checkmark.circle")
-                                        .padding(.horizontal, 18)
-                                    Text(devices[deviceIndex].name)
-                                    Spacer()
-                                }
-                                .frame(height: 44)
-
-                                if deviceIndex + 1 < devices.count {
-                                    Divider()
-                                        .padding(.leading, 52)
-                                }
-                            }
-                        }
-                    }
-                }
-                .padding(.bottom, 20)
-
-                Text(UserText.deviceSyncedMessage)
-                    .lineLimit(nil)
+                Text("\(message) \(Text(devicesOnMessageText).bold())")
                     .multilineTextAlignment(.center)
-
+                
+                if shouldShowOptions {
+                    options()
+                }
             }
             .padding(.horizontal, 20)
         } foregroundContent: {
@@ -97,6 +107,37 @@ public struct DeviceConnectedView: View {
         .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)
diff --git a/LocalPackages/SyncUI/Sources/SyncUI/Views/Internal/BackButtonModifier.swift b/LocalPackages/SyncUI/Sources/SyncUI/Views/Internal/BackButtonModifier.swift
index 17e8d63245..3425a8af5f 100644
--- a/LocalPackages/SyncUI/Sources/SyncUI/Views/Internal/BackButtonModifier.swift
+++ b/LocalPackages/SyncUI/Sources/SyncUI/Views/Internal/BackButtonModifier.swift
@@ -42,3 +42,21 @@ struct BackButtonModifier: ViewModifier {
     }
 
 }
+
+struct CancelButtonModifier: ViewModifier {
+    
+    @Environment(\.presentationMode) var presentation
+    let action: () -> Void
+    
+    func body(content: Content) -> some View {
+        content
+            .navigationBarBackButtonHidden()
+            .toolbar {
+                ToolbarItem(placement: .navigationBarLeading) {
+                    Button("Cancel", action: action)
+                        .foregroundColor(Color.white)
+                }
+            }
+    }
+    
+}
diff --git a/LocalPackages/SyncUI/Sources/SyncUI/Views/Internal/ConnectModeView.swift b/LocalPackages/SyncUI/Sources/SyncUI/Views/Internal/ConnectModeView.swift
index 354f9fc16d..7ccb491200 100644
--- a/LocalPackages/SyncUI/Sources/SyncUI/Views/Internal/ConnectModeView.swift
+++ b/LocalPackages/SyncUI/Sources/SyncUI/Views/Internal/ConnectModeView.swift
@@ -28,6 +28,8 @@ struct ConnectModeView: View {
 
     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/QRCodeCopierView.swift b/LocalPackages/SyncUI/Sources/SyncUI/Views/Internal/QRCodeCopierView.swift
index 4c2a94ae5c..292ae5dd18 100644
--- a/LocalPackages/SyncUI/Sources/SyncUI/Views/Internal/QRCodeCopierView.swift
+++ b/LocalPackages/SyncUI/Sources/SyncUI/Views/Internal/QRCodeCopierView.swift
@@ -18,6 +18,7 @@
 //
 
 import SwiftUI
+import DesignResourcesKit
 
 struct QRCodeCopierView: View {
 
@@ -38,7 +39,7 @@ struct QRCodeCopierView: View {
             VStack(spacing: 20) {
                 Spacer()
 
-                QRCodeView(string: code, size: 200)
+                QRCodeView(string: code, size: 220)
                     .padding()
 
                 Spacer()
@@ -59,6 +60,8 @@ struct QRCodeCopierView: View {
 
         if model.code != nil {
             Text(UserText.viewQRCodeInstructions)
+                .daxCaption()
+                .foregroundColor(.secondary)
                 .lineLimit(nil)
                 .multilineTextAlignment(.center)
         }
diff --git a/LocalPackages/SyncUI/Sources/SyncUI/Views/Internal/RemoveDeviceView.swift b/LocalPackages/SyncUI/Sources/SyncUI/Views/Internal/RemoveDeviceView.swift
index 674a3d961c..b3a95980c7 100644
--- a/LocalPackages/SyncUI/Sources/SyncUI/Views/Internal/RemoveDeviceView.swift
+++ b/LocalPackages/SyncUI/Sources/SyncUI/Views/Internal/RemoveDeviceView.swift
@@ -19,6 +19,7 @@
 
 import SwiftUI
 import DuckUI
+import DesignResourcesKit
 
 struct RemoveDeviceView: View {
 
@@ -32,13 +33,13 @@ struct RemoveDeviceView: View {
                 Image(model.imageName)
 
                 Text(UserText.removeDeviceTitle)
-                    .font(.title)
+                    .daxTitle1()
 
                 Text(UserText.removeDeviceMessage(model.device.name))
                     .multilineTextAlignment(.center)
                     .padding(.horizontal, 20)
                     .padding(.top, 20)
-                    .font(.system(size: 14))
+                    .daxBodyRegular()
             }
             .padding(.horizontal, 20)
             .navigationBarTitleDisplayMode(.inline)
diff --git a/LocalPackages/SyncUI/Sources/SyncUI/Views/Internal/SyncLabelButtonStyle.swift b/LocalPackages/SyncUI/Sources/SyncUI/Views/Internal/SyncLabelButtonStyle.swift
index 433227b6c4..9826ded53e 100644
--- a/LocalPackages/SyncUI/Sources/SyncUI/Views/Internal/SyncLabelButtonStyle.swift
+++ b/LocalPackages/SyncUI/Sources/SyncUI/Views/Internal/SyncLabelButtonStyle.swift
@@ -18,6 +18,7 @@
 //
 
 import SwiftUI
+import DesignResourcesKit
 
 struct SyncLabelButtonStyle: ButtonStyle {
 
@@ -36,7 +37,7 @@ struct SyncLabelButtonStyle: ButtonStyle {
             .frame(height: 44)
             .background(configuration.isPressed ? backgroundColor.opacity(0.7) : backgroundColor.opacity(1))
             .cornerRadius(8)
-            .font(.system(size: 15, weight: .semibold))
+            .daxButton()
 
     }
 
diff --git a/LocalPackages/SyncUI/Sources/SyncUI/Views/Internal/UserText.swift b/LocalPackages/SyncUI/Sources/SyncUI/Views/Internal/UserText.swift
index 24dd4128c7..1fc5c3535b 100644
--- a/LocalPackages/SyncUI/Sources/SyncUI/Views/Internal/UserText.swift
+++ b/LocalPackages/SyncUI/Sources/SyncUI/Views/Internal/UserText.swift
@@ -23,33 +23,48 @@ import Foundation
 // Localise these later, when feature is closer to exernal release
 struct UserText {
 
-    static let turnOnTitle = "Turn on Sync?"
-    static let turnOnButton = "Turn on Sync"
-    static let turnOnMessage = "This will save an encrypted backup of your bookmarks and Autofill logins on DuckDuckGo’s servers, which can be synced with your other devices.\n\nThe decryption key is stored on your device and cannot be read by DuckDuckGo."
-
-    static let syncWithAnotherDeviceTitle = "Sync Another Device?"
-    static let syncWithAnotherDeviceMessage = "Your bookmarks and Autofill logins will be backed up! Would you like to sync another device now?\n\nIf you’ve already set up Sync on another device, this will allow you to combine bookmarks and Autofill logins from both devices into a single backup."
-    static let syncWithAnotherDeviceButton = "Sync Another Device"
+    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 unifiedFavoritesTitle = "Share Favorites"
+    static let unifiedFavoritesInstruction = "Use the same favorites on all devices. Leave off to keep mobile and desktop favorites separate."
 
-    static let connectDeviceInstructions = "Go to Settings > Sync in the DuckDuckGo App on a different device and scan the QR code to sync."
+    static let syncSettingsFooter = "Your data is end-to-end encrypted, and DuckDuckGo does not have access to the decryption key."
 
-    static let recoveryModeInstructions = "Scan the QR code on your Recovery PDF, or another synced device, to recover your synced data."
+    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 = "That code does not appear to be valid.  Please try copying it again."
+    static let validatingCodeFailed = "Invalid code."
 
-    static let pasteCodeInstructions = "Copy the code from the Settings > Sync page in the DuckDuckGo App on another synced device and paste it here to sync this device."
+    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 = "Go to Settings > Sync in the DuckDuckGo App on a different device and scan this QR code to sync."
-    static let viewQRCodeTitle = "QR Code"
+    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 deviceSyncedMessage = "Your bookmarks and Autofill logins are now syncing with this device."
+    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 Key"
-    static let saveRecoveryButton = "Save As PDF"
+    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."
@@ -57,8 +72,7 @@ struct UserText {
 
     static let goToSettingsButton = "Go to Settings"
 
-    static let syncTitle = "Sync"
-    static let syncSettingsInfo = "Sync your bookmarks and Autofill logins across your devices and save an encrypted backup on DuckDuckGo’s servers."
+    static let syncTitle = "Sync & Back Up"
 
     static let thisDevice = "This Device"
     static let connectedDevicesTitle = "Synced Devices"
@@ -66,14 +80,14 @@ struct UserText {
     static let pasteLabel = "Paste"
     static let copyCodeLabel = "Copy Code"
 
-    static let manuallyEnterCodeLabel = "Manually Enter Code"
-    static let manuallyEnterCodeTitle = "Manually Enter 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 recoverDataButton = "Recover Your Synced Data"
-
-    static let settingsNewDeviceInstructions = "Go to Settings > Sync in the DuckDuckGo App on a different device and scan to connect instantly"
+    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"
@@ -98,5 +112,12 @@ struct UserText {
         return "\"\(name)\" will no longer be able to access your synced data."
     }
 
+    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"
+    
+
 }
 // swiftlint:enable line_length
diff --git a/LocalPackages/SyncUI/Sources/SyncUI/Views/Internal/PasteCodeView.swift b/LocalPackages/SyncUI/Sources/SyncUI/Views/PasteCodeView.swift
similarity index 87%
rename from LocalPackages/SyncUI/Sources/SyncUI/Views/Internal/PasteCodeView.swift
rename to LocalPackages/SyncUI/Sources/SyncUI/Views/PasteCodeView.swift
index 83e62e82ea..2eca97e13b 100644
--- a/LocalPackages/SyncUI/Sources/SyncUI/Views/Internal/PasteCodeView.swift
+++ b/LocalPackages/SyncUI/Sources/SyncUI/Views/PasteCodeView.swift
@@ -19,8 +19,9 @@
 
 import SwiftUI
 import DuckUI
+import DesignResourcesKit
 
-struct PasteCodeView: View {
+public struct PasteCodeView: View {
 
     static let codeFontSize = 18.0
     static let codeLines = 10
@@ -29,6 +30,13 @@ struct PasteCodeView: View {
 
     @State var isEditingCode = false
 
+    var isFirstScreen: Bool
+
+    public init(model: ScanOrPasteCodeViewModel, isfirstScreen: Bool = false) {
+        self.model = model
+        self.isFirstScreen = isfirstScreen
+    }
+
     @ViewBuilder
     func pasteButton() -> some View {
         Button(action: model.pasteCode) {
@@ -96,7 +104,8 @@ struct PasteCodeView: View {
             .padding()
     }
 
-    var body: some View {
+    @ViewBuilder
+    func pastCodeWiewWithNoModifier() -> some View {
         ZStack(alignment: .top) {
             VStack(spacing: 20) {
                 codeEntrySection()
@@ -106,10 +115,19 @@ struct PasteCodeView: View {
         }
         .padding(.horizontal, 20)
         .navigationTitle(UserText.manuallyEnterCodeTitle)
-        .modifier(BackButtonModifier())
         .ignoresSafeArea(.keyboard)
     }
 
+    public var body: some View {
+        if isFirstScreen {
+            pastCodeWiewWithNoModifier()
+                .modifier(CancelButtonModifier(action: model.cancel))
+        } else {
+            pastCodeWiewWithNoModifier()
+                .modifier(BackButtonModifier())
+        }
+    }
+
 }
 
 private extension String {
@@ -146,7 +164,7 @@ struct PasteButtonStyle: ButtonStyle {
             .frame(height: 44)
             .background(configuration.isPressed ? backgroundColor.opacity(0.7) : backgroundColor.opacity(1))
             .cornerRadius(8)
-            .font(.system(size: 15, weight: .semibold))
+            .daxButton()
 
     }
 
diff --git a/LocalPackages/SyncUI/Sources/SyncUI/Views/SaveRecoveryKeyView.swift b/LocalPackages/SyncUI/Sources/SyncUI/Views/SaveRecoveryKeyView.swift
index 651a93d683..b2206716a4 100644
--- a/LocalPackages/SyncUI/Sources/SyncUI/Views/SaveRecoveryKeyView.swift
+++ b/LocalPackages/SyncUI/Sources/SyncUI/Views/SaveRecoveryKeyView.swift
@@ -19,6 +19,7 @@
 
 import SwiftUI
 import DuckUI
+import DesignResourcesKit
 
 public struct SaveRecoveryKeyView: View {
 
@@ -56,7 +57,7 @@ public struct SaveRecoveryKeyView: View {
             .padding(.horizontal, 20)
             .padding(.bottom, 12)
         }
-        .background(RoundedRectangle(cornerRadius: 10).foregroundColor(.black.opacity(0.12)))
+        .background(RoundedRectangle(cornerRadius: 10).foregroundColor(.black.opacity(0.03)))
     }
 
     @ViewBuilder
@@ -67,10 +68,15 @@ public struct SaveRecoveryKeyView: View {
             }
             .buttonStyle(PrimaryButtonStyle(compact: isCompact))
 
-            Button("Copy Key") {
+            Button(UserText.copyCode) {
                 model.copyKey()
             }
             .buttonStyle(SecondaryButtonStyle(compact: isCompact))
+            .overlay(
+                RoundedRectangle(cornerRadius: 8)
+                .inset(by: 0.5)
+                .stroke(.blue, lineWidth: 1)
+                )
 
             Button {
                 presentation.wrappedValue.dismiss()
@@ -90,17 +96,22 @@ public struct SaveRecoveryKeyView: View {
                 .padding(.bottom, 24)
 
             Text(UserText.saveRecoveryTitle)
-                .font(.system(size: 28, weight: .bold))
+                .daxTitle1()
                 .padding(.bottom, 28)
 
             Text(UserText.recoveryMessage)
                 .lineLimit(nil)
-                .font(.system(size: 16))
+                .daxBodyRegular()
                 .lineSpacing(1.32)
                 .multilineTextAlignment(.center)
                 .padding(.bottom, 20)
 
             recoveryInfo()
+                .padding(.bottom, 20)
+            Text(UserText.recoveryWarning)
+                .daxCaption()
+                .multilineTextAlignment(.center)
+                .foregroundColor(.primary.opacity(0.6))
         }
         .padding(.top, isCompact ? 0 : 56)
         .padding(.horizontal, 30)
diff --git a/LocalPackages/SyncUI/Sources/SyncUI/Views/ScanOrPasteCodeView.swift b/LocalPackages/SyncUI/Sources/SyncUI/Views/ScanOrPasteCodeView.swift
index 1ff8db037e..5c8a08af55 100644
--- a/LocalPackages/SyncUI/Sources/SyncUI/Views/ScanOrPasteCodeView.swift
+++ b/LocalPackages/SyncUI/Sources/SyncUI/Views/ScanOrPasteCodeView.swift
@@ -18,6 +18,7 @@
 //
 
 import SwiftUI
+import DesignResourcesKit
 
 /// Handles scanning or pasting a code.
 public struct ScanOrPasteCodeView: View {
@@ -49,8 +50,7 @@ public struct ScanOrPasteCodeView: View {
                 }
             } else {
                 Rectangle()
-                    // White so that the blur / transparent doesn't become too dark
-                    .fill(.white)
+                    .fill(.black)
             }
         }
         .ignoresSafeArea()
@@ -73,14 +73,14 @@ public struct ScanOrPasteCodeView: View {
                     .padding(.bottom, 20)
 
                 Text(UserText.cameraPermissionRequired)
-                    .font(.system(size: 20, weight: .bold))
+                    .daxTitle3()
                     .lineSpacing(1.05)
                     .padding(.bottom, 8)
 
                 Text(UserText.cameraPermissionInstructions)
                     .lineLimit(nil)
                     .multilineTextAlignment(.center)
-                    .font(.system(size: 16, weight: .regular))
+                    .daxBodyRegular()
                     .lineSpacing(1.1)
 
                 Spacer()
@@ -110,7 +110,7 @@ public struct ScanOrPasteCodeView: View {
                     .padding(.bottom, 20)
 
                 Text(UserText.cameraIsUnavailableTitle)
-                    .font(.system(size: 20, weight: .bold))
+                    .daxTitle3()
                     .lineSpacing(1.05)
 
             }
@@ -124,37 +124,55 @@ public struct ScanOrPasteCodeView: View {
         Text(model.showConnectMode ? UserText.connectDeviceInstructions : UserText.recoveryModeInstructions)
             .lineLimit(nil)
             .multilineTextAlignment(.center)
-            .font(.system(size: 16, weight: .regular))
-            .padding(.vertical)
+            .daxCaption()
+            .foregroundColor(.white.opacity(0.6))
+            .padding(.top, 20)
 
     }
 
     @ViewBuilder
     func buttons() -> some View {
 
-        Section {
-            Group {
+        Group {
+            Section {
                 NavigationLink {
                     PasteCodeView(model: model)
                 } label: {
-                    Label(UserText.manuallyEnterCodeLabel, image: "SyncKeyboardIcon")
+                    HStack(spacing: 16) {
+                        Image("SyncKeyboardIcon")
+                        Text(UserText.manuallyEnterCodeTitle)
+                            .daxButton()
+                            .foregroundColor(.white.opacity(0.84))
+                    }
                 }
-
+            }
+            Section {
                 if model.showConnectMode {
                     NavigationLink {
                         ConnectModeView(model: model)
                     } label: {
-                        Label(UserText.showQRCodeLabel, image: "SyncQRCodeIcon")
+                        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)
+                        }
                     }
                 }
             }
-            .frame(height: 40)
-            .foregroundColor(.primary)
-            .onAppear {
-                model.endConnectMode()
-            }
         }
-
+        .frame(height: 40)
+        .foregroundColor(.primary)
+        .onAppear {
+            model.endConnectMode()
+        }
     }
 
     @ViewBuilder
@@ -187,9 +205,8 @@ public struct ScanOrPasteCodeView: View {
 
                 VStack(spacing: 0) {
                     Rectangle() // Also acts as the blur for the camera
-                        .fill(.clear)
+                        .fill(.black)
                         .frame(height: g.safeAreaInsets.top)
-                        .regularMaterialBackground()
 
                     ZStack {
                         // Background in case fullscreen camera view doesn't work
@@ -210,18 +227,19 @@ public struct ScanOrPasteCodeView: View {
 
                     ZStack {
                         Rectangle() // Also acts as the blur for the camera
-                            .fill(.clear)
+                            .fill(.black)
                             .regularMaterialBackground()
 
-                        VStack {
-                            instructions()
-                                .padding(.horizontal, 20)
+                        VStack(spacing: 0) {
+                            Section {
+                                instructions()
+                                    .padding(.horizontal, 20)
+                            }
 
                             List {
                                 buttons()
                             }
                             .ignoresSafeArea()
-                            .hideScrollContentBackground()
                             .disableScrolling()
                         }
                         .frame(maxWidth: Constants.maxFullScreenWidth)
diff --git a/LocalPackages/SyncUI/Sources/SyncUI/Views/SyncSettingsView.swift b/LocalPackages/SyncUI/Sources/SyncUI/Views/SyncSettingsView.swift
index 45b84f2a60..f2fff4bf6c 100644
--- a/LocalPackages/SyncUI/Sources/SyncUI/Views/SyncSettingsView.swift
+++ b/LocalPackages/SyncUI/Sources/SyncUI/Views/SyncSettingsView.swift
@@ -18,6 +18,7 @@
 //
 
 import SwiftUI
+import DesignResourcesKit
 
 public struct SyncSettingsView: View {
 
@@ -29,30 +30,59 @@ public struct SyncSettingsView: View {
         self.model = model
     }
 
-    @ViewBuilder
-    func syncToggle() -> some View {
-        Section {
-            HStack {
-                Text(UserText.syncTitle)
-                Spacer()
+    public var body: some View {
+        if model.isSyncingDevices {
+            SwiftUI.ProgressView()
+                .onReceive(timer) { _ in
+                    if selectedDevice == nil {
+                        model.delegate?.refreshDevices(clearDevices: false)
+                    }
+                }
+        } else {
+            List {
+                workInProgress()
 
-                if model.isBusy {
-                    SwiftUI.ProgressView()
+                if model.isSyncEnabled {
+                    
+                    turnOffSync()
+                    
+                    if $model.isSyncBookmarksPaused.wrappedValue {
+                        syncPaused(for: .bookmarks)
+                    }
+
+                    if $model.isSyncCredentialsPaused.wrappedValue {
+                        syncPaused(for: .credentials)
+                    }
+
+                    devices()
+                    
+                    syncNewDevice()
+                    
+                    OptionsView(isUnifiedFavoritesEnabled: $model.isUnifiedFavoritesEnabled)
+                        .onAppear(perform: {
+                            model.delegate?.updateOptions()
+                        })
+                    
+                    saveRecoveryPDF()
+                    
+                    deleteAllData()
+                    
                 } else {
-                    Toggle("", isOn: Binding(get: {
-                        return model.isSyncEnabled
-                    }, set: { enabled in
-                        if enabled {
-                            model.enableSync()
-                        } else {
-                            model.disableSync()
-                        }
-                    }))
+
+                    syncWithAnotherDeviceView()
+                    
+                    singleDeviceSetUpView()
+                    
+                    recoverYourDataView()
+                    
+                    footerView()
                 }
             }
-        } footer: {
-            Text(UserText.syncSettingsInfo)
+            .navigationTitle(UserText.syncTitle)
+            .applyListStyle()
+            .environmentObject(model)
         }
+
     }
 
     @ViewBuilder
@@ -64,6 +94,155 @@ 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 {
+        Section {
+            HStack {
+                VStack(alignment: .leading, spacing: 4) {
+                    Text(UserText.singleDeviceSetUpTitle)
+                        .daxBodyBold()
+                    Text(UserText.singleDeviceSetUpInstruction)
+                        .daxBodyRegular()
+                }
+                Spacer()
+                Image("Device-Mobile-Upload-96")
+
+            }
+            if model.isBusy {
+                SwiftUI.ProgressView()
+            } else {
+                Button(UserText.turnSyncOn) {
+                    model.startSyncPressed()
+                }
+            }
+        }
+    }
+
+    @ViewBuilder
+    func syncWithAnotherDeviceView() -> some View {
+        Section {
+            HStack {
+                VStack(alignment: .leading, spacing: 4) {
+                    Text(UserText.syncWithAnotherDeviceTitle)
+                        .daxBodyBold()
+                    Text(UserText.syncWithAnotherDeviceMessage)
+                        .daxBodyRegular()
+                }
+                Spacer()
+                Image("Sync-Pair-96")
+
+            }
+            Button(UserText.scanQRCode) {
+                model.scanQRCode()
+            }
+            Button(UserText.enterTextCode) {
+                model.showEnterTextView()
+            }
+        }
+    }
+}
+
+// Sync Enabled Views
+extension SyncSettingsView {
+    @ViewBuilder
+    func deleteAllData() -> some View {
+        Section {
+            Button(UserText.settingsDeleteAllButton) {
+                model.deleteAllData()
+            }
+        }
+    }
+
+    @ViewBuilder
+    func saveRecoveryPDF() -> some View {
+        Section {
+            Button(UserText.settingsSaveRecoveryPDFButton) {
+                model.saveRecoveryPDF()
+            }
+        } footer: {
+            Text(UserText.settingsRecoveryPDFWarning)
+        }
+    }
+
+    @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()
+            }
+        } header: {
+            Text("Sync New Device")
+        }
+    }
+
     @ViewBuilder
     func devices() -> some View {
         Section {
@@ -116,101 +295,59 @@ public struct SyncSettingsView: View {
     }
 
     @ViewBuilder
-    func syncNewDevice() -> some View {
+    func turnOffSync() -> 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)
-
-                Text(UserText.settingsNewDeviceInstructions)
-                    .font(.system(size: 15))
-                    .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()
+            if model.isBusy {
+                SwiftUI.ProgressView()
+            } else {
+                Button(UserText.turnSyncOff) {
+                    model.disableSync()
+                }
             }
-        } header: {
-            Text("Sync New Device")
         }
     }
 
     @ViewBuilder
-    func saveRecoveryPDF() -> some View {
-        Section {
-            Button(UserText.settingsSaveRecoveryPDFButton) {
-                model.saveRecoveryPDF()
+    func syncPaused(for itemType: LimitedItemType) -> some View {
+        var explanation: String {
+            switch itemType {
+            case .bookmarks:
+                return UserText.bookmarksLimitExceededDescription
+            case .credentials:
+                return UserText.credentialsLimitExceededDescription
             }
-        } footer: {
-            Text(UserText.settingsRecoveryPDFWarning)
         }
-    }
-
-    @ViewBuilder
-    func deleteAllData() -> some View {
-        Section {
-            Button(UserText.settingsDeleteAllButton) {
-                model.deleteAllData()
+        var buttonTitle: String {
+            switch itemType {
+            case .bookmarks:
+                return UserText.bookmarksLimitExceededAction
+            case .credentials:
+                return UserText.credentialsLimitExceededAction
             }
         }
-    }
 
-    @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
+                Text(UserText.syncLimitExceededTitle)
+                    .daxBodyBold()
+                Text(explanation)
+                    .daxBodyRegular()
             }
-            .padding()
-            .background(RoundedRectangle(cornerRadius: 8).foregroundColor(.yellow))
-            .padding(.bottom, 10)
-        }
-
-    }
-
-    public var body: some View {
-        List {
-            workInProgress()
-
-            syncToggle()
-
-            if model.isSyncEnabled {
-                devices()
-
-                syncNewDevice()
-
-                saveRecoveryPDF()
-
-                deleteAllData()
+            Button(buttonTitle) {
+                switch itemType {
+                case .bookmarks:
+                    model.manageBookmarks()
+                case .credentials:
+                    model.manageLogins()
+                }
             }
-            
         }
-        .navigationTitle(UserText.syncTitle)
-        .applyListStyle()
-        .environmentObject(model)
-
     }
 
+    enum LimitedItemType {
+        case bookmarks
+        case credentials
+    }
 }
 
 // Extension to apply custom view modifier
@@ -219,3 +356,26 @@ extension View {
         closure(self)
     }
 }
+
+
+public struct OptionsView: View {
+    @Binding var isUnifiedFavoritesEnabled: Bool
+    public var body: some View {
+        Section {
+            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/TurnOnSyncView.swift b/LocalPackages/SyncUI/Sources/SyncUI/Views/TurnOnSyncView.swift
deleted file mode 100644
index 5081ea549c..0000000000
--- a/LocalPackages/SyncUI/Sources/SyncUI/Views/TurnOnSyncView.swift
+++ /dev/null
@@ -1,162 +0,0 @@
-//
-//  TurnOnSyncView.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 TurnOnSyncView: View {
-
-    @Environment(\.verticalSizeClass) var verticalSizeClass
-
-    var isCompact: Bool {
-        verticalSizeClass == .compact
-    }
-
-    @State var turnOnSyncNavigation = false
-
-    @ObservedObject var model: TurnOnSyncViewModel
-
-    public init(model: TurnOnSyncViewModel) {
-        self.model = model
-    }
-
-    @ViewBuilder
-    func turnOnSyncView() -> some View {
-        ZStack {
-            NavigationLink(isActive: $turnOnSyncNavigation) {
-                syncWithAnotherDeviceView()
-                    .padding(.top, verticalSizeClass == .compact ? 8 : 56)
-            } label: {
-                EmptyView()
-            }
-
-            CTAView(imageName: "SyncTurnOnSyncHero",
-                    title: UserText.turnOnTitle,
-                    message: UserText.turnOnMessage,
-                    primaryButtonLabel: UserText.turnOnButton,
-                    secondaryButtonLabel: UserText.recoverDataButton) {
-
-                model.turnOnSyncAction()
-                turnOnSyncNavigation = true
-
-            } secondaryAction: {
-                model.recoverDataAction()
-            }
-        }
-    }
-
-    @ViewBuilder
-    func syncWithAnotherDeviceView() -> some View {
-        CTAView(imageName: "SyncWithAnotherDeviceHero",
-                title: UserText.syncWithAnotherDeviceTitle,
-                message: UserText.syncWithAnotherDeviceMessage,
-                primaryButtonLabel: UserText.syncWithAnotherDeviceButton,
-                secondaryButtonLabel: UserText.notNowButton) {
-            model.syncWithAnotherDeviceAction()
-        } secondaryAction: {
-            model.notNowAction()
-        }
-        .navigationBarBackButtonHidden(true)
-    }
-
-    public var body: some View {
-        NavigationView {
-            turnOnSyncView()
-                .toolbar {
-                    ToolbarItem(placement: .cancellationAction) {
-                        Button {
-                            model.cancelAction()
-                        } label: {
-                            Text(UserText.cancelButton)
-                        }
-                    }
-                }
-        }
-            .navigationViewStyle(.stack)
-    }
-
-}
-
-private struct CTAView: View {
-
-    @Environment(\.verticalSizeClass) var verticalSizeClass
-
-    var isCompact: Bool {
-        verticalSizeClass == .compact
-    }
-
-    let imageName: String
-    let title: String
-    let message: String
-    let primaryButtonLabel: String
-    let secondaryButtonLabel: String
-    let primaryAction: () -> Void
-    let secondaryAction: () -> Void
-
-    @ViewBuilder
-    func hero(imageName: String, title: String, text: String) -> some View {
-        VStack(spacing: verticalSizeClass == .compact ? 12 : 24) {
-            Image(imageName)
-                .resizable()
-                .frame(width: verticalSizeClass == .compact ? 96 : 128,
-                       height: verticalSizeClass == .compact ? 72 : 96)
-
-            Text(title)
-                .font(.system(size: 28, weight: .bold))
-                .padding(.horizontal, 55)
-
-            Text(text)
-                .font(.system(size: 16, weight: .regular))
-                .lineSpacing(3)
-                .padding(.horizontal, 30)
-        }
-        .multilineTextAlignment(.center)
-        .padding(.top, verticalSizeClass == .compact ? 0 : 20)
-    }
-
-    @ViewBuilder
-    func buttons(primaryLabel: String,
-                 secondaryLabel: String,
-                 primaryAction: @escaping () -> Void,
-                 secondaryAction: @escaping () -> Void) -> some View {
-        VStack(spacing: isCompact ? 4 : 8) {
-            Button(primaryLabel, action: primaryAction)
-                .buttonStyle(PrimaryButtonStyle(compact: isCompact))
-
-            Button(secondaryLabel, action: secondaryAction)
-                .buttonStyle(SecondaryButtonStyle(compact: isCompact))
-        }
-        .frame(maxWidth: 360)
-    }
-
-    var body: some View {
-        UnderflowContainer {
-            hero(imageName: imageName,
-                 title: title,
-                 text: message)
-        } foregroundContent: {
-            buttons(primaryLabel: primaryButtonLabel,
-                    secondaryLabel: secondaryButtonLabel,
-                    primaryAction: primaryAction,
-                    secondaryAction: secondaryAction)
-            .padding(.horizontal, 8)
-        }
-    }
-
-}
diff --git a/Widgets/Widgets.swift b/Widgets/Widgets.swift
index 1822daa082..ae5ae2b1d2 100644
--- a/Widgets/Widgets.swift
+++ b/Widgets/Widgets.swift
@@ -112,7 +112,7 @@ class Provider: TimelineProvider {
         
         if maxFavorites > 0,
            let db = bookmarksDB {
-            let model = FavoritesListViewModel(bookmarksDatabase: db)
+            let model = FavoritesListViewModel(bookmarksDatabase: db, favoritesDisplayMode: fetchFavoritesDisplayMode())
             os_log("model created")
             let dbFavorites = model.favorites
             os_log("dbFavorites loaded %d", dbFavorites.count)
@@ -127,6 +127,16 @@ class Provider: TimelineProvider {
         }
     }
 
+    private func fetchFavoritesDisplayMode() -> FavoritesDisplayMode {
+        let userDefaults = UserDefaults(suiteName: "group.com.duckduckgo.bookmarks")
+        let displayModeDescription = userDefaults?.string(forKey: "com.duckduckgo.ios.favoritesDisplayMode")
+
+        if let displayModeDescription, let displayMode = FavoritesDisplayMode(displayModeDescription) {
+            return displayMode
+        }
+        return .displayNative(.mobile)
+    }
+
     private func loadImageFromCache(forDomain domain: String?) -> UIImage? {
         guard let domain = domain else { return nil }
 

From 7f47f023fe5f5f2f62f22368c528cd79ec90d948 Mon Sep 17 00:00:00 2001
From: Sam Symons <sam@samsymons.com>
Date: Fri, 10 Nov 2023 13:11:05 -0800
Subject: [PATCH 14/16] Add DesignResourcesKit to SyncUI (#2147)

Task/Issue URL: https://app.asana.com/0/414235014887631/1205930555428985/f
Tech Design URL:
CC: @ayoy

Description:

This PR adds DesignResourcesKit as a dependency of SyncUI. SyncUI already imports it in a number of places, but doesn't have it declared as a dependency.
---
 LocalPackages/SyncUI/Package.swift | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/LocalPackages/SyncUI/Package.swift b/LocalPackages/SyncUI/Package.swift
index f8193ce7ef..f95f0f7cc2 100644
--- a/LocalPackages/SyncUI/Package.swift
+++ b/LocalPackages/SyncUI/Package.swift
@@ -31,13 +31,15 @@ let package = Package(
             targets: ["SyncUI"])
     ],
     dependencies: [
-        .package(path: "../DuckUI")
+        .package(path: "../DuckUI"),
+        .package(url: "https://github.com/duckduckgo/DesignResourcesKit", exact: "2.0.0")
     ],
     targets: [
         .target(
             name: "SyncUI",
             dependencies: [
-                .product(name: "DuckUI", package: "DuckUI")
+                .product(name: "DuckUI", package: "DuckUI"),
+                "DesignResourcesKit"
             ])
     ]
 )

From efbcf8b38a1780ebc870e83fb6b7ce9a9e53ae6a Mon Sep 17 00:00:00 2001
From: Dominik Kapusta <dkapusta@duckduckgo.com>
Date: Mon, 13 Nov 2023 08:46:50 +0100
Subject: [PATCH 15/16] Properly refresh home page favorites view when updating
 favorites display mode (#2148)

Task/Issue URL: https://app.asana.com/0/1201493110486074/1205918060547867/f

Description:
Listen to changes to favorites display mode also in HomeViewController and reload favorites view as needed.
---
 DuckDuckGo/HomeViewController.swift | 44 +++++++++++++++++++++++++----
 DuckDuckGo/MainViewController.swift |  3 +-
 2 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/DuckDuckGo/HomeViewController.swift b/DuckDuckGo/HomeViewController.swift
index 4f97f8c46b..c90a9ac317 100644
--- a/DuckDuckGo/HomeViewController.swift
+++ b/DuckDuckGo/HomeViewController.swift
@@ -63,42 +63,64 @@ class HomeViewController: UIViewController {
     
     private let tabModel: Tab
     private let favoritesViewModel: FavoritesListInteracting
+    private let appSettings: AppSettings
     private var viewModelCancellable: AnyCancellable?
+    private var favoritesDisplayModeCancellable: AnyCancellable?
 
 #if APP_TRACKING_PROTECTION
     private let appTPHomeViewModel: AppTPHomeViewModel
 #endif
     
 #if APP_TRACKING_PROTECTION
-    static func loadFromStoryboard(model: Tab, favoritesViewModel: FavoritesListInteracting, appTPDatabase: CoreDataDatabase) -> HomeViewController {
+    static func loadFromStoryboard(
+        model: Tab,
+        favoritesViewModel: FavoritesListInteracting,
+        appSettings: AppSettings,
+        appTPDatabase: CoreDataDatabase
+    ) -> HomeViewController {
+
         let storyboard = UIStoryboard(name: "Home", bundle: nil)
         let controller = storyboard.instantiateViewController(identifier: "HomeViewController", creator: { coder in
-            HomeViewController(coder: coder, tabModel: model, favoritesViewModel: favoritesViewModel, appTPDatabase: appTPDatabase)
+            HomeViewController(
+                coder: coder,
+                tabModel: model,
+                favoritesViewModel: favoritesViewModel,
+                appSettings: appSettings,
+                appTPDatabase: appTPDatabase
+            )
         })
         return controller
     }
 #else
-    static func loadFromStoryboard(model: Tab, favoritesViewModel: FavoritesListInteracting) -> HomeViewController {
+    static func loadFromStoryboard(model: Tab, favoritesViewModel: FavoritesListInteracting, appSettings: AppSettings) -> HomeViewController {
         let storyboard = UIStoryboard(name: "Home", bundle: nil)
         let controller = storyboard.instantiateViewController(identifier: "HomeViewController", creator: { coder in
-            HomeViewController(coder: coder, tabModel: model, favoritesViewModel: favoritesViewModel)
+            HomeViewController(coder: coder, tabModel: model, favoritesViewModel: favoritesViewModel, appSettings: appSettings)
         })
         return controller
     }
 #endif
 
 #if APP_TRACKING_PROTECTION
-    required init?(coder: NSCoder, tabModel: Tab, favoritesViewModel: FavoritesListInteracting, appTPDatabase: CoreDataDatabase) {
+    required init?(
+        coder: NSCoder,
+        tabModel: Tab,
+        favoritesViewModel: FavoritesListInteracting,
+        appSettings: AppSettings,
+        appTPDatabase: CoreDataDatabase
+    ) {
         self.tabModel = tabModel
         self.favoritesViewModel = favoritesViewModel
+        self.appSettings = appSettings
         self.appTPHomeViewModel = AppTPHomeViewModel(appTrackingProtectionDatabase: appTPDatabase)
 
         super.init(coder: coder)
     }
 #else
-    required init?(coder: NSCoder, tabModel: Tab, favoritesViewModel: FavoritesListInteracting) {
+    required init?(coder: NSCoder, tabModel: Tab, favoritesViewModel: FavoritesListInteracting, appSettings: AppSettings) {
         self.tabModel = tabModel
         self.favoritesViewModel = favoritesViewModel
+        self.appSettings = appSettings
 
         super.init(coder: coder)
     }
@@ -133,6 +155,16 @@ class HomeViewController: UIViewController {
                 self.delegate?.home(self, didRequestHideLogo: false)
             }
         }
+
+        favoritesDisplayModeCancellable = NotificationCenter.default.publisher(for: AppUserDefaults.Notifications.favoritesDisplayModeChange)
+            .receive(on: DispatchQueue.main)
+            .sink { [weak self] _ in
+                guard let self else {
+                    return
+                }
+                self.favoritesViewModel.favoritesDisplayMode = self.appSettings.favoritesDisplayMode
+                self.collectionView.reloadData()
+            }
     }
     
     @objc func bookmarksDidChange() {
diff --git a/DuckDuckGo/MainViewController.swift b/DuckDuckGo/MainViewController.swift
index ebd8cfd37a..bbc4f9f9d3 100644
--- a/DuckDuckGo/MainViewController.swift
+++ b/DuckDuckGo/MainViewController.swift
@@ -645,9 +645,10 @@ class MainViewController: UIViewController {
 #if APP_TRACKING_PROTECTION
         let controller = HomeViewController.loadFromStoryboard(model: tabModel!,
                                                                favoritesViewModel: favoritesViewModel,
+                                                               appSettings: appSettings,
                                                                appTPDatabase: appTrackingProtectionDatabase)
 #else
-        let controller = HomeViewController.loadFromStoryboard(model: tabModel!, favoritesViewModel: favoritesViewModel)
+        let controller = HomeViewController.loadFromStoryboard(model: tabModel!, favoritesViewModel: favoritesViewModel, appSettings: appSettings)
 #endif
 
         homeController = controller

From 7b58cdb0fd6cab2fe36bba45a5547f431d655c4b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Nov 2023 12:59:21 +0100
Subject: [PATCH 16/16] Bump submodules/privacy-reference-tests from `0d23f76`
 to `7519c3d` (#2135)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Graeme Arthur <garthur@duckduckgo.com>
---
 submodules/privacy-reference-tests | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/submodules/privacy-reference-tests b/submodules/privacy-reference-tests
index 0d23f76801..7519c3d430 160000
--- a/submodules/privacy-reference-tests
+++ b/submodules/privacy-reference-tests
@@ -1 +1 @@
-Subproject commit 0d23f76801c2e73ae7d5ed7daa4af4aca5beec73
+Subproject commit 7519c3d430e5dcef75b6128bfdadb0de3f463a49