diff --git a/Localization/app.json b/Localization/app.json
index 234d160d6..939198777 100644
--- a/Localization/app.json
+++ b/Localization/app.json
@@ -338,10 +338,12 @@
             },
             "search": {
                 "placeholder": "Search name or URL"
-            }
+            },
+            "no_server_selected_hint": "We’ll pick a server based on your language if you continue without making a selection."
         },
         "privacy": {
             "title": "Privacy",
+            "description": "Although the Mastodon app does not collect any data, the server you sign up through may have a different policy. Take a minute to review and agree to the Mastodon app privacy policy and your server’s privacy policy.",
             "policy": {
                 "ios": "Privacy Policy - Mastodon for iOS",
                 "server": "Privacy Policy - %s"
diff --git a/Mastodon/Scene/Onboarding/Welcome/View/Pages/WelcomeContentPage.swift b/Mastodon/Scene/Onboarding/Welcome/View/Pages/WelcomeContentPage.swift
index 9ac8e90fb..1e6ac3cef 100644
--- a/Mastodon/Scene/Onboarding/Welcome/View/Pages/WelcomeContentPage.swift
+++ b/Mastodon/Scene/Onboarding/Welcome/View/Pages/WelcomeContentPage.swift
@@ -52,7 +52,7 @@ enum WelcomeContentPage: CaseIterable {
     var accessibilityLabel: String {
         switch self {
         case .whatIsMastodon:
-            return L10n.Scene.Welcome.Education.A11y.WhatIsMastodon.title
+            return L10n.Scene.Welcome.Education.A11Y.WhatIsMastodon.title
         case .mastodonIsLikeThat:
             return L10n.Scene.Welcome.Education.MastodonIsLikeThat.title
         case .howDoIPickAServer:
diff --git a/MastodonSDK/Sources/MastodonLocalization/Generated/Strings.swift b/MastodonSDK/Sources/MastodonLocalization/Generated/Strings.swift
index 5062d4638..993805a27 100644
--- a/MastodonSDK/Sources/MastodonLocalization/Generated/Strings.swift
+++ b/MastodonSDK/Sources/MastodonLocalization/Generated/Strings.swift
@@ -870,6 +870,8 @@ public enum L10n {
       }
     }
     public enum Privacy {
+      /// Although the Mastodon app does not collect any data, the server you sign up through may have a different policy. Take a minute to review and agree to the Mastodon app privacy policy and your server’s privacy policy.
+      public static let description = L10n.tr("Localizable", "Scene.Privacy.Description", fallback: "Although the Mastodon app does not collect any data, the server you sign up through may have a different policy. Take a minute to review and agree to the Mastodon app privacy policy and your server’s privacy policy.")
       /// Privacy
       public static let title = L10n.tr("Localizable", "Scene.Privacy.Title", fallback: "Privacy")
       public enum Button {
@@ -1282,6 +1284,8 @@ public enum L10n {
       }
     }
     public enum ServerPicker {
+      /// We’ll pick a server based on your language if you continue without making a selection.
+      public static let noServerSelectedHint = L10n.tr("Localizable", "Scene.ServerPicker.NoServerSelectedHint", fallback: "We’ll pick a server based on your language if you continue without making a selection.")
       /// Pick Server
       public static let title = L10n.tr("Localizable", "Scene.ServerPicker.Title", fallback: "Pick Server")
       public enum Button {
diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/Base.lproj/Localizable.strings b/MastodonSDK/Sources/MastodonLocalization/Resources/Base.lproj/Localizable.strings
index 7158033cc..a2c59b8d3 100644
--- a/MastodonSDK/Sources/MastodonLocalization/Resources/Base.lproj/Localizable.strings
+++ b/MastodonSDK/Sources/MastodonLocalization/Resources/Base.lproj/Localizable.strings
@@ -312,6 +312,7 @@ uploaded to Mastodon.";
 "Scene.Privacy.Policy.Ios" = "Privacy Policy - Mastodon for iOS";
 "Scene.Privacy.Policy.Server" = "Privacy Policy - %@";
 "Scene.Privacy.Title" = "Privacy";
+"Scene.Privacy.Description" = "Although the Mastodon app does not collect any data, the server you sign up through may have a different policy. Take a minute to review and agree to the Mastodon app privacy policy and your server’s privacy policy.";
 "Scene.Profile.Accessibility.DoubleTapToOpenTheList" = "Double tap to open the list";
 "Scene.Profile.Accessibility.EditAvatarImage" = "Edit avatar image";
 "Scene.Profile.Accessibility.ShowAvatarImage" = "Show avatar image";
@@ -474,6 +475,7 @@ uploaded to Mastodon.";
 "Scene.ServerPicker.SignupSpeed.Instant" = "Instant Sign-up";
 "Scene.ServerPicker.SignupSpeed.ManuallyReviewed" = "Manual Review";
 "Scene.ServerPicker.Title" = "Pick Server";
+"Scene.ServerPicker.NoServerSelectedHint" = "We’ll pick a server based on your language if you continue without making a selection.";
 "Scene.ServerRules.Button.Confirm" = "I agree";
 "Scene.ServerRules.PrivacyPolicy" = "privacy policy";
 "Scene.ServerRules.Prompt" = "By continuing, you’re subject to the terms of service and privacy policy for %@.";
@@ -549,4 +551,4 @@ back in your hands.";
 "Widget.MultipleFollowers.ConfigurationDescription" = "Show number of followers for multiple accounts.";
 "Widget.MultipleFollowers.ConfigurationDisplayName" = "Multiple followers";
 "Widget.MultipleFollowers.MockUser.AccountName" = "another@follower.social";
-"Widget.MultipleFollowers.MockUser.DisplayName" = "Another follower";
\ No newline at end of file
+"Widget.MultipleFollowers.MockUser.DisplayName" = "Another follower";
diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/en.lproj/Localizable.strings b/MastodonSDK/Sources/MastodonLocalization/Resources/en.lproj/Localizable.strings
index 01edde797..a2c59b8d3 100644
--- a/MastodonSDK/Sources/MastodonLocalization/Resources/en.lproj/Localizable.strings
+++ b/MastodonSDK/Sources/MastodonLocalization/Resources/en.lproj/Localizable.strings
@@ -290,7 +290,7 @@ uploaded to Mastodon.";
 "Scene.HomeTimeline.Title" = "Home";
 "Scene.Login.ServerSearchField.Placeholder" = "Enter URL or search for your server";
 "Scene.Login.Subtitle" = "Log you in on the server you created your account on.";
-"Scene.Login.Title" = "Welcome Back";
+"Scene.Login.Title" = "Welcome back";
 "Scene.Notification.FollowRequest.Accept" = "Accept";
 "Scene.Notification.FollowRequest.Accepted" = "Accepted";
 "Scene.Notification.FollowRequest.Reject" = "reject";
@@ -312,6 +312,7 @@ uploaded to Mastodon.";
 "Scene.Privacy.Policy.Ios" = "Privacy Policy - Mastodon for iOS";
 "Scene.Privacy.Policy.Server" = "Privacy Policy - %@";
 "Scene.Privacy.Title" = "Privacy";
+"Scene.Privacy.Description" = "Although the Mastodon app does not collect any data, the server you sign up through may have a different policy. Take a minute to review and agree to the Mastodon app privacy policy and your server’s privacy policy.";
 "Scene.Profile.Accessibility.DoubleTapToOpenTheList" = "Double tap to open the list";
 "Scene.Profile.Accessibility.EditAvatarImage" = "Edit avatar image";
 "Scene.Profile.Accessibility.ShowAvatarImage" = "Show avatar image";
@@ -474,6 +475,7 @@ uploaded to Mastodon.";
 "Scene.ServerPicker.SignupSpeed.Instant" = "Instant Sign-up";
 "Scene.ServerPicker.SignupSpeed.ManuallyReviewed" = "Manual Review";
 "Scene.ServerPicker.Title" = "Pick Server";
+"Scene.ServerPicker.NoServerSelectedHint" = "We’ll pick a server based on your language if you continue without making a selection.";
 "Scene.ServerRules.Button.Confirm" = "I agree";
 "Scene.ServerRules.PrivacyPolicy" = "privacy policy";
 "Scene.ServerRules.Prompt" = "By continuing, you’re subject to the terms of service and privacy policy for %@.";
@@ -549,4 +551,4 @@ back in your hands.";
 "Widget.MultipleFollowers.ConfigurationDescription" = "Show number of followers for multiple accounts.";
 "Widget.MultipleFollowers.ConfigurationDisplayName" = "Multiple followers";
 "Widget.MultipleFollowers.MockUser.AccountName" = "another@follower.social";
-"Widget.MultipleFollowers.MockUser.DisplayName" = "Another follower";
\ No newline at end of file
+"Widget.MultipleFollowers.MockUser.DisplayName" = "Another follower";
diff --git a/MastodonSDK/Sources/MastodonUI/View/Control/ActionToolbarContainer.swift b/MastodonSDK/Sources/MastodonUI/View/Control/ActionToolbarContainer.swift
index dca57a181..41c5c1b01 100644
--- a/MastodonSDK/Sources/MastodonUI/View/Control/ActionToolbarContainer.swift
+++ b/MastodonSDK/Sources/MastodonUI/View/Control/ActionToolbarContainer.swift
@@ -238,10 +238,10 @@ extension ActionToolbarContainer {
         
         if isHighlighted {
             reblogButton.accessibilityTraits.insert(.selected)
-            reblogButton.accessibilityLabel = L10n.Common.Controls.Status.Actions.A11yLabels.unreblog
+            reblogButton.accessibilityLabel = L10n.Common.Controls.Status.Actions.A11YLabels.unreblog
         } else {
             reblogButton.accessibilityTraits.remove(.selected)
-            reblogButton.accessibilityLabel = L10n.Common.Controls.Status.Actions.A11yLabels.reblog
+            reblogButton.accessibilityLabel = L10n.Common.Controls.Status.Actions.A11YLabels.reblog
         }
         reblogButton.accessibilityCustomActions = [
             UIAccessibilityCustomAction(name: "Show All Reblogs") { [weak self] action in