Index: Core/Common/src/Core.Common.Gui/Style/DeltaresButtonStyle.xaml
===================================================================
diff -u -rce90e6fcd39d3851e9bfda78748ecaaab83d13f3 -r9fe54eadf770f3d09bf43ea8456104bfe59da6d6
--- Core/Common/src/Core.Common.Gui/Style/DeltaresButtonStyle.xaml	(.../DeltaresButtonStyle.xaml)	(revision ce90e6fcd39d3851e9bfda78748ecaaab83d13f3)
+++ Core/Common/src/Core.Common.Gui/Style/DeltaresButtonStyle.xaml	(.../DeltaresButtonStyle.xaml)	(revision 9fe54eadf770f3d09bf43ea8456104bfe59da6d6)
@@ -27,7 +27,7 @@
         <Setter Property="Foreground" Value="{StaticResource WhiteBrush}" />
         <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Background" Value="{StaticResource ViewStateBarButtonHoverBackgroundBrush}"/>
+                <Setter Property="Background" Value="{StaticResource ButtonHoverBackgroundBrush}"/>
             </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 ViewStateBarButtonHoverBackgroundBrush}" />
+                <Setter Property="Background" Value="{StaticResource ButtonHoverBackgroundBrush}" />
             </MultiDataTrigger>
         </Style.Triggers>
     </Style>
@@ -76,7 +76,7 @@
             
         <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Background" Value="{StaticResource ViewStateBarButtonHoverBackgroundBrush}"/>
+                <Setter Property="Background" Value="{StaticResource ButtonHoverBackgroundBrush}"/>
             </Trigger>
             <Trigger Property="IsPressed" Value="True">
                 <Setter Property="Background" Value="{StaticResource DeltaresDarkerBlueBrush}"/>
@@ -100,7 +100,7 @@
                         Value="False" />
                     <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsMouseOver}" Value="True" />
                 </MultiDataTrigger.Conditions>
-                <Setter Property="Background" Value="{StaticResource ViewStateBarButtonHoverBackgroundBrush}" />
+                <Setter Property="Background" Value="{StaticResource ButtonHoverBackgroundBrush}" />
             </MultiDataTrigger>
         </Style.Triggers>
     </Style>
@@ -119,7 +119,7 @@
                         Value="False" />
                     <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsChecked}" Value="True" />
                 </MultiDataTrigger.Conditions>
-                <Setter Property="Background" Value="{StaticResource ViewStateBarButtonHoverBackgroundBrush}" />
+                <Setter Property="Background" Value="{StaticResource ButtonHoverBackgroundBrush}" />
             </MultiDataTrigger>
         </Style.Triggers>
     </Style>
@@ -147,12 +147,12 @@
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="Background" Value="#e4e4df" />
-                            <Setter Property="BorderBrush" Value="#d2d2ca" />
+                            <Setter Property="Background" Value="{StaticResource MainButtonBarPressedButtonBackgroundBrush}" />
+                            <Setter Property="BorderBrush" Value="{StaticResource MainButtonBarPressedButtonBorderBrush}" />
                         </Trigger>
                         <Trigger Property="IsPressed" Value="True">
-                            <Setter Property="Background" Value="#e4e4df" />
-                            <Setter Property="BorderBrush" Value="#d2d2ca" />
+                            <Setter Property="Background" Value="{StaticResource MainButtonBarPressedButtonBackgroundBrush}" />
+                            <Setter Property="BorderBrush" Value="{StaticResource MainButtonBarPressedButtonBorderBrush}" />
                             <Setter Property="Foreground" Value="{StaticResource WindowTitleColorBrush}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
@@ -165,8 +165,8 @@
            BasedOn="{StaticResource MainButtonBarButtonStyle}">
         <Style.Triggers>
             <Trigger Property="IsChecked" Value="True">
-                <Setter Property="Background" Value="#e4e4df" />
-                <Setter Property="BorderBrush" Value="#d2d2ca" />
+                <Setter Property="Background" Value="{StaticResource MainButtonBarPressedButtonBackgroundBrush}" />
+                <Setter Property="BorderBrush" Value="{StaticResource MainButtonBarPressedButtonBorderBrush}" />
                 <Setter Property="Foreground" Value="{StaticResource WindowTitleColorBrush}" />
             </Trigger>
         </Style.Triggers>
