diff --git a/osu.Game/Online/Leaderboards/DrawableRank.cs b/osu.Game/Online/Leaderboards/DrawableRank.cs
index 9155df69b4..ce64395dde 100644
--- a/osu.Game/Online/Leaderboards/DrawableRank.cs
+++ b/osu.Game/Online/Leaderboards/DrawableRank.cs
@@ -43,7 +43,24 @@ namespace osu.Game.Online.Leaderboards
 
         private void updateTexture()
         {
-            rankSprite.Texture = textures.Get($@"Grades/{Rank.GetDescription()}");
+            string textureName;
+
+            switch (Rank)
+            {
+                default:
+                    textureName = Rank.GetDescription();
+                    break;
+
+                case ScoreRank.SH:
+                    textureName = "SPlus";
+                    break;
+
+                case ScoreRank.XH:
+                    textureName = "SSPlus";
+                    break;
+            }
+
+            rankSprite.Texture = textures.Get($@"Grades/{textureName}");
         }
 
         public void UpdateRank(ScoreRank newRank)
diff --git a/osu.Game/Scoring/ScoreRank.cs b/osu.Game/Scoring/ScoreRank.cs
index 82c33748bb..a93d015f1b 100644
--- a/osu.Game/Scoring/ScoreRank.cs
+++ b/osu.Game/Scoring/ScoreRank.cs
@@ -25,13 +25,13 @@ namespace osu.Game.Scoring
         [Description(@"S")]
         S,
 
-        [Description(@"SPlus")]
+        [Description(@"S+")]
         SH,
 
         [Description(@"SS")]
         X,
 
-        [Description(@"SSPlus")]
+        [Description(@"SS+")]
         XH,
     }
 }
diff --git a/osu.Game/Screens/Play/Break/BreakInfoLine.cs b/osu.Game/Screens/Play/Break/BreakInfoLine.cs
index 4b07405812..70e7b8f297 100644
--- a/osu.Game/Screens/Play/Break/BreakInfoLine.cs
+++ b/osu.Game/Screens/Play/Break/BreakInfoLine.cs
@@ -1,8 +1,10 @@
 // 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 osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
@@ -60,7 +62,13 @@ namespace osu.Game.Screens.Play.Break
             valueText.Text = newText;
         }
 
-        protected virtual string Format(T count) => count.ToString();
+        protected virtual string Format(T count)
+        {
+            if (count is Enum countEnum)
+                return countEnum.GetDescription();
+
+            return count.ToString();
+        }
 
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)