Create "User Interface" settings section

osu.Game/Overlays/Settings/Sections/AudioSection.cs

@@ -27,7 +27,6 @@ namespace osu.Game.Overlays.Settings.Sections
                 new AudioDevicesSettings(),
                 new VolumeSettings(),
                 new OffsetSettings(),
-                new MainMenuSettings()
             };
         }
     }

osu.Game/Overlays/Settings/Sections/GameplaySection.cs

@@ -26,7 +26,6 @@ namespace osu.Game.Overlays.Settings.Sections
             Children = new Drawable[]
             {
                 new GeneralSettings(),
-                new SongSelectSettings(),
                 new ModsSettings(),
             };
         }

osu.Game/Overlays/Settings/Sections/GraphicsSection.cs

@@ -23,7 +23,6 @@ namespace osu.Game.Overlays.Settings.Sections
                 new RendererSettings(),
                 new LayoutSettings(),
                 new DetailSettings(),
-                new UserInterfaceSettings(),
             };
         }
     }

osu.Game/Overlays/Settings/Sections/UserInterface/GeneralSettings.cs

@@ -6,11 +6,11 @@ using osu.Framework.Graphics;
 using osu.Game.Configuration;
 using osu.Game.Graphics.UserInterface;
 
-namespace osu.Game.Overlays.Settings.Sections.Graphics
+namespace osu.Game.Overlays.Settings.Sections.UserInterface
 {
-    public class UserInterfaceSettings : SettingsSubsection
+    public class GeneralSettings : SettingsSubsection
     {
-        protected override string Header => "User Interface";
+        protected override string Header => "General";
 
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)

osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.cs

@@ -7,7 +7,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Configuration;
 
-namespace osu.Game.Overlays.Settings.Sections.Audio
+namespace osu.Game.Overlays.Settings.Sections.UserInterface
 {
     public class MainMenuSettings : SettingsSubsection
     {

osu.Game/Overlays/Settings/Sections/UserInterface/SongSelectSettings.cs

@@ -8,7 +8,7 @@ using osu.Framework.Graphics;
 using osu.Game.Configuration;
 using osu.Game.Graphics.UserInterface;
 
-namespace osu.Game.Overlays.Settings.Sections.Gameplay
+namespace osu.Game.Overlays.Settings.Sections.UserInterface
 {
     public class SongSelectSettings : SettingsSubsection
     {

osu.Game/Overlays/Settings/Sections/UserInterfaceSection.cs

@@ -0,0 +1,29 @@
+// 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.
+
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Overlays.Settings.Sections.UserInterface;
+
+namespace osu.Game.Overlays.Settings.Sections
+{
+    public class UserInterfaceSection : SettingsSection
+    {
+        public override string Header => "User Interface";
+
+        public override Drawable CreateIcon() => new SpriteIcon
+        {
+            Icon = FontAwesome.Solid.LayerGroup
+        };
+
+        public UserInterfaceSection()
+        {
+            Children = new Drawable[]
+            {
+                new GeneralSettings(),
+                new MainMenuSettings(),
+                new SongSelectSettings()
+            };
+        }
+    }
+}

osu.Game/Overlays/SettingsOverlay.cs

@@ -23,6 +23,7 @@ namespace osu.Game.Overlays
         {
             new GeneralSection(),
             new GraphicsSection(),
+            new UserInterfaceSection(),
             new GameplaySection(),
             new AudioSection(),
             new SkinSection(),