diff --git a/osu-resources b/osu-resources
index c0781d1d55..5ce2639887 160000
--- a/osu-resources
+++ b/osu-resources
@@ -1 +1 @@
-Subproject commit c0781d1d557c3e5a00f6cf1780049e382f92c0c8
+Subproject commit 5ce263988735b3f15c1195568b65fef40756198c
diff --git a/osu.Game/Beatmaps/Drawable/BeatmapPanel.cs b/osu.Game/Beatmaps/Drawable/BeatmapPanel.cs
index cd28e909a8..35a7f95037 100644
--- a/osu.Game/Beatmaps/Drawable/BeatmapPanel.cs
+++ b/osu.Game/Beatmaps/Drawable/BeatmapPanel.cs
@@ -29,7 +29,7 @@ protected override void Selected()
         public BeatmapPanel(BeatmapInfo beatmap)
         {
             Beatmap = beatmap;
-            Height *= 0.75f;
+            Height *= 0.60f;
 
             Children = new Framework.Graphics.Drawable[]
             {
@@ -44,12 +44,20 @@ public BeatmapPanel(BeatmapInfo beatmap)
                     Padding = new MarginPadding(5),
                     Direction = FlowDirection.HorizontalOnly,
                     AutoSizeAxes = Axes.Both,
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
                     Children = new Framework.Graphics.Drawable[]
                     {
-                        new DifficultyIcon(FontAwesome.dot_circle_o, new Color4(159, 198, 0, 255)),
+                        new DifficultyIcon(FontAwesome.dot_circle_o, new Color4(159, 198, 0, 255))
+                        {
+                            Scale = new Vector2(1.8f),
+                            Anchor = Anchor.CentreLeft,
+                            Origin = Anchor.CentreLeft,
+                        },
                         new FlowContainer
                         {
-                            Padding = new MarginPadding { Left = 10 },
+                            Padding = new MarginPadding { Left = 5 },
+                            Spacing = new Vector2(0, 5),
                             Direction = FlowDirection.VerticalOnly,
                             AutoSizeAxes = Axes.Both,
                             Children = new Framework.Graphics.Drawable[]
@@ -58,17 +66,32 @@ public BeatmapPanel(BeatmapInfo beatmap)
                                 {
                                     Direction = FlowDirection.HorizontalOnly,
                                     AutoSizeAxes = Axes.Both,
+                                    Spacing = new Vector2(4, 0),
                                     Children = new[]
                                     {
                                         new SpriteText
                                         {
+                                            Font = @"Exo2.0-Medium",
                                             Text = beatmap.Version,
                                             TextSize = 20,
+                                            Anchor = Anchor.BottomLeft,
+                                            Origin = Anchor.BottomLeft
                                         },
                                         new SpriteText
                                         {
-                                            Text = $" mapped by {(beatmap.Metadata ?? beatmap.BeatmapSet.Metadata).Author}",
+                                            Font = @"Exo2.0-Medium",
+                                            Text = "mapped by",
                                             TextSize = 16,
+                                            Anchor = Anchor.BottomLeft,
+                                            Origin = Anchor.BottomLeft
+                                        },
+                                        new SpriteText
+                                        {
+                                            Font = @"Exo2.0-MediumItalic",
+                                            Text = $"{(beatmap.Metadata ?? beatmap.BeatmapSet.Metadata).Author}",
+                                            TextSize = 16,
+                                            Anchor = Anchor.BottomLeft,
+                                            Origin = Anchor.BottomLeft
                                         },
                                     }
                                 },
diff --git a/osu.Game/Beatmaps/Drawable/BeatmapSetHeader.cs b/osu.Game/Beatmaps/Drawable/BeatmapSetHeader.cs
index a15198cc8c..9ce0bafdf4 100644
--- a/osu.Game/Beatmaps/Drawable/BeatmapSetHeader.cs
+++ b/osu.Game/Beatmaps/Drawable/BeatmapSetHeader.cs
@@ -60,14 +60,15 @@ public BeatmapSetHeader(BeatmapSetInfo beatmapSet)
                     AutoSizeAxes = Axes.Both,
                     Children = new[]
                     {
-                        // TODO: Make these italic
                         new SpriteText
                         {
+                            Font = @"Exo2.0-SemiBoldItalic",
                             Text = beatmapSet.Metadata.Title ?? beatmapSet.Metadata.TitleUnicode,
-                            TextSize = 20
+                            TextSize = 22
                         },
                         new SpriteText
                         {
+                            Font = @"Exo2.0-MediumItalic",
                             Text = beatmapSet.Metadata.Artist ?? beatmapSet.Metadata.ArtistUnicode,
                             TextSize = 16
                         },
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index a506044bee..ae13b20f4a 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -65,9 +65,21 @@ protected override void Load(BaseGame game)
 
             //this completely overrides the framework default. will need to change once we make a proper FontStore.
             Fonts = new TextureStore() { ScaleAdjust = 0.01f };
-            Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-Regular"));
+
             Fonts.AddStore(new GlyphStore(Resources, @"Fonts/FontAwesome"));
             Fonts.AddStore(new GlyphStore(Resources, @"Fonts/osuFont"));
+            Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-Regular"));
+            Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-RegularItalic"));
+            Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-SemiBold"));
+            Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-SemiBoldItalic"));
+            Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-Bold"));
+            Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-BoldItalic"));
+            Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-Light"));
+            Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-LightItalic"));
+            Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-Medium"));
+            Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-MediumItalic"));
+            Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-Black"));
+            Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-BlackItalic"));
 
             API = new APIAccess()
             {