diff --git a/osu.Game.Tournament/Components/SongBar.cs b/osu.Game.Tournament/Components/SongBar.cs
index 8d766ec9ba..e86fd890c1 100644
--- a/osu.Game.Tournament/Components/SongBar.cs
+++ b/osu.Game.Tournament/Components/SongBar.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Tournament.Components
     {
         private BeatmapInfo beatmap;
 
-        private const float height = 145;
+        public const float HEIGHT = 145 / 2f;
 
         [Resolved]
         private IBindable<RulesetInfo> ruleset { get; set; }
@@ -157,7 +157,7 @@ namespace osu.Game.Tournament.Components
                 new Container
                 {
                     RelativeSizeAxes = Axes.X,
-                    Height = height / 2,
+                    Height = HEIGHT,
                     Width = 0.5f,
                     Anchor = Anchor.BottomRight,
                     Origin = Anchor.BottomRight,
@@ -229,7 +229,7 @@ namespace osu.Game.Tournament.Components
                 {
                     RelativeSizeAxes = Axes.X,
                     Width = 0.5f,
-                    Height = height / 2,
+                    Height = HEIGHT,
                     Anchor = Anchor.BottomRight,
                     Origin = Anchor.BottomRight,
                 }
diff --git a/osu.Game.Tournament/Screens/Showcase/ShowcaseScreen.cs b/osu.Game.Tournament/Screens/Showcase/ShowcaseScreen.cs
index d809dfc994..9785b7e647 100644
--- a/osu.Game.Tournament/Screens/Showcase/ShowcaseScreen.cs
+++ b/osu.Game.Tournament/Screens/Showcase/ShowcaseScreen.cs
@@ -2,15 +2,42 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Tournament.Components;
+using osu.Framework.Graphics.Shapes;
+using osuTK.Graphics;
 
 namespace osu.Game.Tournament.Screens.Showcase
 {
-    public class ShowcaseScreen : BeatmapInfoScreen
+    public class ShowcaseScreen : BeatmapInfoScreen // IProvideVideo
     {
         [BackgroundDependencyLoader]
         private void load()
         {
-            AddInternal(new TournamentLogo());
+            AddRangeInternal(new Drawable[]
+            {
+                new TournamentLogo(),
+                new TourneyVideo("showcase")
+                {
+                    Loop = true,
+                    RelativeSizeAxes = Axes.Both,
+                },
+                new Container
+                {
+                    Padding = new MarginPadding { Bottom = SongBar.HEIGHT },
+                    RelativeSizeAxes = Axes.Both,
+                    Child = new Box
+                    {
+                        // chroma key area for stable gameplay
+                        Name = "chroma",
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopCentre,
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = new Color4(0, 255, 0, 255),
+                    }
+                }
+            });
         }
     }
 }
diff --git a/osu.Game/Overlays/KeyBinding/GlobalKeyBindingsSection.cs b/osu.Game/Overlays/KeyBinding/GlobalKeyBindingsSection.cs
index 56e93b6a1e..5b44c486a3 100644
--- a/osu.Game/Overlays/KeyBinding/GlobalKeyBindingsSection.cs
+++ b/osu.Game/Overlays/KeyBinding/GlobalKeyBindingsSection.cs
@@ -1,6 +1,7 @@
 // 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.Sprites;
 using osu.Game.Input.Bindings;
 using osu.Game.Overlays.Settings;
@@ -9,7 +10,11 @@ namespace osu.Game.Overlays.KeyBinding
 {
     public class GlobalKeyBindingsSection : SettingsSection
     {
-        public override IconUsage Icon => FontAwesome.Solid.Globe;
+        public override Drawable CreateIcon() => new SpriteIcon
+        {
+            Icon = FontAwesome.Solid.Globe
+        };
+
         public override string Header => "Global";
 
         public GlobalKeyBindingsSection(GlobalActionContainer manager)
diff --git a/osu.Game/Overlays/KeyBinding/RulesetBindingsSection.cs b/osu.Game/Overlays/KeyBinding/RulesetBindingsSection.cs
index 1f4042c57c..332fb6c8fc 100644
--- a/osu.Game/Overlays/KeyBinding/RulesetBindingsSection.cs
+++ b/osu.Game/Overlays/KeyBinding/RulesetBindingsSection.cs
@@ -1,6 +1,7 @@
 // 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.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Overlays.Settings;
@@ -10,7 +11,11 @@ namespace osu.Game.Overlays.KeyBinding
 {
     public class RulesetBindingsSection : SettingsSection
     {
-        public override IconUsage Icon => (ruleset.CreateInstance().CreateIcon() as SpriteIcon)?.Icon ?? OsuIcon.Hot;
+        public override Drawable CreateIcon() => ruleset?.CreateInstance()?.CreateIcon() ?? new SpriteIcon
+        {
+            Icon = OsuIcon.Hot
+        };
+
         public override string Header => ruleset.Name;
 
         private readonly RulesetInfo ruleset;
diff --git a/osu.Game/Overlays/Settings/Sections/AudioSection.cs b/osu.Game/Overlays/Settings/Sections/AudioSection.cs
index b18488b616..69538358f1 100644
--- a/osu.Game/Overlays/Settings/Sections/AudioSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/AudioSection.cs
@@ -13,9 +13,12 @@ namespace osu.Game.Overlays.Settings.Sections
     {
         public override string Header => "Audio";
 
-        public override IEnumerable<string> FilterTerms => base.FilterTerms.Concat(new[] { "sound" });
+        public override Drawable CreateIcon() => new SpriteIcon
+        {
+            Icon = FontAwesome.Solid.VolumeUp
+        };
 
-        public override IconUsage Icon => FontAwesome.Solid.VolumeUp;
+        public override IEnumerable<string> FilterTerms => base.FilterTerms.Concat(new[] { "sound" });
 
         public AudioSection()
         {
diff --git a/osu.Game/Overlays/Settings/Sections/DebugSection.cs b/osu.Game/Overlays/Settings/Sections/DebugSection.cs
index f62de0b243..44d4088972 100644
--- a/osu.Game/Overlays/Settings/Sections/DebugSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/DebugSection.cs
@@ -10,7 +10,11 @@ namespace osu.Game.Overlays.Settings.Sections
     public class DebugSection : SettingsSection
     {
         public override string Header => "Debug";
-        public override IconUsage Icon => FontAwesome.Solid.Bug;
+
+        public override Drawable CreateIcon() => new SpriteIcon
+        {
+            Icon = FontAwesome.Solid.Bug
+        };
 
         public DebugSection()
         {
diff --git a/osu.Game/Overlays/Settings/Sections/GameplaySection.cs b/osu.Game/Overlays/Settings/Sections/GameplaySection.cs
index 97d9d3c697..aca507f20a 100644
--- a/osu.Game/Overlays/Settings/Sections/GameplaySection.cs
+++ b/osu.Game/Overlays/Settings/Sections/GameplaySection.cs
@@ -13,7 +13,11 @@ namespace osu.Game.Overlays.Settings.Sections
     public class GameplaySection : SettingsSection
     {
         public override string Header => "Gameplay";
-        public override IconUsage Icon => FontAwesome.Regular.Circle;
+
+        public override Drawable CreateIcon() => new SpriteIcon
+        {
+            Icon = FontAwesome.Regular.Circle
+        };
 
         public GameplaySection()
         {
diff --git a/osu.Game/Overlays/Settings/Sections/GeneralSection.cs b/osu.Game/Overlays/Settings/Sections/GeneralSection.cs
index d9947f16cc..fefc3fe6a7 100644
--- a/osu.Game/Overlays/Settings/Sections/GeneralSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/GeneralSection.cs
@@ -10,7 +10,11 @@ namespace osu.Game.Overlays.Settings.Sections
     public class GeneralSection : SettingsSection
     {
         public override string Header => "General";
-        public override IconUsage Icon => FontAwesome.Solid.Cog;
+
+        public override Drawable CreateIcon() => new SpriteIcon
+        {
+            Icon = FontAwesome.Solid.Cog
+        };
 
         public GeneralSection()
         {
diff --git a/osu.Game/Overlays/Settings/Sections/GraphicsSection.cs b/osu.Game/Overlays/Settings/Sections/GraphicsSection.cs
index 89caa3dc8f..c1b4b0bbcb 100644
--- a/osu.Game/Overlays/Settings/Sections/GraphicsSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/GraphicsSection.cs
@@ -10,7 +10,11 @@ namespace osu.Game.Overlays.Settings.Sections
     public class GraphicsSection : SettingsSection
     {
         public override string Header => "Graphics";
-        public override IconUsage Icon => FontAwesome.Solid.Laptop;
+
+        public override Drawable CreateIcon() => new SpriteIcon
+        {
+            Icon = FontAwesome.Solid.Laptop
+        };
 
         public GraphicsSection()
         {
diff --git a/osu.Game/Overlays/Settings/Sections/InputSection.cs b/osu.Game/Overlays/Settings/Sections/InputSection.cs
index 2a348b4e03..b43453f53d 100644
--- a/osu.Game/Overlays/Settings/Sections/InputSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/InputSection.cs
@@ -10,7 +10,11 @@ namespace osu.Game.Overlays.Settings.Sections
     public class InputSection : SettingsSection
     {
         public override string Header => "Input";
-        public override IconUsage Icon => FontAwesome.Regular.Keyboard;
+
+        public override Drawable CreateIcon() => new SpriteIcon
+        {
+            Icon = FontAwesome.Solid.Keyboard
+        };
 
         public InputSection(KeyBindingPanel keyConfig)
         {
diff --git a/osu.Game/Overlays/Settings/Sections/MaintenanceSection.cs b/osu.Game/Overlays/Settings/Sections/MaintenanceSection.cs
index 0f3acd5b7f..73c88b8e71 100644
--- a/osu.Game/Overlays/Settings/Sections/MaintenanceSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/MaintenanceSection.cs
@@ -11,7 +11,11 @@ namespace osu.Game.Overlays.Settings.Sections
     public class MaintenanceSection : SettingsSection
     {
         public override string Header => "Maintenance";
-        public override IconUsage Icon => FontAwesome.Solid.Wrench;
+
+        public override Drawable CreateIcon() => new SpriteIcon
+        {
+            Icon = FontAwesome.Solid.Wrench
+        };
 
         public MaintenanceSection()
         {
diff --git a/osu.Game/Overlays/Settings/Sections/OnlineSection.cs b/osu.Game/Overlays/Settings/Sections/OnlineSection.cs
index 80295690c0..150cddb388 100644
--- a/osu.Game/Overlays/Settings/Sections/OnlineSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/OnlineSection.cs
@@ -10,7 +10,11 @@ namespace osu.Game.Overlays.Settings.Sections
     public class OnlineSection : SettingsSection
     {
         public override string Header => "Online";
-        public override IconUsage Icon => FontAwesome.Solid.GlobeAsia;
+
+        public override Drawable CreateIcon() => new SpriteIcon
+        {
+            Icon = FontAwesome.Solid.GlobeAsia
+        };
 
         public OnlineSection()
         {
diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index b229014c84..75c8db1612 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -19,7 +19,10 @@ namespace osu.Game.Overlays.Settings.Sections
 
         public override string Header => "Skin";
 
-        public override IconUsage Icon => FontAwesome.Solid.PaintBrush;
+        public override Drawable CreateIcon() => new SpriteIcon
+        {
+            Icon = FontAwesome.Solid.PaintBrush
+        };
 
         private readonly Bindable<SkinInfo> dropdownBindable = new Bindable<SkinInfo> { Default = SkinInfo.Default };
         private readonly Bindable<int> configBindable = new Bindable<int>();
diff --git a/osu.Game/Overlays/Settings/SettingsSection.cs b/osu.Game/Overlays/Settings/SettingsSection.cs
index be3696029e..97e4ba9da7 100644
--- a/osu.Game/Overlays/Settings/SettingsSection.cs
+++ b/osu.Game/Overlays/Settings/SettingsSection.cs
@@ -11,7 +11,6 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using System.Collections.Generic;
 using System.Linq;
-using osu.Framework.Graphics.Sprites;
 
 namespace osu.Game.Overlays.Settings
 {
@@ -20,7 +19,7 @@ namespace osu.Game.Overlays.Settings
         protected FillFlowContainer FlowContent;
         protected override Container<Drawable> Content => FlowContent;
 
-        public abstract IconUsage Icon { get; }
+        public abstract Drawable CreateIcon();
         public abstract string Header { get; }
 
         public IEnumerable<IFilterable> FilterableChildren => Children.OfType<IFilterable>();
diff --git a/osu.Game/Overlays/Settings/SidebarButton.cs b/osu.Game/Overlays/Settings/SidebarButton.cs
index 68836bc6b3..30a53b351d 100644
--- a/osu.Game/Overlays/Settings/SidebarButton.cs
+++ b/osu.Game/Overlays/Settings/SidebarButton.cs
@@ -11,12 +11,13 @@ using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Overlays.Settings
 {
     public class SidebarButton : OsuButton
     {
-        private readonly SpriteIcon drawableIcon;
+        private readonly ConstrainedIconContainer iconContainer;
         private readonly SpriteText headerText;
         private readonly Box selectionIndicator;
         private readonly Container text;
@@ -30,7 +31,7 @@ namespace osu.Game.Overlays.Settings
             {
                 section = value;
                 headerText.Text = value.Header;
-                drawableIcon.Icon = value.Icon;
+                iconContainer.Icon = value.CreateIcon();
             }
         }
 
@@ -78,7 +79,7 @@ namespace osu.Game.Overlays.Settings
                             Anchor = Anchor.CentreLeft,
                             Origin = Anchor.CentreLeft,
                         },
-                        drawableIcon = new SpriteIcon
+                        iconContainer = new ConstrainedIconContainer
                         {
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/CentreMarker.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/CentreMarker.cs
index 0d4c48b5f6..8c8b38d9ea 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/CentreMarker.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/CentreMarker.cs
@@ -12,14 +12,14 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 {
     public class CentreMarker : CompositeDrawable
     {
-        private const float triangle_width = 20;
+        private const float triangle_width = 15;
         private const float triangle_height = 10;
         private const float bar_width = 2;
 
         public CentreMarker()
         {
             RelativeSizeAxes = Axes.Y;
-            Size = new Vector2(20, 1);
+            Size = new Vector2(triangle_width, 1);
 
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
@@ -39,6 +39,12 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                     Origin = Anchor.BottomCentre,
                     Size = new Vector2(triangle_width, triangle_height),
                     Scale = new Vector2(1, -1)
+                },
+                new Triangle
+                {
+                    Anchor = Anchor.BottomCentre,
+                    Origin = Anchor.BottomCentre,
+                    Size = new Vector2(triangle_width, triangle_height),
                 }
             };
         }
@@ -46,7 +52,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            Colour = colours.Red;
+            Colour = colours.RedDark;
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index 8e6b3d5424..25f3cfc285 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             });
 
             // We don't want the centre marker to scroll
-            AddInternal(new CentreMarker());
+            AddInternal(new CentreMarker { Depth = float.MaxValue });
 
             WaveformVisible.ValueChanged += visible => waveform.FadeTo(visible.NewValue ? 1 : 0, 200, Easing.OutQuint);