diff --git a/osu.Game.Tests/Visual/TestCaseVolumeControl.cs b/osu.Game.Tests/Visual/TestCaseVolumePieces.cs
similarity index 90%
rename from osu.Game.Tests/Visual/TestCaseVolumeControl.cs
rename to osu.Game.Tests/Visual/TestCaseVolumePieces.cs
index 04390d6d19..5a43574a9d 100644
--- a/osu.Game.Tests/Visual/TestCaseVolumeControl.cs
+++ b/osu.Game.Tests/Visual/TestCaseVolumePieces.cs
@@ -9,7 +9,7 @@ using osu.Game.Overlays.Volume;
 
 namespace osu.Game.Tests.Visual
 {
-    public class TestCaseVolumeControl : TestCase
+    public class TestCaseVolumePieces : TestCase
     {
         public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(VolumeMeter), typeof(MuteButton) };
 
@@ -24,6 +24,7 @@ namespace osu.Game.Tests.Visual
             });
 
             meter.Bindable.BindTo(audio.Volume);
+
         }
     }
 }
diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj
index dde04201f2..8cbeb6aab6 100644
--- a/osu.Game.Tests/osu.Game.Tests.csproj
+++ b/osu.Game.Tests/osu.Game.Tests.csproj
@@ -174,7 +174,7 @@
     <Compile Include="Visual\TestCaseUserPanel.cs" />
     <Compile Include="Visual\TestCaseUserProfile.cs" />
     <Compile Include="Visual\TestCaseUserRanks.cs" />
-    <Compile Include="Visual\TestCaseVolumeControl.cs" />
+    <Compile Include="Visual\TestCaseVolumePieces.cs" />
     <Compile Include="Visual\TestCaseWaveform.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/osu.Game/Graphics/UserInterface/Volume/VolumeMeter.cs b/osu.Game/Graphics/UserInterface/Volume/VolumeMeter.cs
deleted file mode 100644
index ef3702fdf3..0000000000
--- a/osu.Game/Graphics/UserInterface/Volume/VolumeMeter.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using osu.Framework.Configuration;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Game.Graphics.Sprites;
-using OpenTK;
-using OpenTK.Graphics;
-using osu.Framework.Graphics.Shapes;
-using osu.Framework.Input.Bindings;
-using osu.Game.Input.Bindings;
-
-namespace osu.Game.Graphics.UserInterface.Volume
-{
-    public class VolumeMeter : Container, IKeyBindingHandler<GlobalAction>
-    {
-        private readonly Box meterFill;
-        public BindableDouble Bindable { get; } = new BindableDouble();
-
-        public VolumeMeter(string meterName)
-        {
-            Size = new Vector2(40, 180);
-            Children = new Drawable[]
-            {
-                new Box
-                {
-                    Colour = Color4.Black,
-                    RelativeSizeAxes = Axes.Both
-                },
-                new Container
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Size = new Vector2(0.5f, 0.9f),
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Children = new Drawable[]
-                    {
-                        new Box
-                        {
-                            Colour = Color4.DarkGray,
-                            RelativeSizeAxes = Axes.Both
-                        },
-                        meterFill = new Box
-                        {
-                            Colour = Color4.White,
-                            Scale = new Vector2(1, 0),
-                            RelativeSizeAxes = Axes.Both,
-                            Origin = Anchor.BottomCentre,
-                            Anchor = Anchor.BottomCentre
-                        }
-                    }
-                },
-                new OsuSpriteText
-                {
-                    Text = meterName,
-                    Anchor = Anchor.BottomCentre,
-                    Origin = Anchor.TopCentre
-                }
-            };
-
-            Bindable.ValueChanged += delegate { updateFill(); };
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-            updateFill();
-        }
-
-        public double Volume
-        {
-            get => Bindable.Value;
-            private set => Bindable.Value = value;
-        }
-
-        public void Increase()
-        {
-            Volume += 0.05f;
-        }
-
-        public void Decrease()
-        {
-            Volume -= 0.05f;
-        }
-
-        private void updateFill() => meterFill.ScaleTo(new Vector2(1, (float)Volume), 300, Easing.OutQuint);
-
-        public bool OnPressed(GlobalAction action)
-        {
-            if (!IsHovered) return false;
-
-            switch (action)
-            {
-                case GlobalAction.DecreaseVolume:
-                    Decrease();
-                    return true;
-                case GlobalAction.IncreaseVolume:
-                    Increase();
-                    return true;
-            }
-
-            return false;
-        }
-
-        public bool OnReleased(GlobalAction action) => false;
-    }
-}
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index aeb23dccd7..a6f650d23d 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -10,7 +10,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Overlays;
 using osu.Framework.Logging;
