diff --git a/osu-framework b/osu-framework
index 2fdf4a83c5..672e318d54 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit 2fdf4a83c538a49df5647c68971a9f6a5611efbf
+Subproject commit 672e318d541f6a7106a0a2b088dd3ec5e8bff5db
diff --git a/osu.Game/Graphics/Containers/OsuClickableContainer.cs b/osu.Game/Graphics/Containers/OsuClickableContainer.cs
new file mode 100644
index 0000000000..11c049ed3e
--- /dev/null
+++ b/osu.Game/Graphics/Containers/OsuClickableContainer.cs
@@ -0,0 +1,35 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Input;
+
+namespace osu.Game.Graphics.Containers
+{
+    public class OsuClickableContainer : ClickableContainer
+    {
+        protected SampleChannel SampleClick, SampleHover;
+
+        [BackgroundDependencyLoader]
+        private void load(AudioManager audio)
+        {
+            SampleHover = audio.Sample.Get(@"UI/generic-hover");
+            SampleClick = audio.Sample.Get(@"UI/generic-click");
+        }
+
+        protected override bool OnHover(InputState state)
+        {
+            SampleHover?.Play();
+            return base.OnHover(state);
+        }
+
+        protected override bool OnClick(InputState state)
+        {
+            SampleClick?.Play();
+            return base.OnClick(state);
+        }
+    }
+}
diff --git a/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs b/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
new file mode 100644
index 0000000000..0713fa1a52
--- /dev/null
+++ b/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
@@ -0,0 +1,38 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
+using osu.Framework.Graphics.Containers;
+
+namespace osu.Game.Graphics.Containers
+{
+    public class OsuFocusedOverlayContainer : FocusedOverlayContainer
+    {
+        private SampleChannel samplePopIn;
+        private SampleChannel samplePopOut;
+
+        [BackgroundDependencyLoader]
+        private void load(AudioManager audio)
+        {
+            samplePopIn = audio.Sample.Get(@"UI/melodic-5");
+            samplePopOut = audio.Sample.Get(@"UI/melodic-4");
+
+            StateChanged += OsuFocusedOverlayContainer_StateChanged;
+        }
+
+        private void OsuFocusedOverlayContainer_StateChanged(VisibilityContainer arg1, Visibility arg2)
+        {
+            switch (arg2)
+            {
+                case Visibility.Visible:
+                    samplePopIn?.Play();
+                    break;
+                case Visibility.Hidden:
+                    samplePopOut?.Play();
+                    break;
+            }
+        }
+    }
+}
diff --git a/osu.Game/Graphics/UserInterface/BackButton.cs b/osu.Game/Graphics/UserInterface/BackButton.cs
index 2b4b9cdb04..6a3757ec0e 100644
--- a/osu.Game/Graphics/UserInterface/BackButton.cs
+++ b/osu.Game/Graphics/UserInterface/BackButton.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Allocation;
-using osu.Framework.Audio;
 using osu.Framework.Graphics;
 
 namespace osu.Game.Graphics.UserInterface
@@ -18,9 +17,8 @@ namespace osu.Game.Graphics.UserInterface
         }
 
         [BackgroundDependencyLoader]
-        private void load(AudioManager audio, OsuColour colours)
+        private void load(OsuColour colours)
         {
-            ActivationSound = audio.Sample.Get(@"Menu/menuback");
             BackgroundColour = colours.Pink;
             HoverColour = colours.PinkDark;
         }
diff --git a/osu.Game/Graphics/UserInterface/DialogButton.cs b/osu.Game/Graphics/UserInterface/DialogButton.cs
index 253f902438..3f1b81893d 100644
--- a/osu.Game/Graphics/UserInterface/DialogButton.cs
+++ b/osu.Game/Graphics/UserInterface/DialogButton.cs
@@ -8,14 +8,14 @@ using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Audio.Sample;
 using osu.Game.Graphics.Backgrounds;
 using osu.Game.Graphics.Sprites;
 using osu.Framework.Extensions.Color4Extensions;
+using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Graphics.UserInterface
 {
-    public class DialogButton : ClickableContainer
+    public class DialogButton : OsuClickableContainer
     {
         private const float hover_width = 0.9f;
         private const float hover_duration = 500;
@@ -79,8 +79,6 @@ namespace osu.Game.Graphics.UserInterface
             }
         }
 
-        public SampleChannel SampleClick, SampleHover;
-
         private readonly Container backgroundContainer;
         private readonly Container colourContainer;
         private readonly Container glowContainer;
@@ -100,8 +98,6 @@ namespace osu.Game.Graphics.UserInterface
             didClick = true;
             colourContainer.ResizeTo(new Vector2(1.5f, 1f), click_duration, EasingTypes.In);
             flash();
-            SampleClick?.Play();
-            Action?.Invoke();
 
             Delay(click_duration);
             Schedule(delegate {
@@ -110,7 +106,7 @@ namespace osu.Game.Graphics.UserInterface
                 glowContainer.FadeOut();
             });
 
-            return true;
+            return base.OnClick(state);
         }
 
         protected override bool OnHover(Framework.Input.InputState state)
@@ -119,7 +115,7 @@ namespace osu.Game.Graphics.UserInterface
 
             colourContainer.ResizeTo(new Vector2(hover_width, 1f), hover_duration, EasingTypes.OutElastic);
             glowContainer.FadeIn(glow_fade_duration, EasingTypes.Out);
-            SampleHover?.Play();
+            base.OnHover(state);
             return true;
         }
 
