Merge branch 'master' into framed-replay-handler-fixes

osu.Desktop/Overlays/VersionManager.cs

@@ -110,7 +110,7 @@ namespace osu.Desktop.Overlays
             public UpdateCompleteNotification(string version, Action<string> openUrl = null)
             {
                 Text = $"You are now running osu!lazer {version}.\nClick to see what's new!";
-                Icon = FontAwesome.fa_check_square;
+                Icon = FontAwesome.CheckSquare;
                 Activated = delegate
                 {
                     openUrl?.Invoke($"https://osu.ppy.sh/home/changelog/lazer/{version}");

osu.Desktop/Updater/SimpleUpdateManager.cs

@@ -7,10 +7,10 @@ using Newtonsoft.Json;
 using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
 using osu.Framework.IO.Network;
 using osu.Framework.Platform;
 using osu.Game;
-using osu.Game.Graphics;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
 
@@ -54,7 +54,7 @@ namespace osu.Desktop.Updater
                     {
                         Text = $"A newer release of osu! has been found ({version} → {latest.TagName}).\n\n"
                                + "Click here to download the new version, which can be installed over the top of your existing installation",
-                        Icon = FontAwesome.fa_upload,
+                        Icon = FontAwesome.Upload,
                         Activated = () =>
                         {
                             host.OpenUrlExternally(getBestUrl(latest));

osu.Desktop/Updater/SquirrelUpdateManager.cs

@@ -9,6 +9,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
 using osu.Framework.Logging;
 using osu.Game;
 using osu.Game.Graphics;
@@ -158,7 +159,7 @@ namespace osu.Desktop.Updater
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
-                        Icon = FontAwesome.fa_upload,
+                        Icon = FontAwesome.Upload,
                         Colour = Color4.White,
                         Size = new Vector2(20),
                     }

osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmap.cs

@@ -3,8 +3,8 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Graphics.Sprites;
 using osu.Game.Beatmaps;
-using osu.Game.Graphics;
 using osu.Game.Rulesets.Catch.Objects;
 
 namespace osu.Game.Rulesets.Catch.Beatmaps
@@ -23,19 +23,19 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
                 {
                     Name = @"Fruit Count",
                     Content = fruits.ToString(),
-                    Icon = FontAwesome.fa_circle_o
+                    Icon = FontAwesome.CircleOutline
                 },
                 new BeatmapStatistic
                 {
                     Name = @"Juice Stream Count",
                     Content = juiceStreams.ToString(),
-                    Icon = FontAwesome.fa_circle
+                    Icon = FontAwesome.Circle
                 },
                 new BeatmapStatistic
                 {
                     Name = @"Banana Shower Count",
                     Content = bananaShowers.ToString(),
-                    Icon = FontAwesome.fa_circle
+                    Icon = FontAwesome.Circle
                 }
             };
         }

osu.Game.Rulesets.Catch/CatchRuleset.cs

@@ -9,6 +9,7 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.UI;
 using System.Collections.Generic;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Bindings;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.Replays;
@@ -17,6 +18,7 @@ using osu.Game.Beatmaps.Legacy;
 using osu.Game.Rulesets.Catch.Beatmaps;
 using osu.Game.Rulesets.Catch.Difficulty;
 using osu.Game.Rulesets.Difficulty;
+using osu.Game.Scoring;
 
 namespace osu.Game.Rulesets.Catch
 {
@@ -114,10 +116,12 @@ namespace osu.Game.Rulesets.Catch
 
         public override string ShortName => "fruits";
 
-        public override Drawable CreateIcon() => new SpriteIcon { Icon = FontAwesome.fa_osu_fruits_o };
+        public override Drawable CreateIcon() => new SpriteIcon { Icon = OsuIcon.RulesetCatch };
 
         public override DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap) => new CatchDifficultyCalculator(this, beatmap);
 
+        public override PerformanceCalculator CreatePerformanceCalculator(WorkingBeatmap beatmap, ScoreInfo score) => new CatchPerformanceCalculator(this, beatmap, score);
+
         public override int? LegacyID => 2;
 
         public override IConvertibleReplayFrame CreateConvertibleReplayFrame() => new CatchReplayFrame();

osu.Game.Rulesets.Catch/Difficulty/CatchPerformanceCalculator.cs

@@ -0,0 +1,104 @@
+// 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 System;
+using System.Collections.Generic;
+using System.Linq;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Difficulty;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Scoring;
+using osu.Game.Scoring.Legacy;
+using osuTK;
+
+namespace osu.Game.Rulesets.Catch.Difficulty
+{
+    public class CatchPerformanceCalculator : PerformanceCalculator
+    {
+        protected new CatchDifficultyAttributes Attributes => (CatchDifficultyAttributes)base.Attributes;
+
+        private Mod[] mods;
+
+        private int fruitsHit;
+        private int ticksHit;
+        private int tinyTicksHit;
+        private int tinyTicksMissed;
+        private int misses;
+
+        public CatchPerformanceCalculator(Ruleset ruleset, WorkingBeatmap beatmap, ScoreInfo score)
+            : base(ruleset, beatmap, score)
+        {
+        }
+
+        public override double Calculate(Dictionary<string, double> categoryDifficulty = null)
+        {
+            mods = Score.Mods;
+
+            var legacyScore = Score as LegacyScoreInfo;
+
+            fruitsHit = legacyScore?.Count300 ?? Score.Statistics[HitResult.Perfect];
+            ticksHit = legacyScore?.Count100 ?? 0;
+            tinyTicksHit = legacyScore?.Count50 ?? 0;
+            tinyTicksMissed = legacyScore?.CountKatu ?? 0;
+            misses = Score.Statistics[HitResult.Miss];
+
+            // Don't count scores made with supposedly unranked mods
+            if (mods.Any(m => !m.Ranked))
+                return 0;
+
+            // We are heavily relying on aim in catch the beat
+            double value = Math.Pow(5.0f * Math.Max(1.0f, Attributes.StarRating / 0.0049f) - 4.0f, 2.0f) / 100000.0f;
+
+            // Longer maps are worth more. "Longer" means how many hits there are which can contribute to combo
+            int numTotalHits = totalComboHits();
+
+            // Longer maps are worth more
+            float lengthBonus =
+                0.95f + 0.4f * Math.Min(1.0f, numTotalHits / 3000.0f) +
+                (numTotalHits > 3000 ? (float)Math.Log10(numTotalHits / 3000.0f) * 0.5f : 0.0f);
+
+            // Longer maps are worth more
+            value *= lengthBonus;
+
+            // Penalize misses exponentially. This mainly fixes tag4 maps and the likes until a per-hitobject solution is available
+            value *= Math.Pow(0.97f, misses);
+
+            // Combo scaling
+            float beatmapMaxCombo = Attributes.MaxCombo;
+            if (beatmapMaxCombo > 0)
+                value *= Math.Min(Math.Pow(Attributes.MaxCombo, 0.8f) / Math.Pow(beatmapMaxCombo, 0.8f), 1.0f);
+
+            float approachRate = (float)Attributes.ApproachRate;
+            float approachRateFactor = 1.0f;
+            if (approachRate > 9.0f)
+                approachRateFactor += 0.1f * (approachRate - 9.0f); // 10% for each AR above 9
+            else if (approachRate < 8.0f)
+                approachRateFactor += 0.025f * (8.0f - approachRate); // 2.5% for each AR below 8
+
+            value *= approachRateFactor;
+
+            if (mods.Any(m => m is ModHidden))
+                // Hiddens gives nothing on max approach rate, and more the lower it is
+                value *= 1.05f + 0.075f * (10.0f - Math.Min(10.0f, approachRate)); // 7.5% for each AR below 10
+
+            if (mods.Any(m => m is ModFlashlight))
+                // Apply length bonus again if flashlight is on simply because it becomes a lot harder on longer maps.
+                value *= 1.35f * lengthBonus;
+
+            // Scale the aim value with accuracy _slightly_
+            value *= Math.Pow(accuracy(), 5.5f);
+
+            // Custom multipliers for NoFail. SpunOut is not applicable.
+            if (mods.Any(m => m is ModNoFail))
+                value *= 0.90f;
+
+            return value;
+        }
+
+        private float accuracy() => totalHits() == 0 ? 0 : MathHelper.Clamp((float)totalSuccessfulHits() / totalHits(), 0f, 1f);
+        private int totalHits() => tinyTicksHit + ticksHit + fruitsHit + misses + tinyTicksMissed;
+        private int totalSuccessfulHits() => tinyTicksHit + ticksHit + fruitsHit;
+        private int totalComboHits() => misses + ticksHit + fruitsHit;
+    }
+}

osu.Game.Rulesets.Catch/Objects/Drawable/DrawableBananaShower.cs

@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
             Origin = Anchor.BottomLeft;
             X = 0;
 
-            InternalChild = bananaContainer = new Container { RelativeSizeAxes = Axes.Both };
+            AddInternal(bananaContainer = new Container { RelativeSizeAxes = Axes.Both });
 
             foreach (var b in s.NestedHitObjects.Cast<Banana>())
                 AddNested(getVisualRepresentation?.Invoke(b));

osu.Game.Rulesets.Catch/Objects/Drawable/DrawableDroplet.cs

@@ -26,10 +26,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
         [BackgroundDependencyLoader]
         private void load()
         {
-            InternalChild = pulp = new Pulp
+            AddInternal(pulp = new Pulp { Size = Size });
-            {
-                Size = Size
-            };
         }
 
         public override Color4 AccentColour

osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs

@@ -42,7 +42,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
             // todo: this should come from the skin.
             AccentColour = colourForRepresentation(HitObject.VisualRepresentation);
 
-            InternalChildren = new[]
+            AddRangeInternal(new[]
             {
                 createPulp(HitObject.VisualRepresentation),
                 border = new Circle
@@ -70,7 +70,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
                         }
                     }
                 },