-using osu.Game.Graphics.UserInterface.Volume;
 using osu.Framework.Allocation;
 using osu.Game.Overlays.Toolbar;
 using osu.Game.Screens;
@@ -33,6 +32,7 @@ using osu.Game.Input.Bindings;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Skinning;
 using OpenTK.Graphics;
+using osu.Game.Overlays.Volume;
 
 namespace osu.Game
 {
@@ -75,7 +75,7 @@ namespace osu.Game
 
         private OsuScreen screenStack;
 
-        private VolumeControl volume;
+        private VolumeOverlay volume;
         private OnScreenDisplay onscreenDisplay;
 
         private Bindable<int> configRuleset;
@@ -232,7 +232,7 @@ namespace osu.Game
                 },
             }, overlayContent.Add);
 
-            loadComponentSingleFile(volume = new VolumeControl(), Add);
+            loadComponentSingleFile(volume = new VolumeOverlay(), Add);
             loadComponentSingleFile(onscreenDisplay = new OnScreenDisplay(), Add);
 
             //overlay elements
diff --git a/osu.Game/Overlays/Volume/MuteButton.cs b/osu.Game/Overlays/Volume/MuteButton.cs
index b45034c166..82e61c8f0b 100644
--- a/osu.Game/Overlays/Volume/MuteButton.cs
+++ b/osu.Game/Overlays/Volume/MuteButton.cs
@@ -18,13 +18,15 @@ namespace osu.Game.Overlays.Volume
         public Bindable<bool> Current { get; } = new Bindable<bool>();
 
         private Color4 hoveredColour, unhoveredColour;
+        private const float width = 100;
+        public const float HEIGHT = 35;
 
         public MuteButton()
         {
             Masking = true;
             BorderThickness = 3;
-            CornerRadius = 20;
-            Size = new Vector2(100, 40);
+            CornerRadius = HEIGHT / 2;
+            Size = new Vector2(width, HEIGHT);
         }
 
         [BackgroundDependencyLoader]
@@ -33,6 +35,8 @@ namespace osu.Game.Overlays.Volume
             hoveredColour = colours.YellowDark;
             BorderColour = unhoveredColour = colours.Gray1.Opacity(0.9f);
 
+
+            SpriteIcon icon;
             AddRange(new Drawable[]
             {
                 new Box
@@ -41,7 +45,20 @@ namespace osu.Game.Overlays.Volume
                     Colour = colours.Gray1,
                     Alpha = 0.9f,
                 },
+                icon = new SpriteIcon
+                {
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                    Size = new Vector2(20),
+                }
             });
+
+            Current.ValueChanged += newValue =>
+            {
+                icon.Icon = newValue ? FontAwesome.fa_volume_off : FontAwesome.fa_volume_up;
+                icon.Margin = new MarginPadding { Left = newValue ? width / 2 - 15 : width / 2 - 10 }; //Magic numbers to line up both icons because they're different widths
+            };
+            Current.TriggerChange();
         }
 
         protected override bool OnHover(InputState state)
@@ -54,5 +71,11 @@ namespace osu.Game.Overlays.Volume
         {
             this.TransformTo<MuteButton, SRGBColour>("BorderColour", unhoveredColour, 500, Easing.OutQuint);
         }
+
+        protected override bool OnClick(InputState state)
+        {
+            Current.Value = !Current.Value;
+            return true;
+        }
     }
 }
diff --git a/osu.Game/Graphics/UserInterface/Volume/VolumeControlReceptor.cs b/osu.Game/Overlays/Volume/VolumeControlReceptor.cs
similarity index 90%
rename from osu.Game/Graphics/UserInterface/Volume/VolumeControlReceptor.cs
rename to osu.Game/Overlays/Volume/VolumeControlReceptor.cs
index 2328533665..a5be7dc445 100644
--- a/osu.Game/Graphics/UserInterface/Volume/VolumeControlReceptor.cs
+++ b/osu.Game/Overlays/Volume/VolumeControlReceptor.cs
@@ -7,7 +7,7 @@ using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Game.Input.Bindings;
 
-namespace osu.Game.Graphics.UserInterface.Volume
+namespace osu.Game.Overlays.Volume
 {
     public class VolumeControlReceptor : Container, IKeyBindingHandler<GlobalAction>, IHandleGlobalInput
     {
diff --git a/osu.Game/Overlays/Volume/VolumeMeter.cs b/osu.Game/Overlays/Volume/VolumeMeter.cs
index 3351dbed9a..92b5c3f0bd 100644
--- a/osu.Game/Overlays/Volume/VolumeMeter.cs
+++ b/osu.Game/Overlays/Volume/VolumeMeter.cs
@@ -128,9 +128,9 @@ namespace osu.Game.Overlays.Volume
             });
 
             Bindable.ValueChanged += newVolume => this.TransformTo("circleBindable", newVolume * 0.75, 250, Easing.OutQuint);
