Index: Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml
===================================================================
diff -u -rb38dd206d7c24306f7b40c77b48bf7ed562a6f37 -rce90e6fcd39d3851e9bfda78748ecaaab83d13f3
--- Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml	(.../MainWindow.xaml)	(revision b38dd206d7c24306f7b40c77b48bf7ed562a6f37)
+++ Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml	(.../MainWindow.xaml)	(revision ce90e6fcd39d3851e9bfda78748ecaaab83d13f3)
@@ -73,11 +73,11 @@
                 </Style.Triggers>
             </Style>
             
-            <Style x:Key="SeparatorStyle" TargetType="{x:Type Separator}"
+            <Style x:Key="MainButtonBarSeparatorStyle" TargetType="{x:Type Separator}"
                    BasedOn="{StaticResource {x:Static ToolBar.SeparatorStyleKey}}">
                 <Setter Property="Width" Value="1"/>
                 <Setter Property="Height" Value="84"/>
-                <Setter Property="Background" Value="#d2d2ca" />
+                <Setter Property="Background" Value="{StaticResource SeparatorBackgroundBrush}" />
             </Style>
         </ResourceDictionary>
     </metro:MetroWindow.Resources>
@@ -122,13 +122,13 @@
     <Grid Background="{StaticResource BackgroundColorBrush}">
         <DockPanel>
             
-            <StackPanel DockPanel.Dock="Top" Height="100" Background="{StaticResource MainButtonBarActiveBackgroundColor}" Orientation="Horizontal">
+            <StackPanel DockPanel.Dock="Top" Height="100" Background="{StaticResource MainButtonBarBackgroundBrush}" Orientation="Horizontal">
                 <Button Style="{StaticResource MainButtonBarButtonStyle}"
                         Tag="Project">
                     <TextBlock Style="{StaticResource ButtonLargeIconStyle}"
                                Text="&#xE949;"/>
                 </Button>
-                <Separator Style="{StaticResource SeparatorStyle}" />
+                <Separator Style="{StaticResource MainButtonBarSeparatorStyle}" />
                 <ToggleButton Style="{StaticResource MainButtonBarToggleButtonStyle}"
                               Tag="Traject">
                     <TextBlock Style="{StaticResource ButtonLargeIconStyle}"
@@ -149,7 +149,7 @@
                     <TextBlock Style="{StaticResource ButtonLargeIconStyle}"
                                Text="&#xE94B;"/>
                 </ToggleButton>
-                <Separator Style="{StaticResource SeparatorStyle}" />
+                <Separator Style="{StaticResource MainButtonBarSeparatorStyle}" />
             </StackPanel>
             
             <Border DockPanel.Dock="Top"
@@ -159,27 +159,27 @@
             <DockPanel Height="30" DockPanel.Dock="Bottom" Style="{StaticResource PanelBackgroundWindowTitleStyle}">
                 <StackPanel Orientation="Horizontal" DockPanel.Dock="Left">
                     <ToggleButton Name="ButtonShowProjectExplorer"
-                                  Style="{StaticResource BottomToggleButtonStyle}">
+                                  Style="{StaticResource ViewStateBarToggleButtonStyle}">
                         <TextBlock Style="{StaticResource ButtonIconStyle}" Text="&#xE95B;"/>
                     </ToggleButton>
                     <ToggleButton Name="ButtonShowProperties"
                                   ToolTip="{x:Static properties:Resources.Ribbon_Properties}"
                                   Click="ButtonShowProperties_Click"
-                                  Style="{StaticResource BottomToggleButtonStyle}">
+                                  Style="{StaticResource ViewStateBarToggleButtonStyle}">
                         <TextBlock Style="{StaticResource ButtonIconStyle}" Text="&#xE945;"/>
                     </ToggleButton>
                     <ToggleButton Name="ButtonShowMessages"
                                   ToolTip="{x:Static properties:Resources.Ribbon_Messages}"
                                   Click="ButtonShowMessages_Click"
-                                  Style="{StaticResource BottomToggleButtonStyle}">
+                                  Style="{StaticResource ViewStateBarToggleButtonStyle}">
                         <TextBlock Style="{StaticResource ButtonIconStyle}" Text="&#xE942;"/>
                     </ToggleButton>
                     <ToggleButton Name="ButtonShowMapLegendView"
