diff --git a/osu.Desktop.VisualTests/Tests/TestCaseReplaySettingsOverlay.cs b/osu.Desktop.VisualTests/Tests/TestCaseReplaySettingsOverlay.cs
index a63ded5cf4..76919a5304 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseReplaySettingsOverlay.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseReplaySettingsOverlay.cs
@@ -19,7 +19,6 @@ namespace osu.Desktop.VisualTests.Tests
             {
                 Anchor = Anchor.TopCentre,
                 Origin = Anchor.TopCentre,
-                AutoSizeAxes = Axes.Both,
             });
         }
     }
diff --git a/osu.Game/Graphics/UserInterface/SimpleButton.cs b/osu.Game/Graphics/UserInterface/SimpleButton.cs
index 2110ffc986..c1c87dda26 100644
--- a/osu.Game/Graphics/UserInterface/SimpleButton.cs
+++ b/osu.Game/Graphics/UserInterface/SimpleButton.cs
@@ -42,35 +42,35 @@ namespace osu.Game.Graphics.UserInterface
 
             Children = new Drawable[]
             {
-                    content = new Container
-                    {
-                        Size = new Vector2(button_size),
-                        CornerRadius = 5,
-                        Masking = true,
+                content = new Container
+                {
+                    Size = new Vector2(button_size),
+                    CornerRadius = 5,
+                    Masking = true,
 
-                        Origin = Anchor.Centre,
-                        Anchor = Anchor.Centre,
-                        EdgeEffect = new EdgeEffect
+                    Origin = Anchor.Centre,
+                    Anchor = Anchor.Centre,
+                    EdgeEffect = new EdgeEffect
+                    {
+                        Colour = Color4.Black.Opacity(0.04f),
+                        Type = EdgeEffectType.Shadow,
+                        Radius = 5,
+                    },
+                    Children = new Drawable[]
+                    {
+                        hover = new Box
                         {
-                            Colour = Color4.Black.Opacity(0.04f),
-                            Type = EdgeEffectType.Shadow,
-                            Radius = 5,
+                            RelativeSizeAxes = Axes.Both,
+                            Alpha = 0,
                         },
-                        Children = new Drawable[]
+                        icon = new TextAwesome
                         {
-                            hover = new Box
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                Alpha = 0,
-                            },
-                            icon = new TextAwesome
-                            {
-                                TextSize = 18,
-                                Origin = Anchor.Centre,
-                                Anchor = Anchor.Centre
-                            }
+                            TextSize = 18,
+                            Origin = Anchor.Centre,
+                            Anchor = Anchor.Centre
                         }
                     }
+                }
             };
         }
 
diff --git a/osu.Game/Screens/Play/Settings/ReplaySettingsOverlay.cs b/osu.Game/Screens/Play/Settings/ReplaySettingsOverlay.cs
index 3d8e1e2d38..fbd6b7f758 100644
--- a/osu.Game/Screens/Play/Settings/ReplaySettingsOverlay.cs
+++ b/osu.Game/Screens/Play/Settings/ReplaySettingsOverlay.cs
@@ -3,6 +3,7 @@
 
 using OpenTK;
 using OpenTK.Input;
+using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input;
 
@@ -32,6 +33,7 @@ namespace osu.Game.Screens.Play.Settings
         {
             AlwaysPresent = true;
             Direction = FillDirection.Vertical;
+            AutoSizeAxes = Axes.Both;
             Spacing = new Vector2(0, 20);
 
             Add(new CollectionSettings());
diff --git a/osu.Game/Screens/Play/StandardHUDOverlay.cs b/osu.Game/Screens/Play/StandardHUDOverlay.cs
index 1674785b1b..17cf16d7ea 100644
--- a/osu.Game/Screens/Play/StandardHUDOverlay.cs
+++ b/osu.Game/Screens/Play/StandardHUDOverlay.cs
@@ -76,7 +76,6 @@ namespace osu.Game.Screens.Play
         {
             Anchor = Anchor.TopRight,
             Origin = Anchor.TopRight,
-            AutoSizeAxes = Axes.Both,
             Margin = new MarginPadding { Top = 100, Right = 10 },
         };