-            volumeCircle.Current.ValueChanged += newVolume =>
+            volumeCircle.Current.ValueChanged += newVolume =>  //by using this event we sync the meter with the text. newValue has to be divided by 0.75 to give the actual percentage
             {
-                if (newVolume > 0.745)
+                if (Precision.DefinitelyBigger(newVolume, 0.74))
                 {
                     text.Alpha = 0;
                     maxGlow.Alpha = 1; //show "MAX"
diff --git a/osu.Game/Graphics/UserInterface/Volume/VolumeControl.cs b/osu.Game/Overlays/VolumeOverlay.cs
similarity index 54%
rename from osu.Game/Graphics/UserInterface/Volume/VolumeControl.cs
rename to osu.Game/Overlays/VolumeOverlay.cs
index ccf70af6ed..aa94667901 100644
--- a/osu.Game/Graphics/UserInterface/Volume/VolumeControl.cs
+++ b/osu.Game/Overlays/VolumeOverlay.cs
@@ -1,57 +1,87 @@
-// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Threading;
-using OpenTK;
+using osu.Framework.Allocation;
 using osu.Framework.Audio;
-using osu.Framework.Allocation;
 using osu.Framework.Configuration;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Threading;
+using osu.Game.Graphics;
 using osu.Game.Input.Bindings;
+using osu.Game.Overlays.Volume;
+using OpenTK;
+using OpenTK.Graphics;
 
-namespace osu.Game.Graphics.UserInterface.Volume
+namespace osu.Game.Overlays
 {
-    public class VolumeControl : OverlayContainer
+    public class VolumeOverlay : OverlayContainer
     {
-        private readonly VolumeMeter volumeMeterMaster;
-        private readonly IconButton muteIcon;
+        private const float offset = 10;
+
+        private VolumeMeter volumeMeterMaster;
+        private VolumeMeter volumeMeterEffect;
+        private VolumeMeter volumeMeterMusic;
+        private MuteButton muteButton;
 
         protected override bool BlockPassThroughMouse => false;
 
-        public VolumeControl()
-        {
-            AutoSizeAxes = Axes.Both;
-            Anchor = Anchor.BottomRight;
-            Origin = Anchor.BottomRight;
+        private readonly BindableDouble muteAdjustment = new BindableDouble();
 
-            Children = new Drawable[]
+        [BackgroundDependencyLoader]
+        private void load(AudioManager audio, OsuColour colours)
+        {
+            RelativeSizeAxes = Axes.Both;
+
+            AddRange(new Drawable[]
             {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Y,
+                    Width = 300,
+                    Colour = new ColourInfo
+                    {
+                        TopLeft = Color4.Black.Opacity(0.5f),
+                        BottomLeft = Color4.Black.Opacity(0.5f),
+                        TopRight = Color4.Black.Opacity(0),
+                        BottomRight = Color4.Black.Opacity(0),
+                    }
+                },
                 new FillFlowContainer
                 {
+                    Direction = FillDirection.Vertical,
                     AutoSizeAxes = Axes.Both,
-                    Anchor = Anchor.BottomRight,
-                    Origin = Anchor.BottomRight,
-                    Margin = new MarginPadding { Left = 10, Right = 10, Top = 30, Bottom = 30 },
-                    Spacing = new Vector2(15, 0),
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                    Spacing = new Vector2(0, offset),
+                    Margin = new MarginPadding { Left = offset },
                     Children = new Drawable[]
                     {
-                        new Container
+                        volumeMeterEffect = new VolumeMeter("EFFECTS", 125, colours.Blue)
                         {
-                            Size = new Vector2(IconButton.BUTTON_SIZE),
-                            Child = muteIcon = new IconButton
-                            {
-                                Anchor = Anchor.Centre,
-                                Origin = Anchor.Centre,
-                                Icon = FontAwesome.fa_volume_up,
-                                Action = () => Adjust(GlobalAction.ToggleMute),
-                            }
+                            Margin = new MarginPadding { Top = 100 + MuteButton.HEIGHT } //to counter the mute button and re-center the volume meters
                         },
-                        volumeMeterMaster = new VolumeMeter("Master"),
-                        volumeMeterEffect = new VolumeMeter("Effects"),
-                        volumeMeterMusic = new VolumeMeter("Music")
+                        volumeMeterMaster = new VolumeMeter("MASTER", 150, colours.Pink),
+                        volumeMeterMusic = new VolumeMeter("MUSIC", 125, colours.Blue),
+                        muteButton = new MuteButton
+                        {
+                            Margin = new MarginPadding { Top = 100 }
+                        }
                     }
-                }
+                },
+            });
+
+
+            volumeMeterMaster.Bindable.BindTo(audio.Volume);
+            volumeMeterEffect.Bindable.BindTo(audio.VolumeSample);
+            volumeMeterMusic.Bindable.BindTo(audio.VolumeTrack);
+
+            muteButton.Current.ValueChanged += mute =>
+            {
+                if (mute)
+                    audio.AddAdjustment(AdjustableProperty.Volume, muteAdjustment);
+                else
+                    audio.RemoveAdjustment(AdjustableProperty.Volume, muteAdjustment);
             };
         }
 
@@ -62,7 +92,13 @@ namespace osu.Game.Graphics.UserInterface.Volume
             volumeMeterMaster.Bindable.ValueChanged += _ => settingChanged();
             volumeMeterEffect.Bindable.ValueChanged += _ => settingChanged();
             volumeMeterMusic.Bindable.ValueChanged += _ => settingChanged();
-            muted.ValueChanged += _ => settingChanged();
+            muteButton.Current.ValueChanged += _ => settingChanged();
+        }
+
+        private void settingChanged()
+        {
+            Show();
+            schedulePopOut();
         }
 
         public bool Adjust(GlobalAction action)
@@ -83,50 +119,15 @@ namespace osu.Game.Graphics.UserInterface.Volume
                     return true;
                 case GlobalAction.ToggleMute:
                     Show();
-                    muted.Toggle();
+                    muteButton.Current.Value = !muteButton.Current;
                     return true;
             }
 
             return false;
         }
 
