diff --git a/osu.Game.Modes.Catch/CatchRuleset.cs b/osu.Game.Modes.Catch/CatchRuleset.cs
index 70d99efeca..a09b65e4d4 100644
--- a/osu.Game.Modes.Catch/CatchRuleset.cs
+++ b/osu.Game.Modes.Catch/CatchRuleset.cs
@@ -9,6 +9,7 @@ using osu.Game.Modes.Objects;
 using osu.Game.Modes.Osu.UI;
 using osu.Game.Modes.UI;
 using osu.Game.Beatmaps;
+using osu.Game.Screens.Play;
 
 namespace osu.Game.Modes.Catch
 {
@@ -16,7 +17,7 @@ namespace osu.Game.Modes.Catch
     {
         public override ScoreOverlay CreateScoreOverlay() => new OsuScoreOverlay();
 
-        public override HitRenderer CreateHitRendererWith(Beatmap beatmap, InputManager input = null) => new CatchHitRenderer
+        public override HitRenderer CreateHitRendererWith(Beatmap beatmap, PlayerInputManager input = null) => new CatchHitRenderer
         {
             Beatmap = beatmap,
             InputManager = input,
diff --git a/osu.Game.Modes.Mania/ManiaRuleset.cs b/osu.Game.Modes.Mania/ManiaRuleset.cs
index 94c2c0c31f..d4d8f10258 100644
--- a/osu.Game.Modes.Mania/ManiaRuleset.cs
+++ b/osu.Game.Modes.Mania/ManiaRuleset.cs
@@ -9,6 +9,7 @@ using osu.Game.Modes.Objects;
 using osu.Game.Modes.Osu.UI;
 using osu.Game.Modes.UI;
 using osu.Game.Beatmaps;
+using osu.Game.Screens.Play;
 
 namespace osu.Game.Modes.Mania
 {
@@ -16,7 +17,7 @@ namespace osu.Game.Modes.Mania
     {
         public override ScoreOverlay CreateScoreOverlay() => new OsuScoreOverlay();
 
-        public override HitRenderer CreateHitRendererWith(Beatmap beatmap, InputManager input = null) => new ManiaHitRenderer
+        public override HitRenderer CreateHitRendererWith(Beatmap beatmap, PlayerInputManager input = null) => new ManiaHitRenderer
         {
             Beatmap = beatmap,
             InputManager = input,
diff --git a/osu.Game.Modes.Osu/OsuRuleset.cs b/osu.Game.Modes.Osu/OsuRuleset.cs
index d1bb5b02af..cfa650b3c4 100644
--- a/osu.Game.Modes.Osu/OsuRuleset.cs
+++ b/osu.Game.Modes.Osu/OsuRuleset.cs
@@ -10,6 +10,7 @@ using osu.Game.Modes.Objects;
 using osu.Game.Modes.Osu.Objects;
 using osu.Game.Modes.Osu.UI;
 using osu.Game.Modes.UI;
+using osu.Game.Screens.Play;
 
 namespace osu.Game.Modes.Osu
 {
@@ -17,7 +18,7 @@ namespace osu.Game.Modes.Osu
     {
         public override ScoreOverlay CreateScoreOverlay() => new OsuScoreOverlay();
 
-        public override HitRenderer CreateHitRendererWith(Beatmap beatmap, InputManager input = null) => new OsuHitRenderer
+        public override HitRenderer CreateHitRendererWith(Beatmap beatmap, PlayerInputManager input = null) => new OsuHitRenderer
         {
             Beatmap = beatmap,
             InputManager = input
diff --git a/osu.Game.Modes.Osu/UI/OsuPlayfield.cs b/osu.Game.Modes.Osu/UI/OsuPlayfield.cs
index 2479b15dce..26cda012e5 100644
--- a/osu.Game.Modes.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Modes.Osu/UI/OsuPlayfield.cs
@@ -11,7 +11,7 @@ using osu.Game.Modes.Osu.Objects.Drawables.Connections;
 using osu.Game.Modes.UI;
 using System.Linq;
 using osu.Game.Graphics.Cursor;
-using osu.Game.Modes.Objects;
+using OpenTK.Graphics;
 
 namespace osu.Game.Modes.Osu.UI
 {
@@ -56,10 +56,16 @@ namespace osu.Game.Modes.Osu.UI
                     RelativeSizeAxes = Axes.Both,
                     Depth = -1,
                 },
-                new OsuCursorContainer()
             });
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            if (InputManager.ReplayInputHandler != null)
+                Add(new OsuCursorContainer { Colour = Color4.LightYellow });
+        }
+
         public override void Add(DrawableHitObject<OsuHitObject> h)
         {
             h.Depth = (float)h.HitObject.StartTime;
diff --git a/osu.Game.Modes.Taiko/TaikoRuleset.cs b/osu.Game.Modes.Taiko/TaikoRuleset.cs
index f9e7aeba21..baf3f15e4b 100644
--- a/osu.Game.Modes.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Modes.Taiko/TaikoRuleset.cs
@@ -9,6 +9,7 @@ using osu.Game.Modes.Osu.UI;
 using osu.Game.Modes.Taiko.UI;
 using osu.Game.Modes.UI;
 using osu.Game.Beatmaps;
+using osu.Game.Screens.Play;
 
 namespace osu.Game.Modes.Taiko
 {
@@ -16,7 +17,7 @@ namespace osu.Game.Modes.Taiko
     {
         public override ScoreOverlay CreateScoreOverlay() => new OsuScoreOverlay();
 
-        public override HitRenderer CreateHitRendererWith(Beatmap beatmap, InputManager input = null) => new TaikoHitRenderer
+        public override HitRenderer CreateHitRendererWith(Beatmap beatmap, PlayerInputManager input = null) => new TaikoHitRenderer
         {
             Beatmap = beatmap,
             InputManager = input,
diff --git a/osu.Game/Modes/Ruleset.cs b/osu.Game/Modes/Ruleset.cs
index 7d5fc6ca77..2b10f0ba4f 100644
--- a/osu.Game/Modes/Ruleset.cs
+++ b/osu.Game/Modes/Ruleset.cs
@@ -9,6 +9,7 @@ using System.Collections.Concurrent;
 using osu.Framework.Input;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
+using osu.Game.Screens.Play;
 
 namespace osu.Game.Modes
 {
@@ -31,7 +32,7 @@ namespace osu.Game.Modes
 
         public abstract ScoreProcessor CreateScoreProcessor(int hitObjectCount = 0);
 
-        public abstract HitRenderer CreateHitRendererWith(Beatmap beatmap, InputManager input = null);
+        public abstract HitRenderer CreateHitRendererWith(Beatmap beatmap, PlayerInputManager input = null);
 
         public abstract HitObjectParser CreateHitObjectParser();
 
diff --git a/osu.Game/Modes/UI/HitRenderer.cs b/osu.Game/Modes/UI/HitRenderer.cs
index eac53b811b..7596a24557 100644
--- a/osu.Game/Modes/UI/HitRenderer.cs
+++ b/osu.Game/Modes/UI/HitRenderer.cs
@@ -11,6 +11,7 @@ using osu.Framework.Input;
 using osu.Game.Modes.Objects;
 using osu.Game.Modes.Objects.Drawables;
 using osu.Game.Beatmaps;
+using osu.Game.Screens.Play;
 
 namespace osu.Game.Modes.UI
 {
@@ -35,7 +36,7 @@ namespace osu.Game.Modes.UI
     {
         private List<TObject> objects;
 
-        public InputManager InputManager;
+        public PlayerInputManager InputManager;
 
         protected Playfield<TObject> Playfield;
 
diff --git a/osu.Game/Modes/UI/Playfield.cs b/osu.Game/Modes/UI/Playfield.cs
index 424b4c3c68..cbd49abc5a 100644
--- a/osu.Game/Modes/UI/Playfield.cs
+++ b/osu.Game/Modes/UI/Playfield.cs
@@ -8,6 +8,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Input;
 using osu.Game.Modes.Objects;
 using osu.Game.Modes.Objects.Drawables;
+using osu.Game.Screens.Play;
 
 namespace osu.Game.Modes.UI
 {
@@ -55,7 +56,7 @@ namespace osu.Game.Modes.UI
         /// <summary>
         /// An optional inputManager to provide interactivity etc.
         /// </summary>
-        public InputManager InputManager;
+        public PlayerInputManager InputManager;
 
         [BackgroundDependencyLoader]
         private void load()