diff --git a/osu.Game.Rulesets.RurusettoAddon.Tests/TestSceneOsuPlayer.cs b/osu.Game.Rulesets.RurusettoAddon.Tests/TestSceneOsuPlayer.cs
deleted file mode 100644
index bf40284..0000000
--- a/osu.Game.Rulesets.RurusettoAddon.Tests/TestSceneOsuPlayer.cs
+++ /dev/null
@@ -1,13 +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 NUnit.Framework;
-using osu.Game.Tests.Visual;
-
-namespace osu.Game.Rulesets.RurusettoAddon.Tests {
-	[TestFixture]
-    public class TestSceneOsuPlayer : PlayerTestScene
-    {
-        protected override Ruleset CreatePlayerRuleset() => new RurusettoAddonRuleset();
-    }
-}
diff --git a/osu.Game.Rulesets.RurusettoAddon/RurusettoAddonRuleset.cs b/osu.Game.Rulesets.RurusettoAddon/RurusettoAddonRuleset.cs
index 6b99fa6..195dbdf 100644
--- a/osu.Game.Rulesets.RurusettoAddon/RurusettoAddonRuleset.cs
+++ b/osu.Game.Rulesets.RurusettoAddon/RurusettoAddonRuleset.cs
@@ -47,25 +47,30 @@ public override IEnumerable<Mod> GetModsFor ( ModType type )
         public override IEnumerable<KeyBinding> GetDefaultKeyBindings ( int variant = 0 )
             => Array.Empty<KeyBinding>();
 
-        public override Drawable CreateIcon() => new Icon(ShortName[0], this);
+        public override Drawable CreateIcon() => new Icon( this );
 
         public class Icon : CompositeDrawable
         {
             private RurusettoAddonRuleset ruleset;
 
-            public Icon ( char c, RurusettoAddonRuleset ruleset ) {
+            public Icon ( RurusettoAddonRuleset ruleset ) {
                 this.ruleset = ruleset;
 
+                RelativeSizeAxes = Axes.Both;
+
                 InternalChildren = new Drawable[] {
-                    new Circle {
-                        Size = new Vector2(20),
-                        Colour = Color4.White,
+                    new SpriteIcon {
+                        Icon = FontAwesome.Regular.Circle,
+                        RelativeSizeAxes = Axes.Both,
+                        Origin = Anchor.Centre,
+                        Anchor = Anchor.Centre
                     },
                     new SpriteText {
-                        Anchor = Anchor.Centre,
+                        UseFullGlyphHeight = false,
+                        Text = "r",
+                        Font = OsuFont.GetFont( size: 24 ),
                         Origin = Anchor.Centre,
-                        Text = c.ToString(),
-                        Font = OsuFont.Default.With(size: 18)
+                        Anchor = Anchor.Centre
                     }
                 };
             }
diff --git a/osu.Game.Rulesets.RurusettoAddon/UI/TogglableScrollContainer.cs b/osu.Game.Rulesets.RurusettoAddon/UI/TogglableScrollContainer.cs
index 7244a08..0678ad4 100644
--- a/osu.Game.Rulesets.RurusettoAddon/UI/TogglableScrollContainer.cs
+++ b/osu.Game.Rulesets.RurusettoAddon/UI/TogglableScrollContainer.cs
@@ -1,11 +1,6 @@
 using osu.Framework.Graphics;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics.Containers;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace osu.Game.Rulesets.RurusettoAddon.UI {
 	public class TogglableScrollContainer : OsuScrollContainer {