diff --git a/osu.Game/Graphics/UserInterface/IconButton.cs b/osu.Game/Graphics/UserInterface/IconButton.cs
index 8540b35702..84904c10db 100644
--- a/osu.Game/Graphics/UserInterface/IconButton.cs
+++ b/osu.Game/Graphics/UserInterface/IconButton.cs
@@ -9,10 +9,11 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input;
+using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Graphics.UserInterface
 {
-    public class IconButton : ClickableContainer
+    public class IconButton : OsuClickableContainer
     {
         private readonly TextAwesome icon;
         private readonly Box hover;
diff --git a/osu.Game/Graphics/UserInterface/OsuButton.cs b/osu.Game/Graphics/UserInterface/OsuButton.cs
index 7bd58d38a5..6814308cb4 100644
--- a/osu.Game/Graphics/UserInterface/OsuButton.cs
+++ b/osu.Game/Graphics/UserInterface/OsuButton.cs
@@ -3,6 +3,8 @@
 
 using OpenTK.Graphics;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
@@ -18,6 +20,9 @@ namespace osu.Game.Graphics.UserInterface
     {
         private Box hover;
 
+        private SampleChannel sampleClick;
+        private SampleChannel sampleHover;
+
         public OsuButton()
         {
             Height = 40;
@@ -34,7 +39,7 @@ namespace osu.Game.Graphics.UserInterface
         public override bool HandleInput => Action != null;
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(OsuColour colours, AudioManager audio)
         {
             if (Action == null)
                 Colour = OsuColour.Gray(0.5f);
@@ -60,10 +65,20 @@ namespace osu.Game.Graphics.UserInterface
                     Alpha = 0,
                 },
             });
+
+            sampleClick = audio.Sample.Get(@"UI/generic-click");
+            sampleHover = audio.Sample.Get(@"UI/generic-hover");
+        }
+
+        protected override bool OnClick(InputState state)
+        {
+            sampleClick?.Play();
+            return base.OnClick(state);
         }
 
         protected override bool OnHover(InputState state)
         {
+            sampleHover?.Play();
             hover.FadeIn(200);
             return base.OnHover(state);
         }
diff --git a/osu.Game/Graphics/UserInterface/OsuCheckbox.cs b/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
index 198a01b5a4..68ff99e593 100644
--- a/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
@@ -106,8 +106,8 @@ namespace osu.Game.Graphics.UserInterface
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)
         {
-            sampleChecked = audio.Sample.Get(@"Checkbox/check-on");
-            sampleUnchecked = audio.Sample.Get(@"Checkbox/check-off");
+            sampleChecked = audio.Sample.Get(@"UI/check-on");
+            sampleUnchecked = audio.Sample.Get(@"UI/check-off");
         }
     }
 }
