diff --git a/osu.Game.Tests/Visual/Online/TestSceneFriendDisplay.cs b/osu.Game.Tests/Visual/Online/TestSceneFriendDisplay.cs
index c5c61cdd72..5454c87dff 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneFriendDisplay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneFriendDisplay.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Tests.Visual.Online
                 Id = 3103765,
                 IsOnline = true,
                 Statistics = new UserStatistics { GlobalRank = 1111 },
-                Country = new Country { FlagName = "JP" },
+                CountryCode = CountryCode.JP,
                 CoverUrl = "https://osu.ppy.sh/images/headers/profile-covers/c6.jpg"
             },
             new APIUser
@@ -64,7 +64,7 @@ namespace osu.Game.Tests.Visual.Online
                 Id = 2,
                 IsOnline = false,
                 Statistics = new UserStatistics { GlobalRank = 2222 },
-                Country = new Country { FlagName = "AU" },
+                CountryCode = CountryCode.AU,
                 CoverUrl = "https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
                 IsSupporter = true,
                 SupportLevel = 3,
@@ -73,7 +73,7 @@ namespace osu.Game.Tests.Visual.Online
             {
                 Username = "Evast",
                 Id = 8195163,
-                Country = new Country { FlagName = "BY" },
+                CountryCode = CountryCode.BY,
                 CoverUrl = "https://assets.ppy.sh/user-profile-covers/8195163/4a8e2ad5a02a2642b631438cfa6c6bd7e2f9db289be881cb27df18331f64144c.jpeg",
                 IsOnline = false,
                 LastVisit = DateTimeOffset.Now
diff --git a/osu.Game.Tests/Visual/Online/TestSceneRankingsCountryFilter.cs b/osu.Game.Tests/Visual/Online/TestSceneRankingsCountryFilter.cs
index e7d799222a..6a39db4870 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneRankingsCountryFilter.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneRankingsCountryFilter.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Tests.Visual.Online
 
         public TestSceneRankingsCountryFilter()
         {
-            var countryBindable = new Bindable<Country>();
+            var countryBindable = new Bindable<CountryCode>();
 
             AddRange(new Drawable[]
             {
@@ -56,20 +56,12 @@ namespace osu.Game.Tests.Visual.Online
                 }
             });
 
-            var country = new Country
-            {
-                FlagName = "BY",
-                FullName = "Belarus"
-            };
-            var unknownCountry = new Country
-            {
-                FlagName = "CK",
-                FullName = "Cook Islands"
-            };
+            const CountryCode country = CountryCode.BY;
+            const CountryCode unknown_country = CountryCode.CK;
 
             AddStep("Set country", () => countryBindable.Value = country);
-            AddStep("Set null country", () => countryBindable.Value = null);
-            AddStep("Set country with no flag", () => countryBindable.Value = unknownCountry);
+            AddStep("Set default country", () => countryBindable.Value = default);
+            AddStep("Set country with no flag", () => countryBindable.Value = unknown_country);
         }
     }
 }
diff --git a/osu.Game.Tests/Visual/Online/TestSceneRankingsHeader.cs b/osu.Game.Tests/Visual/Online/TestSceneRankingsHeader.cs
index c8f08d70be..c776cfe377 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneRankingsHeader.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneRankingsHeader.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Tests.Visual.Online
 
         public TestSceneRankingsHeader()
         {
-            var countryBindable = new Bindable<Country>();
+            var countryBindable = new Bindable<CountryCode>();
             var ruleset = new Bindable<RulesetInfo>();
             var scope = new Bindable<RankingsScope>();
 
@@ -30,21 +30,12 @@ namespace osu.Game.Tests.Visual.Online
                 Ruleset = { BindTarget = ruleset }
             });
 
-            var country = new Country
-            {
-                FlagName = "BY",
-                FullName = "Belarus"
-            };
-
-            var unknownCountry = new Country
-            {
-                FlagName = "CK",
-                FullName = "Cook Islands"
-            };
+            const CountryCode country = CountryCode.BY;
+            const CountryCode unknown_country = CountryCode.CK;
 
             AddStep("Set country", () => countryBindable.Value = country);
             AddStep("Set scope to Score", () => scope.Value = RankingsScope.Score);
-            AddStep("Set country with no flag", () => countryBindable.Value = unknownCountry);
+            AddStep("Set country with no flag", () => countryBindable.Value = unknown_country);
         }
     }
 }
diff --git a/osu.Game.Tests/Visual/Online/TestSceneRankingsOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneRankingsOverlay.cs
index 62dad7b458..5476049882 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneRankingsOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneRankingsOverlay.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Tests.Visual.Online
 
         private TestRankingsOverlay rankingsOverlay;
 
-        private readonly Bindable<Country> countryBindable = new Bindable<Country>();
+        private readonly Bindable<CountryCode> countryBindable = new Bindable<CountryCode>();
         private readonly Bindable<RankingsScope> scope = new Bindable<RankingsScope>();
 
         [SetUp]
@@ -48,15 +48,15 @@ namespace osu.Game.Tests.Visual.Online
         public void TestFlagScopeDependency()
         {
             AddStep("Set scope to Score", () => scope.Value = RankingsScope.Score);
-            AddAssert("Check country is Null", () => countryBindable.Value == null);
-            AddStep("Set country", () => countryBindable.Value = us_country);
+            AddAssert("Check country is default", () => countryBindable.IsDefault);
+            AddStep("Set country", () => countryBindable.Value = CountryCode.US);
             AddAssert("Check scope is Performance", () => scope.Value == RankingsScope.Performance);
         }
 
         [Test]
         public void TestShowCountry()
         {
-            AddStep("Show US", () => rankingsOverlay.ShowCountry(us_country));
+            AddStep("Show US", () => rankingsOverlay.ShowCountry(CountryCode.US));
         }
 
         private void loadRankingsOverlay()
@@ -69,15 +69,9 @@ namespace osu.Game.Tests.Visual.Online
             };
         }
 
-        private static readonly Country us_country = new Country
-        {
-            FlagName = "US",
-            FullName = "United States"
-        };
-
         private class TestRankingsOverlay : RankingsOverlay
         {
-            public new Bindable<Country> Country => base.Country;
+            public new Bindable<CountryCode> Country => base.Country;
         }
     }
 }
