diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/BeatmapSettings.cs
similarity index 62%
rename from osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs
rename to osu.Game/Overlays/Settings/Sections/Maintenance/BeatmapSettings.cs
index 916c607c1c..474f23e4e7 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/BeatmapSettings.cs
@@ -9,31 +9,25 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
-using osu.Game.Collections;
 using osu.Game.Database;
 using osu.Game.Localisation;
 using osu.Game.Scoring;
-using osu.Game.Skinning;
 
 namespace osu.Game.Overlays.Settings.Sections.Maintenance
 {
-    public class GeneralSettings : SettingsSubsection
+    public class BeatmapSettings : SettingsSubsection
     {
-        protected override LocalisableString Header => "General";
-
+        protected override LocalisableString Header => "Beatmaps";
         private SettingsButton importBeatmapsButton;
         private SettingsButton importScoresButton;
-        private SettingsButton importSkinsButton;
-        private SettingsButton importCollectionsButton;
         private SettingsButton deleteBeatmapsButton;
+        private SettingsButton deleteBeatmapVideosButton;
         private SettingsButton deleteScoresButton;
-        private SettingsButton deleteSkinsButton;
         private SettingsButton restoreButton;
         private SettingsButton undeleteButton;
-        private SettingsButton deleteBeatmapVideosButton;
 
         [BackgroundDependencyLoader(permitNulls: true)]
-        private void load(BeatmapManager beatmaps, ScoreManager scores, SkinManager skins, [CanBeNull] CollectionManager collectionManager, [CanBeNull] LegacyImportManager legacyImportManager, IDialogOverlay dialogOverlay)
+        private void load(BeatmapManager beatmaps, ScoreManager scores, [CanBeNull] LegacyImportManager legacyImportManager, IDialogOverlay dialogOverlay)
         {
             if (legacyImportManager?.SupportsImportFromStable == true)
             {
@@ -46,6 +40,15 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
                         legacyImportManager.ImportFromStableAsync(StableContent.Beatmaps).ContinueWith(t => Schedule(() => importBeatmapsButton.Enabled.Value = true));
                     }
                 });
+                Add(importScoresButton = new SettingsButton
+                {
+                    Text = MaintenanceSettingsStrings.ImportScoresFromStable,
+                    Action = () =>
+                    {
+                        importScoresButton.Enabled.Value = false;
+                        legacyImportManager.ImportFromStableAsync(StableContent.Scores).ContinueWith(t => Schedule(() => importScoresButton.Enabled.Value = true));
+                    }
+                });
             }
 
             Add(deleteBeatmapsButton = new DangerousSettingsButton
@@ -74,19 +77,6 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
                 }
             });
 
-            if (legacyImportManager?.SupportsImportFromStable == true)
-            {
-                Add(importScoresButton = new SettingsButton
-                {
-                    Text = MaintenanceSettingsStrings.ImportScoresFromStable,
-                    Action = () =>
-                    {
-                        importScoresButton.Enabled.Value = false;
-                        legacyImportManager.ImportFromStableAsync(StableContent.Scores).ContinueWith(t => Schedule(() => importScoresButton.Enabled.Value = true));
-                    }
-                });
-            }
-
             Add(deleteScoresButton = new DangerousSettingsButton
             {
                 Text = MaintenanceSettingsStrings.DeleteAllScores,
@@ -99,58 +89,6 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
                     }));
                 }
             });
