diff --git a/osu-framework b/osu-framework
index 6c9be31f19..5906ae1e16 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit 6c9be31f1928436d92b8880c16bb9ffe3b550991
+Subproject commit 5906ae1e16802fd4e04a6e9ceefdbd1a95de8b9e
diff --git a/osu-resources b/osu-resources
index 7c42cf0a56..c03414fd4e 160000
--- a/osu-resources
+++ b/osu-resources
@@ -1 +1 @@
-Subproject commit 7c42cf0a565ca125edcf335fabcb2ba3961d202d
+Subproject commit c03414fd4e9ffd99ab5641ac9a15ee21f3976b55
diff --git a/osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs
index 5143bd4af8..dab9aa1144 100644
--- a/osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -105,7 +105,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
             //sane defaults
             ring.Alpha = circle.Alpha = number.Alpha = glow.Alpha = 1;
             ApproachCircle.Alpha = 0;
-            ApproachCircle.Scale = new Vector2(2);
+            ApproachCircle.Scale = new Vector2(4);
             explode.Alpha = 0;
         }
 
@@ -114,7 +114,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
             base.UpdatePreemptState();
 
             ApproachCircle.FadeIn(Math.Min(TIME_FADEIN * 2, TIME_PREEMPT));
-            ApproachCircle.ScaleTo(0.6f, TIME_PREEMPT);
+            ApproachCircle.ScaleTo(1.1f, TIME_PREEMPT);
         }
 
         protected override void UpdateState(ArmedState state)
diff --git a/osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
index ee8acf74c8..0626873afc 100644
--- a/osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
                 body = new SliderBody(s)
                 {
                     Position = s.Position,
-                    PathWidth = s.Scale * 72,
+                    PathWidth = s.Scale * 64,
                 },
                 bouncer1 = new SliderBouncer(s, false)
                 {
diff --git a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/ApproachCircle.cs b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/ApproachCircle.cs
index 356a6c1c35..0e2ec50d89 100644
--- a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/ApproachCircle.cs
+++ b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/ApproachCircle.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
         [BackgroundDependencyLoader]
         private void load(TextureStore textures)
         {
-            approachCircle.Texture = textures.Get(@"Play/osu/approachcircle@2x");
+            approachCircle.Texture = textures.Get(@"Play/osu/approachcircle");
         }
     }
 }