-            };
+            });
 
             if (HitObject.HyperDash)
             {

osu.Game.Rulesets.Catch/Objects/Drawable/DrawableJuiceStream.cs

@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
             Origin = Anchor.BottomLeft;
             X = 0;
 
-            InternalChild = dropletContainer = new Container { RelativeSizeAxes = Axes.Both, };
+            AddInternal(dropletContainer = new Container { RelativeSizeAxes = Axes.Both, });
 
             foreach (var o in s.NestedHitObjects.Cast<CatchHitObject>())
                 AddNested(getVisualRepresentation?.Invoke(o));

osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs

@@ -10,7 +10,6 @@ using osu.Game.Rulesets.Catch.Objects.Drawable;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI.Scrolling;
-using osuTK;
 
 namespace osu.Game.Rulesets.Catch.UI
 {
@@ -24,29 +23,20 @@ namespace osu.Game.Rulesets.Catch.UI
         {
             Container explodingFruitContainer;
 
-            Anchor = Anchor.TopCentre;
+            InternalChildren = new Drawable[]
-            Origin = Anchor.TopCentre;
-
-            Size = new Vector2(0.86f); // matches stable's vertical offset for catcher plate
-
-            InternalChild = new PlayfieldAdjustmentContainer
             {
-                RelativeSizeAxes = Axes.Both,
+                explodingFruitContainer = new Container
-                Children = new Drawable[]
                 {
-                    explodingFruitContainer = new Container
+                    RelativeSizeAxes = Axes.Both,
-                    {
+                },
-                        RelativeSizeAxes = Axes.Both,
+                CatcherArea = new CatcherArea(difficulty)
-                    },
+                {
-                    CatcherArea = new CatcherArea(difficulty)
+                    GetVisualRepresentation = getVisualRepresentation,
-                    {
+                    ExplodingFruitTarget = explodingFruitContainer,
-                        GetVisualRepresentation = getVisualRepresentation,
+                    Anchor = Anchor.BottomLeft,
-                        ExplodingFruitTarget = explodingFruitContainer,
+                    Origin = Anchor.TopLeft,
-                        Anchor = Anchor.BottomLeft,
+                },
-                        Origin = Anchor.TopLeft,
+                HitObjectContainer
-                    },
-                    HitObjectContainer
-                }
             };
         }
 

osu.Game.Rulesets.Catch/UI/CatchPlayfieldAdjustmentContainer.cs

@@ -3,17 +3,23 @@
 
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.UI;
 using osuTK;
 
 namespace osu.Game.Rulesets.Catch.UI
 {
-    public class PlayfieldAdjustmentContainer : Container
+    public class CatchPlayfieldAdjustmentContainer : PlayfieldAdjustmentContainer
     {
         protected override Container<Drawable> Content => content;
         private readonly Container content;
 
-        public PlayfieldAdjustmentContainer()
+        public CatchPlayfieldAdjustmentContainer()
         {
+            Anchor = Anchor.TopCentre;
+            Origin = Anchor.TopCentre;
+
+            Size = new Vector2(0.86f); // matches stable's vertical offset for catcher plate
+
             InternalChild = new Container
             {
                 Anchor = Anchor.Centre,

osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs

@@ -36,6 +36,8 @@ namespace osu.Game.Rulesets.Catch.UI
 
         protected override Playfield CreatePlayfield() => new CatchPlayfield(Beatmap.BeatmapInfo.BaseDifficulty, GetVisualRepresentation);
 
+        protected override PlayfieldAdjustmentContainer CreatePlayfieldAdjustmentContainer() => new CatchPlayfieldAdjustmentContainer();
+
         protected override PassThroughInputManager CreateInputManager() => new CatchInputManager(Ruleset.RulesetInfo);
 
         public override DrawableHitObject<CatchHitObject> GetVisualRepresentation(CatchHitObject h)

osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmap.cs

@@ -3,8 +3,8 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Graphics.Sprites;
 using osu.Game.Beatmaps;
-using osu.Game.Graphics;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.UI;
 
@@ -42,13 +42,13 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
                 {
                     Name = @"Note Count",
                     Content = notes.ToString(),
-                    Icon = FontAwesome.fa_circle_o
+                    Icon = FontAwesome.CircleOutline
                 },
                 new BeatmapStatistic
                 {
                     Name = @"Hold Note Count",
                     Content = holdnotes.ToString(),
-                    Icon = FontAwesome.fa_circle
+                    Icon = FontAwesome.Circle
                 },
             };
         }

osu.Game.Rulesets.Mania/ManiaRuleset.cs

@@ -10,6 +10,7 @@ using osu.Game.Rulesets.UI;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Bindings;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Mania.Objects;
@@ -160,7 +161,7 @@ namespace osu.Game.Rulesets.Mania
 
         public override string ShortName => "mania";
 
-        public override Drawable CreateIcon() => new SpriteIcon { Icon = FontAwesome.fa_osu_mania_o };
+        public override Drawable CreateIcon() => new SpriteIcon { Icon = OsuIcon.RulesetMania };
 
         public override DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap) => new ManiaDifficultyCalculator(this, beatmap);
 

osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs

@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mods;
@@ -12,7 +13,7 @@ namespace osu.Game.Rulesets.Mania.Mods
     {
         public override string Name => "Fade In";
         public override string Acronym => "FI";
-        public override FontAwesome Icon => FontAwesome.fa_osu_mod_hidden;
+        public override IconUsage Icon => OsuIcon.ModHidden;
         public override ModType Type => ModType.DifficultyIncrease;
         public override string Description => @"Keys appear out of nowhere!";
         public override double ScoreMultiplier => 1;

osu.Game.Rulesets.Mania/Mods/ManiaModRandom.cs

@@ -3,6 +3,7 @@
 
 using System.Linq;
 using osu.Framework.Extensions.IEnumerableExtensions;
+using osu.Framework.Graphics.Sprites;
 using osu.Framework.MathUtils;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
@@ -17,7 +18,7 @@ namespace osu.Game.Rulesets.Mania.Mods
         public override string Name => "Random";
         public override string Acronym => "RD";
         public override ModType Type => ModType.Conversion;
-        public override FontAwesome Icon => FontAwesome.fa_osu_dice;
+        public override IconUsage Icon => OsuIcon.Dice;
         public override string Description => @"Shuffle around the keys!";
         public override double ScoreMultiplier => 1;
 

osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs

@@ -43,7 +43,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         {
             RelativeSizeAxes = Axes.X;
 
-            InternalChildren = new Drawable[]
+            AddRangeInternal(new Drawable[]
             {
                 bodyPiece = new BodyPiece
                 {
@@ -67,7 +67,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
                     Anchor = Anchor.TopCentre,
                     Origin = Anchor.TopCentre
                 }
-            };
+            });
 
             foreach (var tick in tickContainer)
                 AddNested(tick);

osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTick.cs

@@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             RelativeSizeAxes = Axes.X;
             Size = new Vector2(1);
 
-            InternalChildren = new[]
+            AddRangeInternal(new[]
             {
                 glowContainer = new CircularContainer
                 {
@@ -51,7 +51,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
                         }
                     }
                 }
-            };
+            });
         }
 
         public override Color4 AccentColour

osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs

@@ -29,7 +29,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             CornerRadius = 5;
             Masking = true;
 
-            InternalChild = headPiece = new NotePiece();
+            AddInternal(headPiece = new NotePiece());
         }
 
         protected override void OnDirectionChanged(ValueChangedEvent<ScrollingDirection> e)

osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs

@@ -6,7 +6,6 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
-using osu.Framework.Graphics;
 using osu.Framework.Input;
 using osu.Framework.MathUtils;
 using osu.Game.Beatmaps;
@@ -89,11 +88,9 @@ namespace osu.Game.Rulesets.Mania.UI
         /// <returns>The column which intersects with <paramref name="screenSpacePosition"/>.</returns>
         public Column GetColumnByPosition(Vector2 screenSpacePosition) => Playfield.GetColumnByPosition(screenSpacePosition);
 
-        protected override Playfield CreatePlayfield() => new ManiaPlayfield(Beatmap.Stages)
+        protected override PlayfieldAdjustmentContainer CreatePlayfieldAdjustmentContainer() => new ManiaPlayfieldAdjustmentContainer();
-        {
+
-            Anchor = Anchor.Centre,
+        protected override Playfield CreatePlayfield() => new ManiaPlayfield(Beatmap.Stages);
-            Origin = Anchor.Centre,
-        };
 
         public override ScoreProcessor CreateScoreProcessor() => new ManiaScoreProcessor(this);
 

osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs

@@ -28,8 +28,6 @@ namespace osu.Game.Rulesets.Mania.UI
             if (stageDefinitions.Count <= 0)
                 throw new ArgumentException("Can't have zero or fewer stages.");
 
-            Size = new Vector2(1, 0.8f);
-
             GridContainer playfieldGrid;
             AddInternal(playfieldGrid = new GridContainer
             {

osu.Game.Rulesets.Mania/UI/ManiaPlayfieldAdjustmentContainer.cs

@@ -0,0 +1,20 @@
+// 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.Game.Rulesets.UI;
+using osuTK;
+
+namespace osu.Game.Rulesets.Mania.UI
+{
+    public class ManiaPlayfieldAdjustmentContainer : PlayfieldAdjustmentContainer
+    {
+        public ManiaPlayfieldAdjustmentContainer()
+        {
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
+
+            Size = new Vector2(1, 0.8f);
+        }
+    }
+}

osu.Game.Rulesets.Osu.Tests/TestCaseGameplayCursor.cs

@@ -9,6 +9,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Cursor;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Rulesets.Osu.UI.Cursor;
+using osu.Game.Rulesets.UI;
 using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Osu.Tests
@@ -27,7 +28,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         [BackgroundDependencyLoader]
         private void load()
         {
-            Add(cursorContainer = new GameplayCursorContainer { RelativeSizeAxes = Axes.Both });
+            Add(cursorContainer = new OsuCursorContainer { RelativeSizeAxes = Axes.Both });
         }
     }
 }

osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmap.cs

@@ -3,8 +3,8 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Graphics.Sprites;
 using osu.Game.Beatmaps;
-using osu.Game.Graphics;
 using osu.Game.Rulesets.Osu.Objects;
 
 namespace osu.Game.Rulesets.Osu.Beatmaps
@@ -23,19 +23,19 @@ namespace osu.Game.Rulesets.Osu.Beatmaps
                 {
                     Name = @"Circle Count",
                     Content = circles.ToString(),
-                    Icon = FontAwesome.fa_circle_o
+                    Icon = FontAwesome.CircleOutline
                 },
                 new BeatmapStatistic
                 {
                     Name = @"Slider Count",
                     Content = sliders.ToString(),
-                    Icon = FontAwesome.fa_circle
+                    Icon = FontAwesome.Circle
                 },
                 new BeatmapStatistic
                 {
                     Name = @"Spinner Count",
                     Content = spinners.ToString(),
-                    Icon = FontAwesome.fa_circle
+                    Icon = FontAwesome.Circle
                 }
             };
         }

osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs

@@ -1,7 +1,6 @@
 // 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.Cursor;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Osu.UI;
 using osu.Game.Rulesets.UI;
@@ -20,7 +19,7 @@ namespace osu.Game.Rulesets.Osu.Edit
 
         private class OsuPlayfieldNoCursor : OsuPlayfield
         {
-            protected override CursorContainer CreateCursor() => null;
+            protected override GameplayCursorContainer CreateCursor() => null;
         }
     }
 }

osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs

@@ -38,7 +38,7 @@ namespace osu.Game.Rulesets.Osu.Edit
 
         public override SelectionHandler CreateSelectionHandler() => new OsuSelectionHandler();
 