diff --git a/osu.Game.Tests/Visual/Online/TestSceneRankingsTables.cs b/osu.Game.Tests/Visual/Online/TestSceneRankingsTables.cs
index e357b0fffc..81b76d19ac 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneRankingsTables.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneRankingsTables.cs
@@ -57,8 +57,7 @@ namespace osu.Game.Tests.Visual.Online
             {
                 new CountryStatistics
                 {
-                    Country = new Country { FlagName = "US", FullName = "United States" },
-                    FlagName = "US",
+                    Code = CountryCode.US,
                     ActiveUsers = 2_972_623,
                     PlayCount = 3_086_515_743,
                     RankedScore = 449_407_643_332_546,
@@ -66,8 +65,7 @@ namespace osu.Game.Tests.Visual.Online
                 },
                 new CountryStatistics
                 {
-                    Country = new Country { FlagName = "RU", FullName = "Russian Federation" },
-                    FlagName = "RU",
+                    Code = CountryCode.RU,
                     ActiveUsers = 1_609_989,
                     PlayCount = 1_637_052_841,
                     RankedScore = 221_660_827_473_004,
@@ -86,7 +84,7 @@ namespace osu.Game.Tests.Visual.Online
                 User = new APIUser
                 {
                     Username = "first active user",
-                    Country = new Country { FlagName = "JP" },
+                    CountryCode = CountryCode.JP,
                     Active = true,
                 },
                 Accuracy = 0.9972,
@@ -106,7 +104,7 @@ namespace osu.Game.Tests.Visual.Online
                 User = new APIUser
                 {
                     Username = "inactive user",
-                    Country = new Country { FlagName = "AU" },
+                    CountryCode = CountryCode.AU,
                     Active = false,
                 },
                 Accuracy = 0.9831,
@@ -126,7 +124,7 @@ namespace osu.Game.Tests.Visual.Online
                 User = new APIUser
                 {
                     Username = "second active user",
-                    Country = new Country { FlagName = "PL" },
+                    CountryCode = CountryCode.PL,
                     Active = true,
                 },
                 Accuracy = 0.9584,
diff --git a/osu.Game.Tests/Visual/Online/TestSceneScoresContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneScoresContainer.cs
index 6ef87f762c..beca3a8700 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneScoresContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneScoresContainer.cs
@@ -157,11 +157,7 @@ namespace osu.Game.Tests.Visual.Online
                         {
                             Id = 6602580,
                             Username = @"waaiiru",
-                            Country = new Country
-                            {
-                                FullName = @"Spain",
-                                FlagName = @"ES",
-                            },
+                            CountryCode = CountryCode.ES,
                         },
                         Mods = new[]
                         {
@@ -184,11 +180,7 @@ namespace osu.Game.Tests.Visual.Online
                         {
                             Id = 4608074,
                             Username = @"Skycries",
-                            Country = new Country
-                            {
-                                FullName = @"Brazil",
-                                FlagName = @"BR",
-                            },
+                            CountryCode = CountryCode.BR,
                         },
                         Mods = new[]
                         {
@@ -210,11 +202,7 @@ namespace osu.Game.Tests.Visual.Online
                         {
                             Id = 1014222,
                             Username = @"eLy",
-                            Country = new Country
-                            {
-                                FullName = @"Japan",
-                                FlagName = @"JP",
-                            },
+                            CountryCode = CountryCode.JP,
                         },
                         Mods = new[]
                         {
@@ -235,11 +223,7 @@ namespace osu.Game.Tests.Visual.Online
                         {
                             Id = 1541390,
                             Username = @"Toukai",
-                            Country = new Country
-                            {
-                                FullName = @"Canada",
-                                FlagName = @"CA",
-                            },
+                            CountryCode = CountryCode.CA,
                         },
                         Mods = new[]
                         {
@@ -259,11 +243,7 @@ namespace osu.Game.Tests.Visual.Online
                         {
                             Id = 7151382,
                             Username = @"Mayuri Hana",
-                            Country = new Country
-                            {
-                                FullName = @"Thailand",
-                                FlagName = @"TH",
-                            },
+                            CountryCode = CountryCode.TH,
                         },
                         Rank = ScoreRank.D,
                         PP = 160,
@@ -302,11 +282,7 @@ namespace osu.Game.Tests.Visual.Online
                 {
                     Id = 7151382,
                     Username = @"Mayuri Hana",
-                    Country = new Country
-                    {
-                        FullName = @"Thailand",
-                        FlagName = @"TH",
-                    },
+                    CountryCode = CountryCode.TH,
                 },
                 Rank = ScoreRank.D,
                 PP = 160,
diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs b/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs
index fff40b3c74..2a70fd7df3 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs
@@ -60,7 +60,7 @@ namespace osu.Game.Tests.Visual.Online
                     {
                         Username = @"flyte",
                         Id = 3103765,
-                        Country = new Country { FlagName = @"JP" },
+                        CountryCode = CountryCode.JP,
                         CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c6.jpg",
                         Status = { Value = new UserStatusOnline() }
                     }) { Width = 300 },
@@ -68,7 +68,7 @@ namespace osu.Game.Tests.Visual.Online
                     {
                         Username = @"peppy",
                         Id = 2,
-                        Country = new Country { FlagName = @"AU" },
+                        CountryCode = CountryCode.AU,
                         CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
                         IsSupporter = true,
                         SupportLevel = 3,
@@ -77,7 +77,7 @@ namespace osu.Game.Tests.Visual.Online
                     {
                         Username = @"Evast",
                         Id = 8195163,
-                        Country = new Country { FlagName = @"BY" },
+                        CountryCode = CountryCode.BY,
                         CoverUrl = @"https://assets.ppy.sh/user-profile-covers/8195163/4a8e2ad5a02a2642b631438cfa6c6bd7e2f9db289be881cb27df18331f64144c.jpeg",
                         IsOnline = false,
                         LastVisit = DateTimeOffset.Now
diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs
index ad3215b1ef..caa2d2571d 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Tests.Visual.Online
         {
             Username = @"Somebody",
             Id = 1,
-            Country = new Country { FullName = @"Alien" },
+            CountryCode = CountryCode.Unknown,
             CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c1.jpg",
             JoinDate = DateTimeOffset.Now.AddDays(-1),
             LastVisit = DateTimeOffset.Now,
@@ -82,7 +82,7 @@ namespace osu.Game.Tests.Visual.Online
                 Username = @"peppy",
                 Id = 2,
                 IsSupporter = true,
-                Country = new Country { FullName = @"Australia", FlagName = @"AU" },
+                CountryCode = CountryCode.AU,
                 CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg"
             }));
 
@@ -90,7 +90,7 @@ namespace osu.Game.Tests.Visual.Online
             {
                 Username = @"flyte",
                 Id = 3103765,
-                Country = new Country { FullName = @"Japan", FlagName = @"JP" },
+                CountryCode = CountryCode.JP,
                 CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c6.jpg"
             }));
 
@@ -99,7 +99,7 @@ namespace osu.Game.Tests.Visual.Online
                 Username = @"BanchoBot",
                 Id = 3,
                 IsBot = true,
-                Country = new Country { FullName = @"Saint Helena", FlagName = @"SH" },
+                CountryCode = CountryCode.SH,
                 CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c4.jpg"
             }));
 
diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserProfileScores.cs b/osu.Game.Tests/Visual/Online/TestSceneUserProfileScores.cs
index fa28df3061..0eb6ec3c04 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserProfileScores.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserProfileScores.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Tests.Visual.Online
     {
         public TestSceneUserProfileScores()
         {
-            var firstScore = new APIScore
+            var firstScore = new SoloScoreInfo
             {
                 PP = 1047.21,
                 Rank = ScoreRank.SH,
@@ -34,7 +34,7 @@ namespace osu.Game.Tests.Visual.Online
                     },
                     DifficultyName = "Extreme"
                 },
-                Date = DateTimeOffset.Now,
+                EndedAt = DateTimeOffset.Now,
                 Mods = new[]
                 {
                     new APIMod { Acronym = new OsuModHidden().Acronym },
@@ -44,7 +44,7 @@ namespace osu.Game.Tests.Visual.Online
                 Accuracy = 0.9813
             };
 
-            var secondScore = new APIScore
+            var secondScore = new SoloScoreInfo
             {
                 PP = 134.32,
                 Rank = ScoreRank.A,
@@ -57,7 +57,7 @@ namespace osu.Game.Tests.Visual.Online
                     },
                     DifficultyName = "[4K] Regret"
                 },
-                Date = DateTimeOffset.Now,
+                EndedAt = DateTimeOffset.Now,
                 Mods = new[]
                 {
                     new APIMod { Acronym = new OsuModHardRock().Acronym },
@@ -66,7 +66,7 @@ namespace osu.Game.Tests.Visual.Online
                 Accuracy = 0.998546
             };
 
-            var thirdScore = new APIScore
+            var thirdScore = new SoloScoreInfo
             {
                 PP = 96.83,
                 Rank = ScoreRank.S,
@@ -79,11 +79,11 @@ namespace osu.Game.Tests.Visual.Online
                     },
                     DifficultyName = "Insane"
                 },
-                Date = DateTimeOffset.Now,
+                EndedAt = DateTimeOffset.Now,
                 Accuracy = 0.9726
             };
 
-            var noPPScore = new APIScore
+            var noPPScore = new SoloScoreInfo
             {
                 Rank = ScoreRank.B,
                 Beatmap = new APIBeatmap
@@ -95,7 +95,7 @@ namespace osu.Game.Tests.Visual.Online
                     },
                     DifficultyName = "[4K] Cataclysmic Hypernova"
                 },
-                Date = DateTimeOffset.Now,
+                EndedAt = DateTimeOffset.Now,
                 Accuracy = 0.55879
             };
 
diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboard.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboard.cs
index ef0c7d7d4d..abcb888cd4 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboard.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboard.cs
@@ -140,11 +140,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 {
                     Id = 6602580,
                     Username = @"waaiiru",
-                    Country = new Country
-                    {
-                        FullName = @"Spain",
-                        FlagName = @"ES",
-                    },
+                    CountryCode = CountryCode.ES,
                 },
             });
         }
@@ -164,12 +160,8 @@ namespace osu.Game.Tests.Visual.SongSelect
                 {
                     Id = 6602580,
                     Username = @"waaiiru",
-                    Country = new Country
-                    {
-                        FullName = @"Spain",
-                        FlagName = @"ES",
-                    },
-                },
+                    CountryCode = CountryCode.ES,
+                }
             });
         }
 
@@ -225,11 +217,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                     {
                         Id = 6602580,
                         Username = @"waaiiru",
-                        Country = new Country
-                        {
-                            FullName = @"Spain",
-                            FlagName = @"ES",
-                        },
+                        CountryCode = CountryCode.ES,
                     },
                 },
                 new ScoreInfo
@@ -246,11 +234,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                     {
                         Id = 4608074,
                         Username = @"Skycries",
-                        Country = new Country
-                        {
-                            FullName = @"Brazil",
-                            FlagName = @"BR",
-                        },
+                        CountryCode = CountryCode.BR,
                     },
                 },
                 new ScoreInfo
@@ -268,11 +252,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                     {
                         Id = 1014222,
                         Username = @"eLy",
-                        Country = new Country
-                        {
-                            FullName = @"Japan",
-                            FlagName = @"JP",
-                        },
+                        CountryCode = CountryCode.JP,
                     },
                 },
                 new ScoreInfo
@@ -290,11 +270,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                     {
                         Id = 1541390,
                         Username = @"Toukai",
-                        Country = new Country
-                        {
-                            FullName = @"Canada",
-                            FlagName = @"CA",
-                        },
+                        CountryCode = CountryCode.CA,
                     },
                 },
                 new ScoreInfo
@@ -312,11 +288,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                     {
                         Id = 2243452,
                         Username = @"Satoruu",
-                        Country = new Country
-                        {
-                            FullName = @"Venezuela",
-                            FlagName = @"VE",
-                        },
+                        CountryCode = CountryCode.VE,
                     },
                 },
                 new ScoreInfo
@@ -334,11 +306,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                     {
                         Id = 2705430,
                         Username = @"Mooha",
-                        Country = new Country
-                        {
-                            FullName = @"France",
-                            FlagName = @"FR",
-                        },
+                        CountryCode = CountryCode.FR,
                     },
                 },
                 new ScoreInfo
@@ -356,11 +324,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                     {
                         Id = 7151382,
                         Username = @"Mayuri Hana",
-                        Country = new Country
-                        {
-                            FullName = @"Thailand",
-                            FlagName = @"TH",
-                        },
+                        CountryCode = CountryCode.TH,
                     },
                 },
                 new ScoreInfo
