diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 6d85a69804..e756694285 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -38,16 +38,16 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(InputKey.MouseWheelDown, GlobalAction.DecreaseVolume),
             new KeyBinding(InputKey.F4, GlobalAction.ToggleMute),
 
-            new KeyBinding(InputKey.F5, GlobalAction.MusicPrev),
-            new KeyBinding(InputKey.F6, GlobalAction.MusicNext),
-            new KeyBinding(InputKey.X, GlobalAction.MusicPlay),
-
             new KeyBinding(InputKey.Escape, GlobalAction.Back),
             new KeyBinding(InputKey.MouseButton1, GlobalAction.Back),
 
             new KeyBinding(InputKey.Space, GlobalAction.Select),
             new KeyBinding(InputKey.Enter, GlobalAction.Select),
             new KeyBinding(InputKey.KeypadEnter, GlobalAction.Select),
+
+            new KeyBinding(InputKey.F5, GlobalAction.MusicPrev),
+            new KeyBinding(InputKey.F6, GlobalAction.MusicNext),
+            new KeyBinding(InputKey.X, GlobalAction.MusicPlay),
         };
 
         public IEnumerable<KeyBinding> InGameKeyBindings => new[]
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 32539055a7..bae301a8a6 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -724,20 +724,23 @@ namespace osu.Game
 
                 case GlobalAction.MusicPlay:
                     if (!musicController.IsLoaded) return true;
+
                     if (musicController.PlayTrack())
                         osd.Display(new Overlays.OSD.OsdIconToast(musicController.IsPlaying ? "Play track" : "Pause track", musicController.IsPlaying ? FontAwesome.Solid.PlayCircle : FontAwesome.Solid.PauseCircle));
                     return true;
 
                 case GlobalAction.MusicNext:
                     if (!musicController.IsLoaded) return true;
+
                     if (musicController.NextTrack())
                         osd.Display(new Overlays.OSD.OsdIconToast("Next track", FontAwesome.Solid.FastForward));
                     return true;
 
                 case GlobalAction.MusicPrev:
                     if (!musicController.IsLoaded) return true;
+
                     if (musicController.PreviousTrack())
-                        osd.Display(new Overlays.OSD.OsdIconToast("Previous track", FontAwesome.Solid.FastForward));
+                        osd.Display(new Overlays.OSD.OsdIconToast("Previous track", FontAwesome.Solid.FastBackward));
                     return true;
             }
 
diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index f6d67e9981..618187069d 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -551,6 +551,7 @@ namespace osu.Game.Overlays
 
         /// <summary>
         /// Play or pause the current beatmap track.
+        /// </summary>
         /// <returns>Returns whether the current track could be played / paused or not</returns>
         public bool PlayTrack()
         {
diff --git a/osu.Game/Overlays/OSD/OsdIconToast.cs b/osu.Game/Overlays/OSD/OsdIconToast.cs
index c00949d48b..0e2bcd377f 100644
--- a/osu.Game/Overlays/OSD/OsdIconToast.cs
+++ b/osu.Game/Overlays/OSD/OsdIconToast.cs
@@ -1,4 +1,7 @@
-using osu.Framework.Graphics;
+// 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.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
@@ -12,7 +15,7 @@ namespace osu.Game.Overlays.OSD
         {
             Children = new Drawable[]
             {
-                new FillFlowContainer()
+                new FillFlowContainer
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,