diff --git a/Modules/Package.swift b/Modules/Package.swift
index 6eaf9bef42b4..e5297f2f6462 100644
--- a/Modules/Package.swift
+++ b/Modules/Package.swift
@@ -48,7 +48,7 @@ let package = Package(
         .package(url: "https://github.com/zendesk/support_sdk_ios", from: "8.0.3"),
         // We can't use wordpress-rs branches nor commits here. Only tags work.
         .package(url: "https://github.com/Automattic/wordpress-rs", revision: "alpha-20241116"),
-        .package(url: "https://github.com/wordpress-mobile/GutenbergKit", revision: "4476d597b271778d001a26c50d74e527b54ebfef"),
+        .package(url: "https://github.com/wordpress-mobile/GutenbergKit", revision: "cc52214a50893b41898607ac0bff7f2787b085bb"),
         .package(url: "https://github.com/Automattic/color-studio", branch: "trunk"),
         .package(url: "https://github.com/allenhumphreys/AztecEditor-iOS", branch: "ah/spm"),
     ],
diff --git a/Modules/Sources/AsyncImageKit/ImagePrefetcher.swift b/Modules/Sources/AsyncImageKit/ImagePrefetcher.swift
index 623d60ac2aa2..7b807ec0dd99 100644
--- a/Modules/Sources/AsyncImageKit/ImagePrefetcher.swift
+++ b/Modules/Sources/AsyncImageKit/ImagePrefetcher.swift
@@ -89,6 +89,7 @@ public final class ImagePrefetcher {
                 value.task?.cancel()
             }
             queue.removeAll()
+            numberOfActiveTasks = 0
         }
     }
 
