diff --git a/osu-framework b/osu-framework
index cb420e7f7f..223c5a68dd 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit cb420e7f7f4ef9cdda8ae8336d997946384d3732
+Subproject commit 223c5a68dd795ff5859cf29decfeaa87915149fe
diff --git a/osu.Game/Overlays/ChatConsole.cs b/osu.Game/Overlays/ChatConsole.cs
index 820b9245d3..2876fa19cc 100644
--- a/osu.Game/Overlays/ChatConsole.cs
+++ b/osu.Game/Overlays/ChatConsole.cs
@@ -20,7 +20,7 @@ using osu.Game.Online.Chat.Display;
 
 namespace osu.Game.Overlays
 {
-    public class ChatConsole : Overlay
+    public class ChatConsole : OverlayContainer
     {
         private ChannelDisplay channelDisplay;
 
diff --git a/osu.Game/Overlays/Options.cs b/osu.Game/Overlays/Options.cs
index 5bcc5e9a16..1031de5084 100644
--- a/osu.Game/Overlays/Options.cs
+++ b/osu.Game/Overlays/Options.cs
@@ -6,13 +6,14 @@ using OpenTK.Graphics;
 using OpenTK.Input;
 using osu.Framework;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Drawables;
 using osu.Framework.Graphics.Transformations;
 using osu.Framework.Input;
 
 namespace osu.Game.Overlays
 {
-    public class Options : Overlay
+    public class Options : OverlayContainer
     {
         private const float width = 300;
 
diff --git a/osu.Game/Overlays/Overlay.cs b/osu.Game/Overlays/Overlay.cs
deleted file mode 100644
index 648a78c248..0000000000
--- a/osu.Game/Overlays/Overlay.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using osu.Framework;
-using osu.Framework.Graphics.Containers;
-
-namespace osu.Game.Overlays
-{
-    /// <summary>
-    /// An element which starts hidden and can be toggled to visible.
-    /// </summary>
-    public abstract class Overlay : Container, IStateful<Visibility>
-    {
-        public override void Load(BaseGame game)
-        {
-            base.Load(game);
-
-            //TODO: init code using Alpha or IsVisible override to ensure we don't call Load on children before we first get unhidden.
-            PopOut();
-            Flush();
-        }
-
-        private Visibility state;
-        public Visibility State
-        {
-            get { return state; }
-            set
-            {
-                if (value == state) return;
-                state = value;
-
-                switch (value)
-                {
-                    case Visibility.Hidden:
-                        PopOut();
-                        break;
-                    case Visibility.Visible:
-                        PopIn();
-                        break;
-                }
-            }
-        }
-
-        protected abstract void PopIn();
-
-        protected abstract void PopOut();
-
-        public void ToggleVisibility() => State = (State == Visibility.Visible ? Visibility.Hidden : Visibility.Visible);
-    }
-
-    public enum Visibility
-    {
-        Hidden,
-        Visible
-    }
-}
diff --git a/osu.Game/Overlays/Toolbar.cs b/osu.Game/Overlays/Toolbar.cs
index c4bc9518cc..34861046be 100644
--- a/osu.Game/Overlays/Toolbar.cs
+++ b/osu.Game/Overlays/Toolbar.cs
@@ -15,7 +15,7 @@ using osu.Game.Graphics;
 
 namespace osu.Game.Overlays
 {
-    public class Toolbar : Overlay
+    public class Toolbar : OverlayContainer
     {
         private const float height = 50;
 
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index f9201e8a32..05e73fc4f1 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -156,7 +156,6 @@
     <Compile Include="OsuGameBase.cs" />
     <Compile Include="Overlays\ChatConsole.cs" />
     <Compile Include="Overlays\Options.cs" />
-    <Compile Include="Overlays\Overlay.cs" />
     <Compile Include="Overlays\Toolbar.cs" />
     <Compile Include="Overlays\ToolbarButton.cs" />
     <Compile Include="Overlays\ToolbarModeButton.cs" />