-                                  Style="{StaticResource BottomToggleButtonStyle}">
+                                  Style="{StaticResource ViewStateBarToggleButtonStyle}">
                         <TextBlock Style="{StaticResource ButtonIconStyle}" Text="&#xE94C;"/>
                     </ToggleButton>
                     <ToggleButton Name="ButtonShowChartLegendView"
-                                  Style="{StaticResource BottomToggleButtonStyle}">
+                                  Style="{StaticResource ViewStateBarToggleButtonStyle}">
                         <TextBlock Style="{StaticResource ButtonIconStyle}" Text="&#xE943;"/>
                     </ToggleButton>
                 </StackPanel>
@@ -188,29 +188,29 @@
                     <Button ToolTip="{x:Static properties:Resources.Ribbon_Show_Log}"
                             DockPanel.Dock="Left"
                             Click="OnFileHelpShowLog_Clicked"
-                            Style="{StaticResource BottomButtonStyle}">
+                            Style="{StaticResource ViewStateBarButtonStyle}">
                         <TextBlock Style="{StaticResource ButtonIconStyle}" Text="&#xE946;"/>
                     </Button>
                     <Button Name="FileManualButton"
                             DockPanel.Dock="Left"
                             ToolTip="{x:Static properties:Resources.Ribbon_Open_Manual}"
                             Click="OnFileManual_Clicked"
                             x:FieldModifier="private"
-                            Style="{StaticResource BottomButtonStyle}">
+                            Style="{StaticResource ViewStateBarButtonStyle}">
                         <TextBlock Style="{StaticResource ButtonIconStyle}" Text="&#xE92D;"/>
                     </Button>
                     <Button Name="AboutButton"
                             DockPanel.Dock="Left"
                             ToolTip="{x:Static properties:Resources.Ribbon_About}"
                             Click="OnAboutDialog_Clicked"
                             x:FieldModifier="private"
-                            Style="{StaticResource BottomButtonStyle}">
+                            Style="{StaticResource ViewStateBarButtonStyle}">
                         <TextBlock Style="{StaticResource ButtonIconStyle}" Text="&#xE921;"/>
                     </Button>
                     <Button ToolTip="{x:Static properties:Resources.Ribbon_Exit}"
                             DockPanel.Dock="Left"
                             Click="OnFileExitClicked"
-                            Style="{StaticResource BottomButtonStyle}">
+                            Style="{StaticResource ViewStateBarButtonStyle}">
                         <TextBlock Style="{StaticResource ButtonIconStyle}" Text="&#xE901;"/>
                     </Button>
                 </StackPanel>
Index: Core/Common/src/Core.Common.Gui/Style/DeltaresButtonStyle.xaml
===================================================================
diff -u -rb38dd206d7c24306f7b40c77b48bf7ed562a6f37 -rce90e6fcd39d3851e9bfda78748ecaaab83d13f3
--- Core/Common/src/Core.Common.Gui/Style/DeltaresButtonStyle.xaml	(.../DeltaresButtonStyle.xaml)	(revision b38dd206d7c24306f7b40c77b48bf7ed562a6f37)
+++ Core/Common/src/Core.Common.Gui/Style/DeltaresButtonStyle.xaml	(.../DeltaresButtonStyle.xaml)	(revision ce90e6fcd39d3851e9bfda78748ecaaab83d13f3)
@@ -27,7 +27,7 @@
         <Setter Property="Foreground" Value="{StaticResource WhiteBrush}" />
         <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Background" Value="{StaticResource ZoomControlHoverItemBackground}"/>
+                <Setter Property="Background" Value="{StaticResource ViewStateBarButtonHoverBackgroundBrush}"/>
             </Trigger>
             <Trigger Property="IsPressed" Value="True">
                 <Setter Property="Background" Value="{StaticResource DeltaresDarkerBlueBrush}"/>
@@ -47,12 +47,12 @@
                         Value="False" />
                     <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsMouseOver}" Value="True" />
                 </MultiDataTrigger.Conditions>
