Index: Core/Gui/src/Core.Gui/Forms/Backstage/BackstageControl.xaml
===================================================================
diff -u -r2c9e2d8b712fba90cdf2dabfcdccf2fd6b9817ad -r0f2655e71ec6bcded6bbf5f5c98db2b9b4cfab3a
--- Core/Gui/src/Core.Gui/Forms/Backstage/BackstageControl.xaml	(.../BackstageControl.xaml)	(revision 2c9e2d8b712fba90cdf2dabfcdccf2fd6b9817ad)
+++ Core/Gui/src/Core.Gui/Forms/Backstage/BackstageControl.xaml	(.../BackstageControl.xaml)	(revision 0f2655e71ec6bcded6bbf5f5c98db2b9b4cfab3a)
@@ -41,18 +41,42 @@
                 <Setter Property="Width" Value="140" />
                 <Setter Property="HorizontalAlignment" Value="Left" />
                 <Setter Property="Padding" Value="25 0 15 0"/>
+                
+                <Style.Triggers>
+                    <Trigger Property="IsMouseOver" Value="True">
+                        <Setter Property="Background" Value="{StaticResource DeltaresDarkerBlueBrush}"/>
+                    </Trigger>
+                    <Trigger Property="IsPressed" Value="True">
+                        <Setter Property="Background" Value="{StaticResource WitheOverlayBrush}"/>
+                    </Trigger>
+
+                    <MultiDataTrigger>
+                        <MultiDataTrigger.Conditions>
+                            <Condition
+                                Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type metro:MetroWindow}}, Path=IsActive}"
+                                Value="False" />
+                            <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsMouseOver}" Value="True" />
+                        </MultiDataTrigger.Conditions>
+                        <Setter Property="Background" Value="{StaticResource WitheOverlayBrush}" />
+                    </MultiDataTrigger>
+
+                    <MultiDataTrigger>
+                        <MultiDataTrigger.Conditions>
+                            <Condition
+                                Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type metro:MetroWindow}}, Path=IsActive}"
+                                Value="False" />
+                            <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsEnabled}" Value="False" />
+                        </MultiDataTrigger.Conditions>
+                        <Setter Property="Background" Value="{StaticResource DarkOverlayBrush}" />
+                    </MultiDataTrigger>
+                </Style.Triggers>
             </Style>
             
             <Style x:Key="BackstageToggleButtonStyle" TargetType="{x:Type ToggleButton}"
-                   BasedOn="{StaticResource RiskeerToggleButtonStyle}">
-                <Setter Property="Height" Value="40" />
-                <Setter Property="Width" Value="140" />
-                <Setter Property="HorizontalAlignment" Value="Left" />
-                <Setter Property="Padding" Value="25 0 15 0"/>
-                
+                   BasedOn="{StaticResource BackstageButtonStyle}">
                 <Style.Triggers>
                     <Trigger Property="IsChecked" Value="True">
-                        <Setter Property="Background" Value="{StaticResource ButtonHoverBackgroundBrush}" />
+                        <Setter Property="Background" Value="{StaticResource WitheOverlayBrush}" />
                     </Trigger>
 
                     <MultiDataTrigger>
@@ -62,14 +86,14 @@
                                 Value="False" />
                             <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsChecked}" Value="True" />
                         </MultiDataTrigger.Conditions>
-                        <Setter Property="Background" Value="{StaticResource ButtonHoverBackgroundBrush}" />
+                        <Setter Property="Background" Value="{StaticResource WitheOverlayBrush}" />
                     </MultiDataTrigger>
                 </Style.Triggers>
             </Style>
             
             <Style x:Key="BackstageSeparatorStyle" TargetType="{x:Type Separator}"
                    BasedOn="{StaticResource {x:Static ToolBar.SeparatorStyleKey}}">
-                <Setter Property="Background" Value="{StaticResource ButtonHoverBackgroundBrush}" />
+                <Setter Property="Background" Value="{StaticResource WitheOverlayBrush}" />
                 <Setter Property="Height" Value="1" />
                 <Setter Property="Margin" Value="25 10 15 10" />
             </Style>