@@ -378,11 +342,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                     {
                         Id = 2051389,
                         Username = @"FunOrange",
-                        Country = new Country
-                        {
-                            FullName = @"Canada",
-                            FlagName = @"CA",
-                        },
+                        CountryCode = CountryCode.CA,
                     },
                 },
                 new ScoreInfo
@@ -400,11 +360,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                     {
                         Id = 6169483,
                         Username = @"-Hebel-",
-                        Country = new Country
-                        {
-                            FullName = @"Mexico",
-                            FlagName = @"MX",
-                        },
+                        CountryCode = CountryCode.MX,
                     },
                 },
                 new ScoreInfo
@@ -422,11 +378,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                     {
                         Id = 6702666,
                         Username = @"prhtnsm",
-                        Country = new Country
-                        {
-                            FullName = @"Germany",
-                            FlagName = @"DE",
-                        },
+                        CountryCode = CountryCode.DE,
                     },
                 },
             };
diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneUserTopScoreContainer.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneUserTopScoreContainer.cs
index 16966e489a..39fd9fda2b 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneUserTopScoreContainer.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneUserTopScoreContainer.cs
@@ -69,11 +69,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                     {
                         Id = 6602580,
                         Username = @"waaiiru",
-                        Country = new Country
-                        {
-                            FullName = @"Spain",
-                            FlagName = @"ES",
-                        },
+                        CountryCode = CountryCode.ES,
                     },
                 },
                 new ScoreInfo
@@ -88,11 +84,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                     {
                         Id = 4608074,
                         Username = @"Skycries",
-                        Country = new Country
-                        {
-                            FullName = @"Brazil",
-                            FlagName = @"BR",
-                        },
+                        CountryCode = CountryCode.BR,
                     },
                 },
                 new ScoreInfo
@@ -107,11 +99,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                     {
                         Id = 1541390,
                         Username = @"Toukai",
-                        Country = new Country
-                        {
-                            FullName = @"Canada",
-                            FlagName = @"CA",
-                        },
+                        CountryCode = CountryCode.CA,
                     },
                 }
             };
diff --git a/osu.Game.Tournament/Models/TournamentUser.cs b/osu.Game.Tournament/Models/TournamentUser.cs
index 80e58538e5..78ca014860 100644
--- a/osu.Game.Tournament/Models/TournamentUser.cs
+++ b/osu.Game.Tournament/Models/TournamentUser.cs
@@ -22,7 +22,8 @@ namespace osu.Game.Tournament.Models
         /// <summary>
         /// The player's country.
         /// </summary>
-        public Country? Country { get; set; }
+        [JsonProperty("country_code")]
+        public CountryCode CountryCode { get; set; }
 
         /// <summary>
         /// The player's global rank, or null if not available.
@@ -40,7 +41,7 @@ namespace osu.Game.Tournament.Models
             {
                 Id = OnlineID,
                 Username = Username,
-                Country = Country,
+                CountryCode = CountryCode,
                 CoverUrl = CoverUrl,
             };
 
diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index f2a35ea5b3..063b62bf08 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -21,6 +21,7 @@ using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Tournament.IO;
 using osu.Game.Tournament.IPC;
 using osu.Game.Tournament.Models;
+using osu.Game.Users;
 using osuTK.Input;
 
 namespace osu.Game.Tournament
@@ -186,7 +187,9 @@ namespace osu.Game.Tournament
         {
             var playersRequiringPopulation = ladder.Teams
                                                    .SelectMany(t => t.Players)
-                                                   .Where(p => string.IsNullOrEmpty(p.Username) || p.Rank == null).ToList();
+                                                   .Where(p => string.IsNullOrEmpty(p.Username)
+                                                               || p.CountryCode == CountryCode.Unknown
+                                                               || p.Rank == null).ToList();
 
             if (playersRequiringPopulation.Count == 0)
                 return false;
@@ -288,7 +291,7 @@ namespace osu.Game.Tournament
 
                 user.Username = res.Username;
                 user.CoverUrl = res.CoverUrl;
-                user.Country = res.Country;
+                user.CountryCode = res.CountryCode;
                 user.Rank = res.Statistics?.GlobalRank;
 
                 success?.Invoke();
diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index bebc101b13..c4d65f4f10 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -60,8 +60,9 @@ namespace osu.Game.Database
         /// 14   2022-03-01    Added BeatmapUserSettings to BeatmapInfo.
         /// 15   2022-07-13    Added LastPlayed to BeatmapInfo.
         /// 16   2022-07-15    Removed HasReplay from ScoreInfo.
+        /// 17   2022-07-16    Added CountryCode to RealmUser.
         /// </summary>
-        private const int schema_version = 16;
+        private const int schema_version = 17;
 
         /// <summary>
         /// Lock object which is held during <see cref="BlockAllOperations"/> sections, blocking realm retrieval during blocking periods.
diff --git a/osu.Game/Localisation/Language.cs b/osu.Game/Localisation/Language.cs
index c13a1a10cb..6a4e5110e6 100644
--- a/osu.Game/Localisation/Language.cs
+++ b/osu.Game/Localisation/Language.cs
@@ -2,9 +2,11 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.ComponentModel;
+using JetBrains.Annotations;
 
 namespace osu.Game.Localisation
 {
+    [UsedImplicitly(ImplicitUseTargetFlags.WithMembers)]
     public enum Language
     {
         [Description(@"English")]
diff --git a/osu.Game/Models/RealmUser.cs b/osu.Game/Models/RealmUser.cs
index 58fd7ff2a3..e20ffc0808 100644
--- a/osu.Game/Models/RealmUser.cs
+++ b/osu.Game/Models/RealmUser.cs
@@ -1,8 +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.
 
-#nullable disable
-
 using System;
 using osu.Game.Database;
 using osu.Game.Users;
@@ -17,6 +15,16 @@ namespace osu.Game.Models
 
         public string Username { get; set; } = string.Empty;
 
+        [Ignored]
+        public CountryCode CountryCode
+        {
+            get => Enum.TryParse(CountryString, out CountryCode country) ? country : CountryCode.Unknown;
+            set => CountryString = value.ToString();
+        }
+
+        [MapTo(nameof(CountryCode))]
+        public string CountryString { get; set; } = default(CountryCode).ToString();
+
         public bool IsBot => false;
 
         public bool Equals(RealmUser other)
diff --git a/osu.Game/Online/API/Requests/GetUserRankingsRequest.cs b/osu.Game/Online/API/Requests/GetUserRankingsRequest.cs
index ab0cc3a56d..c27a83b695 100644
--- a/osu.Game/Online/API/Requests/GetUserRankingsRequest.cs
+++ b/osu.Game/Online/API/Requests/GetUserRankingsRequest.cs
@@ -5,6 +5,7 @@
 
 using osu.Framework.IO.Network;
 using osu.Game.Rulesets;
+using osu.Game.Users;
 
 namespace osu.Game.Online.API.Requests
 {
@@ -12,21 +13,21 @@ namespace osu.Game.Online.API.Requests
     {
         public readonly UserRankingsType Type;
 
-        private readonly string country;
+        private readonly CountryCode countryCode;
 
-        public GetUserRankingsRequest(RulesetInfo ruleset, UserRankingsType type = UserRankingsType.Performance, int page = 1, string country = null)
+        public GetUserRankingsRequest(RulesetInfo ruleset, UserRankingsType type = UserRankingsType.Performance, int page = 1, CountryCode countryCode = CountryCode.Unknown)
             : base(ruleset, page)
         {
             Type = type;
-            this.country = country;
+            this.countryCode = countryCode;
         }
 
         protected override WebRequest CreateWebRequest()
         {
             var req = base.CreateWebRequest();
 
-            if (country != null)
-                req.AddParameter("country", country);
+            if (countryCode != CountryCode.Unknown)
+                req.AddParameter("country", countryCode.ToString());
 
             return req;
         }
diff --git a/osu.Game/Online/API/Requests/GetUserScoresRequest.cs b/osu.Game/Online/API/Requests/GetUserScoresRequest.cs
index 9bd78b7be1..8ef797f799 100644
--- a/osu.Game/Online/API/Requests/GetUserScoresRequest.cs
+++ b/osu.Game/Online/API/Requests/GetUserScoresRequest.cs
@@ -10,7 +10,7 @@ using osu.Game.Rulesets;
 
 namespace osu.Game.Online.API.Requests
 {
-    public class GetUserScoresRequest : PaginatedAPIRequest<List<APIScore>>
+    public class GetUserScoresRequest : PaginatedAPIRequest<List<SoloScoreInfo>>
     {
         private readonly long userId;
         private readonly ScoreType type;
diff --git a/osu.Game/Online/API/Requests/Responses/APIUser.cs b/osu.Game/Online/API/Requests/Responses/APIUser.cs
index 63aaa9b90e..5f843e9a7b 100644
--- a/osu.Game/Online/API/Requests/Responses/APIUser.cs
+++ b/osu.Game/Online/API/Requests/Responses/APIUser.cs
@@ -34,8 +34,19 @@ namespace osu.Game.Online.API.Requests.Responses
         [JsonProperty(@"previous_usernames")]
         public string[] PreviousUsernames;
 
+        private CountryCode? countryCode;
+
+        public CountryCode CountryCode
+        {
+            get => countryCode ??= (Enum.TryParse(country?.Code, out CountryCode result) ? result : default);
+            set => countryCode = value;
+        }
+
+#pragma warning disable 649
+        [CanBeNull]
         [JsonProperty(@"country")]
-        public Country Country;
+        private Country country;
+#pragma warning restore 649
 
         public readonly Bindable<UserStatus> Status = new Bindable<UserStatus>();
 
@@ -256,5 +267,13 @@ namespace osu.Game.Online.API.Requests.Responses
         public int OnlineID => Id;
 
         public bool Equals(APIUser other) => this.MatchesOnlineID(other);
+
+#pragma warning disable 649
+        private class Country
+        {
+            [JsonProperty(@"code")]
+            public string Code;
+        }
+#pragma warning restore 649
     }
 }
diff --git a/osu.Game/Online/API/Requests/Responses/SoloScoreInfo.cs b/osu.Game/Online/API/Requests/Responses/SoloScoreInfo.cs
index cf7aa599f3..bfc8b4102a 100644
--- a/osu.Game/Online/API/Requests/Responses/SoloScoreInfo.cs
+++ b/osu.Game/Online/API/Requests/Responses/SoloScoreInfo.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Online.API.Requests.Responses
         public DateTimeOffset? StartedAt { get; set; }
 
         [JsonProperty("ended_at")]
-        public DateTimeOffset? EndedAt { get; set; }
+        public DateTimeOffset EndedAt { get; set; }
 
         [JsonProperty("mods")]
         public APIMod[] Mods { get; set; } = Array.Empty<APIMod>();
@@ -82,6 +82,23 @@ namespace osu.Game.Online.API.Requests.Responses
         [JsonProperty("user")]
         public APIUser? User { get; set; }
 
+        [JsonProperty("beatmap")]
+        public APIBeatmap? Beatmap { get; set; }
+
+        [JsonProperty("beatmapset")]
+        public APIBeatmapSet? BeatmapSet
+        {
+            set
+            {
+                // in the deserialisation case we need to ferry this data across.
+                // the order of properties returned by the API guarantees that the beatmap is populated by this point.
+                if (!(Beatmap is APIBeatmap apiBeatmap))
+                    throw new InvalidOperationException("Beatmap set metadata arrived before beatmap metadata in response");
+
+                apiBeatmap.BeatmapSet = value;
+            }
+        }
+
         [JsonProperty("pp")]
         public double? PP { get; set; }
 
@@ -128,7 +145,7 @@ namespace osu.Game.Online.API.Requests.Responses
             MaxCombo = MaxCombo,
             Rank = Rank,
             Statistics = Statistics,
-            Date = EndedAt ?? DateTimeOffset.Now,
+            Date = EndedAt,
             Hash = HasReplay ? "online" : string.Empty, // TODO: temporary?
             Mods = mods,
             PP = PP,
diff --git a/osu.Game/Online/Leaderboards/LeaderboardScore.cs b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
index 62827f50aa..a7b6bd044d 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
@@ -181,7 +181,7 @@ namespace osu.Game.Online.Leaderboards
                                                     Masking = true,
                                                     Children = new Drawable[]
                                                     {
-                                                        new UpdateableFlag(user.Country)
+                                                        new UpdateableFlag(user.CountryCode)
                                                         {
                                                             Anchor = Anchor.CentreLeft,
                                                             Origin = Anchor.CentreLeft,
diff --git a/osu.Game/Online/Spectator/OnlineSpectatorClient.cs b/osu.Game/Online/Spectator/OnlineSpectatorClient.cs
index cd9f5233a2..2a05fb1bc0 100644
--- a/osu.Game/Online/Spectator/OnlineSpectatorClient.cs
+++ b/osu.Game/Online/Spectator/OnlineSpectatorClient.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Online.Spectator
 
             try
             {
-                await connection.SendAsync(nameof(ISpectatorServer.BeginPlaySession), state);
+                await connection.InvokeAsync(nameof(ISpectatorServer.BeginPlaySession), state);
             }
             catch (HubException exception)
             {
@@ -73,7 +73,7 @@ namespace osu.Game.Online.Spectator
 
             Debug.Assert(connection != null);
 
-            return connection.SendAsync(nameof(ISpectatorServer.SendFrameData), bundle);
+            return connection.InvokeAsync(nameof(ISpectatorServer.SendFrameData), bundle);
         }
 
         protected override Task EndPlayingInternal(SpectatorState state)
@@ -83,7 +83,7 @@ namespace osu.Game.Online.Spectator
 
             Debug.Assert(connection != null);
 
-            return connection.SendAsync(nameof(ISpectatorServer.EndPlaySession), state);
+            return connection.InvokeAsync(nameof(ISpectatorServer.EndPlaySession), state);
         }
 
         protected override Task WatchUserInternal(int userId)
@@ -93,7 +93,7 @@ namespace osu.Game.Online.Spectator
 
             Debug.Assert(connection != null);
 
-            return connection.SendAsync(nameof(ISpectatorServer.StartWatchingUser), userId);
+            return connection.InvokeAsync(nameof(ISpectatorServer.StartWatchingUser), userId);
         }
 
         protected override Task StopWatchingUserInternal(int userId)
@@ -103,7 +103,7 @@ namespace osu.Game.Online.Spectator
 
             Debug.Assert(connection != null);
 
-            return connection.SendAsync(nameof(ISpectatorServer.EndWatchingUser), userId);
+            return connection.InvokeAsync(nameof(ISpectatorServer.EndWatchingUser), userId);
         }
     }
 }
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
index b2e5be6601..6acc9bf002 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
@@ -165,10 +165,10 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                     Font = OsuFont.GetFont(size: text_size),
                     Colour = score.Accuracy == 1 ? highAccuracyColour : Color4.White
                 },
-                new UpdateableFlag(score.User.Country)
+                new UpdateableFlag(score.User.CountryCode)
                 {
                     Size = new Vector2(19, 14),
-                    ShowPlaceholderOnNull = false,
+                    ShowPlaceholderOnUnknown = false,
                 },
                 username,
                 new OsuSpriteText
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
index f093c6b53f..2eaa03a05d 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
@@ -120,7 +120,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                                 Origin = Anchor.CentreLeft,
                                 Size = new Vector2(19, 14),
                                 Margin = new MarginPadding { Top = 3 }, // makes spacing look more even
-                                ShowPlaceholderOnNull = false,
+                                ShowPlaceholderOnUnknown = false,
                             },
                         }
                     }
