diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneLeaderboardScoreV2.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneLeaderboardScoreV2.cs
index 13eaf5417d..9a6f52a487 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneLeaderboardScoreV2.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneLeaderboardScoreV2.cs
@@ -39,26 +39,11 @@ namespace osu.Game.Tests.Visual.SongSelect
                     },
                 },
                 new ScoreInfo
-                {
-                    Position = 110000,
-                    Rank = ScoreRank.X,
-                    Accuracy = 1,
-                    MaxCombo = 244,
-                    TotalScore = 1707827,
-                    Ruleset = new OsuRuleset().RulesetInfo,
-                    User = new APIUser
-                    {
-                        Id = 4608074,
-                        Username = @"Skycries",
-                        CountryCode = CountryCode.BR,
-                    },
-                },
-                new ScoreInfo
                 {
                     Position = 22333,
                     Rank = ScoreRank.S,
-                    Accuracy = 1,
-                    MaxCombo = 244,
+                    Accuracy = 0.1f,
+                    MaxCombo = 2404,
                     TotalScore = 1707827,
                     Ruleset = new OsuRuleset().RulesetInfo,
                     User = new APIUser
@@ -80,7 +65,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 Children = new Drawable[]
                 {
                     new LeaderBoardScoreV2(scores[0], 1),
-                    new LeaderBoardScoreV2(scores[2], 3, true)
+                    new LeaderBoardScoreV2(scores[1], null, true)
                 }
             };
         }
diff --git a/osu.Game/Online/Leaderboards/LeaderBoardScoreV2.cs b/osu.Game/Online/Leaderboards/LeaderBoardScoreV2.cs
index ccf48f4f74..a9d86d75d7 100644
--- a/osu.Game/Online/Leaderboards/LeaderBoardScoreV2.cs
+++ b/osu.Game/Online/Leaderboards/LeaderBoardScoreV2.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Online.Leaderboards
     {
         private readonly ScoreInfo score;
 
-        private const int HEIGHT = 60;
+        private const int height = 60;
         private const int corner_radius = 10;
         private const int transition_duration = 200;
 
@@ -102,7 +102,7 @@ namespace osu.Game.Online.Leaderboards
 
             Shear = shear;
             RelativeSizeAxes = Axes.X;
-            Height = HEIGHT;
+            Height = height;
             Child = content = new Container
             {
                 Masking = true,
@@ -176,11 +176,11 @@ namespace osu.Game.Online.Leaderboards
                         })
                     {
                         RelativeSizeAxes = Axes.None,
-                        Size = new Vector2(HEIGHT)
+                        Size = new Vector2(height)
                     },
                     new FillFlowContainer
                     {
-                        Position = new Vector2(HEIGHT + 9, 9),
+                        Position = new Vector2(height + 9, 9),
                         AutoSizeAxes = Axes.Both,
                         Direction = FillDirection.Vertical,
                         Children = new Drawable[]
@@ -217,6 +217,7 @@ namespace osu.Game.Online.Leaderboards
                     },
                     new FillFlowContainer
                     {
+                        Spacing = new Vector2(5, 0),
                         Shear = -shear,
                         Anchor = Anchor.CentreRight,
                         Origin = Anchor.CentreRight,
@@ -346,6 +347,8 @@ namespace osu.Game.Online.Leaderboards
             background.FadeColour(IsHovered ? backgroundColour.Lighten(0.2f) : backgroundColour, transition_duration, Easing.OutQuint);
         }
 
+        #region Subclasses
+
         private partial class DateLabel : DrawableDate
         {
             public DateLabel(DateTimeOffset date)
@@ -374,13 +377,12 @@ namespace osu.Game.Online.Leaderboards
             [BackgroundDependencyLoader]
             private void load(OsuColour colours, OverlayColourProvider colourProvider)
             {
-                AutoSizeAxes = Axes.Both;
+                AutoSizeAxes = Axes.Y;
                 OsuSpriteText value;
                 Child = content = new FillFlowContainer
                 {
                     AutoSizeAxes = Axes.Both,
                     Direction = FillDirection.Vertical,
-                    Padding = new MarginPadding { Right = 25 },
                     Children = new Drawable[]
                     {
                         new OsuSpriteText
@@ -397,8 +399,18 @@ namespace osu.Game.Online.Leaderboards
                     }
                 };
 
-                if (score.Combo == score.MaxCombo && statisticInfo.Name == EditorSetupStrings.ComboColourPrefix.ToUpper())
+                if (statisticInfo.Name == EditorSetupStrings.ComboColourPrefix.ToUpper())
+                {
+                    Width = 45;
+
+                    if (score.Combo != score.MaxCombo) return;
+
                     value.Colour = colours.Lime1;
+
+                    return;
+                }
+
+                Width = statisticInfo.Name == BeatmapsetsStrings.ShowScoreboardHeadersAccuracy.ToUpper() ? 60 : 120;
             }
         }
 
@@ -448,6 +460,8 @@ namespace osu.Game.Online.Leaderboards
             }
         }
 
+        #endregion
+
         public MenuItem[] ContextMenuItems
         {
             get