-                <Setter Property="Background" Value="{StaticResource ZoomControlHoverItemBackground}" />
+                <Setter Property="Background" Value="{StaticResource ViewStateBarButtonHoverBackgroundBrush}" />
             </MultiDataTrigger>
         </Style.Triggers>
     </Style>
     
-    <Style x:Key="BottomButtonStyle" TargetType="{x:Type ButtonBase}">
+    <Style x:Key="ViewStateBarButtonStyle" TargetType="{x:Type ButtonBase}">
         <Setter Property="Background" Value="{StaticResource WindowTitleColorBrush}" />
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="Margin" Value="0" />
@@ -76,14 +76,14 @@
             
         <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Background" Value="{StaticResource ZoomControlHoverItemBackground}"/>
+                <Setter Property="Background" Value="{StaticResource ViewStateBarButtonHoverBackgroundBrush}"/>
             </Trigger>
             <Trigger Property="IsPressed" Value="True">
                 <Setter Property="Background" Value="{StaticResource DeltaresDarkerBlueBrush}"/>
             </Trigger>
             <Trigger Property="IsEnabled" Value="False">
-                <Setter Property="Background" Value="{StaticResource DisabledInputBackgroundBrush}"/>
-                <Setter Property="Foreground" Value="{StaticResource DisabledInputForegroundBrush}"/>
+                <Setter Property="Background" Value="{StaticResource DisabledButtonBackgroundBrush}"/>
+                <Setter Property="Foreground" Value="{StaticResource DisabledButtonForegroundBrush}"/>
             </Trigger>
             
             <DataTrigger
@@ -100,13 +100,13 @@
                         Value="False" />
                     <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsMouseOver}" Value="True" />
                 </MultiDataTrigger.Conditions>
-                <Setter Property="Background" Value="{StaticResource ZoomControlHoverItemBackground}" />
+                <Setter Property="Background" Value="{StaticResource ViewStateBarButtonHoverBackgroundBrush}" />
             </MultiDataTrigger>
         </Style.Triggers>
     </Style>
         
-    <Style x:Key="BottomToggleButtonStyle" TargetType="{x:Type ToggleButton}"
-           BasedOn="{StaticResource BottomButtonStyle}">
+    <Style x:Key="ViewStateBarToggleButtonStyle" TargetType="{x:Type ToggleButton}"
+           BasedOn="{StaticResource ViewStateBarButtonStyle}">
         <Style.Triggers>
             <Trigger Property="IsChecked" Value="True">
                 <Setter Property="Background" Value="{StaticResource DeltaresDarkerBlueBrush}" />
@@ -119,7 +119,7 @@
                         Value="False" />
                     <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsChecked}" Value="True" />
                 </MultiDataTrigger.Conditions>
-                <Setter Property="Background" Value="{StaticResource ZoomControlHoverItemBackground}" />
+                <Setter Property="Background" Value="{StaticResource ViewStateBarButtonHoverBackgroundBrush}" />
             </MultiDataTrigger>
         </Style.Triggers>
     </Style>
@@ -129,8 +129,8 @@
         <Setter Property="Margin" Value="3 6 " />
         <Setter Property="MinWidth" Value="66" />
         <Setter Property="Height" Value="85" />
-        <Setter Property="Background" Value="{StaticResource BorderBrush}" />
-        <Setter Property="BorderBrush" Value="{StaticResource ButtonBackground}" />
+        <Setter Property="Background" Value="{StaticResource TransparentBrush}" />
+        <Setter Property="BorderBrush" Value="{StaticResource TransparentBrush}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ButtonBase}">
Index: Core/Common/src/Core.Common.Gui/Style/DeltaresGeneralStyle.xaml
===================================================================
diff -u -r4e42ba4da75d05924418480cd564732284d9ec00 -rce90e6fcd39d3851e9bfda78748ecaaab83d13f3
--- Core/Common/src/Core.Common.Gui/Style/DeltaresGeneralStyle.xaml	(.../DeltaresGeneralStyle.xaml)	(revision 4e42ba4da75d05924418480cd564732284d9ec00)
+++ Core/Common/src/Core.Common.Gui/Style/DeltaresGeneralStyle.xaml	(.../DeltaresGeneralStyle.xaml)	(revision ce90e6fcd39d3851e9bfda78748ecaaab83d13f3)
@@ -34,41 +34,28 @@
     <Color x:Key="Gray">#C6C6C6</Color>
     <Color x:Key="White">#FFFFFF</Color>
     <Color x:Key="Black">#000000</Color>