-        private void settingChanged()
-        {
-            Show();
-            schedulePopOut();
-        }
-
-        private readonly BindableDouble muteAdjustment = new BindableDouble();
-
-        private readonly BindableBool muted = new BindableBool();
-
-        [BackgroundDependencyLoader]
-        private void load(AudioManager audio)
-        {
-            volumeMeterMaster.Bindable.BindTo(audio.Volume);
-            volumeMeterEffect.Bindable.BindTo(audio.VolumeSample);
-            volumeMeterMusic.Bindable.BindTo(audio.VolumeTrack);
-
-            muted.ValueChanged += mute =>
-            {
-                if (mute)
-                {
-                    audio.AddAdjustment(AdjustableProperty.Volume, muteAdjustment);
-                    muteIcon.Icon = FontAwesome.fa_volume_off;
-                }
-                else
-                {
-                    audio.RemoveAdjustment(AdjustableProperty.Volume, muteAdjustment);
-                    muteIcon.Icon = FontAwesome.fa_volume_up;
-                }
-            };
-        }
-
         private ScheduledDelegate popOutDelegate;
 
-        private readonly VolumeMeter volumeMeterEffect;
-        private readonly VolumeMeter volumeMeterMusic;
-
         protected override void PopIn()
         {
             ClearTransforms();
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 847b4469e5..e99fd16aef 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -351,7 +351,9 @@
     <Compile Include="Overlays\Profile\Sections\Ranks\ScoreModsContainer.cs" />
     <Compile Include="Overlays\Settings\Sections\Gameplay\ScrollingSettings.cs" />
     <Compile Include="Overlays\Settings\Sections\Maintenance\DeleteAllBeatmapsDialog.cs" />
+    <Compile Include="Overlays\VolumeOverlay.cs" />
     <Compile Include="Overlays\Volume\MuteButton.cs" />
+    <Compile Include="Overlays\Volume\VolumeControlReceptor.cs" />
     <Compile Include="Overlays\Volume\VolumeMeter.cs" />
     <Compile Include="Rulesets\Configuration\IRulesetConfigManager.cs" />
     <Compile Include="Rulesets\Configuration\RulesetConfigManager.cs" />
@@ -471,9 +473,6 @@
     <Compile Include="Graphics\UserInterface\SimpleComboCounter.cs" />
     <Compile Include="Graphics\UserInterface\StarCounter.cs" />
     <Compile Include="Graphics\UserInterface\TwoLayerButton.cs" />
-    <Compile Include="Graphics\UserInterface\Volume\VolumeControl.cs" />
-    <Compile Include="Graphics\UserInterface\Volume\VolumeControlReceptor.cs" />
-    <Compile Include="Graphics\UserInterface\Volume\VolumeMeter.cs" />
     <Compile Include="Input\Bindings\DatabasedKeyBinding.cs" />
     <Compile Include="Input\Bindings\DatabasedKeyBindingContainer.cs" />
     <Compile Include="Input\Bindings\GlobalActionContainer.cs" />