Index: Core/Gui/src/Core.Gui/Forms/MainWindow/MainWindow.xaml
===================================================================
diff -u -r2c9e2d8b712fba90cdf2dabfcdccf2fd6b9817ad -r0f2655e71ec6bcded6bbf5f5c98db2b9b4cfab3a
--- Core/Gui/src/Core.Gui/Forms/MainWindow/MainWindow.xaml	(.../MainWindow.xaml)	(revision 2c9e2d8b712fba90cdf2dabfcdccf2fd6b9817ad)
+++ Core/Gui/src/Core.Gui/Forms/MainWindow/MainWindow.xaml	(.../MainWindow.xaml)	(revision 0f2655e71ec6bcded6bbf5f5c98db2b9b4cfab3a)
@@ -77,7 +77,7 @@
                    BasedOn="{StaticResource {x:Static ToolBar.SeparatorStyleKey}}">
                 <Setter Property="Width" Value="1"/>
                 <Setter Property="Height" Value="84"/>
-                <Setter Property="Background" Value="{StaticResource SeparatorBackgroundBrush}" />
+                <Setter Property="Background" Value="{StaticResource MainButtonBarSeparatorBackgroundBrush}" />
             </Style>
 
             <Style x:Key="ViewStateBarToggleButtonStyle" TargetType="{x:Type ToggleButton}"
Index: Core/Gui/src/Core.Gui/Style/DeltaresButtonStyle.xaml
===================================================================
diff -u -r1e991b4dc8ed7b537768115f737bfcb3f1294ef8 -r0f2655e71ec6bcded6bbf5f5c98db2b9b4cfab3a
--- Core/Gui/src/Core.Gui/Style/DeltaresButtonStyle.xaml	(.../DeltaresButtonStyle.xaml)	(revision 1e991b4dc8ed7b537768115f737bfcb3f1294ef8)
+++ Core/Gui/src/Core.Gui/Style/DeltaresButtonStyle.xaml	(.../DeltaresButtonStyle.xaml)	(revision 0f2655e71ec6bcded6bbf5f5c98db2b9b4cfab3a)
@@ -27,7 +27,7 @@
         <Setter Property="Foreground" Value="{StaticResource WhiteBrush}" />
         <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Background" Value="{StaticResource ButtonHoverBackgroundBrush}"/>
+                <Setter Property="Background" Value="{StaticResource WitheOverlayBrush}"/>
             </Trigger>
             <Trigger Property="IsPressed" Value="True">
                 <Setter Property="Background" Value="{StaticResource DeltaresDarkerBlueBrush}"/>
@@ -47,7 +47,7 @@
                         Value="False" />
                     <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsMouseOver}" Value="True" />
                 </MultiDataTrigger.Conditions>
-                <Setter Property="Background" Value="{StaticResource ButtonHoverBackgroundBrush}" />
+                <Setter Property="Background" Value="{StaticResource WitheOverlayBrush}" />
             </MultiDataTrigger>
         </Style.Triggers>
     </Style>
@@ -76,13 +76,13 @@
 
         <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Background" Value="{StaticResource ButtonHoverBackgroundBrush}"/>
+                <Setter Property="Background" Value="{StaticResource WitheOverlayBrush}"/>
             </Trigger>
             <Trigger Property="IsPressed" Value="True">
                 <Setter Property="Background" Value="{StaticResource DeltaresDarkerBlueBrush}"/>
             </Trigger>
             <Trigger Property="IsEnabled" Value="False">
-                <Setter Property="Background" Value="{StaticResource DisabledButtonBackgroundBrush}"/>
+                <Setter Property="Background" Value="{StaticResource DarkOverlayBrush}"/>
                 <Setter Property="Foreground" Value="{StaticResource DisabledButtonForegroundBrush}"/>
             </Trigger>
 
@@ -100,7 +100,7 @@
                         Value="False" />
                     <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsMouseOver}" Value="True" />
                 </MultiDataTrigger.Conditions>
-                <Setter Property="Background" Value="{StaticResource ButtonHoverBackgroundBrush}" />
+                <Setter Property="Background" Value="{StaticResource WitheOverlayBrush}" />
             </MultiDataTrigger>
 
             <MultiDataTrigger>