-    <Color x:Key="RibbonActiveBackgroundColor">#F1F1EE</Color>
-    <Color x:Key="ActiveStageBackgroundColor">#E7E7E3</Color>
-    <Color x:Key="InactiveStageBackgroundColor">#DFDFD9</Color>
+    <Color x:Key="MainButtonBarBackgroundColor">#F1F1EE</Color>
     <Color x:Key="Transparent">#00FFFFFF</Color>
 
-    <SolidColorBrush x:Key="ButtonBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="BorderBrush" Color="{StaticResource Transparent}" />
     <SolidColorBrush x:Key="MainButtonBarBottomBorderBrush" Color="{StaticResource DeltaresSand}" />
-    <SolidColorBrush x:Key="MainButtonBarActiveBackgroundColor" Color="#F1F1EE" />
+    <SolidColorBrush x:Key="MainButtonBarBackgroundBrush" Color="{StaticResource MainButtonBarBackgroundColor}" />
 
     <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="DrawingDistanceSwitchActiveItemBackground" Color="{StaticResource Black}" Opacity="0.2" />
-    <SolidColorBrush x:Key="DrawingDistanceSwitchHoverItemBackground" Color="{StaticResource White}" Opacity="0.2" />
-    <SolidColorBrush x:Key="ZoomControlHoverItemBackground" Color="{StaticResource White}" Opacity="0.2" />
-    <SolidColorBrush x:Key="InactiveBackgroundBrush" Color="{StaticResource DeltaresSand}" Opacity="0.2" />
-    <SolidColorBrush x:Key="InactiveStageBackgroundBrush" Color="{StaticResource InactiveStageBackgroundColor}" />
-    <SolidColorBrush x:Key="ActiveStageBackgroundBrush" Color="{StaticResource ActiveStageBackgroundColor}" />
-    <SolidColorBrush x:Key="StageBorderBrush" Color="{StaticResource Black}" Opacity="0.15" />
+    <SolidColorBrush x:Key="ViewStateBarButtonHoverBackgroundBrush" Color="{StaticResource White}" Opacity="0.2" />
 
-    <SolidColorBrush x:Key="MessageWindowAccentedButtonColor" Color="{StaticResource DeltaresBlue}" />
-    <SolidColorBrush x:Key="MessageWindowAccentedButtonHoverColor" Color="{StaticResource DeltaresDarkerBlue}" />
-
     <SolidColorBrush x:Key="TransparentBrush" Color="{StaticResource Transparent}" />
 
-    <SolidColorBrush x:Key="DisabledInputBackgroundBrush" Color="{StaticResource Black}" Opacity="0.15" />
-    <SolidColorBrush x:Key="DisabledInputForegroundBrush" Color="{StaticResource Black}" />
+    <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="GroupBoxSeparatorBackgroundBrush" Color="{StaticResource DeltaresSand}" Opacity="0.25" />
+    <SolidColorBrush x:Key="SeparatorBackgroundBrush" Color="{StaticResource DeltaresSand}" Opacity="0.25" />
 
     <SolidColorBrush x:Key="DeltaresBlueBrush" Color="{StaticResource DeltaresBlue}" />
     <SolidColorBrush x:Key="DeltaresDarkerBlueBrush" Color="{StaticResource DeltaresDarkerBlue}" />
@@ -92,9 +79,4 @@
         <Setter Property="Width" Value="525" />
     </Style>
 
-    <Style TargetType="Separator">
-        <Setter Property="Background" Value="{StaticResource GroupBoxSeparatorBackgroundBrush}" />
-        <Setter Property="Margin" Value="0 20 0 8" />
-    </Style>
-
 </ResourceDictionary>
\ No newline at end of file