-        protected override Container CreateLayerContainer() => new PlayfieldAdjustmentContainer { RelativeSizeAxes = Axes.Both };
+        protected override Container CreateLayerContainer() => new OsuPlayfieldAdjustmentContainer { RelativeSizeAxes = Axes.Both };
 
         public override SelectionBlueprint CreateBlueprintFor(DrawableHitObject hitObject)
         {

osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs

@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Mods;
 
@@ -11,7 +12,7 @@ namespace osu.Game.Rulesets.Osu.Mods
     {
         public override string Name => "Autopilot";
         public override string Acronym => "AP";
-        public override FontAwesome Icon => FontAwesome.fa_osu_mod_autopilot;
+        public override IconUsage Icon => OsuIcon.ModAutopilot;
         public override ModType Type => ModType.Automation;
         public override string Description => @"Automatic cursor movement - just follow the rhythm.";
         public override double ScoreMultiplier => 1;

osu.Game.Rulesets.Osu/Mods/OsuModBlinds.cs

@@ -8,7 +8,6 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Beatmaps;
-using osu.Game.Graphics;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Scoring;
@@ -24,7 +23,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override string Description => "Play with blinds on your screen.";
         public override string Acronym => "BL";
 
-        public override FontAwesome Icon => FontAwesome.fa_adjust;
+        public override IconUsage Icon => FontAwesome.Adjust;
         public override ModType Type => ModType.DifficultyIncrease;
 
         public override bool Ranked => false;

osu.Game.Rulesets.Osu/Mods/OsuModGrow.cs

@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 using osu.Framework.Graphics;
-using osu.Game.Graphics;
+using osu.Framework.Graphics.Sprites;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
@@ -17,7 +17,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         public override string Acronym => "GR";
 
-        public override FontAwesome Icon => FontAwesome.fa_arrows_v;
+        public override IconUsage Icon => FontAwesome.ArrowsV;
 
         public override ModType Type => ModType.Fun;
 

osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs

@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Mods;
 
@@ -11,7 +12,7 @@ namespace osu.Game.Rulesets.Osu.Mods
     {
         public override string Name => "Spun Out";
         public override string Acronym => "SO";
-        public override FontAwesome Icon => FontAwesome.fa_osu_mod_spunout;
+        public override IconUsage Icon => OsuIcon.ModSpunout;
         public override ModType Type => ModType.DifficultyReduction;
         public override string Description => @"Spinners will be automatically completed.";
         public override double ScoreMultiplier => 0.9;

osu.Game.Rulesets.Osu/Mods/OsuModTarget.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.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Mods;
 
@@ -11,7 +12,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override string Name => "Target";
         public override string Acronym => "TP";
         public override ModType Type => ModType.Conversion;
-        public override FontAwesome Icon => FontAwesome.fa_osu_mod_target;
+        public override IconUsage Icon => OsuIcon.ModTarget;
         public override string Description => @"Practice keeping up with the beat of the song.";
         public override double ScoreMultiplier => 1;
     }

osu.Game.Rulesets.Osu/Mods/OsuModTransform.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 using osu.Framework.Graphics;
-using osu.Game.Graphics;
+using osu.Framework.Graphics.Sprites;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
@@ -16,7 +16,7 @@ namespace osu.Game.Rulesets.Osu.Mods
     {
         public override string Name => "Transform";
         public override string Acronym => "TR";
-        public override FontAwesome Icon => FontAwesome.fa_arrows;
+        public override IconUsage Icon => FontAwesome.Arrows;
         public override ModType Type => ModType.Fun;
         public override string Description => "Everything rotates. EVERYTHING.";
         public override double ScoreMultiplier => 1;

osu.Game.Rulesets.Osu/Mods/OsuModWiggle.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 using osu.Framework.Graphics;
-using osu.Game.Graphics;
+using osu.Framework.Graphics.Sprites;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
@@ -17,7 +17,7 @@ namespace osu.Game.Rulesets.Osu.Mods
     {
         public override string Name => "Wiggle";
         public override string Acronym => "WG";
-        public override FontAwesome Icon => FontAwesome.fa_certificate;
+        public override IconUsage Icon => FontAwesome.Certificate;
         public override ModType Type => ModType.Fun;
         public override string Description => "They just won't stay still...";
         public override double ScoreMultiplier => 1;

osu.Game.Rulesets.Osu/Objects/Drawables/DrawableRepeatPoint.cs

@@ -4,10 +4,10 @@
 using System;
 using System.Collections.Generic;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
 using osu.Framework.MathUtils;
 using osu.Game.Rulesets.Objects.Drawables;
 using osuTK;
-using osu.Game.Graphics;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
 
@@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 new SkinnableDrawable("Play/osu/reversearrow", _ => new SpriteIcon
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Icon = FontAwesome.fa_chevron_right
+                    Icon = FontAwesome.ChevronRight
                 }, restrictSize: false)
             };
         }

osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs

@@ -12,6 +12,7 @@ using osu.Game.Graphics;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics.Sprites;
 using osu.Game.Screens.Ranking;
 using osu.Game.Rulesets.Scoring;
 
@@ -76,7 +77,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
                             Size = new Vector2(48),
-                            Icon = FontAwesome.fa_asterisk,
+                            Icon = FontAwesome.Asterisk,
                             Shadow = false,
                         },
                     }

osu.Game.Rulesets.Osu/OsuRuleset.cs

@@ -9,6 +9,7 @@ using osu.Game.Rulesets.Osu.UI;
 using osu.Game.Rulesets.UI;
 using System.Collections.Generic;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
 using osu.Game.Overlays.Settings;
 using osu.Framework.Input.Bindings;
 using osu.Game.Rulesets.Osu.Edit;
@@ -137,7 +138,7 @@ namespace osu.Game.Rulesets.Osu
             }
         }
 
-        public override Drawable CreateIcon() => new SpriteIcon { Icon = FontAwesome.fa_osu_osu_o };
+        public override Drawable CreateIcon() => new SpriteIcon { Icon = OsuIcon.RulesetOsu };
 
         public override DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap) => new OsuDifficultyCalculator(this, beatmap);
 

osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs

@@ -6,7 +6,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Bindings;
 using osu.Game.Beatmaps;
@@ -14,10 +13,11 @@ using osu.Game.Configuration;
 using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