@@ -110,7 +110,7 @@
                         Value="False" />
                     <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsEnabled}" Value="False" />
                 </MultiDataTrigger.Conditions>
-                <Setter Property="Background" Value="{StaticResource DisabledButtonBackgroundBrush}" />
+                <Setter Property="Background" Value="{StaticResource DarkOverlayBrush}" />
             </MultiDataTrigger>
         </Style.Triggers>
     </Style>
@@ -135,7 +135,7 @@
                         Value="False" />
                     <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsChecked}" Value="True" />
                 </MultiDataTrigger.Conditions>
-                <Setter Property="Background" Value="{StaticResource ButtonHoverBackgroundBrush}" />
+                <Setter Property="Background" Value="{StaticResource WitheOverlayBrush}" />
             </MultiDataTrigger>
         </Style.Triggers>
     </Style>
Index: Core/Gui/src/Core.Gui/Style/DeltaresGeneralStyle.xaml
===================================================================
diff -u -r2c9e2d8b712fba90cdf2dabfcdccf2fd6b9817ad -r0f2655e71ec6bcded6bbf5f5c98db2b9b4cfab3a
--- Core/Gui/src/Core.Gui/Style/DeltaresGeneralStyle.xaml	(.../DeltaresGeneralStyle.xaml)	(revision 2c9e2d8b712fba90cdf2dabfcdccf2fd6b9817ad)
+++ Core/Gui/src/Core.Gui/Style/DeltaresGeneralStyle.xaml	(.../DeltaresGeneralStyle.xaml)	(revision 0f2655e71ec6bcded6bbf5f5c98db2b9b4cfab3a)
@@ -44,22 +44,21 @@
     <SolidColorBrush x:Key="MainButtonBarBackgroundBrush" Color="{StaticResource MainButtonBarBackground}" />
     <SolidColorBrush x:Key="MainButtonBarPressedButtonBackgroundBrush" Color="{StaticResource MainButtonBarPressedButtonBackground}" />
     <SolidColorBrush x:Key="MainButtonBarPressedButtonBorderBrush" Color="{StaticResource MainButtonBarPressedButtonBorder}" />
+    <SolidColorBrush x:Key="MainButtonBarSeparatorBackgroundBrush" Color="{StaticResource DeltaresSand}" Opacity="0.25" />
 
     <SolidColorBrush x:Key="WindowGlowBrush" Color="{StaticResource Black}" />
     <SolidColorBrush x:Key="WindowOverlayBrush" Color="{StaticResource Black}" Opacity="0.5" />
     <SolidColorBrush x:Key="BackgroundColorBrush" Color="{StaticResource DeltaresSand}" Opacity="0.25" options:Freeze="True" />
     <SolidColorBrush x:Key="WindowTitleColorBrush" Color="{StaticResource DeltaresBlue}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentBrush" Color="{StaticResource DeltaresBlue}" options:Freeze="True" />
 
-    <SolidColorBrush x:Key="ButtonHoverBackgroundBrush" Color="{StaticResource White}" Opacity="0.2" />
+    <SolidColorBrush x:Key="WitheOverlayBrush" Color="{StaticResource White}" Opacity="0.2" />
 
     <SolidColorBrush x:Key="TransparentBrush" Color="{StaticResource Transparent}" />
 
-    <SolidColorBrush x:Key="DisabledButtonBackgroundBrush" Color="{StaticResource Black}" Opacity="0.15" />
+    <SolidColorBrush x:Key="DarkOverlayBrush" Color="{StaticResource Black}" Opacity="0.15" />
     <SolidColorBrush x:Key="DisabledButtonForegroundBrush" Color="{StaticResource Black}" />
 
-    <SolidColorBrush x:Key="SeparatorBackgroundBrush" Color="{StaticResource DeltaresSand}" Opacity="0.25" />
-
     <SolidColorBrush x:Key="DeltaresDarkerBlueBrush" Color="{StaticResource DeltaresDarkerBlue}" />
     <SolidColorBrush x:Key="WhiteBrush" Color="{StaticResource White}" />