@@ -141,7 +141,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
             set
             {
                 avatar.User = value.User;
-                flag.Country = value.User.Country;
+                flag.CountryCode = value.User.CountryCode;
                 achievedOn.Date = value.Date;
 
                 usernameText.Clear();
diff --git a/osu.Game/Overlays/Chat/ChatLine.cs b/osu.Game/Overlays/Chat/ChatLine.cs
index 5961298485..4c425d3d4c 100644
--- a/osu.Game/Overlays/Chat/ChatLine.cs
+++ b/osu.Game/Overlays/Chat/ChatLine.cs
@@ -257,10 +257,14 @@ namespace osu.Game.Overlays.Chat
             }
 
             [BackgroundDependencyLoader]
-            private void load(UserProfileOverlay? profile, ChannelManager? chatManager)
+            private void load(UserProfileOverlay? profile, ChannelManager? chatManager, ChatOverlay? chatOverlay)
             {
                 Action = () => profile?.ShowUser(sender);
-                startChatAction = () => chatManager?.OpenPrivateChannel(sender);
+                startChatAction = () =>
+                {
+                    chatManager?.OpenPrivateChannel(sender);
+                    chatOverlay?.Show();
+                };
             }
 
             public MenuItem[] ContextMenuItems
diff --git a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
index 9c957e387a..7e079c8341 100644
--- a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
@@ -5,6 +5,7 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Extensions.LocalisationExtensions;
 using osu.Framework.Graphics;