+using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Osu.UI.Cursor
 {
-    public class GameplayCursorContainer : CursorContainer, IKeyBindingHandler<OsuAction>
+    public class OsuCursorContainer : GameplayCursorContainer, IKeyBindingHandler<OsuAction>
     {
         protected override Drawable CreateCursor() => new OsuCursor();
 
@@ -25,7 +25,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
 
         private readonly Container<Drawable> fadeContainer;
 
-        public GameplayCursorContainer()
+        public OsuCursorContainer()
         {
             InternalChild = fadeContainer = new Container
             {

osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs

@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// 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 System.Linq;
@@ -32,6 +32,8 @@ namespace osu.Game.Rulesets.Osu.UI
 
         protected override PassThroughInputManager CreateInputManager() => new OsuInputManager(Ruleset.RulesetInfo);
 
+        protected override PlayfieldAdjustmentContainer CreatePlayfieldAdjustmentContainer() => new OsuPlayfieldAdjustmentContainer();
+
         public override DrawableHitObject<OsuHitObject> GetVisualRepresentation(OsuHitObject h)
         {
             switch (h)

osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs

@@ -10,7 +10,6 @@ using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables.Connections;
 using osu.Game.Rulesets.UI;
 using System.Linq;
-using osu.Framework.Graphics.Cursor;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Osu.UI.Cursor;
 
@@ -24,41 +23,28 @@ namespace osu.Game.Rulesets.Osu.UI
 
         public static readonly Vector2 BASE_SIZE = new Vector2(512, 384);
 
-        private readonly PlayfieldAdjustmentContainer adjustmentContainer;
+        protected override GameplayCursorContainer CreateCursor() => new OsuCursorContainer();
-
-        protected override Container CursorTargetContainer => adjustmentContainer;
-
-        protected override CursorContainer CreateCursor() => new GameplayCursorContainer();
 
         public OsuPlayfield()
         {
-            Anchor = Anchor.Centre;
+            InternalChildren = new Drawable[]
-            Origin = Anchor.Centre;
-
-            Size = new Vector2(0.75f);
-
-            InternalChild = adjustmentContainer = new PlayfieldAdjustmentContainer
             {
-                RelativeSizeAxes = Axes.Both,
+                connectionLayer = new FollowPointRenderer
-                Children = new Drawable[]
                 {
-                    connectionLayer = new FollowPointRenderer
+                    RelativeSizeAxes = Axes.Both,
-                    {
+                    Depth = 2,
-                        RelativeSizeAxes = Axes.Both,
+                },
-                        Depth = 2,
+                judgementLayer = new JudgementContainer<DrawableOsuJudgement>
-                    },
+                {
-                    judgementLayer = new JudgementContainer<DrawableOsuJudgement>
+                    RelativeSizeAxes = Axes.Both,
-                    {
+                    Depth = 1,
-                        RelativeSizeAxes = Axes.Both,
+                },
-                        Depth = 1,
+                HitObjectContainer,
-                    },
+                approachCircles = new ApproachCircleProxyContainer
-                    HitObjectContainer,
+                {
-                    approachCircles = new ApproachCircleProxyContainer
+                    RelativeSizeAxes = Axes.Both,
-                    {
+                    Depth = -1,
-                        RelativeSizeAxes = Axes.Both,
+                },
-                        Depth = -1,
-                    },
-                }
             };
         }
 

osu.Game.Rulesets.Osu/UI/OsuPlayfieldAdjustmentContainer.cs

@@ -3,17 +3,23 @@
 
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.UI;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.UI
 {
-    public class PlayfieldAdjustmentContainer : Container
+    public class OsuPlayfieldAdjustmentContainer : PlayfieldAdjustmentContainer
     {
         protected override Container<Drawable> Content => content;
         private readonly Container content;
 
-        public PlayfieldAdjustmentContainer()
+        public OsuPlayfieldAdjustmentContainer()
         {
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
+
+            Size = new Vector2(0.75f);
+
             InternalChild = new Container
             {
                 Anchor = Anchor.Centre,

osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmap.cs

@@ -3,8 +3,8 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Graphics.Sprites;
 using osu.Game.Beatmaps;
-using osu.Game.Graphics;
 using osu.Game.Rulesets.Taiko.Objects;
 
 namespace osu.Game.Rulesets.Taiko.Beatmaps
@@ -23,19 +23,19 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
                 {
                     Name = @"Hit Count",
                     Content = hits.ToString(),
-                    Icon = FontAwesome.fa_circle_o
+                    Icon = FontAwesome.CircleOutline
                 },
                 new BeatmapStatistic
                 {
                     Name = @"Drumroll Count",
                     Content = drumrolls.ToString(),
-                    Icon = FontAwesome.fa_circle
+                    Icon = FontAwesome.Circle
                 },
                 new BeatmapStatistic
                 {
                     Name = @"Swell Count",
                     Content = swells.ToString(),
-                    Icon = FontAwesome.fa_circle
+                    Icon = FontAwesome.Circle
                 }
             };
         }

osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLine.cs

@@ -44,17 +44,14 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             RelativeSizeAxes = Axes.Y;
             Width = tracker_width;
 
-            InternalChildren = new[]
+            AddInternal(Tracker = new Box
             {
-                Tracker = new Box
+                Anchor = Anchor.Centre,
-                {
+                Origin = Anchor.Centre,
-                    Anchor = Anchor.Centre,
+                RelativeSizeAxes = Axes.Both,
-                    Origin = Anchor.Centre,
+                EdgeSmoothness = new Vector2(0.5f, 0),
-                    RelativeSizeAxes = Axes.Both,
+                Alpha = 0.75f
-                    EdgeSmoothness = new Vector2(0.5f, 0),
+            });
-                    Alpha = 0.75f
-                }
-            };
         }
 
         protected override void UpdateState(ArmedState state)

osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs

@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         protected DrawableTaikoHitObject(TaikoHitObject hitObject)
             : base(hitObject)
         {
-            InternalChildren = new[]
+            AddRangeInternal(new[]
             {
                 nonProxiedContent = new Container
                 {
@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
                     Child = Content = new Container { RelativeSizeAxes = Axes.Both }
                 },
                 proxiedContent = new ProxiedContentContainer { RelativeSizeAxes = Axes.Both }
-            };
+            });
         }
 
         /// <summary>

osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/SwellSymbolPiece.cs

@@ -4,7 +4,7 @@
 using osuTK;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Graphics;
+using osu.Framework.Graphics.Sprites;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces
 {
@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces
                 new SpriteIcon
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Icon = FontAwesome.fa_asterisk,
+                    Icon = FontAwesome.Asterisk,
                     Shadow = false
                 }
             };

osu.Game.Rulesets.Taiko/TaikoRuleset.cs

@@ -9,6 +9,7 @@ using osu.Game.Rulesets.Taiko.UI;
 using osu.Game.Rulesets.UI;
 using System.Collections.Generic;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Bindings;
 using osu.Game.Rulesets.Replays.Types;
 using osu.Game.Rulesets.Taiko.Objects;
@@ -114,7 +115,7 @@ namespace osu.Game.Rulesets.Taiko
 
         public override string ShortName => "taiko";
 
-        public override Drawable CreateIcon() => new SpriteIcon { Icon = FontAwesome.fa_osu_taiko_o };
+        public override Drawable CreateIcon() => new SpriteIcon { Icon = OsuIcon.RulesetTaiko };
 
         public override DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap) => new TaikoDifficultyCalculator(this, beatmap);
 

osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs

@@ -81,6 +81,8 @@ namespace osu.Game.Rulesets.Taiko.UI
 
         public override ScoreProcessor CreateScoreProcessor() => new TaikoScoreProcessor(this);
 
+        protected override PlayfieldAdjustmentContainer CreatePlayfieldAdjustmentContainer() => new TaikoPlayfieldAdjustmentContainer();
+
         protected override PassThroughInputManager CreateInputManager() => new TaikoInputManager(Ruleset.RulesetInfo);
 
         protected override Playfield CreatePlayfield() => new TaikoPlayfield(Beatmap.ControlPointInfo);

osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs

@@ -55,143 +55,137 @@ namespace osu.Game.Rulesets.Taiko.UI
 
         public TaikoPlayfield(ControlPointInfo controlPoints)
         {
-            InternalChild = new PlayfieldAdjustmentContainer
+            InternalChildren = new Drawable[]
             {
-                Anchor = Anchor.CentreLeft,
+                backgroundContainer = new Container
-                Origin = Anchor.CentreLeft,
-                RelativeSizeAxes = Axes.Both,
-                Children = new Drawable[]
                 {
-                    backgroundContainer = new Container
+                    Name = "Transparent playfield background",
+                    RelativeSizeAxes = Axes.Both,
+                    Masking = true,
+                    EdgeEffect = new EdgeEffectParameters
                     {
-                        Name = "Transparent playfield background",
+                        Type = EdgeEffectType.Shadow,
-                        RelativeSizeAxes = Axes.Both,
+                        Colour = Color4.Black.Opacity(0.2f),
-                        Masking = true,
+                        Radius = 5,
-                        EdgeEffect = new EdgeEffectParameters
+                    },
+                    Children = new Drawable[]
+                    {
+                        background = new Box
                         {
-                            Type = EdgeEffectType.Shadow,
+                            RelativeSizeAxes = Axes.Both,
-                            Colour = Color4.Black.Opacity(0.2f),
+                            Alpha = 0.6f
-                            Radius = 5,
                         },
-                        Children = new Drawable[]
-                        {
-                            background = new Box
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                Alpha = 0.6f
-                            },
-                        }
-                    },
-                    new Container
-                    {
-                        Name = "Right area",
-                        RelativeSizeAxes = Axes.Both,
-                        Padding = new MarginPadding { Left = left_area_size },
-                        Children = new Drawable[]
-                        {
-                            new Container
-                            {
-                                Name = "Masked elements before hit objects",
-                                RelativeSizeAxes = Axes.Both,
-                                Padding = new MarginPadding { Left = HIT_TARGET_OFFSET },
-                                Masking = true,
-                                Children = new Drawable[]
-                                {
-                                    hitExplosionContainer = new Container<HitExplosion>
-                                    {
-                                        RelativeSizeAxes = Axes.Both,
-                                        FillMode = FillMode.Fit,
-                                        Blending = BlendingMode.Additive,
-                                    },
-                                    HitTarget = new HitTarget
-                                    {
-                                        Anchor = Anchor.CentreLeft,
-                                        Origin = Anchor.Centre,
-                                        RelativeSizeAxes = Axes.Both,
-                                        FillMode = FillMode.Fit
-                                    }
-                                }
-                            },
-                            barlineContainer = new Container
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                Padding = new MarginPadding { Left = HIT_TARGET_OFFSET }
-                            },
-                            new Container
-                            {
-                                Name = "Hit objects",
-                                RelativeSizeAxes = Axes.Both,
-                                Padding = new MarginPadding { Left = HIT_TARGET_OFFSET },
-                                Masking = true,
-                                Child = HitObjectContainer
-                            },
-                            kiaiExplosionContainer = new Container<KiaiHitExplosion>
-                            {
-                                Name = "Kiai hit explosions",
-                                RelativeSizeAxes = Axes.Both,
-                                FillMode = FillMode.Fit,
-                                Margin = new MarginPadding { Left = HIT_TARGET_OFFSET },
-                                Blending = BlendingMode.Additive
-                            },
-                            judgementContainer = new JudgementContainer<DrawableTaikoJudgement>
-                            {
-                                Name = "Judgements",
-                                RelativeSizeAxes = Axes.Y,
-                                Margin = new MarginPadding { Left = HIT_TARGET_OFFSET },
-                                Blending = BlendingMode.Additive
-                            },
-                        }
-                    },
-                    overlayBackgroundContainer = new Container
-                    {
-                        Name = "Left overlay",
-                        RelativeSizeAxes = Axes.Y,
-                        Size = new Vector2(left_area_size, 1),
-                        Children = new Drawable[]
-                        {
-                            overlayBackground = new Box
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                            },
-                            new InputDrum(controlPoints)
-                            {
-                                Anchor = Anchor.CentreRight,
-                                Origin = Anchor.CentreRight,
-                                Scale = new Vector2(0.9f),
-                                Margin = new MarginPadding { Right = 20 }
-                            },
-                            new Box
-                            {
-                                Anchor = Anchor.TopRight,
-                                RelativeSizeAxes = Axes.Y,
-                                Width = 10,
-                                Colour = Framework.Graphics.Colour.ColourInfo.GradientHorizontal(Color4.Black.Opacity(0.6f), Color4.Black.Opacity(0)),
-                            },
-                        }
-                    },
-                    new Container
-                    {
-                        Name = "Border",
-                        RelativeSizeAxes = Axes.Both,
-                        Masking = true,
-                        MaskingSmoothness = 0,
-                        BorderThickness = 2,
-                        AlwaysPresent = true,
-                        Children = new[]
-                        {
-                            new Box
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                Alpha = 0,
-                                AlwaysPresent = true
-                            }
-                        }
-                    },
-                    topLevelHitContainer = new Container
-                    {
-                        Name = "Top level hit objects",
-                        RelativeSizeAxes = Axes.Both,
                     }
+                },
+                new Container
+                {
+                    Name = "Right area",
+                    RelativeSizeAxes = Axes.Both,
+                    Padding = new MarginPadding { Left = left_area_size },
+                    Children = new Drawable[]
+                    {
+                        new Container
+                        {
+                            Name = "Masked elements before hit objects",
+                            RelativeSizeAxes = Axes.Both,
+                            Padding = new MarginPadding { Left = HIT_TARGET_OFFSET },
+                            Masking = true,
+                            Children = new Drawable[]
+                            {
+                                hitExplosionContainer = new Container<HitExplosion>
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    FillMode = FillMode.Fit,
+                                    Blending = BlendingMode.Additive,
+                                },
+                                HitTarget = new HitTarget
+                                {
+                                    Anchor = Anchor.CentreLeft,
+                                    Origin = Anchor.Centre,
+                                    RelativeSizeAxes = Axes.Both,
+                                    FillMode = FillMode.Fit
+                                }
+                            }
+                        },
+                        barlineContainer = new Container
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Padding = new MarginPadding { Left = HIT_TARGET_OFFSET }
+                        },
+                        new Container
+                        {
+                            Name = "Hit objects",
+                            RelativeSizeAxes = Axes.Both,
+                            Padding = new MarginPadding { Left = HIT_TARGET_OFFSET },
+                            Masking = true,
+                            Child = HitObjectContainer
+                        },
+                        kiaiExplosionContainer = new Container<KiaiHitExplosion>
+                        {
+                            Name = "Kiai hit explosions",
+                            RelativeSizeAxes = Axes.Both,
+                            FillMode = FillMode.Fit,
+                            Margin = new MarginPadding { Left = HIT_TARGET_OFFSET },
+                            Blending = BlendingMode.Additive
+                        },
+                        judgementContainer = new JudgementContainer<DrawableTaikoJudgement>
+                        {
+                            Name = "Judgements",
+                            RelativeSizeAxes = Axes.Y,
+                            Margin = new MarginPadding { Left = HIT_TARGET_OFFSET },
+                            Blending = BlendingMode.Additive
+                        },
+                    }
+                },
+                overlayBackgroundContainer = new Container
+                {
+                    Name = "Left overlay",
+                    RelativeSizeAxes = Axes.Y,
+                    Size = new Vector2(left_area_size, 1),
+                    Children = new Drawable[]
+                    {
+                        overlayBackground = new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                        },
+                        new InputDrum(controlPoints)
+                        {
+                            Anchor = Anchor.CentreRight,
+                            Origin = Anchor.CentreRight,
+                            Scale = new Vector2(0.9f),
+                            Margin = new MarginPadding { Right = 20 }
+                        },
+                        new Box
+                        {
+                            Anchor = Anchor.TopRight,
+                            RelativeSizeAxes = Axes.Y,
+                            Width = 10,
+                            Colour = Framework.Graphics.Colour.ColourInfo.GradientHorizontal(Color4.Black.Opacity(0.6f), Color4.Black.Opacity(0)),
+                        },
+                    }
+                },
+                new Container
+                {
+                    Name = "Border",
+                    RelativeSizeAxes = Axes.Both,
+                    Masking = true,
+                    MaskingSmoothness = 0,
+                    BorderThickness = 2,
+                    AlwaysPresent = true,
+                    Children = new[]
+                    {
+                        new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Alpha = 0,
+                            AlwaysPresent = true
+                        }
+                    }
+                },
+                topLevelHitContainer = new Container
+                {
+                    Name = "Top level hit objects",
+                    RelativeSizeAxes = Axes.Both,
                 }
             };
         }

osu.Game.Rulesets.Taiko/UI/TaikoPlayfieldAdjustmentContainer.cs

@@ -1,16 +1,23 @@
 // 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.Containers;
