diff --git a/osu.Game/Overlays/KeyBinding/RulesetBindingsSection.cs b/osu.Game/Overlays/KeyBinding/RulesetBindingsSection.cs
index 5edeabfd2a..ea6faf98c1 100644
--- a/osu.Game/Overlays/KeyBinding/RulesetBindingsSection.cs
+++ b/osu.Game/Overlays/KeyBinding/RulesetBindingsSection.cs
@@ -9,7 +9,7 @@ namespace osu.Game.Overlays.KeyBinding
 {
     public class RulesetBindingsSection : SettingsSection
     {
-        public override FontAwesome Icon => (ruleset.CreateInstance().CreateIcon() as SpriteIcon).Icon;
+        public override FontAwesome Icon => (ruleset?.CreateInstance().CreateIcon() as SpriteIcon)?.Icon ?? FontAwesome.fa_osu_hot;
         public override string Header => ruleset.Name;
 
         private readonly RulesetInfo ruleset;
diff --git a/osu.Game/Overlays/KeyBindingOverlay.cs b/osu.Game/Overlays/KeyBindingOverlay.cs
index bd3bb3b9de..d0382a4264 100644
--- a/osu.Game/Overlays/KeyBindingOverlay.cs
+++ b/osu.Game/Overlays/KeyBindingOverlay.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Overlays
             {
                 Anchor = Anchor.BottomLeft,
                 Origin = Anchor.BottomLeft,
-                Action = () => Hide()
+                Action = Hide
             });
         }
 
diff --git a/osu.Game/Overlays/MainSettings.cs b/osu.Game/Overlays/MainSettings.cs
index 62a2ee6fe3..61dd51d16f 100644
--- a/osu.Game/Overlays/MainSettings.cs
+++ b/osu.Game/Overlays/MainSettings.cs
@@ -1,21 +1,13 @@
 // 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 System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Input.Bindings;
-using osu.Framework.Input.Events;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Containers;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Input.Bindings;
 using osu.Game.Overlays.Settings;
 using osu.Game.Overlays.Settings.Sections;
-using osu.Game.Screens.Ranking;
-using osuTK;
 using osuTK.Graphics;
+using System.Collections.Generic;
 
 namespace osu.Game.Overlays
 {
@@ -79,6 +71,6 @@ namespace osu.Game.Overlays
         private void load()
         {
             ContentContainer.Add(keyBindingOverlay);
-        }        
+        }
     }
 }