-
-            if (legacyImportManager?.SupportsImportFromStable == true)
-            {
-                Add(importSkinsButton = new SettingsButton
-                {
-                    Text = MaintenanceSettingsStrings.ImportSkinsFromStable,
-                    Action = () =>
-                    {
-                        importSkinsButton.Enabled.Value = false;
-                        legacyImportManager.ImportFromStableAsync(StableContent.Skins).ContinueWith(t => Schedule(() => importSkinsButton.Enabled.Value = true));
-                    }
-                });
-            }
-
-            Add(deleteSkinsButton = new DangerousSettingsButton
-            {
-                Text = MaintenanceSettingsStrings.DeleteAllSkins,
-                Action = () =>
-                {
-                    dialogOverlay?.Push(new MassDeleteConfirmationDialog(() =>
-                    {
-                        deleteSkinsButton.Enabled.Value = false;
-                        Task.Run(() => skins.Delete()).ContinueWith(t => Schedule(() => deleteSkinsButton.Enabled.Value = true));
-                    }));
-                }
-            });
-
-            if (collectionManager != null)
-            {
-                if (legacyImportManager?.SupportsImportFromStable == true)
-                {
-                    Add(importCollectionsButton = new SettingsButton
-                    {
-                        Text = MaintenanceSettingsStrings.ImportCollectionsFromStable,
-                        Action = () =>
-                        {
-                            importCollectionsButton.Enabled.Value = false;
-                            legacyImportManager.ImportFromStableAsync(StableContent.Collections).ContinueWith(t => Schedule(() => importCollectionsButton.Enabled.Value = true));
-                        }
-                    });
-                }
-
-                Add(new DangerousSettingsButton
-                {
-                    Text = MaintenanceSettingsStrings.DeleteAllCollections,
-                    Action = () =>
-                    {
-                        dialogOverlay?.Push(new MassDeleteConfirmationDialog(collectionManager.DeleteAll));
-                    }
-                });
-            }
-
             AddRange(new Drawable[]
             {
                 restoreButton = new SettingsButton
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/CollectionsSettings.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/CollectionsSettings.cs
new file mode 100644
index 0000000000..98a9a271ab
--- /dev/null
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/CollectionsSettings.cs
@@ -0,0 +1,49 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+#nullable disable
+
+using JetBrains.Annotations;
+using osu.Framework.Allocation;
+using osu.Framework.Localisation;
+using osu.Game.Collections;
+using osu.Game.Database;
+using osu.Game.Localisation;
+
+namespace osu.Game.Overlays.Settings.Sections.Maintenance
+{
+    public class CollectionsSettings : SettingsSubsection
+    {
+        protected override LocalisableString Header => "Collections";
+        private SettingsButton importCollectionsButton;
+
+        [BackgroundDependencyLoader(permitNulls: true)]
+        private void load([CanBeNull] CollectionManager collectionManager, [CanBeNull] LegacyImportManager legacyImportManager, IDialogOverlay dialogOverlay)
+        {
+            if (collectionManager != null)
+            {
+                if (legacyImportManager?.SupportsImportFromStable == true)
+                {
+                    Add(importCollectionsButton = new SettingsButton
+                    {
+                        Text = MaintenanceSettingsStrings.ImportCollectionsFromStable,
+                        Action = () =>
+                        {
+                            importCollectionsButton.Enabled.Value = false;
+                            legacyImportManager.ImportFromStableAsync(StableContent.Collections).ContinueWith(t => Schedule(() => importCollectionsButton.Enabled.Value = true));
+                        }
+                    });
+                }
+
+                Add(new DangerousSettingsButton
+                {
+                    Text = MaintenanceSettingsStrings.DeleteAllCollections,
+                    Action = () =>
+                    {
+                        dialogOverlay?.Push(new MassDeleteConfirmationDialog(collectionManager.DeleteAll));
+                    }
+                });
+            }
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/ScoreSettings.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/ScoreSettings.cs
new file mode 100644
index 0000000000..ddeb48725c
--- /dev/null
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/ScoreSettings.cs
@@ -0,0 +1,52 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+#nullable disable
+
+using System.Threading.Tasks;
+using JetBrains.Annotations;
+using osu.Framework.Allocation;
+using osu.Framework.Localisation;
+using osu.Game.Database;
+using osu.Game.Localisation;
+using osu.Game.Scoring;
+
+namespace osu.Game.Overlays.Settings.Sections.Maintenance
+{
+    public class ScoreSettings : SettingsSubsection
+    {
+        protected override LocalisableString Header => "Scores";
+        private SettingsButton importScoresButton;
+        private SettingsButton deleteScoresButton;
+
+        [BackgroundDependencyLoader(permitNulls: true)]
+        private void load(ScoreManager scores, [CanBeNull] LegacyImportManager legacyImportManager, IDialogOverlay dialogOverlay)
+        {
+            if (legacyImportManager?.SupportsImportFromStable == true)
+            {
+                Add(importScoresButton = new SettingsButton
+                {
+                    Text = MaintenanceSettingsStrings.ImportScoresFromStable,
+                    Action = () =>
+                    {
+                        importScoresButton.Enabled.Value = false;
+                        legacyImportManager.ImportFromStableAsync(StableContent.Scores).ContinueWith(t => Schedule(() => importScoresButton.Enabled.Value = true));
+                    }
+                });
+            }
+
+            Add(deleteScoresButton = new DangerousSettingsButton
+            {
+                Text = MaintenanceSettingsStrings.DeleteAllScores,
+                Action = () =>
+                {
+                    dialogOverlay?.Push(new MassDeleteConfirmationDialog(() =>
+                    {
+                        deleteScoresButton.Enabled.Value = false;
+                        Task.Run(() => scores.Delete()).ContinueWith(t => Schedule(() => deleteScoresButton.Enabled.Value = true));
+                    }));
+                }
+            });
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/SkinSettings.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/SkinSettings.cs
new file mode 100644
index 0000000000..6019023c50
--- /dev/null
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/SkinSettings.cs
@@ -0,0 +1,52 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+#nullable disable
+
+using System.Threading.Tasks;
+using JetBrains.Annotations;
+using osu.Framework.Allocation;
+using osu.Framework.Localisation;
+using osu.Game.Database;
+using osu.Game.Localisation;
+using osu.Game.Skinning;
+
+namespace osu.Game.Overlays.Settings.Sections.Maintenance
+{
+    public class SkinSettings : SettingsSubsection
+    {
+        protected override LocalisableString Header => "Skins";
+        private SettingsButton importSkinsButton;
+        private SettingsButton deleteSkinsButton;
+
+        [BackgroundDependencyLoader(permitNulls: true)]
+        private void load(SkinManager skins, [CanBeNull] LegacyImportManager legacyImportManager, IDialogOverlay dialogOverlay)
+        {
+            if (legacyImportManager?.SupportsImportFromStable == true)
+            {
+                Add(importSkinsButton = new SettingsButton
+                {
+                    Text = MaintenanceSettingsStrings.ImportSkinsFromStable,
+                    Action = () =>
+                    {
+                        importSkinsButton.Enabled.Value = false;
+                        legacyImportManager.ImportFromStableAsync(StableContent.Skins).ContinueWith(t => Schedule(() => importSkinsButton.Enabled.Value = true));
+                    }
+                });
+            }
+
+            Add(deleteSkinsButton = new DangerousSettingsButton
+            {
+                Text = MaintenanceSettingsStrings.DeleteAllSkins,
+                Action = () =>
+                {
+                    dialogOverlay?.Push(new MassDeleteConfirmationDialog(() =>
+                    {
+                        deleteSkinsButton.Enabled.Value = false;
+                        Task.Run(() => skins.Delete()).ContinueWith(t => Schedule(() => deleteSkinsButton.Enabled.Value = true));
+                    }));
+                }
+            });
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Settings/Sections/MaintenanceSection.cs b/osu.Game/Overlays/Settings/Sections/MaintenanceSection.cs
index cfe1961bc1..19d02baa4a 100644
--- a/osu.Game/Overlays/Settings/Sections/MaintenanceSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/MaintenanceSection.cs
@@ -24,7 +24,10 @@ namespace osu.Game.Overlays.Settings.Sections
         {
             Children = new Drawable[]
             {
-                new GeneralSettings()
+                new BeatmapSettings(),
+                new SkinSettings(),
+                new CollectionsSettings(),
+                new ScoreSettings()
             };
         }
     }