\ No newline at end of file
diff --git a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/CirclePiece.cs b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/CirclePiece.cs
index 7cfd0d43ab..f28b4ba7eb 100644
--- a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/CirclePiece.cs
+++ b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/CirclePiece.cs
@@ -22,9 +22,9 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
 
         public CirclePiece()
         {
-            Size = new Vector2(144);
+            Size = new Vector2(128);
             Masking = true;
-            CornerRadius = DrawSize.X / 2;
+            CornerRadius = Size.X / 2;
 
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
@@ -47,7 +47,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
         [BackgroundDependencyLoader]
         private void load(TextureStore textures)
         {
-            disc.Texture = textures.Get(@"Play/osu/disc@2x");
+            disc.Texture = textures.Get(@"Play/osu/disc");
         }
 
         protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
diff --git a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/ExplodePiece.cs b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/ExplodePiece.cs
index 6f9e2a979a..0b7d30cafc 100644
--- a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/ExplodePiece.cs
+++ b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/ExplodePiece.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
     {
         public ExplodePiece()
         {
-            Size = new Vector2(144);
+            Size = new Vector2(128);
 
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
diff --git a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/FlashPiece.cs b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/FlashPiece.cs
index 7ae3306be7..a4d69de4eb 100644
--- a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/FlashPiece.cs
+++ b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/FlashPiece.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
     {
         public FlashPiece()
         {
-            Size = new Vector2(144);
+            Size = new Vector2(128);
 
             Masking = true;
             CornerRadius = Size.X / 2;
diff --git a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/GlowPiece.cs b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/GlowPiece.cs
index a9e1c9c369..569deb8ce6 100644
--- a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/GlowPiece.cs
+++ b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/GlowPiece.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
         [BackgroundDependencyLoader]
         private void load(TextureStore textures)
         {
-            layer.Texture = textures.Get(@"Play/osu/ring-glow@2x");
+            layer.Texture = textures.Get(@"Play/osu/ring-glow");
         }
     }
 }
\ No newline at end of file
diff --git a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/NumberPiece.cs b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/NumberPiece.cs
index 0c5d2e9186..6478027335 100644
--- a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/NumberPiece.cs
+++ b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/NumberPiece.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
         [BackgroundDependencyLoader]
         private void load(TextureStore textures)
         {
-            number.Texture = textures.Get(@"Play/osu/number@2x");
+            number.Texture = textures.Get(@"Play/osu/number");
         }
     }
 }
\ No newline at end of file
diff --git a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/RingPiece.cs b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/RingPiece.cs
index c5fdbbfdfb..379c384144 100644
--- a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/RingPiece.cs
+++ b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/RingPiece.cs
@@ -6,32 +6,35 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
+using OpenTK;
+using OpenTK.Graphics;
 
 namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
 {
     public class RingPiece : Container
     {
-        private Sprite ring;
-
         public RingPiece()
         {
+            Size = new Vector2(128);
+
+            Masking = true;
+            CornerRadius = Size.X / 2;
+
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
 
+            BorderThickness = 10;
+            BorderColour = Color4.White;
+
             Children = new Drawable[]
             {
-                ring = new Sprite
+                new Box
                 {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre
+                    AlwaysPresent = true,
+                    Alpha = 0,
+                    RelativeSizeAxes = Axes.Both
                 }
             };
         }
-
-        [BackgroundDependencyLoader]
-        private void load(TextureStore textures)
-        {
-            ring.Texture = textures.Get(@"Play/osu/ring@2x");
-        }
     }
 }
\ No newline at end of file
diff --git a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SliderBall.cs b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SliderBall.cs
index 0df80984bb..caae9b11f2 100644
--- a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SliderBall.cs
+++ b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SliderBall.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
         private readonly Slider slider;
         private Box follow;
 
-        const float width = 140;
+        const float width = 128;
 
         public SliderBall(Slider slider)
         {
@@ -45,7 +45,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
                     AutoSizeAxes = Axes.Both,
                     Origin = Anchor.Centre,
                     Anchor = Anchor.Centre,
-                    BorderThickness = 14,
+                    BorderThickness = 10,
                     BorderColour = Color4.White,
                     Alpha = 1,
                     CornerRadius = width / 2,
diff --git a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SliderBody.cs b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SliderBody.cs
index c0bd29bc02..2849976c09 100644
--- a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SliderBody.cs
+++ b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SliderBody.cs
@@ -89,7 +89,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
             var bytes = upload.Data;
 
             const float aa_portion = 0.02f;
-            const float border_portion = 0.18f;
+            const float border_portion = 0.128f;
             const float gradient_portion = 1 - border_portion;
 
             const float opacity_at_centre = 0.3f;
diff --git a/osu.Game/Graphics/Cursor/CursorTrail.cs b/osu.Game/Graphics/Cursor/CursorTrail.cs
index f2060bf8a3..935895ed65 100644
--- a/osu.Game/Graphics/Cursor/CursorTrail.cs
+++ b/osu.Game/Graphics/Cursor/CursorTrail.cs
@@ -74,6 +74,7 @@ namespace osu.Game.Graphics.Cursor
         {
             shader = shaders?.Load(@"CursorTrail", FragmentShaderDescriptor.Texture);
             texture = textures.Get(@"Cursor/cursortrail");
+            Scale = new Vector2(1 / texture.ScaleAdjust);
         }
 
         protected override void Update()
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 31cee2ed39..f3b869c39a 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -45,7 +45,7 @@ namespace osu.Game
             Dependencies.Cache(new OsuColour());
 
             //this completely overrides the framework default. will need to change once we make a proper FontStore.
-            Dependencies.Cache(Fonts = new FontStore { ScaleAdjust = 0.01f }, true);
+            Dependencies.Cache(Fonts = new FontStore { ScaleAdjust = 100 }, true);
 
             Fonts.AddStore(new GlyphStore(Resources, @"Fonts/FontAwesome"));
             Fonts.AddStore(new GlyphStore(Resources, @"Fonts/osuFont"));
diff --git a/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs b/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs
index d1af30e88d..b6b66ffb7e 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs
@@ -79,7 +79,7 @@ namespace osu.Game.Overlays.Toolbar
             {
                 this.game = game;
 
-                guestTexture = textures.Get(@"Online/avatar-guest@2x");
+                guestTexture = textures.Get(@"Online/avatar-guest");
             }
 
             public int UserId
diff --git a/osu.Game/Screens/Menu/OsuLogo.cs b/osu.Game/Screens/Menu/OsuLogo.cs
index af552c6bb6..d66c42ee4f 100644
--- a/osu.Game/Screens/Menu/OsuLogo.cs
+++ b/osu.Game/Screens/Menu/OsuLogo.cs
@@ -132,7 +132,6 @@ namespace osu.Game.Screens.Menu
                                         {
                                             Anchor = Anchor.Centre,
                                             Origin = Anchor.Centre,
-                                            Scale = new Vector2(0.5f),
                                         },
                                     }
                                 },
@@ -147,7 +146,6 @@ namespace osu.Game.Screens.Menu
                                             Anchor = Anchor.Centre,
                                             Origin = Anchor.Centre,
                                             BlendingMode = BlendingMode.Additive,
-                                            Scale = new Vector2(0.5f),
                                             Alpha = 0.15f
                                         }
                                     }
@@ -170,8 +168,8 @@ namespace osu.Game.Screens.Menu
         [BackgroundDependencyLoader]
         private void load(TextureStore textures)
         {
-            logo.Texture = textures.Get(@"Menu/logo@2x");
-            ripple.Texture = textures.Get(@"Menu/logo@2x");
+            logo.Texture = textures.Get(@"Menu/logo");
+            ripple.Texture = textures.Get(@"Menu/logo");
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game/Screens/Select/FooterButton.cs b/osu.Game/Screens/Select/FooterButton.cs
index bf592396bb..365b043d3b 100644
--- a/osu.Game/Screens/Select/FooterButton.cs
+++ b/osu.Game/Screens/Select/FooterButton.cs
@@ -97,7 +97,6 @@ namespace osu.Game.Screens.Select
             HoverLost?.Invoke();
             light.ScaleTo(new Vector2(1, 1), Footer.TRANSITION_LENGTH, EasingTypes.OutQuint);
             light.FadeColour(DeselectedColour, Footer.TRANSITION_LENGTH, EasingTypes.OutQuint);
-            box.FadeOut(Footer.TRANSITION_LENGTH, EasingTypes.OutQuint);
         }
 
         protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
@@ -106,6 +105,12 @@ namespace osu.Game.Screens.Select
             return base.OnMouseDown(state, args);
         }
 
+        protected override bool OnMouseUp(InputState state, MouseUpEventArgs args)
+        {
+            box.FadeOut(Footer.TRANSITION_LENGTH, EasingTypes.OutQuint);
+            return base.OnMouseUp(state, args);
+        }
+
         protected override bool OnClick(InputState state)
         {
             box.ClearTransformations();