diff --git a/Modules/Sources/AsyncImageKit/ImageRequest.swift b/Modules/Sources/AsyncImageKit/ImageRequest.swift
index 5a4ada4df736..9573ab0edbd2 100644
--- a/Modules/Sources/AsyncImageKit/ImageRequest.swift
+++ b/Modules/Sources/AsyncImageKit/ImageRequest.swift
@@ -51,29 +51,34 @@ public struct ImageRequestOptions: Hashable, Sendable {
 
 /// Image size in **pixels**.
 public struct ImageSize: Hashable, Sendable {
-    public let width: CGFloat
-    public let height: CGFloat
+    /// Width in **pixels**.
+    public var width: Int
+    /// Height in **pixels**.
+    public var height: Int
 
-    public init(width: CGFloat, height: CGFloat) {
+    /// Initializes the struct with given size in **pixels**.
+    public init(width: Int, height: Int) {
         self.width = width
         self.height = height
     }
 
-    public init(_ size: CGSize) {
-        self.width = size.width
-        self.height = size.height
+    /// Initializes the struct with given size in **pixels**.
+    public init(pixels size: CGSize) {
+        self.width = Int(size.width)
+        self.height = Int(size.height)
     }
 
-    /// Initializes `ImageSize` with the given size scaled for the given view.
+    /// A convenience initializer that creates `ImageSize` with the given size
+    /// in **points** scaled for the given view.
     @MainActor
     public init(scaling size: CGSize, in view: UIView) {
-        self.init(size.scaled(by: view.traitCollection.displayScale))
+        self.init(scaling: size, scale: view.traitCollection.displayScale)
     }
 
-    /// Initializes `ImageSize` with the given size scaled for the current trait
-    /// collection display scale.
-    public init(scaling size: CGSize) {
-        self.init(size.scaled(by: UITraitCollection.current.displayScale))
+    /// Initializes `ImageSize` with the given size in **points** scaled for the
+    /// current trait collection display scale.
+    public init(scaling size: CGSize, scale: CGFloat) {
+        self.init(pixels: size.scaled(by: max(1, scale)))
     }
 }
 
diff --git a/Modules/Sources/AsyncImageKit/Views/AsyncImageView.swift b/Modules/Sources/AsyncImageKit/Views/AsyncImageView.swift
index 464490a0bfb2..df8c49bd1fcb 100644
--- a/Modules/Sources/AsyncImageKit/Views/AsyncImageView.swift
+++ b/Modules/Sources/AsyncImageKit/Views/AsyncImageView.swift
@@ -30,6 +30,7 @@ public final class AsyncImageView: UIView {
         /// By default, `background`.
         public var loadingStyle = LoadingStyle.background
 
+        // TODO: remove when WPRichTextImage is removed
         public var passTouchesToSuperview = false
 
         public init() {}
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 7ca6344db2a7..4416a3000569 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,8 +1,9 @@
 25.7
 -----
 * [**] Add Image Playground support (part of Apple Intelligence suite) for adding images to your posts, generated featured image, site icons, and more [#23688]
-* [**] Add new lightbox screen for images with modern transitions and enhanced performance [#23922]
+* [**] Enable history navigation (undo and redo) for the experimental editor. [#23961]
 * [**] Enhance the Gravatar Quick Editor by adding features that allow users to delete and share their avatars. [#23868]
+* [**] Add new lightbox screen for images with modern transitions and enhanced performance [#23922]
 * [**] Add the capability to create an avatar using Apple Image Playground through the Gravatar Quick Editor. [#23868]
 * [**] Various bug fixes and improvements in the new experimental editor [#23919]
 * [*] Fix sorting in Stats Subscriber Emails (latest first) [#23913]
@@ -39,6 +40,14 @@
 * [*] Fix small tap area for “More” button in the Subscriptions screen in Reader [#23964]
 * [*] Fix “Notification Settings” for individual posts sometimes being clipped [#23964]
 * [*] Add context menu (long-press) and previews for subscriptions with quick access to “Share”, “Copy Link”, “Add to Favorites”, “Notification Settings”, and “Unsubscribe” buttons in both the Subscriptions view and the Sidebar in Reader [#23964]
+* [*] Fix an issue with fullscreen button in reply view clipped by the notch [#23965]
+* [*] Remove "Lazy Images" option that is no longer part of the Jetpack plugin [#23966]
+* [*] Fix an issue with "Speed up your site" section not refreshing (fails silently) [#23966]
+* [*] Fix an issue with small tap area of the ellipsis in the post list [#23973]
+* [*] Avoid unexpectedly marking post content as unsaved. [#23969]
+* [*] Fix an issue with Mastodon connection not working [#23981]
+* [**] Send feedback from within the experimental editor "more" options menu. [#23980]
+* [**] Support accessing the code editor within the experimental editor. [#23979]
 
 25.6
 -----
@@ -98,7 +107,7 @@
 * [*] [internal] Incorporate a parser to handle Gutenberg blocks more efficiently for improved performance [#22886]
 * [**] Improve performance of Image and Gallery block processors to avoid long delay when saving a post [#22896]
 * [*] Improve performance of File block processor [#22897]
-* [*] [internal] Prompt users to keep the app up to date on their devices, so they can try new features, as well as benefit from performance improvements and bug fixes [#23195, #23216, #23218, #23211] 
+* [*] [internal] Prompt users to keep the app up to date on their devices, so they can try new features, as well as benefit from performance improvements and bug fixes [#23195, #23216, #23218, #23211]
 * [**] [Jetpack-only] Reader: Add a new feed dedicated to tags [#23242]
 
 24.9.1
diff --git a/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved b/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved
index ed7e6362bd38..5ae8f5ac883b 100644
--- a/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,5 +1,5 @@
 {
-  "originHash" : "c6c4224bb9091cbaed87a958001b2435576248fec163dc8ce6be041f8e1da166",
+  "originHash" : "d8a7faa1972ab73744be3161f236c4bae7faf7c44f840b7bd0a52b3ee1ee6d6c",
   "pins" : [
     {
       "identity" : "alamofire",
@@ -150,7 +150,7 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/wordpress-mobile/GutenbergKit",
       "state" : {
-        "revision" : "4476d597b271778d001a26c50d74e527b54ebfef"
+        "revision" : "cc52214a50893b41898607ac0bff7f2787b085bb"
       }
     },
     {
@@ -392,7 +392,7 @@
       "location" : "https://github.com/wordpress-mobile/WordPressKit-iOS",
       "state" : {
         "branch" : "wpios-edition",
-        "revision" : "908d96a6ff4eb38217e57c03996bf1f3e9cdb114"
+        "revision" : "a9a057ea6fba8080c146497336951dc805409771"
       }
     },
     {
diff --git a/WordPress/Classes/Models/Blog/BlogSettings.swift b/WordPress/Classes/Models/Blog/BlogSettings.swift
index d07e8368719d..ff1f175d26b8 100644
--- a/WordPress/Classes/Models/Blog/BlogSettings.swift
+++ b/WordPress/Classes/Models/Blog/BlogSettings.swift
@@ -71,6 +71,7 @@ open class BlogSettings: NSManagedObject {
 
     /// Jetpack Setting: lazy load images.
     ///
+    @available(*, deprecated)
     @NSManaged var jetpackLazyLoadImages: Bool
 
     // MARK: - Discussion
diff --git a/WordPress/Classes/Models/ReaderTagTopic.swift b/WordPress/Classes/Models/ReaderTagTopic.swift
index 9151484d576d..7bb43246d362 100644
--- a/WordPress/Classes/Models/ReaderTagTopic.swift
+++ b/WordPress/Classes/Models/ReaderTagTopic.swift
@@ -52,6 +52,10 @@ import Foundation
         return topic
     }
 
+    var formattedTitle: String {
+        title.split(separator: "-").map(\.capitalized).joined(separator: " ")
+    }
+
     /// Convenience method to update the tag's `following` state and also updates `showInMenu`.
     @objc func toggleFollowing(_ isFollowing: Bool) {
         following = isFollowing
diff --git a/WordPress/Classes/Services/BlogJetpackSettingsService.swift b/WordPress/Classes/Services/BlogJetpackSettingsService.swift
index e8a58a197868..f300c8aae2ef 100644
--- a/WordPress/Classes/Services/BlogJetpackSettingsService.swift
+++ b/WordPress/Classes/Services/BlogJetpackSettingsService.swift
@@ -142,29 +142,6 @@ struct BlogJetpackSettingsService {
         )
     }
 
-    func updateJetpackLazyImagesModuleSettingForBlog(_ blog: Blog, success: @escaping () -> Void, failure: @escaping (Error?) -> Void) {
-        guard let blogSettings = blog.settings else {
-            failure(nil)
-            return
-        }
-
-        let isActive = blogSettings.jetpackLazyLoadImages
-        updateJetpackModuleActiveSettingForBlog(
-            blog,
-            module: BlogJetpackSettingsServiceRemote.Keys.lazyLoadImages,
-            active: isActive,
-            success: {
-                self.coreDataStack.performAndSave({ context in
-                    guard let blogSettingsInContext = Blog.lookup(withObjectID: blog.objectID, in: context)?.settings else {
-                        return
-                    }
-                    blogSettingsInContext.jetpackLazyLoadImages = isActive
-                }, completion: success, on: .main)
-            },
-            failure: failure
-        )
-    }
-
     func updateJetpackServeImagesFromOurServersModuleSettingForBlog(_ blog: Blog, success: @escaping () -> Void, failure: @escaping (Error?) -> Void) {
         guard let blogSettings = blog.settings else {
             failure(nil)
@@ -235,7 +212,6 @@ private extension BlogJetpackSettingsService {
     }
 
     func updateJetpackModulesSettings(_ settings: BlogSettings, remoteSettings: RemoteBlogJetpackModulesSettings) {
-        settings.jetpackLazyLoadImages = remoteSettings.lazyLoadImages
         settings.jetpackServeImagesFromOurServers = remoteSettings.serveImagesFromOurServers
     }
 
diff --git a/WordPress/Classes/System/Root View/ReaderPresenter.swift b/WordPress/Classes/System/Root View/ReaderPresenter.swift
index 6e48fd7c208d..d9fe311ba90a 100644
--- a/WordPress/Classes/System/Root View/ReaderPresenter.swift	
+++ b/WordPress/Classes/System/Root View/ReaderPresenter.swift	
@@ -15,7 +15,6 @@ final class ReaderPresenter: NSObject, SplitViewDisplayable {
 
     /// The navigation controller for the main content when shown using tabs.
     private var mainNavigationController = UINavigationController()
-    private var latestContentVC: UIViewController?
 
     private var viewContext: NSManagedObjectContext {
         ContextManager.shared.mainContext
@@ -58,8 +57,8 @@ final class ReaderPresenter: NSObject, SplitViewDisplayable {
         // -warning: List occasionally sets the selection to `nil` when switching items.
         selectionObserver = sidebarViewModel.$selection.compactMap { $0 }
             .removeDuplicates { [weak self] in
-                guard $0 == $1 else { return false }
-                self?.popMainNavigationController()
+                guard $0 == $1, let self, let splitViewController else { return false }
+                self.popMainNavigationController(in: splitViewController)
                 return true
             }
             .sink { [weak self] in self?.configure(for: $0) }
@@ -84,17 +83,10 @@ final class ReaderPresenter: NSObject, SplitViewDisplayable {
         hideSupplementaryColumnIfNeeded()
     }
 
-    private func popMainNavigationController() {
-        if let splitViewController {
-            let secondaryVC = splitViewController.viewController(for: .secondary)
-            (secondaryVC as? UINavigationController)?.popToRootViewController(animated: true)
-            hideSupplementaryColumnIfNeeded()
-        } else {
-            if let latestContentVC {
-                // Return to the previous view controller preserving its state
-                mainNavigationController.safePushViewController(latestContentVC, animated: true)
-            }
-        }
+    private func popMainNavigationController(in splitViewController: UISplitViewController) {
+        let secondaryVC = splitViewController.viewController(for: .secondary)
+        (secondaryVC as? UINavigationController)?.popToRootViewController(animated: true)
+        hideSupplementaryColumnIfNeeded()
     }
 
     private func hideSupplementaryColumnIfNeeded() {
@@ -190,7 +182,6 @@ final class ReaderPresenter: NSObject, SplitViewDisplayable {
             }
             splitViewController.setViewController(navigationVC, for: .secondary)
         } else {
-            latestContentVC = viewController
             mainNavigationController.safePushViewController(viewController, animated: true)
         }
     }
diff --git a/WordPress/Classes/Utility/In-App Feedback/SubmitFeedbackViewController.swift b/WordPress/Classes/Utility/In-App Feedback/SubmitFeedbackViewController.swift
index 0129e0cf7c38..9808ef547e0f 100644
--- a/WordPress/Classes/Utility/In-App Feedback/SubmitFeedbackViewController.swift	
+++ b/WordPress/Classes/Utility/In-App Feedback/SubmitFeedbackViewController.swift	
@@ -4,9 +4,11 @@ import WordPressShared
 
 final class SubmitFeedbackViewController: UIViewController {
     private var source: String
+    private var feedbackPrefix: String?
 
-    init(source: String) {
+    init(source: String, feedbackPrefix: String? = nil) {
         self.source = source
+        self.feedbackPrefix = feedbackPrefix
         super.init(nibName: nil, bundle: nil)
         self.modalPresentationStyle = .formSheet
     }
@@ -18,7 +20,7 @@ final class SubmitFeedbackViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        let viewController = UIHostingController(rootView: SubmitFeedbackView(presentingViewController: self, source: source))
+        let viewController = UIHostingController(rootView: SubmitFeedbackView(presentingViewController: self, source: source, feedbackPrefix: feedbackPrefix))
 
         let navigationController = UINavigationController(rootViewController: viewController)
 
@@ -33,6 +35,7 @@ final class SubmitFeedbackViewController: UIViewController {
 private struct SubmitFeedbackView: View {
     weak var presentingViewController: UIViewController?
     let source: String
+    let feedbackPrefix: String?
 
     @State private var text = ""
     @State private var isSubmitting = false
@@ -141,9 +144,10 @@ private struct SubmitFeedbackView: View {
 
         isSubmitting = true
 
+        let descriptionPrefix = feedbackPrefix.map { "[\($0)] " } ?? ""
         ZendeskUtils.sharedInstance.createNewRequest(
             in: presentingViewController,
-            description: text.trim(),
+            description: descriptionPrefix + text.trim(),
             tags: ["appreview_jetpack", "in_app_feedback"],
             attachments: attachmentsViewModel.attachments.compactMap(\.response),
             alertOptions: nil
@@ -195,6 +199,6 @@ private enum Strings {
 
 #Preview {
     NavigationView {
-        SubmitFeedbackView(source: "preview")
+        SubmitFeedbackView(source: "preview", feedbackPrefix: nil)
     }
 }
diff --git a/WordPress/Classes/Utility/SharedStrings.swift b/WordPress/Classes/Utility/SharedStrings.swift
index 32c4c32adcc8..d22a5186b5ec 100644
--- a/WordPress/Classes/Utility/SharedStrings.swift
+++ b/WordPress/Classes/Utility/SharedStrings.swift
@@ -23,6 +23,7 @@ enum SharedStrings {
 
     enum Error {
         static let generic = NSLocalizedString("shared.error.geneirc", value: "Something went wrong", comment: "A generic error message")
+        static let refreshFailed = NSLocalizedString("shared.error.failiedToReloadData", value: "Failed to update data", comment: "A generic error title indicating that a screen failed to fetch the latest data")
     }
 
     enum Reader {
diff --git a/WordPress/Classes/Utility/WebViewController/WPWebViewController.m b/WordPress/Classes/Utility/WebViewController/WPWebViewController.m
index b35ec6873039..5b61051a5a89 100644
--- a/WordPress/Classes/Utility/WebViewController/WPWebViewController.m
+++ b/WordPress/Classes/Utility/WebViewController/WPWebViewController.m
@@ -177,6 +177,7 @@ - (void)setupTitle
 
 - (void)setupWebView
 {
+    self.webView.customUserAgent = [WPUserAgent wordPressUserAgent];
     self.webView.navigationDelegate = self;
 }
 
diff --git a/WordPress/Classes/ViewRelated/Blog/Blog Details/Detail Header/BlogDetailHeaderView.swift b/WordPress/Classes/ViewRelated/Blog/Blog Details/Detail Header/BlogDetailHeaderView.swift
index 9be29e8fc727..0101ea0b21d4 100644
--- a/WordPress/Classes/ViewRelated/Blog/Blog Details/Detail Header/BlogDetailHeaderView.swift	
+++ b/WordPress/Classes/ViewRelated/Blog/Blog Details/Detail Header/BlogDetailHeaderView.swift	
@@ -131,6 +131,9 @@ class BlogDetailHeaderView: UIView {
 
     private func makeSiteLinkMenu() -> UIMenu {
         UIMenu(children: [
+            UIAction(title: SharedStrings.Button.share, image: UIImage(systemName: "square.and.arrow.up"), handler: { [weak self] _ in
+                self?.delegate?.buttonShareSiteTapped()
+            }),
             UIAction(title: Strings.visitSite, image: UIImage(systemName: "safari"), handler: { [weak self] _ in
                 self?.delegate?.visitSiteTapped()
             }),
diff --git a/WordPress/Classes/ViewRelated/Blog/My Site/Header/HomeSiteHeaderViewController+SiteActions.swift b/WordPress/Classes/ViewRelated/Blog/My Site/Header/HomeSiteHeaderViewController+SiteActions.swift
index 0f8966bb6ffa..f98b62bc690b 100644
--- a/WordPress/Classes/ViewRelated/Blog/My Site/Header/HomeSiteHeaderViewController+SiteActions.swift	
+++ b/WordPress/Classes/ViewRelated/Blog/My Site/Header/HomeSiteHeaderViewController+SiteActions.swift	
@@ -108,7 +108,7 @@ private enum MenuItem {
     var title: String {
         switch self {
         case .visitSite: return Strings.visitSite
-        case .shareSite: return SharedStrings.Button.share + "…"
+        case .shareSite: return SharedStrings.Button.share
         case .siteTitle: return Strings.siteTitle
         case .personalizeHome: return Strings.personalizeHome
         }
diff --git a/WordPress/Classes/ViewRelated/Blog/Sharing/SharingConnectionsViewController.m b/WordPress/Classes/ViewRelated/Blog/Sharing/SharingConnectionsViewController.m
index 27061ce4c1ae..d4aec707d768 100644
--- a/WordPress/Classes/ViewRelated/Blog/Sharing/SharingConnectionsViewController.m
+++ b/WordPress/Classes/ViewRelated/Blog/Sharing/SharingConnectionsViewController.m
@@ -232,11 +232,6 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
 
 - (void)handleConnectTapped:(NSIndexPath *)indexPath
 {
-    if (![ReachabilityUtils isInternetReachable]) {
-        [ReachabilityUtils showAlertNoInternetConnection];
-        return;
-    }
-
     if ([UIDevice isPad]) {
         UITableViewCell *cell = [self.tableView cellForRowAtIndexPath:indexPath];
         self.helper.popoverSourceView = cell.textLabel;
diff --git a/WordPress/Classes/ViewRelated/Blog/Sharing/SharingDetailViewController.m b/WordPress/Classes/ViewRelated/Blog/Sharing/SharingDetailViewController.m
index 67f06758b3e9..6e4824379d89 100644
--- a/WordPress/Classes/ViewRelated/Blog/Sharing/SharingDetailViewController.m
+++ b/WordPress/Classes/ViewRelated/Blog/Sharing/SharingDetailViewController.m
@@ -238,11 +238,6 @@ - (void)updateSharedGlobally:(BOOL)shared
 
 - (void)reconnectPublicizeConnection
 {
-    if (![ReachabilityUtils isInternetReachable]) {
-        [ReachabilityUtils showAlertNoInternetConnection];
-        return;
-    }
-
     SharingService *sharingService = [[SharingService alloc] initWithContextManager:[ContextManager sharedInstance]];
 
     __weak __typeof(self) weakSelf = self;
@@ -273,11 +268,6 @@ - (void)disconnectPublicizeConnection
 
 - (void)promptToConfirmDisconnect
 {
-    if (![ReachabilityUtils isInternetReachable]) {
-        [ReachabilityUtils showAlertNoInternetConnection];
-        return;
-    }
-
     NSString *message = NSLocalizedString(@"Disconnecting this account means published posts will no longer be automatically shared to %@", @"Explanatory text for the user. The `%@` is a placeholder for the name of a third-party sharing service.");
     message = [NSString stringWithFormat:message, self.publicizeConnection.label];
     UIAlertController *alert = [UIAlertController alertControllerWithTitle:nil
diff --git a/WordPress/Classes/ViewRelated/EEUUSCompliance/ComplianceLocationService.swift b/WordPress/Classes/ViewRelated/EEUUSCompliance/ComplianceLocationService.swift
index 806fa6ec2a91..a1b1f1977616 100644
--- a/WordPress/Classes/ViewRelated/EEUUSCompliance/ComplianceLocationService.swift
+++ b/WordPress/Classes/ViewRelated/EEUUSCompliance/ComplianceLocationService.swift
@@ -1,7 +1,9 @@
 import WordPressKit
 
 class ComplianceLocationService {
+    private let session = URLSession(configuration: .ephemeral)
+
     func getIPCountryCode(completion: @escaping (Result<String, Error>) -> Void) {
-        IPLocationRemote().fetchIPCountryCode(completion: completion)
+        IPLocationRemote(urlSession: session).fetchIPCountryCode(completion: completion)
     }
 }
diff --git a/WordPress/Classes/ViewRelated/Gutenberg/EditorMediaUtility.swift b/WordPress/Classes/ViewRelated/Gutenberg/EditorMediaUtility.swift
index db8140d79a04..a338f13e481f 100644
--- a/WordPress/Classes/ViewRelated/Gutenberg/EditorMediaUtility.swift
+++ b/WordPress/Classes/ViewRelated/Gutenberg/EditorMediaUtility.swift
@@ -87,7 +87,7 @@ class EditorMediaUtility {
             callbackQueue.async {
                 failure(error)
             }
-            return MeediaUtilityTask { /* do nothing */ }
+            return MediaUtilityTask { /* do nothing */ }
         case let .success((imageURL, host)):
             let task = Task { @MainActor in
                 do {
@@ -98,7 +98,7 @@ class EditorMediaUtility {
 
                 }
             }
-            return MeediaUtilityTask { task.cancel() }
+            return MediaUtilityTask { task.cancel() }
         }
     }
 
@@ -202,7 +202,7 @@ class EditorMediaUtility {
     }
 }
 
-private struct MeediaUtilityTask: ImageDownloaderTask {
+private struct MediaUtilityTask: ImageDownloaderTask {
     let closure: @Sendable () -> Void
 
     func cancel() {
diff --git a/WordPress/Classes/ViewRelated/Jetpack/Jetpack Settings/JetpackSpeedUpSiteSettingsViewController.swift b/WordPress/Classes/ViewRelated/Jetpack/Jetpack Settings/JetpackSpeedUpSiteSettingsViewController.swift
index 38741318ab74..b15d4f330b2d 100644
--- a/WordPress/Classes/ViewRelated/Jetpack/Jetpack Settings/JetpackSpeedUpSiteSettingsViewController.swift	
+++ b/WordPress/Classes/ViewRelated/Jetpack/Jetpack Settings/JetpackSpeedUpSiteSettingsViewController.swift	
@@ -24,6 +24,7 @@ open class JetpackSpeedUpSiteSettingsViewController: UITableViewController {
 
     @objc public convenience init(blog: Blog) {
         self.init(style: .insetGrouped)
+
         self.blog = blog
         self.service = BlogJetpackSettingsService(coreDataStack: ContextManager.shared)
     }
@@ -32,6 +33,7 @@ open class JetpackSpeedUpSiteSettingsViewController: UITableViewController {
 
     open override func viewDidLoad() {
         super.viewDidLoad()
+
         title = NSLocalizedString("Speed up your site", comment: "Title for the Speed up your site Settings Screen")
         ImmuTable.registerRows([SwitchRow.self], tableView: tableView)
         WPStyleGuide.configureColors(view: view, tableView: tableView)
@@ -40,6 +42,7 @@ open class JetpackSpeedUpSiteSettingsViewController: UITableViewController {
 
     open override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
+
         reloadViewModel()
         refreshSettings()
     }
@@ -51,34 +54,18 @@ open class JetpackSpeedUpSiteSettingsViewController: UITableViewController {
     }
 
     func tableViewModel() -> ImmuTable {
-
-        let serveImagesFromOurServers = SwitchRow(title: NSLocalizedString("Serve images from our servers",
-                                                                           comment: "Title for the Serve images from our servers setting"),
-                                                  value: self.settings.jetpackServeImagesFromOurServers,
-                                                  onChange: self.serveImagesFromOurServersValueChanged())
-
-        let lazyLoadImages = SwitchRow(title: NSLocalizedString("\"Lazy-load\" images",
-                                                          comment: "Title for the lazy load images setting"),
-                                       value: self.settings.jetpackLazyLoadImages,
-                                       onChange: self.lazyLoadImagesValueChanged())
+        let serveImagesFromOurServers = SwitchRow(
+            title: NSLocalizedString("Serve images from our servers",
+                                     comment: "Title for the Serve images from our servers setting"),
+            value: self.settings.jetpackServeImagesFromOurServers,
+            onChange: self.serveImagesFromOurServersValueChanged())
 
         return ImmuTable(sections: [
             ImmuTableSection(
                 headerText: "",
                 rows: [serveImagesFromOurServers],
-                footerText: NSLocalizedString("Jetpack will optimize your images and serve them from the server " +
-                                              "location nearest to your visitors. Using our global content delivery " +
-                                              "network will boost the loading speed of your site.",
-                                              comment: "Footer for the Serve images from our servers setting")),
-
-            ImmuTableSection(
-                headerText: "",
-                rows: [lazyLoadImages],
-                footerText: NSLocalizedString("Improve your site's speed by only loading images visible on the screen. " +
-                                              "New images will load just before they scroll into view. This prevents " +
-                                              "viewers from having to download all the images on a page all at once, " +
-                                              "even ones they can't see.",
-                                              comment: "Footer for the Serve images from our servers setting")),
+                footerText: NSLocalizedString("Jetpack will optimize your images and serve them from the server location nearest to your visitors. Using our global content delivery network will boost the loading speed of your site.", comment: "Footer for the Serve images from our servers setting")
+            )
         ])
     }
 
@@ -92,36 +79,25 @@ open class JetpackSpeedUpSiteSettingsViewController: UITableViewController {
 
             self.service.updateJetpackServeImagesFromOurServersModuleSettingForBlog(self.blog,
                                                                                     success: {},
-                                                                                    failure: { [weak self] (_) in
+                                                                                    failure: { [weak self] _ in
                                                                                         self?.refreshSettingsAfterSavingError()
                                                                                     })
         }
     }
 
-    fileprivate func lazyLoadImagesValueChanged() -> (_ newValue: Bool) -> Void {
-        return { [unowned self] newValue in
-            self.settings.jetpackLazyLoadImages = newValue
-            self.reloadViewModel()
-            WPAnalytics.trackSettingsChange("jetpack_speed_up_site", fieldName: "lazy_load_images", value: newValue as Any)
-            self.service.updateJetpackLazyImagesModuleSettingForBlog(self.blog,
-                                                                     success: {},
-                                                                     failure: { [weak self] (_) in
-                                                                         self?.refreshSettingsAfterSavingError()
-                                                                     })
-        }
-    }
-
     // MARK: - Persistance
 
     fileprivate func refreshSettings() {
-        service.syncJetpackModulesForBlog(blog,
-                                          success: { [weak self] in
-                                              self?.reloadViewModel()
-                                              DDLogInfo("Reloaded Speed up site settings")
-                                          },
-                                          failure: { (error: Error?) in
-                                              DDLogError("Error while syncing blog Speed up site settings: \(String(describing: error))")
-                                          })
+        service.syncJetpackModulesForBlog(
+            blog,
+            success: { [weak self] in
+                self?.reloadViewModel()
+                DDLogInfo("Reloaded Speed up site settings")
+            },
+            failure: { (error: Error?) in
+                Notice(title: SharedStrings.Error.refreshFailed, message: error?.localizedDescription).post()
+                DDLogError("Error while syncing blog Speed up site settings: \(String(describing: error))")
+        })
     }
 
     fileprivate func refreshSettingsAfterSavingError() {
diff --git a/WordPress/Classes/ViewRelated/Media/External/ExternalMediaPickerViewController.swift b/WordPress/Classes/ViewRelated/Media/External/ExternalMediaPickerViewController.swift
index b0ad72b0d00a..d4def47f7823 100644
--- a/WordPress/Classes/ViewRelated/Media/External/ExternalMediaPickerViewController.swift
+++ b/WordPress/Classes/ViewRelated/Media/External/ExternalMediaPickerViewController.swift
@@ -236,7 +236,7 @@ final class ExternalMediaPickerViewController: UIViewController, UICollectionVie
     func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
         let cell = collectionView.dequeueReusableCell(withReuseIdentifier: Self.cellReuseID, for: indexPath) as! ExternalMediaPickerCollectionCell
         let item = dataSource.assets[indexPath.item]
-        cell.configure(imageURL: item.thumbnailURL, size: ImageSize(scaling: flowLayout.itemSize))
+        cell.configure(imageURL: item.thumbnailURL, size: ImageSize(scaling: flowLayout.itemSize, in: self.view))
         return cell
     }
 
diff --git a/WordPress/Classes/ViewRelated/NewGutenberg/NewGutenbergViewController.swift b/WordPress/Classes/ViewRelated/NewGutenberg/NewGutenbergViewController.swift
index 567c69365271..466d07ece773 100644
--- a/WordPress/Classes/ViewRelated/NewGutenberg/NewGutenbergViewController.swift
+++ b/WordPress/Classes/ViewRelated/NewGutenberg/NewGutenbergViewController.swift
@@ -1,4 +1,5 @@
 import UIKit
+import WordPressUI
 import AsyncImageKit
 import AutomatticTracks
 import GutenbergKit
@@ -69,18 +70,6 @@ class NewGutenbergViewController: UIViewController, PostEditor, PublishingEditor
     private let editorViewController: GutenbergKit.EditorViewController
     private weak var autosaveTimer: Timer?
 
-    var editorHasChanges: Bool {
-        var changes = post.changes
-        // TODO: cleanup (+ it doesn't handle scenarios like load from a revision)
-        // - warning: it has to compare two version serialized using the same system
-        if editorViewController.initialContent != post.content {
-            changes.content = post.content
-        } else {
-            changes.content = nil // yes, it needs to be set to .none manually
-        }
-        return !changes.isEmpty
-    }
-
     // TODO: remove (none of these APIs are needed for the new editor)
     var autosaver = Autosaver(action: {})
     func prepopulateMediaItems(_ media: [Media]) {}
@@ -243,22 +232,8 @@ class NewGutenbergViewController: UIViewController, PostEditor, PublishingEditor
     }
 
     private func reloadBlogIconView() {
-        let blog = post.blog
-
-//        if blog.hasIcon == true {
-//            let size = CGSize(width: 24, height: 24)
-//            navigationBarManager.siteIconView.imageView.downloadSiteIcon(for: blog, imageSize: size)
-//        } else if blog.isWPForTeams() {
-//            navigationBarManager.siteIconView.imageView.tintColor = UIColor.secondaryLabel
-//            navigationBarManager.siteIconView.imageView.image = UIImage.gridicon(.p2)
-//        } else {
-//            navigationBarManager.siteIconView.imageView.image = UIImage.siteIconPlaceholder
-//        }
-
-        // TODO: implement
-        // Docs: https://wordpress.org/gutenberg-framework/docs/basic-concepts/undo-redo
-        navigationBarManager.undoButton.isHidden = true
-        navigationBarManager.redoButton.isHidden = true
+        let viewModel = SiteIconViewModel(blog: post.blog, size: .small)
+        navigationBarManager.siteIconView.imageView.setIcon(with: viewModel)
     }
 
     // TODO: this should not be called on viewDidLoad
@@ -313,6 +288,10 @@ class NewGutenbergViewController: UIViewController, PostEditor, PublishingEditor
         guard let url = URL(string: "https://wordpress.com/support/wordpress-editor/") else { return }
         present(SFSafariViewController(url: url), animated: true)
     }
+
+    func showFeedbackView() {
+        self.present(SubmitFeedbackViewController(source: "gutenberg_kit", feedbackPrefix: "Editor"), animated: true)
+    }
 }
 
 extension NewGutenbergViewController: GutenbergKit.EditorViewControllerDelegate {
@@ -347,6 +326,11 @@ extension NewGutenbergViewController: GutenbergKit.EditorViewControllerDelegate
         }
     }
 
+    func editor(_ viewController: GutenbergKit.EditorViewController, didUpdateHistoryState state: GutenbergKit.EditorState) {
+        gutenbergDidRequestToggleRedoButton(!state.hasRedo)
+        gutenbergDidRequestToggleUndoButton(!state.hasUndo)
+    }
+
     func editor(_ viewController: GutenbergKit.EditorViewController, performRequest: GutenbergKit.EditorNetworkRequest) async throws -> GutenbergKit.EditorNetworkResponse {
         throw URLError(.unknown)
     }
@@ -610,13 +594,11 @@ extension NewGutenbergViewController: PostEditorNavigationBarManagerDelegate {
     }
 
     func navigationBarManager(_ manager: PostEditorNavigationBarManager, undoWasPressed sender: UIButton) {
-        // TODO: reimplement
-        // self.gutenberg.onUndoPressed()
+        editorViewController.undo()
     }
 
     func navigationBarManager(_ manager: PostEditorNavigationBarManager, redoWasPressed sender: UIButton) {
-        // TODO: reimplement
-        // self.gutenberg.onRedoPressed()
+        editorViewController.redo()
     }
 
     func navigationBarManager(_ manager: PostEditorNavigationBarManager, moreWasPressed sender: UIButton) {
@@ -728,6 +710,9 @@ extension NewGutenbergViewController {
         actions.append(UIAction(title: helpTitle, image: UIImage(systemName: "questionmark.circle")) { [weak self] _ in
             self?.showEditorHelp()
         })
+        actions.append(UIAction(title: Strings.sendFeedback, image: UIImage(systemName: "envelope")) { [weak self] _ in
+            self?.showFeedbackView()
+        })
         return actions
     }
 
@@ -767,6 +752,7 @@ private enum Strings {
     static let postSettings = NSLocalizedString("postEditor.moreMenu.postSettings", value: "Post Settings", comment: "Post Editor / Button in the 'More' menu")
     static let helpAndSupport = NSLocalizedString("postEditor.moreMenu.helpAndSupport", value: "Help & Support", comment: "Post Editor / Button in the 'More' menu")
     static let help = NSLocalizedString("postEditor.moreMenu.help", value: "Help", comment: "Post Editor / Button in the 'More' menu")
+    static let sendFeedback = NSLocalizedString("postEditor.moreMenu.sendFeedback", value: "Send Feedback", comment: "Post Editor / Button in the 'More' menu")
     static let saveDraft = NSLocalizedString("postEditor.moreMenu.saveDraft", value: "Save Draft", comment: "Post Editor / Button in the 'More' menu")
     static let contentStructure = NSLocalizedString("postEditor.moreMenu.contentStructure", value: "Blocks: %li, Words: %li, Characters: %li", comment: "Post Editor / 'More' menu details labels with 'Blocks', 'Words' and 'Characters' counts as parameters (in that order)")
 }
diff --git a/WordPress/Classes/ViewRelated/Notifications/ReplyTextView/ReplyTextView.xib b/WordPress/Classes/ViewRelated/Notifications/ReplyTextView/ReplyTextView.xib
index 873787813b75..b64ae72ebdee 100644
--- a/WordPress/Classes/ViewRelated/Notifications/ReplyTextView/ReplyTextView.xib
+++ b/WordPress/Classes/ViewRelated/Notifications/ReplyTextView/ReplyTextView.xib
@@ -23,7 +23,7 @@
             </connections>
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" layoutMarginsFollowReadableWidth="YES" id="iN0-l3-epB">
+        <view contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" id="iN0-l3-epB">
             <rect key="frame" x="0.0" y="0.0" width="348" height="57"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
@@ -35,7 +35,7 @@
                     </constraints>
                 </view>
                 <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dls-e1-onf">
-                    <rect key="frame" x="15" y="12" width="318" height="33"/>
+                    <rect key="frame" x="16" y="12" width="316" height="33"/>
                     <subviews>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="OaT-BL-6lY" userLabel="Fullscreen Button View">
                             <rect key="frame" x="0.0" y="0.0" width="33" height="33"/>
@@ -63,16 +63,16 @@
                             </constraints>
                         </view>
                         <view multipleTouchEnabled="YES" contentMode="scaleToFill" horizontalHuggingPriority="240" horizontalCompressionResistancePriority="740" translatesAutoresizingMaskIntoConstraints="NO" id="t6q-rh-Bzh" userLabel="Text Container View">
-                            <rect key="frame" x="33" y="0.0" width="225" height="33"/>
+                            <rect key="frame" x="33" y="0.0" width="223" height="33"/>
                             <subviews>
                                 <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" bounces="NO" showsHorizontalScrollIndicator="NO" bouncesZoom="NO" textAlignment="natural" adjustsFontForContentSizeCategory="YES" translatesAutoresizingMaskIntoConstraints="NO" id="gfH-NN-dph">
-                                    <rect key="frame" x="0.0" y="5" width="225" height="28"/>
+                                    <rect key="frame" x="0.0" y="5" width="223" height="28"/>
                                     <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                     <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                                 </textView>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Placeholder" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6Lf-XI-exE" userLabel="Placeholder">
-                                    <rect key="frame" x="0.0" y="0.0" width="225" height="33"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="223" height="33"/>
                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                     <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                     <nil key="highlightedColor"/>
@@ -92,7 +92,7 @@
                             <edgeInsets key="layoutMargins" top="0.0" left="0.0" bottom="0.0" right="0.0"/>
                         </view>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="lA2-1V-bck" userLabel="Reply Button View">
-                            <rect key="frame" x="258" y="0.0" width="60" height="33"/>
+                            <rect key="frame" x="256" y="0.0" width="60" height="33"/>
                             <subviews>
                                 <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="252" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="250" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8sg-79-AsR" userLabel="Reply Button">
                                     <rect key="frame" x="0.0" y="0.0" width="60" height="33"/>
@@ -119,9 +119,9 @@
             </subviews>
             <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
-                <constraint firstItem="dls-e1-onf" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="15" id="Grf-Yd-1ll"/>
+                <constraint firstItem="dls-e1-onf" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leadingMargin" id="Grf-Yd-1ll"/>
                 <constraint firstAttribute="trailing" secondItem="IdZ-UI-Nwf" secondAttribute="trailing" id="Vdg-Rq-CX8"/>
-                <constraint firstAttribute="trailing" secondItem="dls-e1-onf" secondAttribute="trailing" constant="15" id="Zht-SW-LEv"/>
+                <constraint firstAttribute="trailingMargin" secondItem="dls-e1-onf" secondAttribute="trailing" id="Zht-SW-LEv"/>
                 <constraint firstItem="IdZ-UI-Nwf" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="eHd-2o-Jp5"/>
                 <constraint firstItem="dls-e1-onf" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="12" id="wjV-vs-veI"/>
                 <constraint firstItem="IdZ-UI-Nwf" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="xW3-yX-z7r"/>
diff --git a/WordPress/Classes/ViewRelated/Notifications/Views/NoteBlockHeaderTableViewCell.swift b/WordPress/Classes/ViewRelated/Notifications/Views/NoteBlockHeaderTableViewCell.swift
index bba43f80f4f2..3668334b878f 100644
--- a/WordPress/Classes/ViewRelated/Notifications/Views/NoteBlockHeaderTableViewCell.swift
+++ b/WordPress/Classes/ViewRelated/Notifications/Views/NoteBlockHeaderTableViewCell.swift
@@ -71,7 +71,7 @@ class NoteBlockHeaderTableViewCell: NoteBlockTableViewCell {
         if let gravatar = AvatarURL(url: url) {
             authorAvatarImageView.downloadGravatar(gravatar, placeholder: .gravatarPlaceholderImage, animate: true)
         } else {
-            authorAvatarImageView.wp.setImage(with: url, size: ImageSize(scaling: SiteIconViewModel.Size.regular.size))
+            authorAvatarImageView.wp.setImage(with: url, size: ImageSize(scaling: SiteIconViewModel.Size.regular.size, in: self))
         }
     }
 
diff --git a/WordPress/Classes/ViewRelated/Post/Views/PostListCell.swift b/WordPress/Classes/ViewRelated/Post/Views/PostListCell.swift
index 431b482a3d9f..3f62292a9688 100644
--- a/WordPress/Classes/ViewRelated/Post/Views/PostListCell.swift
+++ b/WordPress/Classes/ViewRelated/Post/Views/PostListCell.swift
@@ -1,6 +1,7 @@
 import Foundation
 import UIKit
 import AsyncImageKit
+import WordPressUI
 
 protocol AbstractPostListCell {
     /// A post displayed by the cell.
@@ -23,6 +24,7 @@ final class PostListCell: UITableViewCell, AbstractPostListCell, PostSearchResul
     }()
 
     private let headerView = PostListHeaderView()
+    private let ellipsisButton = UIButton(type: .system)
     private let contentLabel = UILabel()
     private let featuredImageView = AsyncImageView()
     private let statusLabel = UILabel()
@@ -69,7 +71,7 @@ final class PostListCell: UITableViewCell, AbstractPostListCell, PostSearchResul
     }
 
     private func _configure(with viewModel: PostListItemViewModel, delegate: InteractivePostViewDelegate? = nil) {
-        headerView.configure(with: viewModel, delegate: delegate)
+        headerView.configure(with: viewModel)
         contentLabel.attributedText = viewModel.content
 
         featuredImageView.isHidden = viewModel.imageURL == nil
@@ -87,12 +89,22 @@ final class PostListCell: UITableViewCell, AbstractPostListCell, PostSearchResul
         accessibilityLabel = viewModel.accessibilityLabel
 
         configure(with: viewModel.syncStateViewModel)
+        if let delegate {
+            configureEllipsisButton(with: viewModel.post, delegate: delegate)
+        }
         self.viewModel = viewModel
     }
 
     private func configure(with viewModel: PostSyncStateViewModel) {
         contentView.isUserInteractionEnabled = viewModel.isEditable
         headerView.configure(with: viewModel)
+        ellipsisButton.isHidden = !viewModel.isShowingEllipsis
+    }
+
+    private func configureEllipsisButton(with post: Post, delegate: InteractivePostViewDelegate) {
+        let menuHelper = AbstractPostMenuHelper(post)
+        ellipsisButton.showsMenuAsPrimaryAction = true
+        ellipsisButton.menu = menuHelper.makeMenu(presentingView: ellipsisButton, delegate: delegate)
     }
 
     // MARK: - Setup
@@ -102,7 +114,6 @@ final class PostListCell: UITableViewCell, AbstractPostListCell, PostSearchResul
         setupFeaturedImageView()
         setupStatusLabel()
 
-        contentStackView.translatesAutoresizingMaskIntoConstraints = false
         contentStackView.addArrangedSubviews([
             contentLabel,
             featuredImageView
@@ -110,7 +121,6 @@ final class PostListCell: UITableViewCell, AbstractPostListCell, PostSearchResul
         contentStackView.spacing = 16
         contentStackView.alignment = .top
 
-        mainStackView.translatesAutoresizingMaskIntoConstraints = false
         mainStackView.addArrangedSubviews([
             headerView,
             contentStackView,
@@ -118,18 +128,19 @@ final class PostListCell: UITableViewCell, AbstractPostListCell, PostSearchResul
         ])
         mainStackView.spacing = 4
         contentView.addSubview(mainStackView)
-        contentView.pinSubviewToAllEdgeMargins(mainStackView)
+        mainStackView.pinEdges(to: contentView.layoutMarginsGuide)
+
+        // It is added last to ensure it's tappable
+        setupEllipsisButton()
     }
 
     private func setupContentLabel() {
-        contentLabel.translatesAutoresizingMaskIntoConstraints = false
         contentLabel.adjustsFontForContentSizeCategory = true
         contentLabel.numberOfLines = 3
         contentLabel.setContentHuggingPriority(.defaultHigh, for: .horizontal)
     }
 
     private func setupFeaturedImageView() {
-        featuredImageView.translatesAutoresizingMaskIntoConstraints = false
         featuredImageView.contentMode = .scaleAspectFill
         featuredImageView.layer.masksToBounds = true
         featuredImageView.layer.cornerRadius = 5
@@ -142,11 +153,23 @@ final class PostListCell: UITableViewCell, AbstractPostListCell, PostSearchResul
     }
 
     private func setupStatusLabel() {
-        statusLabel.translatesAutoresizingMaskIntoConstraints = false
         statusLabel.adjustsFontForContentSizeCategory = true
         statusLabel.numberOfLines = 1
         statusLabel.font = WPStyleGuide.fontForTextStyle(.footnote, fontWeight: .regular)
     }
+
+    private func setupEllipsisButton() {
+        ellipsisButton.setImage(UIImage(named: "more-horizontal-mobile"), for: .normal)
+        ellipsisButton.tintColor = .secondaryLabel
+
+        NSLayoutConstraint.activate([
+            ellipsisButton.heightAnchor.constraint(equalToConstant: 44),
+            ellipsisButton.widthAnchor.constraint(equalToConstant: 54)
+        ])
+
+        contentView.addSubview(ellipsisButton)
+        ellipsisButton.pinEdges([.top, .trailing])
+    }
 }
 
 private enum Constants {
diff --git a/WordPress/Classes/ViewRelated/Post/Views/PostListHeaderView.swift b/WordPress/Classes/ViewRelated/Post/Views/PostListHeaderView.swift
index c46181e60a33..720356147bb5 100644
--- a/WordPress/Classes/ViewRelated/Post/Views/PostListHeaderView.swift
+++ b/WordPress/Classes/ViewRelated/Post/Views/PostListHeaderView.swift
@@ -1,4 +1,5 @@
 import UIKit
+import WordPressUI
 
 final class PostListHeaderView: UIView {
 
@@ -7,7 +8,6 @@ final class PostListHeaderView: UIView {
     private let textLabel = UILabel()
     private let icon = UIImageView()
     private let indicator = UIActivityIndicatorView(style: .medium)
-    private let ellipsisButton = UIButton(type: .custom)
 
     // MARK: - Initializer
 
@@ -22,10 +22,7 @@ final class PostListHeaderView: UIView {
 
     // MARK: - Public
 
-    func configure(with viewModel: PostListItemViewModel, delegate: InteractivePostViewDelegate? = nil) {
-        if let delegate {
-            configureEllipsisButton(with: viewModel.post, delegate: delegate)
-        }
+    func configure(with viewModel: PostListItemViewModel) {
         textLabel.attributedText = viewModel.badges
         configure(with: viewModel.syncStateViewModel)
     }
@@ -35,8 +32,6 @@ final class PostListHeaderView: UIView {
             icon.image = iconInfo.image
             icon.tintColor = iconInfo.color
         }
-
-        ellipsisButton.isHidden = !viewModel.isShowingEllipsis
         icon.isHidden = viewModel.iconInfo == nil
         indicator.isHidden = !viewModel.isShowingIndicator
 
@@ -45,21 +40,15 @@ final class PostListHeaderView: UIView {
         }
     }
 
-    private func configureEllipsisButton(with post: Post, delegate: InteractivePostViewDelegate) {
-        let menuHelper = AbstractPostMenuHelper(post)
-        ellipsisButton.showsMenuAsPrimaryAction = true
-        ellipsisButton.menu = menuHelper.makeMenu(presentingView: ellipsisButton, delegate: delegate)
-    }
-
     // MARK: - Setup
 
     private func setupView() {
         setupIcon()
-        setupEllipsisButton()
 
-        let innerStackView = UIStackView(arrangedSubviews: [icon, indicator, ellipsisButton])
-        innerStackView.spacing = 4
-        let stackView = UIStackView(arrangedSubviews: [textLabel, innerStackView])
+        // Trailing spacer to allocate enough space for the "More" button.
+        let accessoriesStackView = UIStackView(arrangedSubviews: [icon, indicator, SpacerView(width: 40)])
+        accessoriesStackView.spacing = 4
+        let stackView = UIStackView(arrangedSubviews: [textLabel, accessoriesStackView])
 
         indicator.transform = CGAffineTransform(scaleX: 0.8, y: 0.8)
 
@@ -76,14 +65,4 @@ final class PostListHeaderView: UIView {
         ])
         icon.contentMode = .scaleAspectFit
     }
-
-    private func setupEllipsisButton() {
-        ellipsisButton.translatesAutoresizingMaskIntoConstraints = false
-        ellipsisButton.setImage(UIImage(named: "more-horizontal-mobile"), for: .normal)
-        ellipsisButton.tintColor = .secondaryLabel
-
-        NSLayoutConstraint.activate([
-            ellipsisButton.widthAnchor.constraint(equalToConstant: 24)
-        ])
-    }
 }
diff --git a/WordPress/Classes/ViewRelated/Reader/Cards/ReaderCrossPostCell.swift b/WordPress/Classes/ViewRelated/Reader/Cards/ReaderCrossPostCell.swift
index 923c06598f19..ae80009a558d 100644
--- a/WordPress/Classes/ViewRelated/Reader/Cards/ReaderCrossPostCell.swift
+++ b/WordPress/Classes/ViewRelated/Reader/Cards/ReaderCrossPostCell.swift
@@ -133,7 +133,7 @@ private final class ReaderCrossPostView: UIView {
 
         avatarView.setPlaceholder(UIImage(named: "post-blavatar-placeholder"))
         if let avatarURL = post.avatarURLForDisplay() {
-            let avatarSize = ImageSize(scaling: CGSize(width: avatarSize, height: avatarSize))
+            let avatarSize = ImageSize(scaling: CGSize(width: avatarSize, height: avatarSize), in: self)
             avatarView.setImage(with: avatarURL, size: avatarSize)
         }
     }
diff --git a/WordPress/Classes/ViewRelated/Reader/Cards/ReaderPostCell.swift b/WordPress/Classes/ViewRelated/Reader/Cards/ReaderPostCell.swift
index 3bca261a58ea..b727111fd7cb 100644
--- a/WordPress/Classes/ViewRelated/Reader/Cards/ReaderPostCell.swift
+++ b/WordPress/Classes/ViewRelated/Reader/Cards/ReaderPostCell.swift
@@ -146,7 +146,7 @@ private final class ReaderPostCellView: UIView {
         imageView.layer.masksToBounds = true
         imageView.contentMode = .scaleAspectFill
 
-        buttonMore.configuration?.baseForegroundColor = UIColor.opaqueSeparator
+        buttonMore.configuration?.baseForegroundColor = UIColor.secondaryLabel.withAlphaComponent(0.5)
         buttonMore.configuration?.contentInsets = .init(top: 12, leading: 8, bottom: 12, trailing: 20)
     }
 
@@ -360,7 +360,7 @@ private final class ReaderPostCellView: UIView {
 
     private func setAvatar(with viewModel: ReaderPostCellViewModel) {
         avatarView.setPlaceholder(UIImage(named: "post-blavatar-placeholder"))
-        let avatarSize = ImageSize(scaling: CGSize(width: ReaderPostCell.avatarSize, height: ReaderPostCell.avatarSize))
+        let avatarSize = ImageSize(scaling: CGSize(width: ReaderPostCell.avatarSize, height: ReaderPostCell.avatarSize), in: self)
         if let avatarURL = viewModel.avatarURL {
             avatarView.setImage(with: avatarURL, size: avatarSize)
         } else {
diff --git a/WordPress/Classes/ViewRelated/Reader/Headers/ReaderDiscoverHeaderView.swift b/WordPress/Classes/ViewRelated/Reader/Headers/ReaderDiscoverHeaderView.swift
index df3394a10f02..d8c5c17d7605 100644
--- a/WordPress/Classes/ViewRelated/Reader/Headers/ReaderDiscoverHeaderView.swift
+++ b/WordPress/Classes/ViewRelated/Reader/Headers/ReaderDiscoverHeaderView.swift
@@ -215,7 +215,7 @@ enum ReaderDiscoverChannel: Hashable {
         case .dailyPrompts:
             NSLocalizedString("reader.discover.channel.dailyPrompts", value: "Daily Prompts", comment: "Header view channel (filter)")
         case .tag(let tag):
-            tag.title.localizedCapitalized
+            tag.formattedTitle
         }
     }
 
diff --git a/WordPress/Classes/ViewRelated/Reader/Headers/ReaderTagStreamHeader.swift b/WordPress/Classes/ViewRelated/Reader/Headers/ReaderTagStreamHeader.swift
index 139e9238b261..4abd228e57f3 100644
--- a/WordPress/Classes/ViewRelated/Reader/Headers/ReaderTagStreamHeader.swift
+++ b/WordPress/Classes/ViewRelated/Reader/Headers/ReaderTagStreamHeader.swift
@@ -41,7 +41,11 @@ final class ReaderTagStreamHeader: ReaderBaseHeaderView, ReaderStreamHeader {
     // MARK: - Configuration
 
     public func configureHeader(_ topic: ReaderAbstractTopic) {
-        titleLabel.text = topic.title.split(separator: "-").map { $0.capitalized }.joined(separator: " ")
+        if let tag = topic as? ReaderTagTopic {
+            titleLabel.text = tag.formattedTitle
+        } else {
+            titleLabel.text = topic.title
+        }
         followButton.isSelected = topic.following
         WPStyleGuide.applyTagsReaderButtonStyle(followButton)
     }
diff --git a/WordPress/Resources/pt-BR.lproj/Localizable.strings b/WordPress/Resources/pt-BR.lproj/Localizable.strings
index 68e337557eb7..a23c81c7f169 100644
--- a/WordPress/Resources/pt-BR.lproj/Localizable.strings
+++ b/WordPress/Resources/pt-BR.lproj/Localizable.strings
@@ -1,4 +1,4 @@
-/* Translation-Revision-Date: 2024-11-29 00:03:31+0000 */
+/* Translation-Revision-Date: 2025-01-09 17:55:19+0000 */
 /* Plural-Forms: nplurals=2; plural=n > 1; */
 /* Generator: GlotPress/4.0.1 */
 /* Language: pt_BR */
@@ -7898,6 +7898,24 @@ translators: %s: Select control option value e.g: \"Auto, 25%\". */
 /* Title of application passwords list */
 "applicationPassword.list.title" = "Senhas de aplicativo";
 
+/* Error message when the current site's url cannot be found */
+"applicationPasswordMigration.error.siteUrlNotFound" = "Não foi possível encontrar o URL do site atual";
+
+/* Error message when the username does not match the signed-in user. The first argument is the currently signed in user's user login name */
+"applicationPasswordMigration.error.usernameMismatch" = "Você precisa acessar com o usuário \"%@\"";
+
+/* Description for the prompt to upgrade to Application Passwords. The first argument is the name of the feature that requires Application Passwords. */
+"applicationPasswordRequired.description" = "As senhas de aplicativos são uma forma mais segura de se conectar ao seu site auto-hospedado e habilitam o suporte a recursos como %@.";
+
+/* Feature name for managing users in the app */
+"applicationPasswordRequired.feature.users" = "Gestão de usuários";
+
+/* Title for the button to authenticate with Application Passwords */
+"applicationPasswordRequired.getStartedButton" = "Iniciar";
+
+/* Title for the prompt to upgrade to Application Passwords */
+"applicationPasswordRequired.title" = "Senha de aplicativo obrigatória";
+
 /* translators: displays audio file extension. e.g. MP3 audio file */
 "audio file" = "arquivo de áudio";
 
@@ -8157,6 +8175,9 @@ Example: Reply to Pamela Nguyen */
 /* Title for an empty state view when no cards are displayed */
 "dasboard.emptyView.title" = "Nenhum cartão para exibir";
 
+/* Personialize home screen button title */
+"dasboard.personalizeHomeButton" = "Personalize sua tela de início";
+
 /* Title for a menu action in the context menu on the Jetpack Social dashboard card. */
 "dashboard.card.social.menu.hide" = "Ocultar isso";
 
@@ -8299,6 +8320,9 @@ Example: Reply to Pamela Nguyen */
 /* Weekly Roundup debug menu item */
 "debugMenu.weeklyRoundup" = "Resumo semanal";
 
+/* Error tilte */
+"discussionSettings.saveErrorTitle" = "Falha ao salvar configurações";
+
 /* Title for a menu action in the context menu on the Jetpack install card. */
 "domain.dashboard.card.menu.hide" = "Ocultar isso";
 
@@ -8449,6 +8473,9 @@ Example: Reply to Pamela Nguyen */
 /* Shared empty state view */
 "emptyStateView.noSearchResult.title" = "Nenhum resultado";
 
+/* A name of the ID field (it's a technical field, has to be short, displayed below everything else) */
+"entityMetadataFooterView.id" = "ID";
+
 /* Placeholder for the site url textfield.
    Site Address placeholder */
 "example.com" = "exemplo.com";
@@ -8576,6 +8603,9 @@ Example: Reply to Pamela Nguyen */
 /* The 'no' button title for the first feedback alert */
 "in-app.feedback.alert.no" = "Não muito";
 
+/* The 'Not Now' button title for the first feedback alert */
+"in-app.feedback.alert.notNow" = "Agora não";
+
 /* The title for the first feedback alert */
 "in-app.feedback.alert.title" = "Seu feedback é importante";
 
@@ -8870,6 +8900,9 @@ Example: Reply to Pamela Nguyen */
 /* Write a blog prompt for the jetpack prologue */
 "jetpack.prologue.prompt.writeBlog" = "Escrever em um blog";
 
+/* Message stating that the user is unable to use Stats and Notifications because their site is connected to a different WordPress.com account */
+"jetpackSite.connectToDefaultAccount" = "Você precisa acessar com %@ para usar estatísticas e notificações.";
+
 /* Title for a call-to-action button on the Jetpack install card. */
 "jetpackinstallcard.button.learn" = "Saiba mais";
 
@@ -8891,6 +8924,9 @@ Example: Reply to Pamela Nguyen */
 /* Error message that informs likes from a private blog cannot be fetched. */
 "likesListViewController.likesList.privateBlogErrorMessage" = "Você não tem permissão para ver este blog privado.";
 
+/* Instruction label in the two-factor authorization screen WordPress.com login authentication. Note: it has to mention that it's for a WordPress.com account. */
+"login.twoFactorInstructions.details" = "Digite o código de verificação do aplicativo de autenticação para a sua conta do WordPress.com.";
+
 /* Indicating that referrer was marked as spam */
 "marked as spam" = "marcado como spam";
 
@@ -9371,6 +9407,9 @@ Example: Reply to Pamela Nguyen */
 /* Card title for the pesonalization menu */
 "personalizeHome.dashboardCard.todaysStats" = "Estatísticas de hoje";
 
+/* Page title */
+"personalizeHome.navigationTitle" = "Personalizar página inicial";
+
 /* Section header for shortcuts */
 "personalizeHome.shortcutsSectionHeader" = "Mostrar ou ocultar atalhos";
 
@@ -9973,12 +10012,51 @@ but tapping on this button will remove their like from the post. */
 /* Accessibility label for the 'Save Post' button when a post has been saved. */
 "reader.detail.toolbar.saved.button.a11y.label" = "Post salvo";
 
+/* Header view channel (filter) */
+"reader.discover.channel.dailyPrompts" = "Sugestões diárias";
+
+/* Header view channel (filter) */
+"reader.discover.channel.firstPost" = "Primeiros posts";
+
+/* Header view channel (filter) */
+"reader.discover.channel.latest" = "Mais recentes";
+
+/* Header view channel (filter) */
+"reader.discover.channel.recommended" = "Recomendado";
+
+/* Reader Discover header view details label. The text has a Markdown URL: [interests](/interests). Only the text in the square brackets needs to be translated: [<translate_this>](/interests). */
+"reader.discover.header.title" = "Conheça blogs populares que inspiram, informam e entretêm baseados em seus [interesses](\/interests).";
+
+/* Used in multiple contexts, usually as a screen title */
+"reader.discover.title" = "Explorar";
+
+/* Screen title */
+"reader.editInterests.title" = "Editar interesses";
+
 /* Error message informing the user that they are already following a blog in their reader. */
 "reader.error.already.subscribed.message" = "Você já assinou este blog.";
 
 /* VoiceOver accessibility hint, informing the user the button can be used to follow a tag. */
 "reader.follow.button.accessibility.hint" = "Use para seguir a tag.";
 
+/* Reader screen title for follow conversation settings */
+"reader.followConversationSettings.title" = "Configurações de conversa";
+
+/* Screen header details */
+"reader.following.header.details" = "Fique por dentro das atualizações dos blogs que você assinou.";
+
+/* Used in multiple contexts, usually as a screen title */
+"reader.likes.title" = "Curtidas";
+
+/* Reader logged-out screen details */
+"reader.loggedOut.details" = "Acesse com uma conta do WordPress.com para seguir seus blogs favoritos";
+
+/* Reader logged-out screen sign in button */
+"reader.loggedOut.signIn" = "Entrar";
+
+/* Reader logged-out screen title */
+"reader.loggedOut.title" = "Participe da conversa";
+
 /* Title for button on the no followed blogs result screen */
 "reader.no.blogs.button" = "Descobrir blogs";
 
@@ -10040,6 +10118,84 @@ Example: given a notice format "Following %@" and empty site name, this will be
 /* Notice title when blocking a user fails. */
 "reader.notice.user.blocked" = "reader.notice.user.block.failed";
 
+/* Button accessibility label */
+"reader.post.buttonBookmark.accessibilityLabel" = "Favorito";
+
+/* Button accessibility label */
+"reader.post.buttonComment.accessibilityLabel" = "Exibir comentários";
+
+/* Button accessibility label */
+"reader.post.buttonLike.accessibilityLabel" = "Curtir";
+
+/* Button accessibility label */
+"reader.post.buttonReblog.accessibilityLabel" = "Reblogar";
+
+/* Button accessibility label */
+"reader.post.buttonRemoveBookmark.accessibilityLint" = "Remover favorito";
+
+/* Button accessibility label */
+"reader.post.buttonRemoveLike.accessibilityLabel" = "Remover curtida";
+
+/* Accessibility hint for the site header */
+"reader.post.buttonSite.accessibilityHint" = "Abre os detalhes do site";
+
+/* Button accessibility label */
+"reader.post.moreMenu.accessibilityLabel" = "Mais ações";
+
+/* Accessibility label showing total number of comments */
+"reader.post.numberOfComments.accessibilityLabel" = "%@ comentários";
+
+/* Accessibility label showing total number of likes */
+"reader.post.numberOfLikes.accessibilityLabel" = "%@ curtidas";
+
+/* Context menu action */
+"reader.postContextMenu.blockOrReportMenu" = "Bloquear ou denunciar";
+
+/* Context menu action */
+"reader.postContextMenu.blockSite" = "Bloquear site";
+
+/* Context menu action */
+"reader.postContextMenu.blockUser" = "Bloquear usuário";
+
+/* Context menu action (placeholder value when blog name not available – should never happen) */
+"reader.postContextMenu.blogDetails" = "Detalhes do blog";
+
+/* Context menu action */
+"reader.postContextMenu.copyLink" = "Copiar link";
+
+/* Context menu action */
+"reader.postContextMenu.manageNotifications" = "Gerenciar notificações";
+
+/* Context menu action */
+"reader.postContextMenu.reportPost" = "Denunciar post";
+
+/* Context menu action */
+"reader.postContextMenu.reportUser" = "Denunciar usuário";
+
+/* Context menu action */
+"reader.postContextMenu.share" = "Compartilhar";
+
+/* Context menu action */
+"reader.postContextMenu.showBlog" = "Ir para o blog";
+
+/* Context menu action */
+"reader.postContextMenu.subscribeT" = "Assinar";
+
+/* Context menu action */
+"reader.postContextMenu.unsubscribe" = "Cancelar assinatura";
+
+/* Context menu action */
+"reader.postContextMenu.viewInBrowser" = "Visualizar no navegador";
+
+/* Reader post details view placeholder when blog name not avail */
+"reader.postDetails.blog" = "blog";
+
+/* Reader post details view */
+"reader.postDetails.viewModeDescription" = "O dono deste site permite que mostremos apenas um breve resumo do seu conteúdo. Para visualizar o post completo, você deverá acessar o seu site.";
+
+/* Reader post details view */
+"reader.postDetails.viewMoreOn" = "Acesse %@ para ver o post inteiro";
+
 /* Name for the Candy color theme, used in the Reader's reading preferences. */
 "reader.preferences.color.candy" = "Candy";
 
@@ -10121,12 +10277,27 @@ Feel free to replace it with other bracket types that you think looks better for
 /* A short message that informs the user no WordPress.com blogs could be found. */
 "reader.reblog.no.blogs.title" = "Nenhum blog do WordPress.com disponível";
 
+/* Used in multiple contexts, usually as a screen title */
+"reader.recent.title" = "Recente";
+
+/* Used in multiple contexts, usually as a screen title */
+"reader.saved.title" = "Salvo";
+
 /* Notification title for when saved post is removed */
 "reader.savedPostRemovedNotificationTitle" = "Post salvo removido";
 
+/* Reader Search */
+"reader.search.clearHistory" = "Limpar histórico";
+
 /* Title of a Reader tab showing Sites matching a user's search query */
 "reader.search.tab.blogs" = "Blogs";
 
+/* Title of a Reader tab showing Posts matching a user's search query */
+"reader.search.tab.posts" = "Posts";
+
+/* Title of the Reader's search feature */
+"reader.search.title" = "Pesquisa";
+
 /* Screen title. Reader select interests title label text. */
 "reader.select.interests.follow.title" = "Seguir tags";
 
@@ -10166,12 +10337,18 @@ Feel free to replace it with other bracket types that you think looks better for
 /* Reader sidebar menu item */
 "reader.sidebar.search" = "Pesquisar";
 
+/* Reader sidebar section title */
+"reader.sidebar.section.favorites.title" = "Favoritos";
+
 /* Reader sidebar section title */
 "reader.sidebar.section.lists.title" = "Listas";
 
 /* Reader sidebar section title */
 "reader.sidebar.section.organization.title" = "Empresa";
 
+/* Reader sidebar section title */
+"reader.sidebar.section.subscriptions.title" = "Assinaturas";
+
 /* Reader sidebar button */
 "reader.sidebar.section.tags.addTag" = "Adicionar tag";
 
@@ -10214,6 +10391,9 @@ Feel free to replace it with other bracket types that you think looks better for
 /* A suggestion of topics the user might want to subscribe to */
 "reader.suggested.blogs.title" = "Blogs para assinar";
 
+/* A suggestion of topics (tags) the user might like */
+"reader.suggested.tags.title" = "Tópicos que você pode gostar";
+
 /* Title of a feature to add a new tag to the tags subscribed by the user. */
 "reader.tags.add.tag" = "Adicionar uma tag";
 
@@ -10514,6 +10694,9 @@ Feel free to replace it with other bracket types that you think looks better for
 /* Accessibility hint for actions when displaying media items. */
 "siteMedia.cellAccessibilityHint" = "Selecione a mídia.";
 
+/* Title for the URL field */
+"siteMedia.details.url" = "URL";
+
 /* Accessibility hint for media item preview for user's viewing an item in their media library */
 "siteMediaItem.contentViewAccessibilityHint" = "Toque para visualizar mídia em tela cheia";
 
@@ -10835,6 +11018,9 @@ Feel free to replace it with other bracket types that you think looks better for
 /* The section title and or placeholder */
 "submit.feedback.detailsPlaceholder" = "Detalhes";
 
+/* The footer in the Submit Feedback screen to clarify that it's not support */
+"submit.feedback.footer" = "Se precisar de auxílio, entre em contato conosco usando a tela Ajuda e suporte";
+
 /* The button title for the Submit button in the In-App Feedback screen */
 "submit.feedback.submit.button" = "Enviar";
 
@@ -11051,6 +11237,88 @@ Feel free to replace it with other bracket types that you think looks better for
 /* Site's Viewers Profile. Displayed when the name is empty! */
 "user.details.title.viewer" = "Visitante do site";
 
+/* The 'Account Management' section of the user profile – matches what's in /wp-admin/profile.php */
+"userDetails.accountManagementSectionTitle" = "Gestão da conta";
+
+/* The help message for reassigning content to a user after deletion. */
+"userDetails.alert.attributeContentToUserHelpMessage" = "O autor das páginas e posts que pertenciam ao usuário excluído será substituído pelo usuário que for selecionado.";
+
+/* The label that appears in the alert that appears when deleting a user */
+"userDetails.alert.attributeContentToUserLabel" = "Usuário selecionado";
+
+/* The message that appears when deleting a user. */
+"userDetails.alert.deleteUserAttributionMessage" = "Selecione outro usuário para atribuir este conteúdo.";
+
+/* The title of the confirmation button in the alert that appears when deleting a user */
+"userDetails.alert.deleteUserConfirmButtonTitle" = "Sim, excluir usuário";
+
+/* The title of the cancel button in the confirmation alert that appears when deleting a user */
+"userDetails.alert.deleteUserConfirmationCancelButton" = "Cancelar";
+
+/* The title of the delete button in the confirmation alert that appears when deleting a user */
+"userDetails.alert.deleteUserConfirmationDeleteButton" = "Excluir";
+
+/* The message in the alert that appears when deleting a user. The first argument is the display name of the user to which content will be attributed */
+"userDetails.alert.deleteUserConfirmationMessage" = "Tem certeza de que deseja excluir este usuário e atribuir todo o conteúdo a %@?";
+
+/* The title of the alert that appears when deleting a user
+   The title of the confirmation alert that appears when deleting a user */
+"userDetails.alert.deleteUserConfirmationTitle" = "Confirmação de exclusão";
+
+/* The message in the alert that appears when deleting a user */
+"userDetails.alert.deleteUserErrorAlertMessage" = "Houve um erro ao excluir o usuário.";
+
+/* The title of the OK button in the alert that appears when deleting a user */
+"userDetails.alert.deleteUserErrorAlertOkButton" = "OK";
+
+/* The title of the alert that appears when deleting a user */
+"userDetails.alert.deleteUserErrorAlertTitle" = "Erro";
+
+/* The 'Biographical Info' field of the user profile – matches what's in /wp-admin/profile.php */
+"userDetails.bioFieldTitle" = "Informações biográficas";
+
+/* The 'Update' button to set a new password on the user profile */
+"userDetails.button.updatePassword" = "Atualizar";
+
+/* The 'Delete User' button on the user profile – matches what's in /wp-admin/profile.php */
+"userDetails.deleteUserActionTitle" = "Excluir usuário";
+
+/* The 'Deleting User…' button on the user profile */
+"userDetails.deletingUserActionTitle" = "Excluindo usuário…";
+
+/* The 'Email' field of the user profile – matches what's in /wp-admin/profile.php */
+"userDetails.emailAddressFieldTitle" = "Endereço de e-mail";
+
+/* The message in the alert that appears when setting a new password on the user profile */
+"userDetails.newPasswordAlertMessage" = "Digite uma nova senha para este usuário";
+
+/* The 'Role' field of the user profile – matches what's in /wp-admin/profile.php */
+"userDetails.roleFieldTitle" = "Função";
+
+/* The 'Set New Password' button on the user profile – matches what's in /wp-admin/profile.php */
+"userDetails.setNewPasswordActionTitle" = "Definir nova senha";
+
+/* The placeholder text for the 'New Password' field on the user profile */
+"userDetails.textField.placeholder.newPassword" = "Nova senha";
+
+/* The placeholder text for the 'Confirm New Password' field on the user profile */
+"userDetails.textField.placeholder.newPasswordConfirmation" = "Confirme a nova senha";
+
+/* The 'Website' field of the user profile – matches what's in /wp-admin/profile.php */
+"userDetails.websiteFieldTitle" = "Site";
+
+/* Header text fo the search results section in the users list */
+"userList.searchResults.header" = "Resultados de pesquisa";
+
+/* Shown when the user list is empty */
+"userlist.nousersfound" = "Nenhum usuário encontrado";
+
+/* An instruction for the user to tap to start searching */
+"userlist.searchprompt" = "Pesquisar";
+
+/* The heading at the top of the user list */
+"userlist.title" = "Usuários";
+
 /* Site Subscribers */
 "users.list.title.subscribers" = "Assinantes";
 
@@ -11240,6 +11508,27 @@ Feel free to replace it with other bracket types that you think looks better for
 /* Title of a button that displays a blog post in a web view. */
 "wp.migration.successCard.learnMore" = "Saiba mais";
 
+/* Error message when user denies access to WordPress.com */
+"wpComLogin.error.accessDenied" = "Acesso negado. Você precisa aprovar o acesso ao WordPress.com";
+
+/* Error message when user signs in with an different account than the account that's alredy signed in. The first argument is the current signed-in account email address */
+"wpComLogin.error.alreadySignedIn" = "Você já fez o acesso com o endereço de email %@. Saia da conta e tente novamente.";
+
+/* Error message when failing to load user details during WordPress.com login */
+"wpComLogin.error.fetchUser" = "Falha em carregar os detalhes do usuário";
+
+/* Error message when failing to load account's site after signing in */
+"wpComLogin.error.loadingSites" = "Não foi possível carregar os sites da sua conta. Tente mais tarde.";
+
+/* Error message when user signs in with an unexpected email address. The first argument is the expected email address */
+"wpComLogin.error.mismatchedEmail" = "Acesse com o endereço de email %@";
+
+/* Message title to be displayed when the user needs to re-authenticate their WordPress.com account. */
+"wpcom.token.fix.signin" = "Entrar no WordPress.com";
+
+/* Detailed message to be displayed when the user needs to re-authenticate their WordPress.com account. */
+"wpcom.token.fix.signin.message" = "Você precisa entrar no WordPress.com para ter acesso à sua conta.";
+
 /* Managing Zendesk attachments */
 "zendeskAttachmentsSection.addAttachment" = "Adicionar anexos";
 
diff --git a/WordPress/Resources/sk.lproj/Localizable.strings b/WordPress/Resources/sk.lproj/Localizable.strings
index 1b695789ac99..23cebc09458d 100644
--- a/WordPress/Resources/sk.lproj/Localizable.strings
+++ b/WordPress/Resources/sk.lproj/Localizable.strings
@@ -1,4 +1,4 @@
-/* Translation-Revision-Date: 2024-03-17 10:29:09+0000 */
+/* Translation-Revision-Date: 2025-01-08 15:01:32+0000 */
 /* Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ((n >= 2 && n <= 4) ? 1 : 2); */
 /* Generator: GlotPress/4.0.1 */
 /* Language: sk */
@@ -2300,6 +2300,9 @@
 /* No comment provided by engineer. */
 "Please try entering your login details again." = "Skúste zadať vaše prihlasovacie údaje ešte raz.";
 
+/* Asks the user to wait until the currently running fetch request completes. */
+"Please wait until the current fetch completes." = "Počkajte, kým sa dokončí načítavanie.";
+
 /* Link to a plugin's home page */
 "Plugin Homepage" = "Domovská stránka pluginu";
 
diff --git a/WordPress/Resources/zh-Hans.lproj/Localizable.strings b/WordPress/Resources/zh-Hans.lproj/Localizable.strings
index cb38135976c0..c845ee5caeb0 100644
--- a/WordPress/Resources/zh-Hans.lproj/Localizable.strings
+++ b/WordPress/Resources/zh-Hans.lproj/Localizable.strings
@@ -1,4 +1,4 @@
-/* Translation-Revision-Date: 2024-12-18 09:54:10+0000 */
+/* Translation-Revision-Date: 2025-01-12 05:41:44+0000 */
 /* Plural-Forms: nplurals=1; plural=0; */
 /* Generator: GlotPress/4.0.1 */
 /* Language: zh_CN */
@@ -8473,6 +8473,9 @@ Example: Reply to Pamela Nguyen */
 /* Shared empty state view */
 "emptyStateView.noSearchResult.title" = "无结果";
 
+/* A name of the ID field (it's a technical field, has to be short, displayed below everything else) */
+"entityMetadataFooterView.id" = "ID";
+
 /* Placeholder for the site url textfield.
    Site Address placeholder */
 "example.com" = "example.com";
@@ -10691,6 +10694,9 @@ Feel free to replace it with other bracket types that you think looks better for
 /* Accessibility hint for actions when displaying media items. */
 "siteMedia.cellAccessibilityHint" = "选择媒体。";
 
+/* Title for the URL field */
+"siteMedia.details.url" = "URL";
+
 /* Accessibility hint for media item preview for user's viewing an item in their media library */
 "siteMediaItem.contentViewAccessibilityHint" = "轻点可全屏查看媒体";
 
diff --git a/WordPress/Resources/zh-Hant.lproj/Localizable.strings b/WordPress/Resources/zh-Hant.lproj/Localizable.strings
index ec3f7f121137..de83c455320b 100644
--- a/WordPress/Resources/zh-Hant.lproj/Localizable.strings
+++ b/WordPress/Resources/zh-Hant.lproj/Localizable.strings
@@ -1,4 +1,4 @@
-/* Translation-Revision-Date: 2024-12-18 13:54:09+0000 */
+/* Translation-Revision-Date: 2025-01-15 00:23:01+0000 */
 /* Plural-Forms: nplurals=1; plural=0; */
 /* Generator: GlotPress/4.0.1 */
 /* Language: zh_TW */
@@ -4979,10 +4979,10 @@ translators: %s: Select control button label e.g. \"Button width\" */
 "Redo" = "取消復原";
 
 /* Label for link title in Referrers stat. */
-"Referrer" = "訪客連結來源";
+"Referrer" = "參照連結網址";
 
 /* Period Stats 'Referrers' header */
-"Referrers" = "來源網址";
+"Referrers" = "參照連結網址";
 
 /* Button label to refres a web page
    The loading view button title displayed when an error occurred */
@@ -10704,7 +10704,7 @@ Example: given a notice format "Following %@" and empty site name, this will be
 "siteMonitoring.metadataKeyName" = "名稱";
 
 /* Site Monitoring details screen metadata key */
-"siteMonitoring.metadataKeyReferrer" = "推薦連結";
+"siteMonitoring.metadataKeyReferrer" = "參照連結網址";
 
 /* Site Monitoring details screen metadata key */
 "siteMonitoring.metadataKeyRequestTime" = "申請時間";
diff --git a/WordPress/WordPressTest/Comments/Controllers/FullScreenCommentReplyViewControllerTests.swift b/WordPress/WordPressTest/Comments/Controllers/FullScreenCommentReplyViewControllerTests.swift
index 7f04a1ecec65..8845dbd54a3a 100644
--- a/WordPress/WordPressTest/Comments/Controllers/FullScreenCommentReplyViewControllerTests.swift
+++ b/WordPress/WordPressTest/Comments/Controllers/FullScreenCommentReplyViewControllerTests.swift
@@ -83,7 +83,8 @@ class FullScreenCommentReplyViewControllerTests: CoreDataTestCase {
 
     /// Tests the onExitFullscreen callback is correctly called when pressing the cancel button
     /// also validates the arguments being triggered are correct
-    func testExitCallbackCalledWithLastSearchTextWhenCancelPressed() throws {
+    // TODO: flaky test (and we'll rewrite this soon)
+    func _testExitCallbackCalledWithLastSearchTextWhenCancelPressed() throws {
         let testContent = "Test - Cancel"
         let expectedLastSearchText = "@Ren"
         let callbackExpectation = expectation(description: "onExitFullscreen is called successfully when the cancel button is pressed")
diff --git a/config/Version.public.xcconfig b/config/Version.public.xcconfig
index c60a198d3410..268757483a8b 100644
--- a/config/Version.public.xcconfig
+++ b/config/Version.public.xcconfig
@@ -1,2 +1,2 @@
-VERSION_LONG = 25.6.0.1
+VERSION_LONG = 25.6.0.2
 VERSION_SHORT = 25.6