diff --git a/Modules/Tests/WordPressCommentsTests/CommentDetailViewModelTests.swift b/Modules/Tests/WordPressCommentsTests/CommentDetailViewModelTests.swift
index 3200e956eaa2..353f59f48068 100644
--- a/Modules/Tests/WordPressCommentsTests/CommentDetailViewModelTests.swift
+++ b/Modules/Tests/WordPressCommentsTests/CommentDetailViewModelTests.swift
@@ -289,7 +289,7 @@ struct CommentDetailViewModelTests {
         async let appear: Void = vm.onAppear()
         await waitUntil { !service.fetchCommentInvocations.isEmpty }
         service.resolveFetch(callIndex: 0, with: detail)
-        await waitUntil { !service.numberOfRepliesInvocations.isEmpty }
+        await waitUntil { vm.content == .loaded(detail) && !service.numberOfRepliesInvocations.isEmpty }
 
         // The comment is on screen while the count is still in flight, but
         // actions wait for it so a reply can't race a stale count.
diff --git a/Sources/Jetpack/Resources/Assets.xcassets/WordPress Migration/wp-migration-notifications-explainer-ltr.imageset/Contents.json b/Sources/Jetpack/Resources/Assets.xcassets/WordPress Migration/wp-migration-notifications-explainer-ltr.imageset/Contents.json
index a00e94ccc738..47629caf997d 100644
--- a/Sources/Jetpack/Resources/Assets.xcassets/WordPress Migration/wp-migration-notifications-explainer-ltr.imageset/Contents.json	
+++ b/Sources/Jetpack/Resources/Assets.xcassets/WordPress Migration/wp-migration-notifications-explainer-ltr.imageset/Contents.json	
@@ -1,8 +1,25 @@
 {
   "images" : [
     {
-      "filename" : "wp-migration-notifications-explainer-ltr-light.pdf",
-      "idiom" : "universal"
+      "filename" : "wp-migration-notifications-explainer-ltr-light@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "wp-migration-notifications-explainer-ltr-light@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "wp-migration-notifications-explainer-ltr-dark@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
     },
     {
       "appearances" : [
@@ -11,8 +28,9 @@
           "value" : "dark"
         }
       ],
-      "filename" : "wp-migration-notifications-explainer-ltr-dark.pdf",
-      "idiom" : "universal"
+      "filename" : "wp-migration-notifications-explainer-ltr-dark@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {
diff --git a/Sources/Jetpack/Resources/Assets.xcassets/WordPress Migration/wp-migration-notifications-explainer-ltr.imageset/wp-migration-notifications-explainer-ltr-dark.pdf b/Sources/Jetpack/Resources/Assets.xcassets/WordPress Migration/wp-migration-notifications-explainer-ltr.imageset/wp-migration-notifications-explainer-ltr-dark.pdf
deleted file mode 100644
index 219e724f8e64..000000000000
Binary files a/Sources/Jetpack/Resources/Assets.xcassets/WordPress Migration/wp-migration-notifications-explainer-ltr.imageset/wp-migration-notifications-explainer-ltr-dark.pdf and /dev/null differ
diff --git a/Sources/Jetpack/Resources/Assets.xcassets/WordPress Migration/wp-migration-notifications-explainer-ltr.imageset/wp-migration-notifications-explainer-ltr-dark@2x.png b/Sources/Jetpack/Resources/Assets.xcassets/WordPress Migration/wp-migration-notifications-explainer-ltr.imageset/wp-migration-notifications-explainer-ltr-dark@2x.png
new file mode 100644
index 000000000000..5022df0d2ac7
Binary files /dev/null and b/Sources/Jetpack/Resources/Assets.xcassets/WordPress Migration/wp-migration-notifications-explainer-ltr.imageset/wp-migration-notifications-explainer-ltr-dark@2x.png differ
diff --git a/Sources/Jetpack/Resources/Assets.xcassets/WordPress Migration/wp-migration-notifications-explainer-ltr.imageset/wp-migration-notifications-explainer-ltr-dark@3x.png b/Sources/Jetpack/Resources/Assets.xcassets/WordPress Migration/wp-migration-notifications-explainer-ltr.imageset/wp-migration-notifications-explainer-ltr-dark@3x.png
new file mode 100644
index 000000000000..af6e13c3400f
Binary files /dev/null and b/Sources/Jetpack/Resources/Assets.xcassets/WordPress Migration/wp-migration-notifications-explainer-ltr.imageset/wp-migration-notifications-explainer-ltr-dark@3x.png differ
diff --git a/Sources/Jetpack/Resources/Assets.xcassets/WordPress Migration/wp-migration-notifications-explainer-ltr.imageset/wp-migration-notifications-explainer-ltr-light.pdf b/Sources/Jetpack/Resources/Assets.xcassets/WordPress Migration/wp-migration-notifications-explainer-ltr.imageset/wp-migration-notifications-explainer-ltr-light.pdf
deleted file mode 100644
index c9d1805404a4..000000000000
Binary files a/Sources/Jetpack/Resources/Assets.xcassets/WordPress Migration/wp-migration-notifications-explainer-ltr.imageset/wp-migration-notifications-explainer-ltr-light.pdf and /dev/null differ
diff --git a/Sources/Jetpack/Resources/Assets.xcassets/WordPress Migration/wp-migration-notifications-explainer-ltr.imageset/wp-migration-notifications-explainer-ltr-light@2x.png b/Sources/Jetpack/Resources/Assets.xcassets/WordPress Migration/wp-migration-notifications-explainer-ltr.imageset/wp-migration-notifications-explainer-ltr-light@2x.png
new file mode 100644
index 000000000000..8a37a2ab68de
Binary files /dev/null and b/Sources/Jetpack/Resources/Assets.xcassets/WordPress Migration/wp-migration-notifications-explainer-ltr.imageset/wp-migration-notifications-explainer-ltr-light@2x.png differ
diff --git a/Sources/Jetpack/Resources/Assets.xcassets/WordPress Migration/wp-migration-notifications-explainer-ltr.imageset/wp-migration-notifications-explainer-ltr-light@3x.png b/Sources/Jetpack/Resources/Assets.xcassets/WordPress Migration/wp-migration-notifications-explainer-ltr.imageset/wp-migration-notifications-explainer-ltr-light@3x.png
new file mode 100644
index 000000000000..3e3950e25aa7
Binary files /dev/null and b/Sources/Jetpack/Resources/Assets.xcassets/WordPress Migration/wp-migration-notifications-explainer-ltr.imageset/wp-migration-notifications-explainer-ltr-light@3x.png differ
diff --git a/Sources/Jetpack/Resources/Assets.xcassets/WordPress Migration/wp-migration-notifications-explainer-rtl.imageset/Contents.json b/Sources/Jetpack/Resources/Assets.xcassets/WordPress Migration/wp-migration-notifications-explainer-rtl.imageset/Contents.json
index 7a5364335b79..23fb1a47ea54 100644
--- a/Sources/Jetpack/Resources/Assets.xcassets/WordPress Migration/wp-migration-notifications-explainer-rtl.imageset/Contents.json	
+++ b/Sources/Jetpack/Resources/Assets.xcassets/WordPress Migration/wp-migration-notifications-explainer-rtl.imageset/Contents.json	
@@ -1,8 +1,25 @@
 {
   "images" : [
     {
-      "filename" : "wp-migration-notifications-explainer-rtl-light.pdf",
-      "idiom" : "universal"
+      "filename" : "wp-migration-notifications-explainer-rtl-light@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "wp-migration-notifications-explainer-rtl-light@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "wp-migration-notifications-explainer-rtl-dark@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
     },
     {
       "appearances" : [
@@ -11,8 +28,9 @@
           "value" : "dark"
         }
       ],
-      "filename" : "wp-migration-notifications-explainer-rtl-dark.pdf",
-      "idiom" : "universal"
+      "filename" : "wp-migration-notifications-explainer-rtl-dark@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {
diff --git a/Sources/Jetpack/Resources/Assets.xcassets/WordPress Migration/wp-migration-notifications-explainer-rtl.imageset/wp-migration-notifications-explainer-rtl-dark.pdf b/Sources/Jetpack/Resources/Assets.xcassets/WordPress Migration/wp-migration-notifications-explainer-rtl.imageset/wp-migration-notifications-explainer-rtl-dark.pdf
deleted file mode 100644
index f719c19adfb3..000000000000
Binary files a/Sources/Jetpack/Resources/Assets.xcassets/WordPress Migration/wp-migration-notifications-explainer-rtl.imageset/wp-migration-notifications-explainer-rtl-dark.pdf and /dev/null differ
diff --git a/Sources/Jetpack/Resources/Assets.xcassets/WordPress Migration/wp-migration-notifications-explainer-rtl.imageset/wp-migration-notifications-explainer-rtl-dark@2x.png b/Sources/Jetpack/Resources/Assets.xcassets/WordPress Migration/wp-migration-notifications-explainer-rtl.imageset/wp-migration-notifications-explainer-rtl-dark@2x.png
new file mode 100644
index 000000000000..c28d6b3e31bc
Binary files /dev/null and b/Sources/Jetpack/Resources/Assets.xcassets/WordPress Migration/wp-migration-notifications-explainer-rtl.imageset/wp-migration-notifications-explainer-rtl-dark@2x.png differ
diff --git a/Sources/Jetpack/Resources/Assets.xcassets/WordPress Migration/wp-migration-notifications-explainer-rtl.imageset/wp-migration-notifications-explainer-rtl-dark@3x.png b/Sources/Jetpack/Resources/Assets.xcassets/WordPress Migration/wp-migration-notifications-explainer-rtl.imageset/wp-migration-notifications-explainer-rtl-dark@3x.png
new file mode 100644
index 000000000000..060f196488ee
Binary files /dev/null and b/Sources/Jetpack/Resources/Assets.xcassets/WordPress Migration/wp-migration-notifications-explainer-rtl.imageset/wp-migration-notifications-explainer-rtl-dark@3x.png differ
diff --git a/Sources/Jetpack/Resources/Assets.xcassets/WordPress Migration/wp-migration-notifications-explainer-rtl.imageset/wp-migration-notifications-explainer-rtl-light.pdf b/Sources/Jetpack/Resources/Assets.xcassets/WordPress Migration/wp-migration-notifications-explainer-rtl.imageset/wp-migration-notifications-explainer-rtl-light.pdf
deleted file mode 100644
index 3d5b0235af0a..000000000000
Binary files a/Sources/Jetpack/Resources/Assets.xcassets/WordPress Migration/wp-migration-notifications-explainer-rtl.imageset/wp-migration-notifications-explainer-rtl-light.pdf and /dev/null differ
diff --git a/Sources/Jetpack/Resources/Assets.xcassets/WordPress Migration/wp-migration-notifications-explainer-rtl.imageset/wp-migration-notifications-explainer-rtl-light@2x.png b/Sources/Jetpack/Resources/Assets.xcassets/WordPress Migration/wp-migration-notifications-explainer-rtl.imageset/wp-migration-notifications-explainer-rtl-light@2x.png
new file mode 100644
index 000000000000..7f401453efbd
Binary files /dev/null and b/Sources/Jetpack/Resources/Assets.xcassets/WordPress Migration/wp-migration-notifications-explainer-rtl.imageset/wp-migration-notifications-explainer-rtl-light@2x.png differ
diff --git a/Sources/Jetpack/Resources/Assets.xcassets/WordPress Migration/wp-migration-notifications-explainer-rtl.imageset/wp-migration-notifications-explainer-rtl-light@3x.png b/Sources/Jetpack/Resources/Assets.xcassets/WordPress Migration/wp-migration-notifications-explainer-rtl.imageset/wp-migration-notifications-explainer-rtl-light@3x.png
new file mode 100644
index 000000000000..110823357620
Binary files /dev/null and b/Sources/Jetpack/Resources/Assets.xcassets/WordPress Migration/wp-migration-notifications-explainer-rtl.imageset/wp-migration-notifications-explainer-rtl-light@3x.png differ
diff --git a/Tests/KeystoneTests/Tests/Services/BlogJetpackTests.swift b/Tests/KeystoneTests/Tests/Services/BlogJetpackTests.swift
index a1ba73c330d8..afa040d42b53 100644
--- a/Tests/KeystoneTests/Tests/Services/BlogJetpackTests.swift
+++ b/Tests/KeystoneTests/Tests/Services/BlogJetpackTests.swift
@@ -188,7 +188,7 @@ class BlogJetpackTests: CoreDataTestCase {
         }
 
         // No blogs should be saved after the sync blogs operation finishes.
-        wait(for: [syncExpectation], timeout: 1.0)
+        wait(for: [syncExpectation], timeout: 5.0)
         XCTAssertEqual(Blog.count(in: mainContext), 0)
     }
 
diff --git a/Tests/KeystoneTests/Tests/Services/ReaderTopicServiceTest.swift b/Tests/KeystoneTests/Tests/Services/ReaderTopicServiceTest.swift
index 61f69c541334..88b1087476f4 100644
--- a/Tests/KeystoneTests/Tests/Services/ReaderTopicServiceTest.swift
+++ b/Tests/KeystoneTests/Tests/Services/ReaderTopicServiceTest.swift
@@ -439,7 +439,7 @@ final class ReaderTopicSwiftTest: CoreDataTestCase {
     /**
         Ensure that pre-existing site topic is not deleted when fetching siteTopicForSiteWithID
      */
-    func testReaderSiteTopicUpdated() async throws {
+    @MainActor func testReaderSiteTopicUpdated() async throws {
         // GIVEN:
         let service = ReaderTopicService(coreDataStack: contextManager)
         let siteID = 1