diff --git a/osu.Game/Graphics/UserInterface/OsuContextMenuItem.cs b/osu.Game/Graphics/UserInterface/OsuContextMenuItem.cs
index 769df18566..5d12dadf5f 100644
--- a/osu.Game/Graphics/UserInterface/OsuContextMenuItem.cs
+++ b/osu.Game/Graphics/UserInterface/OsuContextMenuItem.cs
@@ -65,8 +65,8 @@ namespace osu.Game.Graphics.UserInterface
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)
         {
-            sampleHover = audio.Sample.Get(@"Menu/menuclick");
-            sampleClick = audio.Sample.Get(@"Menu/menuback");
+            sampleHover = audio.Sample.Get(@"UI/generic-hover");
+            sampleClick = audio.Sample.Get(@"UI/generic-click");
 
             BackgroundColour = Color4.Transparent;
             BackgroundColourHover = OsuColour.FromHex(@"172023");
diff --git a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
index 4f0ac28731..673a23afac 100644
--- a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
+++ b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
@@ -100,7 +100,7 @@ namespace osu.Game.Graphics.UserInterface
         [BackgroundDependencyLoader]
         private void load(AudioManager audio, OsuColour colours)
         {
-            sample = audio.Sample.Get(@"Sliderbar/sliderbar");
+            sample = audio.Sample.Get(@"UI/sliderbar-notch");
             AccentColour = colours.Pink;
         }
 
diff --git a/osu.Game/Graphics/UserInterface/TwoLayerButton.cs b/osu.Game/Graphics/UserInterface/TwoLayerButton.cs
index c774fad0e1..7f2bbb8f9f 100644
--- a/osu.Game/Graphics/UserInterface/TwoLayerButton.cs
+++ b/osu.Game/Graphics/UserInterface/TwoLayerButton.cs
@@ -1,7 +1,6 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework.Audio.Sample;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
@@ -18,7 +17,7 @@ using osu.Framework.Graphics.Shapes;
 
 namespace osu.Game.Graphics.UserInterface
 {
-    public class TwoLayerButton : ClickableContainer
+    public class TwoLayerButton : OsuClickableContainer
     {
         private readonly BouncingIcon bouncingIcon;
 
@@ -32,7 +31,6 @@ namespace osu.Game.Graphics.UserInterface
 
         public static readonly Vector2 SIZE_EXTENDED = new Vector2(140, 50);
         public static readonly Vector2 SIZE_RETRACTED = new Vector2(100, 50);
-        public SampleChannel ActivationSound;
         private readonly SpriteText text;
 
         public Color4 HoverColour;
@@ -210,8 +208,6 @@ namespace osu.Game.Graphics.UserInterface
             flash.FadeOut(500, EasingTypes.OutQuint);
             flash.Expire();
 
-            ActivationSound.Play();
-
             return base.OnClick(state);
         }
 
diff --git a/osu.Game/Overlays/Chat/ChannelListItem.cs b/osu.Game/Overlays/Chat/ChannelListItem.cs
index 9aa11cdd4f..aca65bbc17 100644
--- a/osu.Game/Overlays/Chat/ChannelListItem.cs
+++ b/osu.Game/Overlays/Chat/ChannelListItem.cs
@@ -12,10 +12,11 @@ using osu.Framework.Input;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Online.Chat;
+using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Overlays.Chat
 {
-    public class ChannelListItem : ClickableContainer, IFilterable
+    public class ChannelListItem : OsuClickableContainer, IFilterable
     {
         private const float width_padding = 5;
         private const float channel_width = 150;
diff --git a/osu.Game/Overlays/Chat/ChannelSelectionOverlay.cs b/osu.Game/Overlays/Chat/ChannelSelectionOverlay.cs
index 7c10c4fb9b..9f61d13813 100644
--- a/osu.Game/Overlays/Chat/ChannelSelectionOverlay.cs
+++ b/osu.Game/Overlays/Chat/ChannelSelectionOverlay.cs
@@ -16,10 +16,11 @@ using osu.Game.Graphics.Backgrounds;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Chat;
+using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Overlays.Chat
 {
-    public class ChannelSelectionOverlay : FocusedOverlayContainer
+    public class ChannelSelectionOverlay : OsuFocusedOverlayContainer
     {
         public static readonly float WIDTH_PADDING = 170;
 
diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index 37dc61e072..5fcdf22122 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -22,10 +22,11 @@ using osu.Framework.Input;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Overlays.Chat;
+using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Overlays
 {
-    public class ChatOverlay : FocusedOverlayContainer, IOnlineComponent
+    public class ChatOverlay : OsuFocusedOverlayContainer, IOnlineComponent
     {
         private const float textbox_height = 60;
         private const float channel_selection_min_height = 0.3f;
diff --git a/osu.Game/Overlays/Dialog/PopupDialog.cs b/osu.Game/Overlays/Dialog/PopupDialog.cs
index 5edb48e136..39338ba3e1 100644
--- a/osu.Game/Overlays/Dialog/PopupDialog.cs
+++ b/osu.Game/Overlays/Dialog/PopupDialog.cs
@@ -15,10 +15,11 @@ using OpenTK;
 using OpenTK.Graphics;
 using OpenTK.Input;
 using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Overlays.Dialog
 {
-    public class PopupDialog : FocusedOverlayContainer
+    public class PopupDialog : OsuFocusedOverlayContainer
     {
         public static readonly float ENTER_DURATION = 500;
         public static readonly float EXIT_DURATION = 200;
diff --git a/osu.Game/Overlays/Dialog/PopupDialogCancelButton.cs b/osu.Game/Overlays/Dialog/PopupDialogCancelButton.cs
index 1449577b21..a17c4a7bf2 100644
--- a/osu.Game/Overlays/Dialog/PopupDialogCancelButton.cs
+++ b/osu.Game/Overlays/Dialog/PopupDialogCancelButton.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Allocation;
-using osu.Framework.Audio;
 using osu.Game.Graphics;
 
 namespace osu.Game.Overlays.Dialog
@@ -10,11 +9,9 @@ namespace osu.Game.Overlays.Dialog
     public class PopupDialogCancelButton : PopupDialogButton
     {
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours, AudioManager audio)
+        private void load(OsuColour colours)
         {
             ButtonColour = colours.Blue;
-            SampleHover = audio.Sample.Get(@"Menu/menuclick");
-            SampleClick = audio.Sample.Get(@"Menu/menuback");
         }
     }
 }
diff --git a/osu.Game/Overlays/Dialog/PopupDialogOkButton.cs b/osu.Game/Overlays/Dialog/PopupDialogOkButton.cs
index 46bf3debc4..3d99987080 100644
--- a/osu.Game/Overlays/Dialog/PopupDialogOkButton.cs
+++ b/osu.Game/Overlays/Dialog/PopupDialogOkButton.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Allocation;
-using osu.Framework.Audio;
 using osu.Game.Graphics;
 
 namespace osu.Game.Overlays.Dialog
@@ -10,11 +9,9 @@ namespace osu.Game.Overlays.Dialog
     public class PopupDialogOkButton : PopupDialogButton
     {
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours, AudioManager audio)
+        private void load(OsuColour colours)
         {
             ButtonColour = colours.Pink;
-            SampleHover = audio.Sample.Get(@"Menu/menuclick");
-            SampleClick = audio.Sample.Get(@"Menu/menu-play-click");
         }
     }
 }
diff --git a/osu.Game/Overlays/DialogOverlay.cs b/osu.Game/Overlays/DialogOverlay.cs
index 757781a4ab..f1a6bc1681 100644
--- a/osu.Game/Overlays/DialogOverlay.cs
+++ b/osu.Game/Overlays/DialogOverlay.cs
@@ -7,10 +7,11 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Overlays.Dialog;
 using OpenTK.Graphics;
 using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Overlays
 {
-    public class DialogOverlay : FocusedOverlayContainer
+    public class DialogOverlay : OsuFocusedOverlayContainer
     {
         private readonly Container dialogContainer;
         private PopupDialog currentDialog;
diff --git a/osu.Game/Overlays/Direct/DirectListPanel.cs b/osu.Game/Overlays/Direct/DirectListPanel.cs
index 2cede1e574..1e923d79fa 100644
--- a/osu.Game/Overlays/Direct/DirectListPanel.cs
+++ b/osu.Game/Overlays/Direct/DirectListPanel.cs
@@ -16,6 +16,7 @@ using osu.Framework.Graphics.Textures;
 using System.Linq;
 using osu.Framework.Input;
 using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Overlays.Direct
 {
@@ -151,7 +152,7 @@ namespace osu.Game.Overlays.Direct
             };
         }
 
-        private class DownloadButton : ClickableContainer
+        private class DownloadButton : OsuClickableContainer
         {
             private readonly TextAwesome icon;
 
diff --git a/osu.Game/Overlays/Direct/FilterControl.cs b/osu.Game/Overlays/Direct/FilterControl.cs
index 455d0ab77b..b898d24c31 100644
--- a/osu.Game/Overlays/Direct/FilterControl.cs
+++ b/osu.Game/Overlays/Direct/FilterControl.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Database;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
 using osu.Game.Overlays.SearchableList;
 
 namespace osu.Game.Overlays.Direct
@@ -42,7 +43,7 @@ namespace osu.Game.Overlays.Direct
             }
         }
 
-        private class RulesetToggleButton : ClickableContainer
+        private class RulesetToggleButton : OsuClickableContainer
         {
             private readonly TextAwesome icon;
 
diff --git a/osu.Game/Overlays/LoginOverlay.cs b/osu.Game/Overlays/LoginOverlay.cs
index b688bafd4d..790530342f 100644
--- a/osu.Game/Overlays/LoginOverlay.cs
+++ b/osu.Game/Overlays/LoginOverlay.cs
@@ -8,10 +8,11 @@ using osu.Game.Graphics;
 using osu.Game.Overlays.Settings.Sections.General;
 using OpenTK.Graphics;
 using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Overlays
 {
-    internal class LoginOverlay : FocusedOverlayContainer
+    internal class LoginOverlay : OsuFocusedOverlayContainer
     {
         private LoginSettings settingsSection;
 
diff --git a/osu.Game/Overlays/Mods/ModButton.cs b/osu.Game/Overlays/Mods/ModButton.cs
index 8a04d91cfb..a7e7bb53b5 100644
--- a/osu.Game/Overlays/Mods/ModButton.cs
+++ b/osu.Game/Overlays/Mods/ModButton.cs
@@ -151,8 +151,8 @@ namespace osu.Game.Overlays.Mods
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)
         {
-            sampleOn = audio.Sample.Get(@"Checkbox/check-on");
-            sampleOff = audio.Sample.Get(@"Checkbox/check-off");
+            sampleOn = audio.Sample.Get(@"UI/check-on");
+            sampleOff = audio.Sample.Get(@"UI/check-off");
         }
 
         protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
@@ -171,7 +171,7 @@ namespace osu.Game.Overlays.Mods
 
         public void SelectNext()
         {
-            (++SelectedIndex == -1 ? sampleOff : sampleOn).Play();
+            (++SelectedIndex == Mods.Length ? sampleOff : sampleOn).Play();
             Action?.Invoke(SelectedMod);
         }
 
diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index e1e920ec0f..61439a26e0 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -24,10 +24,11 @@ using osu.Framework.Threading;
 using osu.Game.Overlays.Music;
 using osu.Game.Graphics.UserInterface;
 using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Overlays
 {
-    public class MusicController : FocusedOverlayContainer
+    public class MusicController : OsuFocusedOverlayContainer
     {
         private const float player_height = 130;
 
diff --git a/osu.Game/Overlays/NotificationManager.cs b/osu.Game/Overlays/NotificationManager.cs
index 34690013df..382683cbcc 100644
--- a/osu.Game/Overlays/NotificationManager.cs
+++ b/osu.Game/Overlays/NotificationManager.cs
@@ -9,10 +9,11 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Overlays.Notifications;
 using OpenTK.Graphics;
 using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Overlays
 {
-    public class NotificationManager : FocusedOverlayContainer
+    public class NotificationManager : OsuFocusedOverlayContainer
     {
         private const float width = 320;
 
diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs
index 2833ef9f3a..3380c61385 100644
--- a/osu.Game/Overlays/Notifications/Notification.cs
+++ b/osu.Game/Overlays/Notifications/Notification.cs
@@ -13,6 +13,7 @@ using osu.Game.Graphics;
 using OpenTK;
 using OpenTK.Graphics;
 using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Overlays.Notifications
 {
@@ -152,7 +153,7 @@ namespace osu.Game.Overlays.Notifications
             Expire();
         }
 
-        private class CloseButton : ClickableContainer
+        private class CloseButton : OsuClickableContainer
         {
             private Color4 hoverColour;
 
diff --git a/osu.Game/Overlays/Notifications/NotificationSection.cs b/osu.Game/Overlays/Notifications/NotificationSection.cs
index b53f8e6b14..b4f35be733 100644
--- a/osu.Game/Overlays/Notifications/NotificationSection.cs
+++ b/osu.Game/Overlays/Notifications/NotificationSection.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using OpenTK;
+using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Overlays.Notifications
 {
@@ -131,7 +132,7 @@ namespace osu.Game.Overlays.Notifications
             countText.Text = notifications.Children.Count(c => c.Alpha > 0.99f).ToString();
         }
 
-        private class ClearAllButton : ClickableContainer
+        private class ClearAllButton : OsuClickableContainer
         {
             private readonly OsuSpriteText text;
 
diff --git a/osu.Game/Overlays/SearchableList/DisplayStyleControl.cs b/osu.Game/Overlays/SearchableList/DisplayStyleControl.cs
index b37b0db139..7157861632 100644
--- a/osu.Game/Overlays/SearchableList/DisplayStyleControl.cs
+++ b/osu.Game/Overlays/SearchableList/DisplayStyleControl.cs
@@ -6,6 +6,7 @@ using osu.Framework.Configuration;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Overlays.SearchableList
 {
@@ -52,7 +53,7 @@ namespace osu.Game.Overlays.SearchableList
             DisplayStyle.Value = PanelDisplayStyle.Grid;
         }
 
-        private class DisplayStyleToggleButton : ClickableContainer
+        private class DisplayStyleToggleButton : OsuClickableContainer
         {
             private readonly TextAwesome icon;
             private readonly PanelDisplayStyle style;
diff --git a/osu.Game/Overlays/SettingsOverlay.cs b/osu.Game/Overlays/SettingsOverlay.cs
index 88f4599383..093b7c8c26 100644
--- a/osu.Game/Overlays/SettingsOverlay.cs
+++ b/osu.Game/Overlays/SettingsOverlay.cs
@@ -15,7 +15,7 @@ using osu.Game.Overlays.Settings.Sections;
 
 namespace osu.Game.Overlays
 {
-    public class SettingsOverlay : FocusedOverlayContainer
+    public class SettingsOverlay : OsuFocusedOverlayContainer
     {
         internal const float CONTENT_MARGINS = 10;
 
diff --git a/osu.Game/Overlays/Toolbar/ToolbarButton.cs b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
index bb3fc0783f..38fd954fe3 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
@@ -1,10 +1,6 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System;
-using osu.Framework.Allocation;
-using osu.Framework.Audio;
-using osu.Framework.Audio.Sample;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -16,10 +12,11 @@ using osu.Game.Graphics.Sprites;
 using OpenTK;
 using OpenTK.Graphics;
 using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Overlays.Toolbar
 {
-    public class ToolbarButton : Container
+    public class ToolbarButton : OsuClickableContainer
     {
         public const float WIDTH = Toolbar.HEIGHT * 1.4f;
 
@@ -58,7 +55,6 @@ namespace osu.Game.Overlays.Toolbar
 
         protected virtual Anchor TooltipAnchor => Anchor.TopLeft;
 
-        public Action Action;
         protected TextAwesome DrawableIcon;
         protected SpriteText DrawableText;
         protected Box HoverBackground;
@@ -66,7 +62,6 @@ namespace osu.Game.Overlays.Toolbar
         private readonly SpriteText tooltip1;
         private readonly SpriteText tooltip2;
         protected FillFlowContainer Flow;
-        private SampleChannel sampleClick;
 
         public ToolbarButton()
         {
@@ -136,27 +131,19 @@ namespace osu.Game.Overlays.Toolbar
             };
         }
 
-        [BackgroundDependencyLoader]
-        private void load(AudioManager audio)
-        {
-            sampleClick = audio.Sample.Get(@"Menu/menuclick");
-        }
-
         protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) => true;
 
         protected override bool OnClick(InputState state)
         {
-            Action?.Invoke();
-            sampleClick.Play();
             HoverBackground.FlashColour(Color4.White.Opacity(100), 500, EasingTypes.OutQuint);
-            return true;
+            return base.OnClick(state);
         }
 
         protected override bool OnHover(InputState state)
         {
             HoverBackground.FadeIn(200);
             tooltipContainer.FadeIn(100);
-            return false;
+            return base.OnHover(state);
         }
 
         protected override void OnHoverLost(InputState state)
diff --git a/osu.Game/Overlays/Toolbar/ToolbarModeSelector.cs b/osu.Game/Overlays/Toolbar/ToolbarModeSelector.cs
index 59c4ac4a61..95906464ec 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarModeSelector.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarModeSelector.cs
@@ -113,8 +113,11 @@ namespace osu.Game.Overlays.Toolbar
         {
             base.UpdateAfterChildren();
 
-            if (!activeMode.EnsureValid())
-                activeMode.Refresh(() => modeButtonLine.MoveToX(activeButton.DrawPosition.X, 200, EasingTypes.OutQuint));
+            if (!activeMode.IsValid)
+            {
+                modeButtonLine.MoveToX(activeButton.DrawPosition.X, 200, EasingTypes.OutQuint);
+                activeMode.Validate();
+            }
         }
     }
 }
diff --git a/osu.Game/Overlays/WaveOverlayContainer.cs b/osu.Game/Overlays/WaveOverlayContainer.cs
index e744f23a3a..1bb7813d90 100644
--- a/osu.Game/Overlays/WaveOverlayContainer.cs
+++ b/osu.Game/Overlays/WaveOverlayContainer.cs
@@ -8,10 +8,11 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics;
 using System;
 using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Overlays
 {
-    public abstract class WaveOverlayContainer : FocusedOverlayContainer
+    public abstract class WaveOverlayContainer : OsuFocusedOverlayContainer
     {
         protected const float APPEAR_DURATION = 800;
         protected const float DISAPPEAR_DURATION = 500;
diff --git a/osu.Game/Rulesets/Timing/DrawableTimingSection.cs b/osu.Game/Rulesets/Timing/DrawableTimingSection.cs
index 3ad9f23605..589ee9991d 100644
--- a/osu.Game/Rulesets/Timing/DrawableTimingSection.cs
+++ b/osu.Game/Rulesets/Timing/DrawableTimingSection.cs
@@ -80,14 +80,9 @@ namespace osu.Game.Rulesets.Timing
             base.InvalidateFromChild(invalidation);
         }
 
-        private Cached<double> durationBacking = new Cached<double>();
-        /// <summary>
-        /// The maximum duration of any one hit object inside this <see cref="DrawableTimingSection"/>. This is calculated as the maximum
-        /// end time between all hit objects relative to this <see cref="DrawableTimingSection"/>'s <see cref="MultiplierControlPoint.StartTime"/>.
-        /// </summary>
-        public double Duration => durationBacking.EnsureValid()
-            ? durationBacking.Value
-            : durationBacking.Refresh(() =>
+        private Cached<double> durationBacking;
+
+        private double computeDuration()
         {
             if (!Children.Any())
                 return 0;
@@ -117,7 +112,13 @@ namespace osu.Game.Rulesets.Timing
             baseDuration *= 1 + maxAbsoluteSize / ourAbsoluteSize;
 
             return baseDuration;
-        });
+        }
+
+        /// <summary>
+        /// The maximum duration of any one hit object inside this <see cref="DrawableTimingSection"/>. This is calculated as the maximum
+        /// end time between all hit objects relative to this <see cref="DrawableTimingSection"/>'s <see cref="MultiplierControlPoint.StartTime"/>.
+        /// </summary>
+        public double Duration => durationBacking.IsValid ? durationBacking : (durationBacking.Value = computeDuration());
 
         protected override void Update()
         {
diff --git a/osu.Game/Screens/Menu/Button.cs b/osu.Game/Screens/Menu/Button.cs
index 76d9eac5c5..c8739f8894 100644
--- a/osu.Game/Screens/Menu/Button.cs
+++ b/osu.Game/Screens/Menu/Button.cs
@@ -30,16 +30,17 @@ namespace osu.Game.Screens.Menu
         private readonly Container box;
         private readonly Box boxHoverLayer;
         private readonly TextAwesome icon;
-        private readonly string internalName;
+        private readonly string sampleName;
         private readonly Action clickAction;
         private readonly Key triggerKey;
         private SampleChannel sampleClick;
+        private SampleChannel sampleHover;
 
         public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => box.ReceiveMouseInputAt(screenSpacePos);
 
-        public Button(string text, string internalName, FontAwesome symbol, Color4 colour, Action clickAction = null, float extraWidth = 0, Key triggerKey = Key.Unknown)
+        public Button(string text, string sampleName, FontAwesome symbol, Color4 colour, Action clickAction = null, float extraWidth = 0, Key triggerKey = Key.Unknown)
         {
-            this.internalName = internalName;
+            this.sampleName = sampleName;
             this.clickAction = clickAction;
             this.triggerKey = triggerKey;
 
@@ -120,8 +121,7 @@ namespace osu.Game.Screens.Menu
         {
             if (State != ButtonState.Expanded) return true;
 
-            //if (OsuGame.Instance.IsActive)
-            //    Game.Audio.PlaySamplePositional($@"menu-{internalName}-hover", @"menuclick");
+            sampleHover?.Play();
 
             box.ScaleTo(new Vector2(1.5f, 1), 500, EasingTypes.OutElastic);
 
@@ -222,7 +222,9 @@ namespace osu.Game.Screens.Menu
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)
         {
-            sampleClick = audio.Sample.Get($@"Menu/menu-{internalName}-click") ?? audio.Sample.Get(internalName.Contains(@"back") ? @"Menu/menuback" : @"Menu/menuhit");
+            sampleHover = audio.Sample.Get(@"Menu/hover");
+            if (!string.IsNullOrEmpty(sampleName))
+                sampleClick = audio.Sample.Get($@"Menu/{sampleName}");
         }
 
         protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
@@ -259,7 +261,7 @@ namespace osu.Game.Screens.Menu
 
         private void trigger()
         {
-            sampleClick.Play();
+            sampleClick?.Play();
 
             clickAction?.Invoke();
 
diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index 82b7335a9b..9ba16ab1ca 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -15,6 +15,8 @@ using osu.Game.Overlays.Toolbar;
 using OpenTK;
 using OpenTK.Graphics;
 using OpenTK.Input;
+using osu.Framework.Audio.Sample;
+using osu.Framework.Audio;
 
 namespace osu.Game.Screens.Menu
 {
@@ -51,6 +53,8 @@ namespace osu.Game.Screens.Menu
         private readonly List<Button> buttonsTopLevel = new List<Button>();
         private readonly List<Button> buttonsPlay = new List<Button>();
 
+        private SampleChannel sampleBack;
+
         public ButtonSystem()
         {
             RelativeSizeAxes = Axes.Both;
@@ -82,8 +86,8 @@ namespace osu.Game.Screens.Menu
                             AutoSizeAxes = Axes.Both,
                             Children = new[]
                             {
-                                settingsButton = new Button(@"settings", @"settings", FontAwesome.fa_gear, new Color4(85, 85, 85, 255), () => OnSettings?.Invoke(), -WEDGE_WIDTH, Key.O),
-                                backButton = new Button(@"back", @"back", FontAwesome.fa_osu_left_o, new Color4(51, 58, 94, 255), onBack, -WEDGE_WIDTH),
+                                settingsButton = new Button(@"settings", string.Empty, FontAwesome.fa_gear, new Color4(85, 85, 85, 255), () => OnSettings?.Invoke(), -WEDGE_WIDTH, Key.O),
+                                backButton = new Button(@"back", string.Empty, FontAwesome.fa_osu_left_o, new Color4(51, 58, 94, 255), onBack, -WEDGE_WIDTH),
                                 iconFacade = new Container //need a container to make the osu! icon flow properly.
                                 {
                                     Size = new Vector2(0, BUTTON_AREA_HEIGHT)
@@ -101,23 +105,24 @@ namespace osu.Game.Screens.Menu
                 }
             };
 
-            buttonsPlay.Add(new Button(@"solo", @"freeplay", FontAwesome.fa_user, new Color4(102, 68, 204, 255), () => OnSolo?.Invoke(), WEDGE_WIDTH, Key.P));
-            buttonsPlay.Add(new Button(@"multi", @"multiplayer", FontAwesome.fa_users, new Color4(94, 63, 186, 255), () => OnMulti?.Invoke(), 0, Key.M));
-            buttonsPlay.Add(new Button(@"chart", @"charts", FontAwesome.fa_osu_charts, new Color4(80, 53, 160, 255), () => OnChart?.Invoke()));
+            buttonsPlay.Add(new Button(@"solo", @"select-6", FontAwesome.fa_user, new Color4(102, 68, 204, 255), () => OnSolo?.Invoke(), WEDGE_WIDTH, Key.P));
+            buttonsPlay.Add(new Button(@"multi", @"select-5", FontAwesome.fa_users, new Color4(94, 63, 186, 255), () => OnMulti?.Invoke(), 0, Key.M));
+            buttonsPlay.Add(new Button(@"chart", @"select-5", FontAwesome.fa_osu_charts, new Color4(80, 53, 160, 255), () => OnChart?.Invoke()));
 
-            buttonsTopLevel.Add(new Button(@"play", @"play", FontAwesome.fa_osu_logo, new Color4(102, 68, 204, 255), onPlay, WEDGE_WIDTH, Key.P));
-            buttonsTopLevel.Add(new Button(@"osu!editor", @"edit", FontAwesome.fa_osu_edit_o, new Color4(238, 170, 0, 255), () => OnEdit?.Invoke(), 0, Key.E));
-            buttonsTopLevel.Add(new Button(@"osu!direct", @"direct", FontAwesome.fa_osu_chevron_down_o, new Color4(165, 204, 0, 255), () => OnDirect?.Invoke(), 0, Key.D));
-            buttonsTopLevel.Add(new Button(@"exit", @"exit", FontAwesome.fa_osu_cross_o, new Color4(238, 51, 153, 255), onExit, 0, Key.Q));
+            buttonsTopLevel.Add(new Button(@"play", @"select-1", FontAwesome.fa_osu_logo, new Color4(102, 68, 204, 255), onPlay, WEDGE_WIDTH, Key.P));
+            buttonsTopLevel.Add(new Button(@"osu!editor", @"select-5", FontAwesome.fa_osu_edit_o, new Color4(238, 170, 0, 255), () => OnEdit?.Invoke(), 0, Key.E));
+            buttonsTopLevel.Add(new Button(@"osu!direct", string.Empty, FontAwesome.fa_osu_chevron_down_o, new Color4(165, 204, 0, 255), () => OnDirect?.Invoke(), 0, Key.D));
+            buttonsTopLevel.Add(new Button(@"exit", string.Empty, FontAwesome.fa_osu_cross_o, new Color4(238, 51, 153, 255), onExit, 0, Key.Q));
 
             buttonFlow.Add(buttonsPlay);
             buttonFlow.Add(buttonsTopLevel);
         }
 
         [BackgroundDependencyLoader(true)]
-        private void load(OsuGame game = null)
+        private void load(AudioManager audio, OsuGame game = null)
         {
             toolbar = game?.Toolbar;
+            sampleBack = audio.Sample.Get(@"Menu/select-4");
         }
 
         protected override void LoadComplete()
@@ -167,6 +172,7 @@ namespace osu.Game.Screens.Menu
 
         private void onBack()
         {
+            sampleBack?.Play();
             State = MenuState.TopLevel;
         }
 
@@ -231,6 +237,8 @@ namespace osu.Game.Screens.Menu
                             osuLogo.RotateTo(20, EXIT_DELAY * 1.5f);
                             osuLogo.FadeOut(EXIT_DELAY);
                         }
+                        else if (lastState == MenuState.TopLevel)
+                            sampleBack?.Play();
                         break;
                     case MenuState.TopLevel:
                         buttonArea.Flush(true);
diff --git a/osu.Game/Screens/Menu/OsuLogo.cs b/osu.Game/Screens/Menu/OsuLogo.cs
index d7d89fe0ff..b26cbe02ba 100644
--- a/osu.Game/Screens/Menu/OsuLogo.cs
+++ b/osu.Game/Screens/Menu/OsuLogo.cs
@@ -72,11 +72,11 @@ namespace osu.Game.Screens.Menu
 
         private const float default_size = 480;
 
-        private const double beat_in_time = 60;
+        private const double early_activation = 60;
 
         public OsuLogo()
         {
-            EarlyActivationMilliseconds = beat_in_time;
+            EarlyActivationMilliseconds = early_activation;
 
             Size = new Vector2(default_size);
 
@@ -215,8 +215,9 @@ namespace osu.Game.Screens.Menu
         [BackgroundDependencyLoader]
         private void load(TextureStore textures, AudioManager audio)
         {
-            sampleClick = audio.Sample.Get(@"Menu/menuhit");
+            sampleClick = audio.Sample.Get(@"Menu/select-2");
             sampleBeat = audio.Sample.Get(@"Menu/heartbeat");
+
             logo.Texture = textures.Get(@"Menu/logo");
             ripple.Texture = textures.Get(@"Menu/logo");
         }
@@ -236,10 +237,13 @@ namespace osu.Game.Screens.Menu
             if (beatIndex < 0) return;
 
             if (Hovering)
-                sampleBeat.Play();
+            {
+                using (BeginDelayedSequence(early_activation))
+                    Schedule(() => sampleBeat.Play());
+            }
 
-            logoBeatContainer.ScaleTo(1 - 0.02f * amplitudeAdjust, beat_in_time, EasingTypes.Out);
-            using (logoBeatContainer.BeginDelayedSequence(beat_in_time))
+            logoBeatContainer.ScaleTo(1 - 0.02f * amplitudeAdjust, early_activation, EasingTypes.Out);
+            using (logoBeatContainer.BeginDelayedSequence(early_activation))
                 logoBeatContainer.ScaleTo(1, beatLength * 2, EasingTypes.OutQuint);
 
             ripple.ClearTransforms();
@@ -255,11 +259,11 @@ namespace osu.Game.Screens.Menu
                 flashLayer.ClearTransforms();
                 visualizer.ClearTransforms();
 
-                flashLayer.FadeTo(0.2f * amplitudeAdjust, beat_in_time, EasingTypes.Out);
-                visualizer.FadeTo(0.9f * amplitudeAdjust, beat_in_time, EasingTypes.Out);
-                using (flashLayer.BeginDelayedSequence(beat_in_time))
+                flashLayer.FadeTo(0.2f * amplitudeAdjust, early_activation, EasingTypes.Out);
+                visualizer.FadeTo(0.9f * amplitudeAdjust, early_activation, EasingTypes.Out);
+                using (flashLayer.BeginDelayedSequence(early_activation))
                     flashLayer.FadeOut(beatLength);
-                using (visualizer.BeginDelayedSequence(beat_in_time))
+                using (visualizer.BeginDelayedSequence(early_activation))
                     visualizer.FadeTo(0.5f, beatLength);
             }
         }
diff --git a/osu.Game/Screens/Multiplayer/DrawableRoom.cs b/osu.Game/Screens/Multiplayer/DrawableRoom.cs
index 71114dd3a3..620797aff6 100644
--- a/osu.Game/Screens/Multiplayer/DrawableRoom.cs
+++ b/osu.Game/Screens/Multiplayer/DrawableRoom.cs
@@ -11,13 +11,14 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Localisation;
 using osu.Game.Database;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Users;
 
 namespace osu.Game.Screens.Multiplayer
 {
-    public class DrawableRoom : ClickableContainer
+    public class DrawableRoom : OsuClickableContainer
     {
         private const float content_padding = 5;
         private const float height = 90;
diff --git a/osu.Game/Screens/OsuScreen.cs b/osu.Game/Screens/OsuScreen.cs
index de9c698f2a..4f8109b4e4 100644
--- a/osu.Game/Screens/OsuScreen.cs
+++ b/osu.Game/Screens/OsuScreen.cs
@@ -8,6 +8,8 @@ using osu.Game.Beatmaps;
 using osu.Game.Database;
 using osu.Game.Graphics.Containers;
 using OpenTK;
+using osu.Framework.Audio.Sample;
+using osu.Framework.Audio;
 
 namespace osu.Game.Screens
 {
@@ -33,6 +35,8 @@ namespace osu.Game.Screens
 
         private readonly Bindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
 
+        private SampleChannel sampleExit;
+
         public WorkingBeatmap Beatmap
         {
             get
@@ -46,7 +50,7 @@ namespace osu.Game.Screens
         }
 
         [BackgroundDependencyLoader(permitNulls: true)]
-        private void load(OsuGameBase game, OsuGame osuGame)
+        private void load(OsuGameBase game, OsuGame osuGame, AudioManager audio)
         {
             if (game != null)
             {
@@ -59,6 +63,8 @@ namespace osu.Game.Screens
 
             if (osuGame != null)
                 ruleset.BindTo(osuGame.Ruleset);
+
+            sampleExit = audio.Sample.Get(@"UI/melodic-1");
         }
 
         protected override void LoadComplete()
@@ -82,6 +88,12 @@ namespace osu.Game.Screens
             ruleset.Disabled = !AllowRulesetChange;
         }
 
+        protected override void OnResuming(Screen last)
+        {
+            base.OnResuming(last);
+            sampleExit?.Play();
+        }
+
         protected override void OnEntering(Screen last)
         {
             OsuScreen lastOsu = last as OsuScreen;
diff --git a/osu.Game/Screens/Play/HotkeyRetryOverlay.cs b/osu.Game/Screens/Play/HotkeyRetryOverlay.cs
index f673965c2b..c4d956ebce 100644
--- a/osu.Game/Screens/Play/HotkeyRetryOverlay.cs
+++ b/osu.Game/Screens/Play/HotkeyRetryOverlay.cs
@@ -4,8 +4,6 @@
 using osu.Framework.Input;
 using OpenTK.Input;
 using osu.Framework.Allocation;
-using osu.Framework.Audio.Sample;
-using osu.Framework.Audio;
 using System;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics;
@@ -18,7 +16,6 @@ namespace osu.Game.Screens.Play
     {
         public Action Action;
 
-        private SampleChannel retrySample;
         private Box overlay;
 
         private const int activate_delay = 400;
@@ -27,9 +24,8 @@ namespace osu.Game.Screens.Play
         private bool fired;
 
         [BackgroundDependencyLoader]
-        private void load(AudioManager audio)
+        private void load()
         {
-            retrySample = audio.Sample.Get(@"Menu/menuback");
             RelativeSizeAxes = Axes.Both;
             AlwaysPresent = true;
 
@@ -74,7 +70,6 @@ namespace osu.Game.Screens.Play
             if (!fired && overlay.Alpha == 1)
             {
                 fired = true;
-                retrySample.Play();
                 Action?.Invoke();
             }
         }
diff --git a/osu.Game/Screens/Play/MenuOverlay.cs b/osu.Game/Screens/Play/MenuOverlay.cs
index adfa1a736b..aedbffbab9 100644
--- a/osu.Game/Screens/Play/MenuOverlay.cs
+++ b/osu.Game/Screens/Play/MenuOverlay.cs
@@ -11,7 +11,6 @@ using OpenTK;
 using OpenTK.Graphics;
 using osu.Game.Graphics;
 using osu.Framework.Allocation;
-using osu.Framework.Audio;
 using osu.Game.Graphics.UserInterface;
 using osu.Framework.Graphics.Shapes;
 
@@ -191,12 +190,6 @@ namespace osu.Game.Screens.Play
 
         public class Button : DialogButton
         {
-            [BackgroundDependencyLoader]
-            private void load(AudioManager audio)
-            {
-                SampleHover = audio.Sample.Get(@"Menu/menuclick");
-                SampleClick = audio.Sample.Get(@"Menu/menuback");
-            }
         }
     }
 }
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index c38ea65f90..d0ffe1de1c 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -23,6 +23,7 @@ using osu.Framework.Threading;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Ranking;
+using osu.Framework.Audio.Sample;
 
 namespace osu.Game.Screens.Play
 {
@@ -61,6 +62,8 @@ namespace osu.Game.Screens.Play
         private Bindable<bool> mouseWheelDisabled;
         private Bindable<double> userAudioOffset;
 
+        private SampleChannel sampleRestart;
+
         #endregion
 
         private HUDOverlay hudOverlay;
@@ -72,6 +75,8 @@ namespace osu.Game.Screens.Play
             dimLevel = config.GetBindable<double>(OsuSetting.DimLevel);
             mouseWheelDisabled = config.GetBindable<bool>(OsuSetting.MouseDisableWheel);
 
+            sampleRestart = audio.Sample.Get(@"Gameplay/restart");
+
             Ruleset rulesetInstance;
 
             try
@@ -215,6 +220,7 @@ namespace osu.Game.Screens.Play
 
         public void Restart()
         {
+            sampleRestart?.Play();
             ValidForResume = false;
             RestartRequested?.Invoke();
             Exit();
diff --git a/osu.Game/Screens/Play/SkipButton.cs b/osu.Game/Screens/Play/SkipButton.cs
index b38a9b4934..4a81ce90ff 100644
--- a/osu.Game/Screens/Play/SkipButton.cs
+++ b/osu.Game/Screens/Play/SkipButton.cs
@@ -4,7 +4,6 @@
 using System;
 using osu.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.Audio;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input;
@@ -16,8 +15,8 @@ using osu.Game.Screens.Ranking;
 using OpenTK;
 using OpenTK.Graphics;
 using OpenTK.Input;
-using osu.Framework.Audio.Sample;
 using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Screens.Play
 {
@@ -175,16 +174,14 @@ namespace osu.Game.Screens.Play
             }
         }
 
-        private class Button : Container
+        private class Button : OsuClickableContainer
         {
-            public Action Action;
             private Color4 colourNormal;
             private Color4 colourHover;
             private Box box;
             private FillFlowContainer flow;
             private Box background;
             private AspectContainer aspect;
-            private SampleChannel activationSound;
 
             public Button()
             {
@@ -192,10 +189,8 @@ namespace osu.Game.Screens.Play
             }
 
             [BackgroundDependencyLoader]
-            private void load(OsuColour colours, AudioManager audio)
+            private void load(OsuColour colours)
             {
-                activationSound = audio.Sample.Get(@"Menu/menuhit");
-
                 colourNormal = colours.Yellow;
                 colourHover = colours.YellowDark;
 
@@ -282,13 +277,9 @@ namespace osu.Game.Screens.Play
 
             protected override bool OnClick(InputState state)
             {
-                Action?.Invoke();
-
-                activationSound.Play();
-
                 box.FlashColour(Color4.White, 500, EasingTypes.OutQuint);
                 aspect.ScaleTo(1.2f, 2000, EasingTypes.OutQuint);
-                return true;
+                return base.OnClick(state);
             }
         }
     }
diff --git a/osu.Game/Screens/Play/SquareGraph.cs b/osu.Game/Screens/Play/SquareGraph.cs
index cd1e9c78c6..f3bb523611 100644
--- a/osu.Game/Screens/Play/SquareGraph.cs
+++ b/osu.Game/Screens/Play/SquareGraph.cs
@@ -77,7 +77,12 @@ namespace osu.Game.Screens.Play
         protected override void Update()
         {
             base.Update();
-            layout.Refresh(recreateGraph);
+
+            if (!layout.IsValid)
+            {
+                recreateGraph();
+                layout.Validate();
+            }
         }
 
         /// <summary>
diff --git a/osu.Game/Screens/ScreenWhiteBox.cs b/osu.Game/Screens/ScreenWhiteBox.cs
index 986947a517..21239e8030 100644
--- a/osu.Game/Screens/ScreenWhiteBox.cs
+++ b/osu.Game/Screens/ScreenWhiteBox.cs
@@ -11,8 +11,6 @@ using osu.Game.Screens.Backgrounds;
 using osu.Game.Graphics.UserInterface;
 using OpenTK;
 using OpenTK.Graphics;
-using osu.Framework.Allocation;
-using osu.Framework.Audio;
 using osu.Game.Graphics;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics.Shapes;
@@ -196,12 +194,6 @@ namespace osu.Game.Screens
                 Anchor = Anchor.BottomRight;
                 Origin = Anchor.BottomRight;
             }
-
-            [BackgroundDependencyLoader]
-            private void load(AudioManager audio)
-            {
-                ActivationSound = audio.Sample.Get(@"Menu/menuhit");
-            }
         }
     }
 }
diff --git a/osu.Game/Screens/Select/FooterButton.cs b/osu.Game/Screens/Select/FooterButton.cs
index 9be940e06a..536bf3971a 100644
--- a/osu.Game/Screens/Select/FooterButton.cs
+++ b/osu.Game/Screens/Select/FooterButton.cs
@@ -6,15 +6,15 @@ using OpenTK;
 using OpenTK.Graphics;
 using OpenTK.Input;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Screens.Select
 {
-    public class FooterButton : ClickableContainer
+    public class FooterButton : OsuClickableContainer
     {
         private static readonly Vector2 shearing = new Vector2(0.15f, 0);
 
diff --git a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
index 32e6d9630b..48de4c2d3a 100644
--- a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
@@ -13,10 +13,11 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Users;
 using osu.Framework;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Screens.Select.Leaderboards
 {
-    public class LeaderboardScore : ClickableContainer, IStateful<Visibility>
+    public class LeaderboardScore : OsuClickableContainer, IStateful<Visibility>
     {
         public static readonly float HEIGHT = 60;
 
diff --git a/osu.Game/Screens/Select/Options/BeatmapOptionsButton.cs b/osu.Game/Screens/Select/Options/BeatmapOptionsButton.cs
index e013b0a223..58ce5ac564 100644
--- a/osu.Game/Screens/Select/Options/BeatmapOptionsButton.cs
+++ b/osu.Game/Screens/Select/Options/BeatmapOptionsButton.cs
@@ -11,10 +11,11 @@ using osu.Game.Graphics.Sprites;
 using OpenTK;
 using OpenTK.Graphics;
 using OpenTK.Input;
+using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Screens.Select.Options
 {
-    public class BeatmapOptionsButton : ClickableContainer
+    public class BeatmapOptionsButton : OsuClickableContainer
     {
         private const float width = 130;
 
diff --git a/osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs b/osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs
index a6ad56b86f..f18080d6f5 100644
--- a/osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs
+++ b/osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs
@@ -14,7 +14,7 @@ using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Screens.Select.Options
 {
-    public class BeatmapOptionsOverlay : FocusedOverlayContainer
+    public class BeatmapOptionsOverlay : OsuFocusedOverlayContainer
     {
         private const float transition_duration = 500;
         private const float x_position = 0.2f;
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 64b81ddc6a..06d4da663e 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -76,6 +76,8 @@
     <Compile Include="Audio\SampleInfoList.cs" />
     <Compile Include="Beatmaps\Drawables\BeatmapBackgroundSprite.cs" />
     <Compile Include="Beatmaps\DifficultyCalculator.cs" />
+    <Compile Include="Graphics\Containers\OsuClickableContainer.cs" />
+    <Compile Include="Graphics\Containers\OsuFocusedOverlayContainer.cs" />
     <Compile Include="Graphics\Cursor\OsuContextMenuContainer.cs" />
     <Compile Include="Graphics\UserInterface\IconButton.cs" />
     <Compile Include="Configuration\SelectionRandomType.cs" />