diff --git a/osu.Game/Graphics/Backgrounds/Triangles.cs b/osu.Game/Graphics/Backgrounds/Triangles.cs
index 88f3a7d41a..514ffb9497 100644
--- a/osu.Game/Graphics/Backgrounds/Triangles.cs
+++ b/osu.Game/Graphics/Backgrounds/Triangles.cs
@@ -19,7 +19,6 @@ public class Triangles : Container
 
         public Triangles()
         {
-            Masking = true;
             Alpha = 0.3f;
         }
 
diff --git a/osu.Game/Overlays/Toolbar/ToolbarButton.cs b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
index b0d8135ef4..9949a81c89 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
@@ -156,6 +156,7 @@ public class OpaqueBackground : Container
         public OpaqueBackground()
         {
             RelativeSizeAxes = Axes.Both;
+            Masking = true;
 
             Children = new Drawable[]
             {
diff --git a/osu.Game/Screens/Menu/OsuLogo.cs b/osu.Game/Screens/Menu/OsuLogo.cs
index d121847c59..50ef033942 100644
--- a/osu.Game/Screens/Menu/OsuLogo.cs
+++ b/osu.Game/Screens/Menu/OsuLogo.cs
@@ -29,7 +29,7 @@ public partial class OsuLogo : BufferedContainer
         private Container logoHoverContainer;
         private MenuVisualisation vis;
 
-        private CircularContainer colourAndTriangles;
+        private Container colourAndTriangles;
 
         public Action Action;
 
@@ -84,14 +84,14 @@ public OsuLogo()
                             {
                                 logoContainer = new CircularContainer
                                 {
-                                    AutoSizeAxes = Axes.Both,
                                     Anchor = Anchor.Centre,
+                                    RelativeSizeAxes = Axes.Both,
+                                    Scale = new Vector2(0.8f),
                                     Children = new Drawable[]
                                     {
-                                        colourAndTriangles = new CircularContainer
+                                        colourAndTriangles = new Container
                                         {
                                             RelativeSizeAxes = Axes.Both,
-                                            Scale = new Vector2(0.78f),
                                             Anchor = Anchor.Centre,
                                             Origin = Anchor.Centre,
                                             Children = new Drawable[]
@@ -107,14 +107,15 @@ public OsuLogo()
                                                 },
                                             }
                                         },
-                                        logo = new Sprite
-                                        {
-                                            Anchor = Anchor.Centre,
-                                            Origin = Anchor.Centre,
-                                            Scale = new Vector2(0.5f),
-                                        },
+
                                     },
                                 },
+                                logo = new Sprite
+                                {
+                                    Anchor = Anchor.Centre,
+                                    Origin = Anchor.Centre,
+                                    Scale = new Vector2(0.5f),
+                                },
                                 rippleContainer = new Container
                                 {
                                     Anchor = Anchor.Centre,
@@ -205,19 +206,6 @@ public OsuLogoTriangles()
                 Alpha = 1;
             }
 
-            public override float CornerRadius
-            {
-                get
-                {
-                    return DrawSize.X / 2f;
-                }
-
-                set
-                {
-                    Debug.Assert(false, "Cannot manually set CornerRadius of CircularContainer.");
-                }
-            }
-
             protected override Sprite CreateTriangle()
             {
                 var triangle = base.CreateTriangle();