@@ -136,7 +137,7 @@ namespace osu.Game.Overlays.Profile.Header
                                                 userFlag = new UpdateableFlag
                                                 {
                                                     Size = new Vector2(28, 20),
-                                                    ShowPlaceholderOnNull = false,
+                                                    ShowPlaceholderOnUnknown = false,
                                                 },
                                                 userCountryText = new OsuSpriteText
                                                 {
@@ -174,8 +175,8 @@ namespace osu.Game.Overlays.Profile.Header
             avatar.User = user;
             usernameText.Text = user?.Username ?? string.Empty;
             openUserExternally.Link = $@"{api.WebsiteRootUrl}/users/{user?.Id ?? 0}";
-            userFlag.Country = user?.Country;
-            userCountryText.Text = user?.Country?.FullName ?? "Alien";
+            userFlag.CountryCode = user?.CountryCode ?? default;
+            userCountryText.Text = (user?.CountryCode ?? default).GetDescription();
             supporterTag.SupportLevel = user?.SupportLevel ?? 0;
             titleText.Text = user?.Title ?? string.Empty;
             titleText.Colour = Color4Extensions.FromHex(user?.Colour ?? "fff");
diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
index 90a357a281..5d8f8c8326 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
 
         private const float performance_background_shear = 0.45f;
 
-        protected readonly APIScore Score;
+        protected readonly SoloScoreInfo Score;
 
         [Resolved]
         private OsuColour colours { get; set; }
@@ -39,7 +39,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
         [Resolved]
         private OverlayColourProvider colourProvider { get; set; }
 
-        public DrawableProfileScore(APIScore score)
+        public DrawableProfileScore(SoloScoreInfo score)
         {
             Score = score;
 
@@ -98,7 +98,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
                                                         Font = OsuFont.GetFont(size: 12, weight: FontWeight.Regular),
                                                         Colour = colours.Yellow
                                                     },
-                                                    new DrawableDate(Score.Date, 12)
+                                                    new DrawableDate(Score.EndedAt, 12)
                                                     {
                                                         Colour = colourProvider.Foreground1
                                                     }
@@ -138,7 +138,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
                                         {
                                             var ruleset = rulesets.GetRuleset(Score.RulesetID) ?? throw new InvalidOperationException($"Ruleset with ID of {Score.RulesetID} not found locally");
 
-                                            return new ModIcon(ruleset.CreateInstance().CreateModFromAcronym(mod.Acronym))
+                                            return new ModIcon(mod.ToMod(ruleset.CreateInstance()))
                                             {
                                                 Scale = new Vector2(0.35f)
                                             };
diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileWeightedScore.cs b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileWeightedScore.cs
index f8f83883fc..94d95dc27e 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileWeightedScore.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileWeightedScore.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
     {
         private readonly double weight;
 
-        public DrawableProfileWeightedScore(APIScore score, double weight)
+        public DrawableProfileWeightedScore(SoloScoreInfo score, double weight)
             : base(score)
         {
             this.weight = weight;
diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs b/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
index 15c7b8f042..2564692c87 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
@@ -17,7 +17,7 @@ using APIUser = osu.Game.Online.API.Requests.Responses.APIUser;
 
 namespace osu.Game.Overlays.Profile.Sections.Ranks
 {
-    public class PaginatedScoreContainer : PaginatedProfileSubsection<APIScore>
+    public class PaginatedScoreContainer : PaginatedProfileSubsection<SoloScoreInfo>
     {
         private readonly ScoreType type;
 
@@ -54,7 +54,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
             }
         }
 
-        protected override void OnItemsReceived(List<APIScore> items)
+        protected override void OnItemsReceived(List<SoloScoreInfo> items)
         {
             if (CurrentPage == null || CurrentPage?.Offset == 0)
                 drawableItemIndex = 0;
@@ -62,12 +62,12 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
             base.OnItemsReceived(items);
         }
 
-        protected override APIRequest<List<APIScore>> CreateRequest(PaginationParameters pagination) =>
+        protected override APIRequest<List<SoloScoreInfo>> CreateRequest(PaginationParameters pagination) =>
             new GetUserScoresRequest(User.Value.Id, type, pagination);
 
         private int drawableItemIndex;
 
-        protected override Drawable CreateDrawableItem(APIScore model)
+        protected override Drawable CreateDrawableItem(SoloScoreInfo model)
         {
             switch (type)
             {
diff --git a/osu.Game/Overlays/Rankings/CountryFilter.cs b/osu.Game/Overlays/Rankings/CountryFilter.cs
index 9ba2018522..9376bafdff 100644
--- a/osu.Game/Overlays/Rankings/CountryFilter.cs
+++ b/osu.Game/Overlays/Rankings/CountryFilter.cs
@@ -16,14 +16,14 @@ using osuTK;
 
 namespace osu.Game.Overlays.Rankings
 {
-    public class CountryFilter : CompositeDrawable, IHasCurrentValue<Country>
+    public class CountryFilter : CompositeDrawable, IHasCurrentValue<CountryCode>
     {
         private const int duration = 200;
         private const int height = 70;
 
-        private readonly BindableWithCurrent<Country> current = new BindableWithCurrent<Country>();
+        private readonly BindableWithCurrent<CountryCode> current = new BindableWithCurrent<CountryCode>();
 
-        public Bindable<Country> Current
+        public Bindable<CountryCode> Current
         {
             get => current.Current;
             set => current.Current = value;
@@ -89,9 +89,9 @@ namespace osu.Game.Overlays.Rankings
             Current.BindValueChanged(onCountryChanged, true);
         }
 
-        private void onCountryChanged(ValueChangedEvent<Country> country)
+        private void onCountryChanged(ValueChangedEvent<CountryCode> country)
         {
-            if (country.NewValue == null)
+            if (Current.Value == CountryCode.Unknown)
             {
                 countryPill.Collapse();
                 this.ResizeHeightTo(0, duration, Easing.OutQuint);
diff --git a/osu.Game/Overlays/Rankings/CountryPill.cs b/osu.Game/Overlays/Rankings/CountryPill.cs
index 90f8c85557..ee4c4f08af 100644
--- a/osu.Game/Overlays/Rankings/CountryPill.cs
+++ b/osu.Game/Overlays/Rankings/CountryPill.cs
@@ -6,6 +6,7 @@
 using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -21,13 +22,13 @@ using osuTK.Graphics;
 
 namespace osu.Game.Overlays.Rankings
 {
-    public class CountryPill : CompositeDrawable, IHasCurrentValue<Country>
+    public class CountryPill : CompositeDrawable, IHasCurrentValue<CountryCode>
     {
         private const int duration = 200;
 
-        private readonly BindableWithCurrent<Country> current = new BindableWithCurrent<Country>();
+        private readonly BindableWithCurrent<CountryCode> current = new BindableWithCurrent<CountryCode>();
 
-        public Bindable<Country> Current
+        public Bindable<CountryCode> Current
         {
             get => current.Current;
             set => current.Current = value;
@@ -93,7 +94,7 @@ namespace osu.Game.Overlays.Rankings
                             {
                                 Anchor = Anchor.Centre,
                                 Origin = Anchor.Centre,
-                                Action = () => Current.Value = null
+                                Action = Current.SetDefault,
                             }
                         }
                     }
@@ -130,13 +131,13 @@ namespace osu.Game.Overlays.Rankings
             this.FadeOut(duration, Easing.OutQuint);
         }
 
-        private void onCountryChanged(ValueChangedEvent<Country> country)
+        private void onCountryChanged(ValueChangedEvent<CountryCode> country)
         {
-            if (country.NewValue == null)
+            if (Current.Value == CountryCode.Unknown)
                 return;
 
-            flag.Country = country.NewValue;
-            countryName.Text = country.NewValue.FullName;
+            flag.CountryCode = country.NewValue;
+            countryName.Text = country.NewValue.GetDescription();
         }
 
         private class CloseButton : OsuHoverContainer
diff --git a/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs b/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
index 9b0b75f663..936545bd49 100644
--- a/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
+++ b/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Overlays.Rankings
     {
         public Bindable<RulesetInfo> Ruleset => rulesetSelector.Current;
 
-        public Bindable<Country> Country => countryFilter.Current;
+        public Bindable<CountryCode> Country => countryFilter.Current;
 
         private OverlayRulesetSelector rulesetSelector;
         private CountryFilter countryFilter;
diff --git a/osu.Game/Overlays/Rankings/Tables/CountriesTable.cs b/osu.Game/Overlays/Rankings/Tables/CountriesTable.cs
index 53d10b3e53..a6f0c7a123 100644
--- a/osu.Game/Overlays/Rankings/Tables/CountriesTable.cs
+++ b/osu.Game/Overlays/Rankings/Tables/CountriesTable.cs
@@ -11,6 +11,7 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using System.Collections.Generic;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions;
 using osu.Framework.Extensions.LocalisationExtensions;
 using osu.Game.Resources.Localisation.Web;
 
@@ -33,9 +34,9 @@ namespace osu.Game.Overlays.Rankings.Tables
             new RankingsTableColumn(RankingsStrings.StatAveragePerformance, Anchor.Centre, new Dimension(GridSizeMode.AutoSize)),
         };
 
-        protected override Country GetCountry(CountryStatistics item) => item.Country;
+        protected override CountryCode GetCountryCode(CountryStatistics item) => item.Code;
 
-        protected override Drawable CreateFlagContent(CountryStatistics item) => new CountryName(item.Country);
+        protected override Drawable CreateFlagContent(CountryStatistics item) => new CountryName(item.Code);
 
         protected override Drawable[] CreateAdditionalContent(CountryStatistics item) => new Drawable[]
         {
@@ -70,15 +71,15 @@ namespace osu.Game.Overlays.Rankings.Tables
             [Resolved(canBeNull: true)]
             private RankingsOverlay rankings { get; set; }
 
-            public CountryName(Country country)
+            public CountryName(CountryCode countryCode)
                 : base(t => t.Font = OsuFont.GetFont(size: 12))
             {
                 AutoSizeAxes = Axes.X;
                 RelativeSizeAxes = Axes.Y;
                 TextAnchor = Anchor.CentreLeft;
 
-                if (!string.IsNullOrEmpty(country.FullName))
-                    AddLink(country.FullName, () => rankings?.ShowCountry(country));
+                if (countryCode != CountryCode.Unknown)
+                    AddLink(countryCode.GetDescription(), () => rankings?.ShowCountry(countryCode));
             }
         }
     }
diff --git a/osu.Game/Overlays/Rankings/Tables/RankingsTable.cs b/osu.Game/Overlays/Rankings/Tables/RankingsTable.cs
index 56e318637a..073bf86a7a 100644
--- a/osu.Game/Overlays/Rankings/Tables/RankingsTable.cs
+++ b/osu.Game/Overlays/Rankings/Tables/RankingsTable.cs
@@ -79,7 +79,7 @@ namespace osu.Game.Overlays.Rankings.Tables
         protected sealed override Drawable CreateHeader(int index, TableColumn column)
             => (column as RankingsTableColumn)?.CreateHeaderText() ?? new HeaderText(column?.Header ?? default, false);
 
-        protected abstract Country GetCountry(TModel item);
+        protected abstract CountryCode GetCountryCode(TModel item);
 
         protected abstract Drawable CreateFlagContent(TModel item);
 
@@ -97,10 +97,10 @@ namespace osu.Game.Overlays.Rankings.Tables
             Margin = new MarginPadding { Bottom = row_spacing },
             Children = new[]
             {
-                new UpdateableFlag(GetCountry(item))
+                new UpdateableFlag(GetCountryCode(item))
                 {
                     Size = new Vector2(28, 20),
-                    ShowPlaceholderOnNull = false,
+                    ShowPlaceholderOnUnknown = false,
                 },
                 CreateFlagContent(item)
             }
diff --git a/osu.Game/Overlays/Rankings/Tables/UserBasedTable.cs b/osu.Game/Overlays/Rankings/Tables/UserBasedTable.cs
index 2edd1b21ba..48185e6083 100644
--- a/osu.Game/Overlays/Rankings/Tables/UserBasedTable.cs
+++ b/osu.Game/Overlays/Rankings/Tables/UserBasedTable.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Overlays.Rankings.Tables
              .Concat(GradeColumns.Select(grade => new GradeTableColumn(grade, Anchor.Centre, new Dimension(GridSizeMode.AutoSize))))
              .ToArray();
 
-        protected sealed override Country GetCountry(UserStatistics item) => item.User.Country;
+        protected sealed override CountryCode GetCountryCode(UserStatistics item) => item.User.CountryCode;
 
         protected sealed override Drawable CreateFlagContent(UserStatistics item)
         {
diff --git a/osu.Game/Overlays/RankingsOverlay.cs b/osu.Game/Overlays/RankingsOverlay.cs
index a66b8cf2ba..586b883604 100644
--- a/osu.Game/Overlays/RankingsOverlay.cs
+++ b/osu.Game/Overlays/RankingsOverlay.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Overlays
 {
     public class RankingsOverlay : TabbableOnlineOverlay<RankingsOverlayHeader, RankingsScope>
     {
-        protected Bindable<Country> Country => Header.Country;
+        protected Bindable<CountryCode> Country => Header.Country;
 
         private APIRequest lastRequest;
 
@@ -44,7 +44,7 @@ namespace osu.Game.Overlays
             Country.BindValueChanged(_ =>
             {
                 // if a country is requested, force performance scope.
-                if (Country.Value != null)
+                if (!Country.IsDefault)
                     Header.Current.Value = RankingsScope.Performance;
 
                 Scheduler.AddOnce(triggerTabChanged);
@@ -76,7 +76,7 @@ namespace osu.Game.Overlays
         {
             // country filtering is only valid for performance scope.
             if (Header.Current.Value != RankingsScope.Performance)
-                Country.Value = null;
+                Country.SetDefault();
 
             Scheduler.AddOnce(triggerTabChanged);
         }
@@ -85,9 +85,9 @@ namespace osu.Game.Overlays
 
         protected override RankingsOverlayHeader CreateHeader() => new RankingsOverlayHeader();
 
-        public void ShowCountry(Country requested)
+        public void ShowCountry(CountryCode requested)
         {
-            if (requested == null)
+            if (requested == default)
                 return;
 
             Show();
@@ -128,7 +128,7 @@ namespace osu.Game.Overlays
             switch (Header.Current.Value)
             {
                 case RankingsScope.Performance:
-                    return new GetUserRankingsRequest(ruleset.Value, country: Country.Value?.FlagName);
+                    return new GetUserRankingsRequest(ruleset.Value, countryCode: Country.Value);
 
                 case RankingsScope.Country:
                     return new GetCountryRankingsRequest(ruleset.Value);
diff --git a/osu.Game/Rulesets/Mods/ICreateReplayData.cs b/osu.Game/Rulesets/Mods/ICreateReplayData.cs
index 6058380eb3..3ed5c2b7f8 100644
--- a/osu.Game/Rulesets/Mods/ICreateReplayData.cs
+++ b/osu.Game/Rulesets/Mods/ICreateReplayData.cs
@@ -58,6 +58,7 @@ namespace osu.Game.Rulesets.Mods
     public class ModCreatedUser : IUser
     {
         public int OnlineID => APIUser.SYSTEM_USER_ID;
+        public CountryCode CountryCode => default;
         public bool IsBot => true;
 
         public string Username { get; set; } = string.Empty;
diff --git a/osu.Game/Scoring/ScoreImporter.cs b/osu.Game/Scoring/ScoreImporter.cs
index 53dd511d57..4107c66dfe 100644
--- a/osu.Game/Scoring/ScoreImporter.cs
+++ b/osu.Game/Scoring/ScoreImporter.cs
@@ -84,7 +84,7 @@ namespace osu.Game.Scoring
             api.Perform(userRequest);
 
             if (userRequest.Response is APIUser user)
-                model.RealmUser.OnlineID = user.Id;
+                model.User = user;
         }
     }
 }
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index 81ca5f0300..d32d611a27 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -85,8 +85,9 @@ namespace osu.Game.Scoring
         {
             get => user ??= new APIUser
             {
-                Username = RealmUser.Username,
                 Id = RealmUser.OnlineID,
+                Username = RealmUser.Username,
+                CountryCode = RealmUser.CountryCode,
             };
             set
             {
@@ -95,7 +96,8 @@ namespace osu.Game.Scoring
                 RealmUser = new RealmUser
                 {
                     OnlineID = user.OnlineID,
-                    Username = user.Username
+                    Username = user.Username,
+                    CountryCode = user.CountryCode,
                 };
             }
         }
@@ -135,6 +137,7 @@ namespace osu.Game.Scoring
             {
                 OnlineID = RealmUser.OnlineID,
                 Username = RealmUser.Username,
+                CountryCode = RealmUser.CountryCode,
             };
 
             return clone;
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
index e3a20cd652..3ef2f033b0 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
@@ -128,7 +128,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
                                             Anchor = Anchor.CentreLeft,
                                             Origin = Anchor.CentreLeft,
                                             Size = new Vector2(28, 20),
-                                            Country = user?.Country
+                                            CountryCode = user?.CountryCode ?? default
                                         },
                                         new OsuSpriteText
                                         {
diff --git a/osu.Game/Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs
index 7b8b4ce608..3e67868f34 100644
--- a/osu.Game/Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Contracted/ContractedPanelMiddleContent.cs
@@ -6,6 +6,7 @@
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Extensions.LocalisationExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
@@ -214,7 +215,7 @@ namespace osu.Game.Screens.Ranking.Contracted
                 {
                     Anchor = Anchor.CentreLeft,
                     Origin = Anchor.CentreLeft,
-                    Text = key,
+                    Text = key.ToTitle(),
                     Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold)
                 },
                 new OsuSpriteText
diff --git a/osu.Game/Screens/Ranking/RetryButton.cs b/osu.Game/Screens/Ranking/RetryButton.cs
index a0ddc98943..c56f364ae8 100644
--- a/osu.Game/Screens/Ranking/RetryButton.cs
+++ b/osu.Game/Screens/Ranking/RetryButton.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Screens.Ranking
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     Size = new Vector2(13),
-                    Icon = FontAwesome.Solid.ArrowCircleLeft,
+                    Icon = FontAwesome.Solid.Redo,
                 },
             };
 
diff --git a/osu.Game/Skinning/LegacyBeatmapSkin.cs b/osu.Game/Skinning/LegacyBeatmapSkin.cs
index 43ae0a2252..e8414b4c11 100644
--- a/osu.Game/Skinning/LegacyBeatmapSkin.cs
+++ b/osu.Game/Skinning/LegacyBeatmapSkin.cs
@@ -96,7 +96,7 @@ namespace osu.Game.Skinning
             new SkinInfo
             {
                 Name = beatmapInfo.ToString(),
-                Creator = beatmapInfo.Metadata.Author.Username ?? string.Empty
+                Creator = beatmapInfo.Metadata.Author.Username
             };
     }
 }
diff --git a/osu.Game/Users/Country.cs b/osu.Game/Users/Country.cs
deleted file mode 100644
index b38600fa1b..0000000000
--- a/osu.Game/Users/Country.cs
+++ /dev/null
@@ -1,27 +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.
-
-#nullable disable
-
-using System;
-using Newtonsoft.Json;
-
-namespace osu.Game.Users
-{
-    public class Country : IEquatable<Country>
-    {
-        /// <summary>
-        /// The name of this country.
-        /// </summary>
-        [JsonProperty(@"name")]
-        public string FullName;
-
-        /// <summary>
-        /// Two-letter flag acronym (ISO 3166 standard)
-        /// </summary>
-        [JsonProperty(@"code")]
-        public string FlagName;
-
-        public bool Equals(Country other) => FlagName == other?.FlagName;
-    }
-}
diff --git a/osu.Game/Users/CountryCode.cs b/osu.Game/Users/CountryCode.cs
new file mode 100644
index 0000000000..775de2bcf5
--- /dev/null
+++ b/osu.Game/Users/CountryCode.cs
@@ -0,0 +1,768 @@
+// 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.ComponentModel;
+using JetBrains.Annotations;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+
+namespace osu.Game.Users
+{
+    [JsonConverter(typeof(StringEnumConverter))]
+    [UsedImplicitly(ImplicitUseTargetFlags.WithMembers)]
+    public enum CountryCode
+    {
+        [Description("Unknown")]
+        Unknown = 0,
+
+        [Description("Bangladesh")]
+        BD,
+
+        [Description("Belgium")]
+        BE,
+
+        [Description("Burkina Faso")]
+        BF,
+
+        [Description("Bulgaria")]
+        BG,
+
+        [Description("Bosnia and Herzegovina")]
+        BA,
+
+        [Description("Barbados")]
+        BB,
+
+        [Description("Wallis and Futuna")]
+        WF,
+
+        [Description("Saint Barthelemy")]
+        BL,
+
+        [Description("Bermuda")]
+        BM,
+
+        [Description("Brunei")]
+        BN,
+
+        [Description("Bolivia")]
+        BO,
+
+        [Description("Bahrain")]
+        BH,
+
+        [Description("Burundi")]
+        BI,
+
+        [Description("Benin")]
+        BJ,
+
+        [Description("Bhutan")]
+        BT,
+
+        [Description("Jamaica")]
+        JM,
+
+        [Description("Bouvet Island")]
+        BV,
+
+        [Description("Botswana")]
+        BW,
+
+        [Description("Samoa")]
+        WS,
+
+        [Description("Bonaire, Saint Eustatius and Saba")]
+        BQ,
+
+        [Description("Brazil")]
+        BR,
+
+        [Description("Bahamas")]
+        BS,
+
+        [Description("Jersey")]
+        JE,
+
+        [Description("Belarus")]
+        BY,
+
+        [Description("Belize")]
+        BZ,
+
+        [Description("Russia")]
+        RU,
+
+        [Description("Rwanda")]
+        RW,
+
+        [Description("Serbia")]
+        RS,
+
+        [Description("East Timor")]
+        TL,
+
+        [Description("Reunion")]
+        RE,
+
+        [Description("Turkmenistan")]
+        TM,
+
+        [Description("Tajikistan")]
+        TJ,
+
+        [Description("Romania")]
+        RO,
+
+        [Description("Tokelau")]
+        TK,
+
+        [Description("Guinea-Bissau")]
+        GW,
+
+        [Description("Guam")]
+        GU,
+
+        [Description("Guatemala")]
+        GT,
+
+        [Description("South Georgia and the South Sandwich Islands")]
+        GS,
+
+        [Description("Greece")]
+        GR,
+
+        [Description("Equatorial Guinea")]
+        GQ,
+
+        [Description("Guadeloupe")]
+        GP,
+
+        [Description("Japan")]
+        JP,
+
+        [Description("Guyana")]
+        GY,
+
+        [Description("Guernsey")]
+        GG,
+
+        [Description("French Guiana")]
+        GF,
+
+        [Description("Georgia")]
+        GE,
+
+        [Description("Grenada")]
+        GD,
+
+        [Description("United Kingdom")]
+        GB,
+
+        [Description("Gabon")]
+        GA,
+
+        [Description("El Salvador")]
+        SV,
+
+        [Description("Guinea")]
+        GN,
+
+        [Description("Gambia")]
+        GM,
+
+        [Description("Greenland")]
+        GL,
+
+        [Description("Gibraltar")]
+        GI,
+
+        [Description("Ghana")]
+        GH,
+
+        [Description("Oman")]
+        OM,
+
+        [Description("Tunisia")]
+        TN,
+
+        [Description("Jordan")]
+        JO,
+
+        [Description("Croatia")]
+        HR,
+
+        [Description("Haiti")]
+        HT,
+
+        [Description("Hungary")]
+        HU,
+
+        [Description("Hong Kong")]
+        HK,
+
+        [Description("Honduras")]
+        HN,
+
+        [Description("Heard Island and McDonald Islands")]
+        HM,
+
+        [Description("Venezuela")]
+        VE,
+
+        [Description("Puerto Rico")]
+        PR,
+
+        [Description("Palestinian Territory")]
+        PS,
+
+        [Description("Palau")]
+        PW,
+
+        [Description("Portugal")]
+        PT,
+
+        [Description("Svalbard and Jan Mayen")]
+        SJ,
+
+        [Description("Paraguay")]
+        PY,
+
+        [Description("Iraq")]
+        IQ,
+
+        [Description("Panama")]
+        PA,
+
+        [Description("French Polynesia")]
+        PF,
+
+        [Description("Papua New Guinea")]
+        PG,
+
+        [Description("Peru")]
+        PE,
+
+        [Description("Pakistan")]
+        PK,
+
+        [Description("Philippines")]
+        PH,
+
+        [Description("Pitcairn")]
+        PN,
+
+        [Description("Poland")]
+        PL,
+
+        [Description("Saint Pierre and Miquelon")]
+        PM,
+
+        [Description("Zambia")]
+        ZM,
+
+        [Description("Western Sahara")]
+        EH,
+
+        [Description("Estonia")]
+        EE,
+
+        [Description("Egypt")]
+        EG,
+
+        [Description("South Africa")]
+        ZA,
+
+        [Description("Ecuador")]
+        EC,
+
+        [Description("Italy")]
+        IT,
+
+        [Description("Vietnam")]
+        VN,
+
+        [Description("Solomon Islands")]
+        SB,
+
+        [Description("Ethiopia")]
+        ET,
+
+        [Description("Somalia")]
+        SO,
+
+        [Description("Zimbabwe")]
+        ZW,
+
+        [Description("Saudi Arabia")]
+        SA,
+
+        [Description("Spain")]
+        ES,
+
+        [Description("Eritrea")]
+        ER,
+
+        [Description("Montenegro")]
+        ME,
+
+        [Description("Moldova")]
+        MD,
+
+        [Description("Madagascar")]
+        MG,
+
+        [Description("Saint Martin")]
+        MF,
+
+        [Description("Morocco")]
+        MA,
+
+        [Description("Monaco")]
+        MC,
+
+        [Description("Uzbekistan")]
+        UZ,
+
+        [Description("Myanmar")]
+        MM,
+
+        [Description("Mali")]
+        ML,
+
+        [Description("Macao")]
+        MO,
+
+        [Description("Mongolia")]
+        MN,
+
+        [Description("Marshall Islands")]
+        MH,
+
+        [Description("North Macedonia")]
+        MK,
+
+        [Description("Mauritius")]
+        MU,
+
+        [Description("Malta")]
+        MT,
+
+        [Description("Malawi")]
+        MW,
+
+        [Description("Maldives")]
+        MV,
+
+        [Description("Martinique")]
+        MQ,
+
+        [Description("Northern Mariana Islands")]
+        MP,
+
+        [Description("Montserrat")]
+        MS,
+
+        [Description("Mauritania")]
+        MR,
+
+        [Description("Isle of Man")]
+        IM,
+
+        [Description("Uganda")]
+        UG,
+
+        [Description("Tanzania")]
+        TZ,
+
+        [Description("Malaysia")]
+        MY,
+
+        [Description("Mexico")]
+        MX,
+
+        [Description("Israel")]
+        IL,
+
+        [Description("France")]
+        FR,
+
+        [Description("British Indian Ocean Territory")]
+        IO,
+
+        [Description("Saint Helena")]
+        SH,
+
+        [Description("Finland")]
+        FI,
+
+        [Description("Fiji")]
+        FJ,
+
+        [Description("Falkland Islands")]
+        FK,
+
+        [Description("Micronesia")]
+        FM,
+
+        [Description("Faroe Islands")]
+        FO,
+
+        [Description("Nicaragua")]
+        NI,
+
+        [Description("Netherlands")]
+        NL,
+
+        [Description("Norway")]
+        NO,
+
+        [Description("Namibia")]
+        NA,
+
+        [Description("Vanuatu")]
+        VU,
+
+        [Description("New Caledonia")]
+        NC,
+
+        [Description("Niger")]
+        NE,
+
+        [Description("Norfolk Island")]
+        NF,
+
+        [Description("Nigeria")]
+        NG,
+
+        [Description("New Zealand")]
+        NZ,
+
+        [Description("Nepal")]
+        NP,
+
+        [Description("Nauru")]
+        NR,
+
+        [Description("Niue")]
+        NU,
+
+        [Description("Cook Islands")]
+        CK,
+
+        [Description("Kosovo")]
+        XK,
+
+        [Description("Ivory Coast")]
+        CI,
+
+        [Description("Switzerland")]
+        CH,
+
+        [Description("Colombia")]
+        CO,
+
+        [Description("China")]
+        CN,
+
+        [Description("Cameroon")]
+        CM,
+
+        [Description("Chile")]
+        CL,
+
+        [Description("Cocos Islands")]
+        CC,
+
+        [Description("Canada")]
+        CA,
+
+        [Description("Republic of the Congo")]
+        CG,
+
+        [Description("Central African Republic")]
+        CF,
+
+        [Description("Democratic Republic of the Congo")]
+        CD,
+
+        [Description("Czech Republic")]
+        CZ,
+
+        [Description("Cyprus")]
+        CY,
+
+        [Description("Christmas Island")]
+        CX,
+
+        [Description("Costa Rica")]
+        CR,
+
+        [Description("Curacao")]
+        CW,
+
+        [Description("Cabo Verde")]
+        CV,
+
+        [Description("Cuba")]
+        CU,
+
+        [Description("Eswatini")]
+        SZ,
+
+        [Description("Syria")]
+        SY,
+
+        [Description("Sint Maarten")]
+        SX,
+
+        [Description("Kyrgyzstan")]
+        KG,
+
+        [Description("Kenya")]
+        KE,
+
+        [Description("South Sudan")]
+        SS,
+
+        [Description("Suriname")]
+        SR,
+
+        [Description("Kiribati")]
+        KI,
+
+        [Description("Cambodia")]
+        KH,
+
+        [Description("Saint Kitts and Nevis")]
+        KN,
+
+        [Description("Comoros")]
+        KM,
+
+        [Description("Sao Tome and Principe")]
+        ST,
+
+        [Description("Slovakia")]
+        SK,
+
+        [Description("South Korea")]
+        KR,
+
+        [Description("Slovenia")]
+        SI,
+
+        [Description("North Korea")]
+        KP,
+
+        [Description("Kuwait")]
+        KW,
+
+        [Description("Senegal")]
+        SN,
+
+        [Description("San Marino")]
+        SM,
+
+        [Description("Sierra Leone")]
+        SL,
+
+        [Description("Seychelles")]
+        SC,
+
+        [Description("Kazakhstan")]
+        KZ,
+
+        [Description("Cayman Islands")]
+        KY,
+
+        [Description("Singapore")]
+        SG,
+
+        [Description("Sweden")]
+        SE,
+
+        [Description("Sudan")]
+        SD,
+
+        [Description("Dominican Republic")]
+        DO,
+
+        [Description("Dominica")]
+        DM,
+
+        [Description("Djibouti")]
+        DJ,
+
+        [Description("Denmark")]
+        DK,
+
+        [Description("British Virgin Islands")]
+        VG,
+
+        [Description("Germany")]
+        DE,
+
+        [Description("Yemen")]
+        YE,
+
+        [Description("Algeria")]
+        DZ,
+
+        [Description("United States")]
+        US,
+
+        [Description("Uruguay")]
+        UY,
+
+        [Description("Mayotte")]
+        YT,
+
+        [Description("United States Minor Outlying Islands")]
+        UM,
+
+        [Description("Lebanon")]
+        LB,
+
+        [Description("Saint Lucia")]
+        LC,
+
+        [Description("Laos")]
+        LA,
+
+        [Description("Tuvalu")]
+        TV,
+
+        [Description("Taiwan")]
+        TW,
+
+        [Description("Trinidad and Tobago")]
+        TT,
+
+        [Description("Turkey")]
+        TR,
+
+        [Description("Sri Lanka")]
+        LK,
+
+        [Description("Liechtenstein")]
+        LI,
+
+        [Description("Latvia")]
+        LV,
+
+        [Description("Tonga")]
+        TO,
+
+        [Description("Lithuania")]
+        LT,
+
+        [Description("Luxembourg")]
+        LU,
+
+        [Description("Liberia")]
+        LR,
+
+        [Description("Lesotho")]
+        LS,
+
+        [Description("Thailand")]
+        TH,
+
+        [Description("French Southern Territories")]
+        TF,
+
+        [Description("Togo")]
+        TG,
+
+        [Description("Chad")]
+        TD,
+
+        [Description("Turks and Caicos Islands")]
+        TC,
+
+        [Description("Libya")]
+        LY,
+
+        [Description("Vatican")]
+        VA,
+
+        [Description("Saint Vincent and the Grenadines")]
+        VC,
+
+        [Description("United Arab Emirates")]
+        AE,
+
+        [Description("Andorra")]
+        AD,
+
+        [Description("Antigua and Barbuda")]
+        AG,
+
+        [Description("Afghanistan")]
+        AF,
+
+        [Description("Anguilla")]
+        AI,
+
+        [Description("U.S. Virgin Islands")]
+        VI,
+
+        [Description("Iceland")]
+        IS,
+
+        [Description("Iran")]
+        IR,
+
+        [Description("Armenia")]
+        AM,
+
+        [Description("Albania")]
+        AL,
+
+        [Description("Angola")]
+        AO,
+
+        [Description("Antarctica")]
+        AQ,
+
+        [Description("American Samoa")]
+        AS,
+
+        [Description("Argentina")]
+        AR,
+
+        [Description("Australia")]
+        AU,
+
+        [Description("Austria")]
+        AT,
+
+        [Description("Aruba")]
+        AW,
+
+        [Description("India")]
+        IN,
+
+        [Description("Aland Islands")]
+        AX,
+
+        [Description("Azerbaijan")]
+        AZ,
+
+        [Description("Ireland")]
+        IE,
+
+        [Description("Indonesia")]
+        ID,
+
+        [Description("Ukraine")]
+        UA,
+
+        [Description("Qatar")]
+        QA,
+
+        [Description("Mozambique")]
+        MZ,
+    }
+}
diff --git a/osu.Game/Users/CountryStatistics.cs b/osu.Game/Users/CountryStatistics.cs
index e784630d56..03d455bc04 100644
--- a/osu.Game/Users/CountryStatistics.cs
+++ b/osu.Game/Users/CountryStatistics.cs
@@ -9,11 +9,8 @@ namespace osu.Game.Users
 {
     public class CountryStatistics
     {
-        [JsonProperty]
-        public Country Country;
-
         [JsonProperty(@"code")]
-        public string FlagName;
+        public CountryCode Code;
 
         [JsonProperty(@"active_users")]
         public long ActiveUsers;
diff --git a/osu.Game/Users/Drawables/DrawableFlag.cs b/osu.Game/Users/Drawables/DrawableFlag.cs
index e5ac8fa257..253835b415 100644
--- a/osu.Game/Users/Drawables/DrawableFlag.cs
+++ b/osu.Game/Users/Drawables/DrawableFlag.cs
@@ -5,6 +5,7 @@
 
 using System;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
@@ -14,13 +15,13 @@ namespace osu.Game.Users.Drawables
 {
     public class DrawableFlag : Sprite, IHasTooltip
     {
-        private readonly Country country;
+        private readonly CountryCode countryCode;
 
-        public LocalisableString TooltipText => country?.FullName;
+        public LocalisableString TooltipText => countryCode == CountryCode.Unknown ? string.Empty : countryCode.GetDescription();
 
-        public DrawableFlag(Country country)
+        public DrawableFlag(CountryCode countryCode)
         {
-            this.country = country;
+            this.countryCode = countryCode;
         }
 
         [BackgroundDependencyLoader]
@@ -29,7 +30,8 @@ namespace osu.Game.Users.Drawables
             if (ts == null)
                 throw new ArgumentNullException(nameof(ts));
 
-            Texture = ts.Get($@"Flags/{country?.FlagName ?? @"__"}") ?? ts.Get(@"Flags/__");
+            string textureName = countryCode == CountryCode.Unknown ? "__" : countryCode.ToString();
+            Texture = ts.Get($@"Flags/{textureName}") ?? ts.Get(@"Flags/__");
         }
     }
 }
diff --git a/osu.Game/Users/Drawables/UpdateableFlag.cs b/osu.Game/Users/Drawables/UpdateableFlag.cs
index fd59bf305d..9b101131b3 100644
--- a/osu.Game/Users/Drawables/UpdateableFlag.cs
+++ b/osu.Game/Users/Drawables/UpdateableFlag.cs
@@ -13,18 +13,18 @@ using osu.Game.Overlays;
 
 namespace osu.Game.Users.Drawables
 {
-    public class UpdateableFlag : ModelBackedDrawable<Country>
+    public class UpdateableFlag : ModelBackedDrawable<CountryCode>
     {
-        public Country Country
+        public CountryCode CountryCode
         {
             get => Model;
             set => Model = value;
         }
 
         /// <summary>
-        /// Whether to show a place holder on null country.
+        /// Whether to show a place holder on unknown country.
         /// </summary>
-        public bool ShowPlaceholderOnNull = true;
+        public bool ShowPlaceholderOnUnknown = true;
 
         /// <summary>
         /// Perform an action in addition to showing the country ranking.
@@ -32,14 +32,14 @@ namespace osu.Game.Users.Drawables
         /// </summary>
         public Action Action;
 
-        public UpdateableFlag(Country country = null)
+        public UpdateableFlag(CountryCode countryCode = CountryCode.Unknown)
         {
-            Country = country;
+            CountryCode = countryCode;
         }
 
-        protected override Drawable CreateDrawable(Country country)
+        protected override Drawable CreateDrawable(CountryCode countryCode)
         {
-            if (country == null && !ShowPlaceholderOnNull)
+            if (countryCode == CountryCode.Unknown && !ShowPlaceholderOnUnknown)
                 return null;
 
             return new Container
@@ -47,7 +47,7 @@ namespace osu.Game.Users.Drawables
                 RelativeSizeAxes = Axes.Both,
                 Children = new Drawable[]
                 {
-                    new DrawableFlag(country)
+                    new DrawableFlag(countryCode)
                     {
                         RelativeSizeAxes = Axes.Both
                     },
@@ -62,7 +62,7 @@ namespace osu.Game.Users.Drawables
         protected override bool OnClick(ClickEvent e)
         {
             Action?.Invoke();
-            rankingsOverlay?.ShowCountry(Country);
+            rankingsOverlay?.ShowCountry(CountryCode);
             return true;
         }
     }
diff --git a/osu.Game/Users/ExtendedUserPanel.cs b/osu.Game/Users/ExtendedUserPanel.cs
index 7d475c545a..a4cba8b920 100644
--- a/osu.Game/Users/ExtendedUserPanel.cs
+++ b/osu.Game/Users/ExtendedUserPanel.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Users
 
         protected UpdateableAvatar CreateAvatar() => new UpdateableAvatar(User, false);
 
-        protected UpdateableFlag CreateFlag() => new UpdateableFlag(User.Country)
+        protected UpdateableFlag CreateFlag() => new UpdateableFlag(User.CountryCode)
         {
             Size = new Vector2(36, 26),
             Action = Action,
diff --git a/osu.Game/Users/IUser.cs b/osu.Game/Users/IUser.cs
index 7a233b5d8b..b7f545f68b 100644
--- a/osu.Game/Users/IUser.cs
+++ b/osu.Game/Users/IUser.cs
@@ -10,6 +10,8 @@ namespace osu.Game.Users
     {
         string Username { get; }
 
+        CountryCode CountryCode { get; }
+
         bool IsBot { get; }
 
         bool IEquatable<IUser>.Equals(IUser? other)