diff --git a/osu-framework b/osu-framework
index 672e318d54..cd2b351de3 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit 672e318d541f6a7106a0a2b088dd3ec5e8bff5db
+Subproject commit cd2b351de37f17b6d91d1fc062627208a09c3834
diff --git a/osu.Game/Graphics/Cursor/OsuContextMenuContainer.cs b/osu.Game/Graphics/Cursor/OsuContextMenuContainer.cs
index 2cc6c3a46a..9162fd6893 100644
--- a/osu.Game/Graphics/Cursor/OsuContextMenuContainer.cs
+++ b/osu.Game/Graphics/Cursor/OsuContextMenuContainer.cs
@@ -10,9 +10,5 @@ namespace osu.Game.Graphics.Cursor
     public class OsuContextMenuContainer : ContextMenuContainer
     {
         protected override ContextMenu<ContextMenuItem> CreateContextMenu() => new OsuContextMenu<ContextMenuItem>();
-
-        public OsuContextMenuContainer(CursorContainer cursor) : base(cursor)
-        {
-        }
     }
 }
\ No newline at end of file
diff --git a/osu.Game/Graphics/Cursor/OsuTooltipContainer.cs b/osu.Game/Graphics/Cursor/OsuTooltipContainer.cs
index 133caf8040..7608a366dc 100644
--- a/osu.Game/Graphics/Cursor/OsuTooltipContainer.cs
+++ b/osu.Game/Graphics/Cursor/OsuTooltipContainer.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Graphics.Cursor
 {
     public class OsuTooltipContainer : TooltipContainer
     {
-        protected override Tooltip CreateTooltip() => new OsuTooltip();
+        protected override ITooltip CreateTooltip() => new OsuTooltip();
 
         public OsuTooltipContainer(CursorContainer cursor) : base(cursor)
         {
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 5e73ea55e6..71ac8af08d 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -37,9 +37,9 @@ namespace osu.Game
 
         public APIAccess API;
 
-        protected override Container<Drawable> Content => ratioContainer;
+        private Container content;
 
-        private RatioAdjust ratioContainer;
+        protected override Container<Drawable> Content => content;
 
         protected MenuCursor Cursor;
 
@@ -146,21 +146,19 @@ namespace osu.Game
         {
             base.LoadComplete();
 
-            base.Content.Add(ratioContainer = new RatioAdjust
+            base.Content.Add(new RatioAdjust
             {
                 Children = new Drawable[]
                 {
-                    new Container
+                    Cursor = new MenuCursor(),
+                    new OsuTooltipContainer(Cursor)
                     {
                         RelativeSizeAxes = Axes.Both,
-                        Depth = float.MinValue,
-                        Children = new Drawable[]
+                        Child = content = new OsuContextMenuContainer
                         {
-                            Cursor = new MenuCursor(),
-                            new OsuContextMenuContainer(Cursor) { Depth = -2 },
-                            new OsuTooltipContainer(Cursor) { Depth = -1 },
-                        }
-                    },
+                            RelativeSizeAxes = Axes.Both,
+                        },
+                    }
                 }
             });
 
diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index 5fcdf22122..700889ed26 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -194,7 +194,7 @@ namespace osu.Game.Overlays
 
         protected override bool OnDragStart(InputState state)
         {
-            if (!channelTabs.Hovering)
+            if (!channelTabs.IsHovered)
                 return base.OnDragStart(state);
 
             startDragChatHeight = chatHeight.Value;
diff --git a/osu.Game/Screens/Menu/OsuLogo.cs b/osu.Game/Screens/Menu/OsuLogo.cs
index b26cbe02ba..efbd106cb5 100644
--- a/osu.Game/Screens/Menu/OsuLogo.cs
+++ b/osu.Game/Screens/Menu/OsuLogo.cs
@@ -236,7 +236,7 @@ namespace osu.Game.Screens.Menu
 
             if (beatIndex < 0) return;
 
-            if (Hovering)
+            if (IsHovered)
             {
                 using (BeginDelayedSequence(early_activation))
                     Schedule(() => sampleBeat.Play());
diff --git a/osu.Game/Screens/Play/SkipButton.cs b/osu.Game/Screens/Play/SkipButton.cs
index 4a81ce90ff..a3ee2aeb72 100644
--- a/osu.Game/Screens/Play/SkipButton.cs
+++ b/osu.Game/Screens/Play/SkipButton.cs
@@ -156,7 +156,7 @@ namespace osu.Game.Screens.Play
                             if (lastState == Visibility.Hidden)
                                 FadeIn(500, EasingTypes.OutExpo);
 
-                            if (!Hovering)
+                            if (!IsHovered)
                                 using (BeginDelayedSequence(1000))
                                     scheduledHide = Schedule(() => State = Visibility.Hidden);
                             break;