diff --git a/Mastodon/Scene/Onboarding/Share/OnboardingViewControllerAppearance.swift b/Mastodon/Scene/Onboarding/Share/OnboardingViewControllerAppearance.swift
index ba1eecfc5..ee01b99e8 100644
--- a/Mastodon/Scene/Onboarding/Share/OnboardingViewControllerAppearance.swift
+++ b/Mastodon/Scene/Onboarding/Share/OnboardingViewControllerAppearance.swift
@@ -22,6 +22,10 @@ extension OnboardingViewControllerAppearance {
     static var actionButtonMarginExtend: CGFloat { return 80 }
     static var viewBottomPaddingHeight: CGFloat { return 11 }
     static var viewBottomPaddingHeightExtend: CGFloat { return 22 }
+
+    // Typically assigned to the button's contentEdgeInsets. Ensures space around content, even when
+    // content is large due to Dynamic Type.
+    static var actionButtonPadding: UIEdgeInsets { return UIEdgeInsets(top: 8, left: 8, bottom: 8, right: 8) }
     
     static var largeTitleFont: UIFont {
         return UIFontMetrics(forTextStyle: .largeTitle).scaledFont(for: .systemFont(ofSize: 28, weight: .bold))
diff --git a/Mastodon/Scene/Onboarding/Welcome/WelcomeViewController.swift b/Mastodon/Scene/Onboarding/Welcome/WelcomeViewController.swift
index 86a4af800..241b1eacc 100644
--- a/Mastodon/Scene/Onboarding/Welcome/WelcomeViewController.swift
+++ b/Mastodon/Scene/Onboarding/Welcome/WelcomeViewController.swift
@@ -51,6 +51,8 @@ final class WelcomeViewController: UIViewController, NeedsDependency {
     private(set) lazy var signUpButton: PrimaryActionButton = {
         let button = PrimaryActionButton()
         button.adjustsBackgroundImageWhenUserInterfaceStyleChanges = false
+        button.contentEdgeInsets = WelcomeViewController.actionButtonPadding
+        button.titleLabel?.adjustsFontForContentSizeCategory = true
         button.titleLabel?.font = UIFontMetrics(forTextStyle: .headline).scaledFont(for: .systemFont(ofSize: 17, weight: .semibold))
         button.setTitle(L10n.Common.Controls.Actions.signUp, for: .normal)
         let backgroundImageColor: UIColor = .white
@@ -65,6 +67,8 @@ final class WelcomeViewController: UIViewController, NeedsDependency {
     private(set) lazy var signInButton: PrimaryActionButton = {
         let button = PrimaryActionButton()
         button.adjustsBackgroundImageWhenUserInterfaceStyleChanges = false
+        button.contentEdgeInsets = WelcomeViewController.actionButtonPadding
+        button.titleLabel?.adjustsFontForContentSizeCategory = true
         button.titleLabel?.font = UIFontMetrics(forTextStyle: .headline).scaledFont(for: .systemFont(ofSize: 17, weight: .semibold))
         button.setTitle(L10n.Scene.Welcome.logIn, for: .normal)
         let backgroundImageColor = Asset.Scene.Welcome.signInButtonBackground.color
@@ -113,12 +117,12 @@ extension WelcomeViewController {
         signUpButton.translatesAutoresizingMaskIntoConstraints = false
         buttonContainer.addArrangedSubview(signUpButton)
         NSLayoutConstraint.activate([
-            signUpButton.heightAnchor.constraint(equalToConstant: WelcomeViewController.actionButtonHeight).priority(.required - 1),
+            signUpButton.heightAnchor.constraint(greaterThanOrEqualToConstant: WelcomeViewController.actionButtonHeight).priority(.required - 1),
         ])
         signInButton.translatesAutoresizingMaskIntoConstraints = false
         buttonContainer.addArrangedSubview(signInButton)
         NSLayoutConstraint.activate([
-            signInButton.heightAnchor.constraint(equalToConstant: WelcomeViewController.actionButtonHeight).priority(.required - 1),
+            signInButton.heightAnchor.constraint(greaterThanOrEqualToConstant: WelcomeViewController.actionButtonHeight).priority(.required - 1),
         ])
         
         signUpButtonShadowView.translatesAutoresizingMaskIntoConstraints = false
@@ -162,7 +166,9 @@ extension WelcomeViewController {
     
     override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
         super.traitCollectionDidChange(previousTraitCollection)
-        
+
+        view.layoutIfNeeded()
+
         setupIllustrationLayout()
         setupButtonShadowView()
     }
@@ -179,7 +185,7 @@ extension WelcomeViewController {
             y: 1,
             blur: 2,
             spread: 0,
-            roundedRect: signInButtonShadowView.bounds,
+            roundedRect: signUpButtonShadowView.bounds,
             byRoundingCorners: .allCorners,
             cornerRadii: CGSize(width: 10, height: 10)
         )