+using osu.Framework.Graphics;
+using osu.Game.Rulesets.UI;
 using osuTK;
 
 namespace osu.Game.Rulesets.Taiko.UI
 {
-    public class PlayfieldAdjustmentContainer : Container
+    public class TaikoPlayfieldAdjustmentContainer : PlayfieldAdjustmentContainer
     {
         private const float default_relative_height = TaikoPlayfield.DEFAULT_HEIGHT / 768;
         private const float default_aspect = 16f / 9f;
 
+        public TaikoPlayfieldAdjustmentContainer()
+        {
+            Anchor = Anchor.CentreLeft;
+            Origin = Anchor.CentreLeft;
+        }
+
         protected override void Update()
         {
             base.Update();

osu.Game.Tests/Visual/Gameplay/TestCaseKeyCounter.cs

@@ -20,13 +20,13 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             typeof(KeyCounterKeyboard),
             typeof(KeyCounterMouse),
-            typeof(KeyCounterCollection)
+            typeof(KeyCounterDisplay)
         };
 
         public TestCaseKeyCounter()
         {
             KeyCounterKeyboard rewindTestKeyCounterKeyboard;
-            KeyCounterCollection kc = new KeyCounterCollection
+            KeyCounterDisplay kc = new KeyCounterDisplay
             {
                 Origin = Anchor.Centre,
                 Anchor = Anchor.Centre,

osu.Game.Tests/Visual/Gameplay/TestCaseScrollingHitObjects.cs

@@ -170,12 +170,12 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
                 Origin = Anchor.Centre;
 
-                InternalChild = new Box
+                AddInternal(new Box
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     RelativeSizeAxes = Axes.Both
-                };
+                });
 
                 switch (direction)
                 {
@@ -205,7 +205,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 Origin = Anchor.Centre;
                 AutoSizeAxes = Axes.Both;
 
-                InternalChild = new Box { Size = new Vector2(75) };
+                AddInternal(new Box { Size = new Vector2(75) });
             }
 
             protected override void UpdateState(ArmedState state)

osu.Game.Tests/Visual/Menus/TestCaseLoaderAnimation.cs

@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using NUnit.Framework;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Screens;
@@ -12,19 +13,24 @@ using osuTK.Graphics;
 namespace osu.Game.Tests.Visual.Menus
 {
     [TestFixture]
-    public class TestCaseLoaderAnimation : OsuTestCase
+    public class TestCaseLoaderAnimation : ScreenTestCase
     {
         private TestLoader loader;
 
+        [Cached]
+        private OsuLogo logo;
+
+        public TestCaseLoaderAnimation()
+        {
+            Add(logo = new OsuLogo { Depth = float.MinValue });
+        }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            // required to preload the logo in a headless run (so it doesn't delay the loading itself).
-            Add(new OsuLogo());
-
             bool logoVisible = false;
-            AddStep("almost instant display", () => Child = loader = new TestLoader(250));
+            AddStep("almost instant display", () => LoadScreen(loader = new TestLoader(250)));
             AddUntilStep("loaded", () =>
             {
                 logoVisible = loader.Logo?.Alpha > 0;
@@ -32,7 +38,7 @@ namespace osu.Game.Tests.Visual.Menus
             });
             AddAssert("logo not visible", () => !logoVisible);
 
-            AddStep("short load", () => Child = loader = new TestLoader(800));
+            AddStep("short load", () => LoadScreen(loader = new TestLoader(800)));
             AddUntilStep("loaded", () =>
             {
                 logoVisible = loader.Logo?.Alpha > 0;
@@ -41,7 +47,7 @@ namespace osu.Game.Tests.Visual.Menus
             AddAssert("logo visible", () => logoVisible);
             AddUntilStep("logo gone", () => loader.Logo?.Alpha == 0);
 
-            AddStep("longer load", () => Child = loader = new TestLoader(1400));
+            AddStep("longer load", () => LoadScreen(loader = new TestLoader(1400)));
             AddUntilStep("loaded", () =>
             {
                 logoVisible = loader.Logo?.Alpha > 0;

osu.Game.Tests/Visual/Multiplayer/TestCaseLoungeRoomsContainer.cs

@@ -27,7 +27,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [Cached(Type = typeof(IRoomManager))]
         private TestRoomManager roomManager = new TestRoomManager();
 
-        public TestCaseLoungeRoomsContainer()
+        [BackgroundDependencyLoader]
+        private void load()
         {
             RoomsContainer container;
 

osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapOptionsOverlay.cs

@@ -2,7 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.ComponentModel;
-using osu.Game.Graphics;
+using osu.Framework.Graphics.Sprites;
 using osu.Game.Screens.Select.Options;
 using osuTK.Graphics;
 using osuTK.Input;
@@ -16,10 +16,10 @@ namespace osu.Game.Tests.Visual.SongSelect
         {
             var overlay = new BeatmapOptionsOverlay();
 
-            overlay.AddButton(@"Remove", @"from unplayed", FontAwesome.fa_times_circle_o, Color4.Purple, null, Key.Number1);
+            overlay.AddButton(@"Remove", @"from unplayed", FontAwesome.TimesCircleOutline, Color4.Purple, null, Key.Number1);
-            overlay.AddButton(@"Clear", @"local scores", FontAwesome.fa_eraser, Color4.Purple, null, Key.Number2);
+            overlay.AddButton(@"Clear", @"local scores", FontAwesome.Eraser, Color4.Purple, null, Key.Number2);
-            overlay.AddButton(@"Edit", @"Beatmap", FontAwesome.fa_pencil, Color4.Yellow, null, Key.Number3);
+            overlay.AddButton(@"Edit", @"Beatmap", FontAwesome.Pencil, Color4.Yellow, null, Key.Number3);
-            overlay.AddButton(@"Delete", @"Beatmap", FontAwesome.fa_trash, Color4.Pink, null, Key.Number4, float.MaxValue);
+            overlay.AddButton(@"Delete", @"Beatmap", FontAwesome.Trash, Color4.Pink, null, Key.Number4, float.MaxValue);
 
             Add(overlay);
 

osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs

@@ -9,7 +9,6 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.MathUtils;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
-using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays.BeatmapSet.Scores;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
@@ -44,9 +43,9 @@ namespace osu.Game.Tests.Visual.SongSelect
                 }
             };
 
-            IEnumerable<APIScoreInfo> scores = new[]
+            IEnumerable<ScoreInfo> scores = new[]
             {
-                new APIScoreInfo
+                new ScoreInfo
                 {
                     User = new User
                     {
@@ -69,7 +68,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                     TotalScore = 1234567890,
                     Accuracy = 1,
                 },
-                new APIScoreInfo
+                new ScoreInfo
                 {
                     User = new User
                     {
@@ -91,7 +90,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                     TotalScore = 1234789,
                     Accuracy = 0.9997,
                 },
-                new APIScoreInfo
+                new ScoreInfo
                 {
                     User = new User
                     {
@@ -112,7 +111,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                     TotalScore = 12345678,
                     Accuracy = 0.9854,
                 },
-                new APIScoreInfo
+                new ScoreInfo
                 {
                     User = new User
                     {
@@ -132,7 +131,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                     TotalScore = 1234567,
                     Accuracy = 0.8765,
                 },
-                new APIScoreInfo
+                new ScoreInfo
                 {
                     User = new User
                     {
@@ -157,9 +156,9 @@ namespace osu.Game.Tests.Visual.SongSelect
                 s.Statistics.Add(HitResult.Meh, RNG.Next(2000));
             }
 
-            IEnumerable<APIScoreInfo> anotherScores = new[]
+            IEnumerable<ScoreInfo> anotherScores = new[]
             {
-                new APIScoreInfo
+                new ScoreInfo
                 {
                     User = new User
                     {
@@ -181,7 +180,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                     TotalScore = 1234789,
                     Accuracy = 0.9997,
                 },
-                new APIScoreInfo
+                new ScoreInfo
                 {
                     User = new User
                     {
@@ -204,7 +203,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                     TotalScore = 1234567890,
                     Accuracy = 1,
                 },
-                new APIScoreInfo
+                new ScoreInfo
                 {
                     User = new User
                     {
@@ -220,7 +219,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                     TotalScore = 123456,
                     Accuracy = 0.6543,
                 },
-                new APIScoreInfo
+                new ScoreInfo
                 {
                     User = new User
                     {
@@ -241,7 +240,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                     TotalScore = 12345678,
                     Accuracy = 0.9854,
                 },
-                new APIScoreInfo
+                new ScoreInfo
                 {
                     User = new User
                     {
@@ -269,7 +268,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 s.Statistics.Add(HitResult.Meh, RNG.Next(2000));
             }
 
-            var topScoreInfo = new APIScoreInfo
+            var topScoreInfo = new ScoreInfo
             {
                 User = new User
                 {

osu.Game.Tests/Visual/Tournament/TestCaseDrawings.cs

@@ -3,6 +3,7 @@
 
 using System.Collections.Generic;
 using System.ComponentModel;
+using osu.Framework.Allocation;
 using osu.Game.Screens.Tournament;
 using osu.Game.Screens.Tournament.Teams;
 
@@ -11,7 +12,8 @@ namespace osu.Game.Tests.Visual.Tournament
     [Description("for tournament use")]
     public class TestCaseDrawings : ScreenTestCase
     {
-        public TestCaseDrawings()
+        [BackgroundDependencyLoader]
+        private void load()
         {
             LoadScreen(new Drawings
             {

osu.Game.Tests/Visual/UserInterface/TestCaseDialogOverlay.cs

@@ -2,7 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using NUnit.Framework;
-using osu.Game.Graphics;
+using osu.Framework.Graphics.Sprites;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Dialog;
 
@@ -19,7 +19,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             AddStep("dialog #1", () => overlay.Push(new PopupDialog
             {
-                Icon = FontAwesome.fa_trash_o,
+                Icon = FontAwesome.TrashOutline,
                 HeaderText = @"Confirm deletion of",
                 BodyText = @"Ayase Rie - Yuima-ru*World TVver.",
                 Buttons = new PopupDialogButton[]
@@ -39,7 +39,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             AddStep("dialog #2", () => overlay.Push(new PopupDialog
             {
-                Icon = FontAwesome.fa_gear,
+                Icon = FontAwesome.Gear,
                 HeaderText = @"What do you want to do with",
                 BodyText = "Camellia as \"Bang Riot\" - Blastix Riotz",
                 Buttons = new PopupDialogButton[]

osu.Game.Tests/Visual/UserInterface/TestCaseIconButton.cs

@@ -111,7 +111,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
                 button.Anchor = Anchor.Centre;
                 button.Origin = Anchor.Centre;
-                button.Icon = FontAwesome.fa_osu_osu_o;
+                button.Icon = OsuIcon.RulesetOsu;
             }
         }
     }

osu.Game.Tests/Visual/UserInterface/TestCaseOsuIcon.cs

@@ -0,0 +1,73 @@
+// 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 System.Reflection;
+using NUnit.Framework;
+using osu.Framework.Extensions.IEnumerableExtensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Cursor;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Testing;
+using osu.Game.Graphics;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    [TestFixture]
+    public class TestCaseOsuIcon : TestCase
+    {
+        public TestCaseOsuIcon()
+        {
+            FillFlowContainer<Icon> flow;
+
+            AddRange(new Drawable[]
+            {
+                new Box
+                {
+                    Colour = Color4.Teal,
+                    RelativeSizeAxes = Axes.Both,
+                },
+                new ScrollContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Child = flow = new FillFlowContainer<Icon>
+                    {
+                        Anchor = Anchor.TopRight,
+                        Origin = Anchor.TopRight,
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Direction = FillDirection.Full,
+                    },
+                }
+            });
+
+            foreach (var p in typeof(OsuIcon).GetProperties(BindingFlags.Public | BindingFlags.Static))
+                flow.Add(new Icon($"{nameof(OsuIcon)}.{p.Name}", (IconUsage)p.GetValue(null)));
+
+            AddStep("toggle shadows", () => flow.Children.ForEach(i => i.SpriteIcon.Shadow = !i.SpriteIcon.Shadow));
+            AddStep("change icons", () => flow.Children.ForEach(i => i.SpriteIcon.Icon = new IconUsage((char)(i.SpriteIcon.Icon.Icon + 1))));
+        }
+
+        private class Icon : Container, IHasTooltip
+        {
+            public string TooltipText { get; }
+
+            public SpriteIcon SpriteIcon { get; }
+
+            public Icon(string name, IconUsage icon)
+            {
+                TooltipText = name;
+
+                AutoSizeAxes = Axes.Both;
+                Child = SpriteIcon = new SpriteIcon
+                {
+                    Icon = icon,
+                    Size = new Vector2(60),
+                };
+            }
+        }
+    }
+}

osu.Game.Tests/Visual/UserInterface/TestCasePopupDialog.cs

@@ -3,7 +3,7 @@
 
 using NUnit.Framework;
 using osu.Framework.Graphics;
-using osu.Game.Graphics;
+using osu.Framework.Graphics.Sprites;
 using osu.Game.Overlays.Dialog;
 
 namespace osu.Game.Tests.Visual.UserInterface
@@ -17,7 +17,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             {
                 RelativeSizeAxes = Axes.Both,
                 State = Framework.Graphics.Containers.Visibility.Visible,
-                Icon = FontAwesome.fa_assistive_listening_systems,
+                Icon = FontAwesome.AssistiveListeningSystems,
                 HeaderText = @"This is a test popup",
                 BodyText = "I can say lots of stuff and even wrap my words!",
                 Buttons = new PopupDialogButton[]

osu.Game.Tests/Visual/UserInterface/TestCaseTextAwesome.cs

@@ -1,55 +0,0 @@
-// 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 System;
-using NUnit.Framework;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Cursor;
-using osu.Game.Graphics;
-using osuTK;
-
-namespace osu.Game.Tests.Visual.UserInterface
-{
-    [TestFixture]
-    public class TestCaseTextAwesome : OsuTestCase
-    {
-        public TestCaseTextAwesome()
-        {
-            FillFlowContainer flow;
-
-            Add(new ScrollContainer
-            {
-                RelativeSizeAxes = Axes.Both,
-                Child = flow = new FillFlowContainer
-                {
-                    Anchor = Anchor.TopRight,
-                    Origin = Anchor.TopRight,
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
-                    Direction = FillDirection.Full,
-                },
-            });
-
-            foreach (FontAwesome fa in Enum.GetValues(typeof(FontAwesome)))
-                flow.Add(new Icon(fa));
-        }
-
-        private class Icon : Container, IHasTooltip
-        {
-            public string TooltipText { get; }
-
-            public Icon(FontAwesome fa)
-            {
-                TooltipText = fa.ToString();
-
-                AutoSizeAxes = Axes.Both;
-                Child = new SpriteIcon
-                {
-                    Icon = fa,
-                    Size = new Vector2(60),
-                };
-            }
-        }
-    }
-}

osu.Game/Beatmaps/BeatmapStatistic.cs

@@ -1,13 +1,13 @@
 // 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.Game.Graphics;
+using osu.Framework.Graphics.Sprites;
 
 namespace osu.Game.Beatmaps
 {
     public class BeatmapStatistic
     {
-        public FontAwesome Icon;
+        public IconUsage Icon;
         public string Content;
         public string Name;
     }

osu.Game/Beatmaps/Drawables/DifficultyIcon.cs

@@ -7,7 +7,7 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osu.Game.Graphics;
+using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics.Containers;
 using osu.Game.Rulesets;
 using osuTK;
@@ -60,7 +60,7 @@ namespace osu.Game.Beatmaps.Drawables
                     Origin = Anchor.Centre,
                     RelativeSizeAxes = Axes.Both,
                     // the null coalesce here is only present to make unit tests work (ruleset dlls aren't copied correctly for testing at the moment)
-                    Icon = ruleset?.CreateInstance().CreateIcon() ?? new SpriteIcon { Icon = FontAwesome.fa_question_circle_o }
+                    Icon = ruleset?.CreateInstance().CreateIcon() ?? new SpriteIcon { Icon = FontAwesome.QuestionCircleOutline }
                 }
             };
         }

osu.Game/Graphics/Containers/LinkFlowContainer.cs

@@ -35,7 +35,7 @@ namespace osu.Game.Graphics.Containers
             showNotImplementedError = () => notifications?.Post(new SimpleNotification
             {
                 Text = @"This link type is not yet supported!",
-                Icon = FontAwesome.fa_life_saver,
+                Icon = FontAwesome.LifeSaver,
             });
         }
 

osu.Game/Graphics/Containers/OsuTextFlowContainer.cs

@@ -21,6 +21,6 @@ namespace osu.Game.Graphics.Containers
 
         public void AddArbitraryDrawable(Drawable drawable) => AddInternal(drawable);
 
-        public IEnumerable<Drawable> AddIcon(FontAwesome icon, Action<SpriteText> creationParameters = null) => AddText(((char)icon).ToString(), creationParameters);
+        public IEnumerable<Drawable> AddIcon(IconUsage icon, Action<SpriteText> creationParameters = null) => AddText(icon.Icon.ToString(), creationParameters);
     }
 }

osu.Game/Graphics/Containers/UserDimContainer.cs

@@ -8,6 +8,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Configuration;
 using osu.Game.Graphics.Backgrounds;
+using osu.Game.Screens.Play;
 using osuTK;
 using osuTK.Graphics;
 

osu.Game/Graphics/OsuFont.cs

@@ -5,7 +5,7 @@ using osu.Framework.Graphics.Sprites;
 
 namespace osu.Game.Graphics
 {
-    public struct OsuFont
+    public static class OsuFont
     {
         /// <summary>
         /// The default font size.

osu.Game/Graphics/OsuIcon.cs

@@ -0,0 +1,94 @@
+// 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.Sprites;
+
+namespace osu.Game.Graphics
+{
+    public static class OsuIcon
+    {
+        public static IconUsage Get(int icon) => new IconUsage((char)icon, "OsuFont");
+
+        // ruleset icons in circles
+        public static IconUsage RulesetOsu => Get(0xe000);
+        public static IconUsage RulesetMania => Get(0xe001);
+        public static IconUsage RulesetCatch => Get(0xe002);
+        public static IconUsage RulesetTaiko => Get(0xe003);
+
+        // ruleset icons without circles
+        public static IconUsage FilledCircle => Get(0xe004);
+        public static IconUsage CrossCircle => Get(0xe005);
+        public static IconUsage Logo => Get(0xe006);
+        public static IconUsage ChevronDownCircle => Get(0xe007);
+        public static IconUsage EditCircle => Get(0xe033);
+        public static IconUsage LeftCircle => Get(0xe034);
+        public static IconUsage RightCircle => Get(0xe035);
+        public static IconUsage Charts => Get(0xe036);
+        public static IconUsage Solo => Get(0xe037);
+        public static IconUsage Multi => Get(0xe038);
+        public static IconUsage Gear => Get(0xe039);
+
+        // misc icons
+        public static IconUsage Bat => Get(0xe008);
+        public static IconUsage Bubble => Get(0xe009);
+        public static IconUsage BubblePop => Get(0xe02e);
+        public static IconUsage Dice => Get(0xe011);
+        public static IconUsage Heart => Get(0xe02f);
+        public static IconUsage HeartBreak => Get(0xe030);
+        public static IconUsage Hot => Get(0xe031);
+        public static IconUsage ListSearch => Get(0xe032);
+
+        //osu! playstyles
+        public static IconUsage PlaystyleTablet => Get(0xe02a);
+        public static IconUsage PlaystyleMouse => Get(0xe029);
+        public static IconUsage PlaystyleKeyboard => Get(0xe02b);
+        public static IconUsage PlaystyleTouch => Get(0xe02c);
+
+        // osu! difficulties
+        public static IconUsage EasyOsu => Get(0xe015);
+        public static IconUsage NormalOsu => Get(0xe016);
+        public static IconUsage HardOsu => Get(0xe017);
+        public static IconUsage InsaneOsu => Get(0xe018);
+        public static IconUsage ExpertOsu => Get(0xe019);
+
+        // taiko difficulties
+        public static IconUsage EasyTaiko => Get(0xe01a);
+        public static IconUsage NormalTaiko => Get(0xe01b);
+        public static IconUsage HardTaiko => Get(0xe01c);
+        public static IconUsage InsaneTaiko => Get(0xe01d);
+        public static IconUsage ExpertTaiko => Get(0xe01e);
+
+        // fruits difficulties
+        public static IconUsage EasyFruits => Get(0xe01f);
+        public static IconUsage NormalFruits => Get(0xe020);
+        public static IconUsage HardFruits => Get(0xe021);
+        public static IconUsage InsaneFruits => Get(0xe022);
+        public static IconUsage ExpertFruits => Get(0xe023);
+
+        // mania difficulties
+        public static IconUsage EasyMania => Get(0xe024);
+        public static IconUsage NormalMania => Get(0xe025);
+        public static IconUsage HardMania => Get(0xe026);
+        public static IconUsage InsaneMania => Get(0xe027);
+        public static IconUsage ExpertMania => Get(0xe028);
+
+        // mod icons
+        public static IconUsage ModPerfect => Get(0xe049);
+        public static IconUsage ModAutopilot => Get(0xe03a);
+        public static IconUsage ModAuto => Get(0xe03b);
+        public static IconUsage ModCinema => Get(0xe03c);
+        public static IconUsage ModDoubletime => Get(0xe03d);
+        public static IconUsage ModEasy => Get(0xe03e);
+        public static IconUsage ModFlashlight => Get(0xe03f);
+        public static IconUsage ModHalftime => Get(0xe040);
+        public static IconUsage ModHardrock => Get(0xe041);
+        public static IconUsage ModHidden => Get(0xe042);
+        public static IconUsage ModNightcore => Get(0xe043);
+        public static IconUsage ModNofail => Get(0xe044);
+        public static IconUsage ModRelax => Get(0xe045);
+        public static IconUsage ModSpunout => Get(0xe046);
+        public static IconUsage ModSuddendeath => Get(0xe047);
+        public static IconUsage ModTarget => Get(0xe048);
+        public static IconUsage ModBg => Get(0xe04a);
+    }
+}

osu.Game/Graphics/UserInterface/BackButton.cs

@@ -11,7 +11,7 @@ namespace osu.Game.Graphics.UserInterface
         public BackButton()
         {
             Text = @"back";
-            Icon = FontAwesome.fa_osu_left_o;
+            Icon = OsuIcon.LeftCircle;
             Anchor = Anchor.BottomLeft;
             Origin = Anchor.BottomLeft;
         }

osu.Game/Graphics/UserInterface/BreadcrumbControl.cs

@@ -8,6 +8,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.UserInterface;
 using System.Linq;
+using osu.Framework.Graphics.Sprites;
 
 namespace osu.Game.Graphics.UserInterface
 {
@@ -92,7 +93,7 @@ namespace osu.Game.Graphics.UserInterface
                     Anchor = Anchor.CentreRight,
                     Origin = Anchor.CentreLeft,
                     Size = new Vector2(item_chevron_size),
-                    Icon = FontAwesome.fa_chevron_right,
+                    Icon = FontAwesome.ChevronRight,
                     Margin = new MarginPadding { Left = padding },
                     Alpha = 0f,
                 });

osu.Game/Graphics/UserInterface/ExternalLinkButton.cs

@@ -5,6 +5,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
+using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
 using osu.Framework.Platform;
 using osuTK;
@@ -25,7 +26,7 @@ namespace osu.Game.Graphics.UserInterface
             Size = new Vector2(12);
             InternalChild = new SpriteIcon
             {
-                Icon = FontAwesome.fa_external_link,
+                Icon = FontAwesome.ExternalLink,
                 RelativeSizeAxes = Axes.Both
             };
         }

osu.Game/Graphics/UserInterface/IconButton.cs

@@ -4,6 +4,7 @@
 using osuTK;
 using osuTK.Graphics;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
 
 namespace osu.Game.Graphics.UserInterface
@@ -41,7 +42,7 @@ namespace osu.Game.Graphics.UserInterface
         /// <summary>
         /// The icon.
         /// </summary>
-        public FontAwesome Icon
+        public IconUsage Icon
         {
             get => icon.Icon;
             set => icon.Icon = value;

osu.Game/Graphics/UserInterface/LoadingAnimation.cs

@@ -3,6 +3,7 @@
 
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
 using osuTK;
 using osuTK.Graphics;
 
@@ -36,14 +37,14 @@ namespace osu.Game.Graphics.UserInterface
                     Position = new Vector2(1, 1),
                     Colour = Color4.Black,
                     Alpha = 0.4f,
-                    Icon = FontAwesome.fa_circle_o_notch
+                    Icon = FontAwesome.CircleONotch
                 },
                 spinner = new SpriteIcon
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     RelativeSizeAxes = Axes.Both,
-                    Icon = FontAwesome.fa_circle_o_notch
+                    Icon = FontAwesome.CircleONotch
                 }
             };
         }

osu.Game/Graphics/UserInterface/OsuDropdown.cs

@@ -179,7 +179,7 @@ namespace osu.Game.Graphics.UserInterface
                             Chevron = new SpriteIcon
                             {
                                 AlwaysPresent = true,
-                                Icon = FontAwesome.fa_chevron_right,
+                                Icon = FontAwesome.ChevronRight,
                                 Colour = Color4.Black,
                                 Alpha = 0.5f,
                                 Size = new Vector2(8),
@@ -244,7 +244,7 @@ namespace osu.Game.Graphics.UserInterface
                     },
                     Icon = new SpriteIcon
                     {
-                        Icon = FontAwesome.fa_chevron_down,
+                        Icon = FontAwesome.ChevronDown,
                         Anchor = Anchor.CentreRight,
                         Origin = Anchor.CentreRight,
                         Margin = new MarginPadding { Right = 4 },

osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs

@@ -9,6 +9,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input;
 using osu.Framework.Input.Events;
 using osu.Framework.Platform;
@@ -107,7 +108,7 @@ namespace osu.Game.Graphics.UserInterface
 
             public CapsWarning()
             {
-                Icon = FontAwesome.fa_warning;
+                Icon = FontAwesome.Warning;
             }
 
             [BackgroundDependencyLoader]

osu.Game/Graphics/UserInterface/OsuTabControl.cs

@@ -254,7 +254,7 @@ namespace osu.Game.Graphics.UserInterface
                     {
                         new SpriteIcon
                         {
-                            Icon = FontAwesome.fa_ellipsis_h,
+                            Icon = FontAwesome.EllipsisH,
                             Size = new Vector2(14),
                             Origin = Anchor.Centre,
                             Anchor = Anchor.Centre,

osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs

@@ -99,7 +99,7 @@ namespace osu.Game.Graphics.UserInterface
                         icon = new SpriteIcon
                         {
                             Size = new Vector2(14),
-                            Icon = FontAwesome.fa_circle_o,
+                            Icon = FontAwesome.CircleOutline,
                             Shadow = true,
                         },
                     },
@@ -120,12 +120,12 @@ namespace osu.Game.Graphics.UserInterface
                 if (selected.NewValue)
                 {
                     fadeIn();
-                    icon.Icon = FontAwesome.fa_check_circle_o;
+                    icon.Icon = FontAwesome.CheckCircleOutline;
                 }
                 else
                 {
                     fadeOut();
-                    icon.Icon = FontAwesome.fa_circle_o;
+                    icon.Icon = FontAwesome.CircleOutline;
                 }
             };
         }

osu.Game/Graphics/UserInterface/SearchTextBox.cs

@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
 using osuTK;
 using osuTK.Input;
@@ -21,7 +22,7 @@ namespace osu.Game.Graphics.UserInterface
             {
                 new SpriteIcon
                 {
-                    Icon = FontAwesome.fa_search,
+                    Icon = FontAwesome.Search,
                     Origin = Anchor.CentreRight,
                     Anchor = Anchor.CentreRight,
                     Margin = new MarginPadding { Right = 10 },

osu.Game/Graphics/UserInterface/StarCounter.cs

@@ -7,6 +7,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.MathUtils;
 using System;
 using System.Linq;
+using osu.Framework.Graphics.Sprites;
 
 namespace osu.Game.Graphics.UserInterface
 {
@@ -142,7 +143,7 @@ namespace osu.Game.Graphics.UserInterface
                 Child = Icon = new SpriteIcon
                 {
                     Size = new Vector2(star_size),
-                    Icon = FontAwesome.fa_star,
+                    Icon = FontAwesome.Star,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                 };

osu.Game/Graphics/UserInterface/TriangleButton.cs

@@ -33,5 +33,7 @@ namespace osu.Game.Graphics.UserInterface
         {
             set => this.FadeTo(value ? 1 : 0);
         }
+
+        public bool FilteringActive { get; set; }
     }
 }

osu.Game/Graphics/UserInterface/TwoLayerButton.cs

@@ -149,7 +149,7 @@ namespace osu.Game.Graphics.UserInterface
             };
         }
 
-        public FontAwesome Icon
+        public IconUsage Icon
         {
             set => bouncingIcon.Icon = value;
         }
@@ -207,7 +207,7 @@ namespace osu.Game.Graphics.UserInterface
 
             private readonly SpriteIcon icon;
 
-            public FontAwesome Icon
+            public IconUsage Icon
             {
                 set => icon.Icon = value;
             }

osu.Game/Online/API/Requests/GetScoresRequest.cs

@@ -10,7 +10,7 @@ using osu.Game.Online.API.Requests.Responses;
 
 namespace osu.Game.Online.API.Requests
 {
-    public class GetScoresRequest : APIRequest<APIScores>
+    public class GetScoresRequest : APIRequest<APILegacyScores>
     {
         private readonly BeatmapInfo beatmap;
         private readonly BeatmapLeaderboardScope scope;
@@ -31,9 +31,9 @@ namespace osu.Game.Online.API.Requests
             Success += onSuccess;
         }
 
-        private void onSuccess(APIScores r)
+        private void onSuccess(APILegacyScores r)
         {
-            foreach (APIScoreInfo score in r.Scores)
+            foreach (APILegacyScoreInfo score in r.Scores)
                 score.Beatmap = beatmap;
         }
 

osu.Game/Online/API/Requests/GetUserScoresRequest.cs

@@ -6,7 +6,7 @@ using osu.Game.Online.API.Requests.Responses;
 
 namespace osu.Game.Online.API.Requests
 {
-    public class GetUserScoresRequest : APIRequest<List<APIScoreInfo>>
+    public class GetUserScoresRequest : APIRequest<List<APILegacyScoreInfo>>
     {
         private readonly long userId;
         private readonly ScoreType type;

osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs

@@ -8,12 +8,12 @@ using Newtonsoft.Json;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Scoring;
-using osu.Game.Scoring;
+using osu.Game.Scoring.Legacy;
 using osu.Game.Users;
 
 namespace osu.Game.Online.API.Requests.Responses
 {
-    public class APIScoreInfo : ScoreInfo
+    public class APILegacyScoreInfo : LegacyScoreInfo
     {
         [JsonProperty(@"score")]
         private int totalScore
@@ -74,29 +74,37 @@ namespace osu.Game.Online.API.Requests.Responses
                     HitResult newKey;
                     switch (kvp.Key)
                     {
+                        case @"count_geki":
+                            CountGeki = kvp.Value;
+                            break;
                         case @"count_300":
-                            newKey = HitResult.Great;
+                            Count300 = kvp.Value;
+                            break;
+                        case @"count_katu":
+                            CountKatu = kvp.Value;
                             break;
                         case @"count_100":
-                            newKey = HitResult.Good;
+                            Count100 = kvp.Value;
                             break;
                         case @"count_50":
-                            newKey = HitResult.Meh;
+                            Count50 = kvp.Value;
                             break;
                         case @"count_miss":
-                            newKey = HitResult.Miss;
+                            CountMiss = kvp.Value;
                             break;
                         default:
                             continue;
                     }
-
-                    Statistics.Add(newKey, kvp.Value);
                 }
             }
         }
 
         [JsonProperty(@"mode_int")]
-        public int OnlineRulesetID { get; set; }
+        public int OnlineRulesetID
+        {
+            get => RulesetID;
+            set => RulesetID = value;
+        }
 
         [JsonProperty(@"mods")]
         private string[] modStrings { get; set; }

osu.Game/Online/API/Requests/Responses/APILegacyScores.cs

@@ -6,9 +6,9 @@ using Newtonsoft.Json;
 
 namespace osu.Game.Online.API.Requests.Responses
 {
-    public class APIScores
+    public class APILegacyScores
     {
         [JsonProperty(@"scores")]
-        public IEnumerable<APIScoreInfo> Scores;
+        public IEnumerable<APILegacyScoreInfo> Scores;
     }
 }

osu.Game/Online/Leaderboards/LeaderboardScore.cs

@@ -258,8 +258,8 @@ namespace osu.Game.Online.Leaderboards
 
         protected virtual IEnumerable<LeaderboardScoreStatistic> GetStatistics(ScoreInfo model) => new[]
         {
-            new LeaderboardScoreStatistic(FontAwesome.fa_link, "Max Combo", model.MaxCombo.ToString()),
+            new LeaderboardScoreStatistic(FontAwesome.Link, "Max Combo", model.MaxCombo.ToString()),
-            new LeaderboardScoreStatistic(FontAwesome.fa_crosshairs, "Accuracy", string.Format(model.Accuracy % 1 == 0 ? @"{0:P0}" : @"{0:P2}", model.Accuracy))
+            new LeaderboardScoreStatistic(FontAwesome.Crosshairs, "Accuracy", string.Format(model.Accuracy % 1 == 0 ? @"{0:P0}" : @"{0:P2}", model.Accuracy))
         };
 
         protected override bool OnHover(HoverEvent e)
@@ -353,7 +353,7 @@ namespace osu.Game.Online.Leaderboards
                                     Size = new Vector2(icon_size),
                                     Rotation = 45,
                                     Colour = OsuColour.FromHex(@"3087ac"),
-                                    Icon = FontAwesome.fa_square,
+                                    Icon = FontAwesome.Square,
                                     Shadow = true,
                                 },
                                 new SpriteIcon
@@ -378,11 +378,11 @@ namespace osu.Game.Online.Leaderboards
 
         public class LeaderboardScoreStatistic
         {
-            public FontAwesome Icon;
+            public IconUsage Icon;
             public string Value;
             public string Name;
 
-            public LeaderboardScoreStatistic(FontAwesome icon, string name, string value)
+            public LeaderboardScoreStatistic(IconUsage icon, string name, string value)
             {
                 Icon = icon;
                 Name = name;

osu.Game/Online/Leaderboards/MessagePlaceholder.cs

@@ -2,7 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics;
-using osu.Game.Graphics;
+using osu.Framework.Graphics.Sprites;
 
 namespace osu.Game.Online.Leaderboards
 {
@@ -12,7 +12,7 @@ namespace osu.Game.Online.Leaderboards
 
         public MessagePlaceholder(string message)
         {
-            AddIcon(FontAwesome.fa_exclamation_circle, cp =>
+            AddIcon(FontAwesome.ExclamationCircle, cp =>
             {
                 cp.Font = cp.Font.With(size: TEXT_SIZE);
                 cp.Padding = new MarginPadding { Right = 10 };

osu.Game/Online/Leaderboards/RetrievalFailurePlaceholder.cs

@@ -3,8 +3,8 @@
 
 using System;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
-using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osuTK;
 
@@ -41,7 +41,7 @@ namespace osu.Game.Online.Leaderboards
                     Action = () => Action?.Invoke(),
                     Child = icon = new SpriteIcon
                     {
-                        Icon = FontAwesome.fa_refresh,
+                        Icon = FontAwesome.Refresh,
                         Size = new Vector2(TEXT_SIZE),
                         Shadow = true,
                     },

osu.Game/Online/Multiplayer/GameTypes/GameTypeTag.cs

@@ -2,6 +2,7 @@
 // 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 osuTK;
 
@@ -17,7 +18,7 @@ namespace osu.Game.Online.Multiplayer.GameTypes
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
-                Icon = FontAwesome.fa_refresh,
+                Icon = FontAwesome.Refresh,
                 Size = new Vector2(size),
                 Colour = colours.Blue,
                 Shadow = false,

osu.Game/Online/Multiplayer/GameTypes/GameTypeTagTeam.cs

@@ -3,6 +3,7 @@
 
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osuTK;
 
@@ -25,14 +26,14 @@ namespace osu.Game.Online.Multiplayer.GameTypes
                 {
                     new SpriteIcon
                     {
-                        Icon = FontAwesome.fa_refresh,
+                        Icon = FontAwesome.Refresh,
                         Size = new Vector2(size * 0.75f),
                         Colour = colours.Blue,
                         Shadow = false,
                     },
                     new SpriteIcon
                     {
-                        Icon = FontAwesome.fa_refresh,
+                        Icon = FontAwesome.Refresh,
                         Size = new Vector2(size * 0.75f),
                         Colour = colours.Pink,
                         Shadow = false,

osu.Game/Online/Multiplayer/GameTypes/GameTypeTimeshift.cs

@@ -2,6 +2,7 @@
 // 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 osuTK;
 
@@ -15,7 +16,7 @@ namespace osu.Game.Online.Multiplayer.GameTypes
         {
             Anchor = Anchor.Centre,
             Origin = Anchor.Centre,
-            Icon = FontAwesome.fa_clock_o,
+            Icon = FontAwesome.ClockOutline,
             Size = new Vector2(size),
             Colour = colours.Blue,
             Shadow = false

osu.Game/OsuGame.cs

@@ -22,6 +22,7 @@ using System.Threading.Tasks;
 using osu.Framework.Audio;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
+using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Platform;
@@ -569,7 +570,7 @@ namespace osu.Game
                 {
                     Schedule(() => notifications.Post(new SimpleNotification
                     {
-                        Icon = entry.Level == LogLevel.Important ? FontAwesome.fa_exclamation_circle : FontAwesome.fa_bomb,
+                        Icon = entry.Level == LogLevel.Important ? FontAwesome.ExclamationCircle : FontAwesome.Bomb,
                         Text = entry.Message + (entry.Exception != null && IsDeployedBuild ? "\n\nThis error has been automatically reported to the devs." : string.Empty),
                     }));
                 }
@@ -577,7 +578,7 @@ namespace osu.Game
                 {
                     Schedule(() => notifications.Post(new SimpleNotification
                     {
-                        Icon = FontAwesome.fa_ellipsis_h,
+                        Icon = FontAwesome.EllipsisH,
                         Text = "Subsequent messages have been logged. Click to view log files.",
                         Activated = () =>
                         {

osu.Game/OsuGameBase.cs

@@ -119,9 +119,6 @@ namespace osu.Game
             dependencies.CacheAs(this);
             dependencies.Cache(LocalConfig);
 
-            //this completely overrides the framework default. will need to change once we make a proper FontStore.
-            dependencies.Cache(Fonts = new FontStore(new GlyphStore(Resources, @"Fonts/FontAwesome")));
-
             Fonts.AddStore(new GlyphStore(Resources, @"Fonts/osuFont"));
             Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-Medium"));
             Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-MediumItalic"));

osu.Game/Overlays/BeatmapSet/BasicStats.cs

@@ -6,6 +6,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
+using osu.Framework.Graphics.Sprites;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
@@ -74,10 +75,10 @@ namespace osu.Game.Overlays.BeatmapSet
                 Direction = FillDirection.Horizontal,
                 Children = new[]
                 {
-                    length = new Statistic(FontAwesome.fa_clock_o, "Length") { Width = 0.25f },
+                    length = new Statistic(FontAwesome.ClockOutline, "Length") { Width = 0.25f },
-                    bpm = new Statistic(FontAwesome.fa_circle, "BPM") { Width = 0.25f },
+                    bpm = new Statistic(FontAwesome.Circle, "BPM") { Width = 0.25f },
-                    circleCount = new Statistic(FontAwesome.fa_circle_o, "Circle Count") { Width = 0.25f },
+                    circleCount = new Statistic(FontAwesome.CircleOutline, "Circle Count") { Width = 0.25f },
-                    sliderCount = new Statistic(FontAwesome.fa_circle, "Slider Count") { Width = 0.25f },
+                    sliderCount = new Statistic(FontAwesome.Circle, "Slider Count") { Width = 0.25f },
                 },
             };
         }
@@ -101,7 +102,7 @@ namespace osu.Game.Overlays.BeatmapSet
                 set => this.value.Text = value;
             }
 
-            public Statistic(FontAwesome icon, string name)
+            public Statistic(IconUsage icon, string name)
             {
                 this.name = name;
                 RelativeSizeAxes = Axes.X;
@@ -120,7 +121,7 @@ namespace osu.Game.Overlays.BeatmapSet
                             {
                                 Anchor = Anchor.CentreLeft,
                                 Origin = Anchor.Centre,
-                                Icon = FontAwesome.fa_square,
+                                Icon = FontAwesome.Square,
                                 Size = new Vector2(13),
                                 Rotation = 45,
                                 Colour = OsuColour.FromHex(@"441288"),

osu.Game/Overlays/BeatmapSet/BeatmapPicker.cs

@@ -10,6 +10,7 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
@@ -130,8 +131,8 @@ namespace osu.Game.Overlays.BeatmapSet
                             Margin = new MarginPadding { Top = 5 },
                             Children = new[]
                             {
-                                plays = new Statistic(FontAwesome.fa_play_circle),
+                                plays = new Statistic(FontAwesome.PlayCircle),
-                                favourites = new Statistic(FontAwesome.fa_heart),
+                                favourites = new Statistic(FontAwesome.Heart),
                             },
                         },
                     },
@@ -292,7 +293,7 @@ namespace osu.Game.Overlays.BeatmapSet
                 }
             }
 
-            public Statistic(FontAwesome icon)
+            public Statistic(IconUsage icon)
             {
                 AutoSizeAxes = Axes.Both;
                 Direction = FillDirection.Horizontal;

osu.Game/Overlays/BeatmapSet/Buttons/DownloadButton.cs

@@ -6,6 +6,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
+using osu.Framework.Graphics.Sprites;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
@@ -77,7 +78,7 @@ namespace osu.Game.Overlays.BeatmapSet.Buttons
                                     Depth = -1,
                                     Anchor = Anchor.CentreRight,
                                     Origin = Anchor.CentreRight,
-                                    Icon = FontAwesome.fa_download,
+                                    Icon = FontAwesome.Download,
                                     Size = new Vector2(16),
                                     Margin = new MarginPadding { Right = 5 },
                                 },

osu.Game/Overlays/BeatmapSet/Buttons/FavouriteButton.cs

@@ -6,6 +6,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Backgrounds;
 using osuTK;
@@ -47,7 +48,7 @@ namespace osu.Game.Overlays.BeatmapSet.Buttons
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Icon = FontAwesome.fa_heart_o,
+                    Icon = FontAwesome.HeartOutline,
                     Size = new Vector2(18),
                     Shadow = false,
                 },
@@ -58,12 +59,12 @@ namespace osu.Game.Overlays.BeatmapSet.Buttons
                 if (favourited.NewValue)
                 {
                     pink.FadeIn(200);
-                    icon.Icon = FontAwesome.fa_heart;
+                    icon.Icon = FontAwesome.Heart;
                 }
                 else
                 {
                     pink.FadeOut(200);
-                    icon.Icon = FontAwesome.fa_heart_o;
+                    icon.Icon = FontAwesome.HeartOutline;
                 }
             };
 

osu.Game/Overlays/BeatmapSet/Scores/DrawableScore.cs

@@ -9,12 +9,12 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Leaderboards;
 using osu.Game.Overlays.Profile.Sections.Ranks;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
+using osu.Game.Scoring;
 using osu.Game.Users;
 
 namespace osu.Game.Overlays.BeatmapSet.Scores
@@ -26,7 +26,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
 
         private readonly Box background;
 
-        public DrawableScore(int index, APIScoreInfo score)
+        public DrawableScore(int index, ScoreInfo score)
         {
             ScoreModsContainer modsContainer;
 

osu.Game/Overlays/BeatmapSet/Scores/DrawableTopScore.cs

@@ -11,7 +11,6 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Leaderboards;
 using osu.Game.Overlays.Profile.Sections.Ranks;
 using osu.Game.Rulesets.Mods;
@@ -43,9 +42,9 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
         private readonly InfoColumn statistics;
         private readonly ScoreModsContainer modsContainer;
 
-        private APIScoreInfo score;
+        private ScoreInfo score;
 
-        public APIScoreInfo Score
+        public ScoreInfo Score
         {
             get => score;
             set