Index: Core/Common/src/Core.Common.Gui/Style/DeltaresGeneralStyle.xaml
===================================================================
diff -u -rce90e6fcd39d3851e9bfda78748ecaaab83d13f3 -r9fe54eadf770f3d09bf43ea8456104bfe59da6d6
--- Core/Common/src/Core.Common.Gui/Style/DeltaresGeneralStyle.xaml	(.../DeltaresGeneralStyle.xaml)	(revision ce90e6fcd39d3851e9bfda78748ecaaab83d13f3)
+++ Core/Common/src/Core.Common.Gui/Style/DeltaresGeneralStyle.xaml	(.../DeltaresGeneralStyle.xaml)	(revision 9fe54eadf770f3d09bf43ea8456104bfe59da6d6)
@@ -34,38 +34,33 @@
     <Color x:Key="Gray">#C6C6C6</Color>
     <Color x:Key="White">#FFFFFF</Color>
     <Color x:Key="Black">#000000</Color>
-    <Color x:Key="MainButtonBarBackgroundColor">#F1F1EE</Color>
+    <Color x:Key="MainButtonBarBackground">#F1F1EE</Color>
     <Color x:Key="Transparent">#00FFFFFF</Color>
+    <Color x:Key="MainButtonBarPressedButtonBackground">#e4e4df</Color>
+    <Color x:Key="MainButtonBarPressedButtonBorder">#d2d2ca</Color>
 
     <SolidColorBrush x:Key="MainButtonBarBottomBorderBrush" Color="{StaticResource DeltaresSand}" />
-    <SolidColorBrush x:Key="MainButtonBarBackgroundBrush" Color="{StaticResource MainButtonBarBackgroundColor}" />
+    <SolidColorBrush x:Key="MainButtonBarBackgroundBrush" Color="{StaticResource MainButtonBarBackground}" />
+    <SolidColorBrush x:Key="MainButtonBarPressedButtonBackgroundBrush" Color="{StaticResource MainButtonBarPressedButtonBackground}" />
+    <SolidColorBrush x:Key="MainButtonBarPressedButtonBorderBrush" Color="{StaticResource MainButtonBarPressedButtonBorder}" />
 
     <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="ViewStateBarButtonHoverBackgroundBrush" Color="{StaticResource White}" Opacity="0.2" />
+    <SolidColorBrush x:Key="ButtonHoverBackgroundBrush" 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="DisabledButtonForegroundBrush" Color="{StaticResource Black}" />
 
-    <SolidColorBrush x:Key="HighTransparentWhiteBrush" Color="{StaticResource White}" Opacity="0.2" />
-
     <SolidColorBrush x:Key="SeparatorBackgroundBrush" Color="{StaticResource DeltaresSand}" Opacity="0.25" />
 
-    <SolidColorBrush x:Key="DeltaresBlueBrush" Color="{StaticResource DeltaresBlue}" />
     <SolidColorBrush x:Key="DeltaresDarkerBlueBrush" Color="{StaticResource DeltaresDarkerBlue}" />
     <SolidColorBrush x:Key="WhiteBrush" Color="{StaticResource White}" />
-    <SolidColorBrush x:Key="GrayBrush" Color="{StaticResource Gray}" />
-    <SolidColorBrush x:Key="Transparent50PercentBlackBrush" Color="Black" Opacity="0.5" />
-    <SolidColorBrush x:Key="White5PercentBlackBrush" Color="#F2F2F2" Opacity="1" />
-    <SolidColorBrush x:Key="White25PercentBlackBrush" Color="#C0C0C0" Opacity="1" />
-    <SolidColorBrush x:Key="White16PercentBlackBrush" Color="#D5D5D5" Opacity="1" />
-    <SolidColorBrush x:Key="White33PercentBlackBrush" Color="#A9A9A9" Opacity="1" />
 
     <Style TargetType="main:MainWindow">
         <Setter Property="GlowBrush" Value="{DynamicResource WindowGlowBrush}" />