diff --git a/osu.Game/Overlays/Settings/SettingsHeader.cs b/osu.Game/Overlays/Settings/SettingsHeader.cs
index 69b7b69a29..8d6e93be9d 100644
--- a/osu.Game/Overlays/Settings/SettingsHeader.cs
+++ b/osu.Game/Overlays/Settings/SettingsHeader.cs
@@ -6,7 +6,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Localisation;
 using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Overlays.Settings
 {
@@ -29,36 +29,27 @@ namespace osu.Game.Overlays.Settings
 
             Children = new Drawable[]
             {
-                new FillFlowContainer
+                new OsuTextFlowContainer
                 {
                     AutoSizeAxes = Axes.Y,
                     RelativeSizeAxes = Axes.X,
-                    Direction = FillDirection.Vertical,
-                    Children = new Drawable[]
+                    Margin = new MarginPadding
                     {
-                        new OsuSpriteText
-                        {
-                            Text = heading,
-                            Font = OsuFont.TorusAlternate.With(size: 40),
-                            Margin = new MarginPadding
-                            {
-                                Left = SettingsPanel.CONTENT_MARGINS,
-                                Top = Toolbar.Toolbar.TOOLTIP_HEIGHT
-                            },
-                        },
-                        new OsuSpriteText
-                        {
-                            Colour = colourProvider.Content2,
-                            Text = subheading,
-                            Font = OsuFont.GetFont(size: 18),
-                            Margin = new MarginPadding
-                            {
-                                Left = SettingsPanel.CONTENT_MARGINS,
-                                Bottom = 30
-                            },
-                        },
+                        Left = SettingsPanel.CONTENT_MARGINS,
+                        Top = Toolbar.Toolbar.TOOLTIP_HEIGHT,
+                        Bottom = 30
                     }
-                }
+                }.With(flow =>
+                {
+                    flow.AddText(heading, header => header.Font = OsuFont.TorusAlternate.With(size: 40));
+                    flow.NewLine();
+                    flow.AddText(subheading, subheader =>
+                    {
+                        subheader.Colour = colourProvider.Content2;
+                        subheader.Font = OsuFont.GetFont(size: 18);
+                    });
+
+                })
             };
         }
     }