Index: Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml
===================================================================
diff -u -rce90e6fcd39d3851e9bfda78748ecaaab83d13f3 -r44a516877223b6aac9691eff4969df23027ef16b
--- Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml	(.../MainWindow.xaml)	(revision ce90e6fcd39d3851e9bfda78748ecaaab83d13f3)
+++ Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml	(.../MainWindow.xaml)	(revision 44a516877223b6aac9691eff4969df23027ef16b)
@@ -45,7 +45,7 @@
         <CommandBinding Command="Close" Executed="OnFileExitClicked" />
         <CommandBinding Command="{x:Static commands:MainWindowCommands.CloseViewTabCommand}" Executed="CloseDocumentTab" CanExecute="CanCloseDocumentTab"/>
     </metro:MetroWindow.CommandBindings>
-    
+
     <metro:MetroWindow.InputBindings>
         <KeyBinding Command="New" Key="N" Modifiers="Ctrl"/>
         <KeyBinding Command="Save" Key="S" Modifiers="Ctrl"/>
@@ -54,13 +54,13 @@
         <KeyBinding Command="Close" Key="F4" Modifiers="Alt"/>
         <KeyBinding Command="{x:Static commands:MainWindowCommands.CloseViewTabCommand}" Key="F4" Modifiers="Ctrl"/>
     </metro:MetroWindow.InputBindings>
-    
+
     <metro:MetroWindow.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="pack://application:,,,/Core.Common.Gui;component/Style/DeltaresStyle.xaml" /> 
             </ResourceDictionary.MergedDictionaries>
-            
+
             <Style x:Key="PanelBackgroundWindowTitleStyle" TargetType="{x:Type Panel}">
                 <Setter Property="Background" Value="{StaticResource WindowTitleColorBrush}" />
                 <Style.Triggers>
@@ -72,16 +72,9 @@
                     </DataTrigger>
                 </Style.Triggers>
             </Style>
-            
-            <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="{StaticResource SeparatorBackgroundBrush}" />
-            </Style>
         </ResourceDictionary>
     </metro:MetroWindow.Resources>
-    
+
     <metro:MetroWindow.LeftWindowCommands>
         <metro:WindowCommands>
             <Button Name="ButtonMenuFileNewProject"
@@ -118,10 +111,10 @@
                 </Button>
         </metro:WindowCommands>
     </metro:MetroWindow.LeftWindowCommands>
-    
+
     <Grid Background="{StaticResource BackgroundColorBrush}">
         <DockPanel>
-            
+
             <StackPanel DockPanel.Dock="Top" Height="100" Background="{StaticResource MainButtonBarBackgroundBrush}" Orientation="Horizontal">
                 <Button Style="{StaticResource MainButtonBarButtonStyle}"
                         Tag="Project">
@@ -151,11 +144,11 @@
                 </ToggleButton>
                 <Separator Style="{StaticResource MainButtonBarSeparatorStyle}" />
             </StackPanel>
-            
+
             <Border DockPanel.Dock="Top"
                     BorderThickness="0,1,0,0"
                     BorderBrush="{StaticResource MainButtonBarBottomBorderBrush}" />
-            
+
             <DockPanel Height="30" DockPanel.Dock="Bottom" Style="{StaticResource PanelBackgroundWindowTitleStyle}">
                 <StackPanel Orientation="Horizontal" DockPanel.Dock="Left">
                     <ToggleButton Name="ButtonShowProjectExplorer"
@@ -183,7 +176,7 @@
                         <TextBlock Style="{StaticResource ButtonIconStyle}" Text="&#xE943;"/>
                     </ToggleButton>
                 </StackPanel>
-                
+
                 <StackPanel Orientation="Horizontal" DockPanel.Dock="Left" Margin="40 0 0 0">
                     <Button ToolTip="{x:Static properties:Resources.Ribbon_Show_Log}"
                             DockPanel.Dock="Left"
@@ -215,9 +208,9 @@
                     </Button>
                 </StackPanel>
             </DockPanel>
-            
+
             <viewHost:AvalonDockViewHost x:Name="AvalonDockViewHost" />
-            
+
         </DockPanel>
     </Grid>
 </metro:MetroWindow>
Index: Core/Common/src/Core.Common.Gui/Style/DeltaresButtonStyle.xaml
===================================================================
diff -u -r9fe54eadf770f3d09bf43ea8456104bfe59da6d6 -r44a516877223b6aac9691eff4969df23027ef16b
--- Core/Common/src/Core.Common.Gui/Style/DeltaresButtonStyle.xaml	(.../DeltaresButtonStyle.xaml)	(revision 9fe54eadf770f3d09bf43ea8456104bfe59da6d6)
+++ Core/Common/src/Core.Common.Gui/Style/DeltaresButtonStyle.xaml	(.../DeltaresButtonStyle.xaml)	(revision 44a516877223b6aac9691eff4969df23027ef16b)
@@ -4,18 +4,18 @@
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="DeltaresGeneralStyle.xaml" />
     </ResourceDictionary.MergedDictionaries>
-    
+
     <Style x:Key="ButtonIconStyle" TargetType="{x:Type TextBlock}">
         <Setter Property="TextAlignment" Value="Center" />
         <Setter Property="FontFamily" Value="{StaticResource RiskeerFont}" />
         <Setter Property="FontSize" Value="20" />
     </Style>
-            
+
     <Style x:Key="ButtonLargeIconStyle" TargetType="{x:Type TextBlock}"
            BasedOn="{StaticResource ButtonIconStyle}">
         <Setter Property="FontSize" Value="32" />
     </Style>
-    
+
     <Style x:Key="WindowCommandsButtonStyle" TargetType="{x:Type Button}"
            BasedOn="{StaticResource {x:Static metro:WindowCommands.ButtonStyleKey}}">
         <Setter Property="Background" Value="{StaticResource WindowTitleColorBrush}" />
@@ -32,14 +32,14 @@
             <Trigger Property="IsPressed" Value="True">
                 <Setter Property="Background" Value="{StaticResource DeltaresDarkerBlueBrush}"/>
             </Trigger>
-            
+
             <DataTrigger
                 Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type metro:MetroWindow}}, Path=IsActive}"
                 Value="False">
                 <Setter Property="Background"
                         Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type metro:MetroWindow}}, Path=NonActiveBorderBrush}" />
             </DataTrigger>
-            
+
             <MultiDataTrigger>
                 <MultiDataTrigger.Conditions>
                     <Condition
@@ -51,7 +51,7 @@
             </MultiDataTrigger>
         </Style.Triggers>
     </Style>
-    
+
     <Style x:Key="ViewStateBarButtonStyle" TargetType="{x:Type ButtonBase}">
         <Setter Property="Background" Value="{StaticResource WindowTitleColorBrush}" />
         <Setter Property="BorderThickness" Value="0" />
@@ -73,7 +73,7 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
-            
+
         <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
                 <Setter Property="Background" Value="{StaticResource ButtonHoverBackgroundBrush}"/>
@@ -85,14 +85,14 @@
                 <Setter Property="Background" Value="{StaticResource DisabledButtonBackgroundBrush}"/>
                 <Setter Property="Foreground" Value="{StaticResource DisabledButtonForegroundBrush}"/>
             </Trigger>
-            
+
             <DataTrigger
                 Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type metro:MetroWindow}}, Path=IsActive}"
                 Value="False">
                 <Setter Property="Background"
                         Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type metro:MetroWindow}}, Path=NonActiveBorderBrush}" />
             </DataTrigger>
-            
+
             <MultiDataTrigger>
                 <MultiDataTrigger.Conditions>
                     <Condition
@@ -104,14 +104,14 @@
             </MultiDataTrigger>
         </Style.Triggers>
     </Style>
-        
+
     <Style x:Key="ViewStateBarToggleButtonStyle" TargetType="{x:Type ToggleButton}"
            BasedOn="{StaticResource ViewStateBarButtonStyle}">
         <Style.Triggers>
             <Trigger Property="IsChecked" Value="True">
                 <Setter Property="Background" Value="{StaticResource DeltaresDarkerBlueBrush}" />
             </Trigger>
-    
+
             <MultiDataTrigger>
                 <MultiDataTrigger.Conditions>
                     <Condition
@@ -123,7 +123,7 @@
             </MultiDataTrigger>
         </Style.Triggers>
     </Style>
-    
+
     <Style x:Key="MainButtonBarButtonStyle" TargetType="{x:Type ButtonBase}">
         <Setter Property="Padding" Value="0 6 0 0" />
         <Setter Property="Margin" Value="3 6 " />
@@ -134,7 +134,9 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ButtonBase}">
-                    <Border x:Name="border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+                    <Border BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Background="{TemplateBinding Background}">
                         <Grid>
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="auto"/>
@@ -160,7 +162,7 @@
             </Setter.Value>
         </Setter>
     </Style>
-            
+
     <Style x:Key="MainButtonBarToggleButtonStyle" TargetType="{x:Type ToggleButton}"
            BasedOn="{StaticResource MainButtonBarButtonStyle}">
         <Style.Triggers>
Index: Core/Common/src/Core.Common.Gui/Style/DeltaresGeneralStyle.xaml
===================================================================
diff -u -r9fe54eadf770f3d09bf43ea8456104bfe59da6d6 -r44a516877223b6aac9691eff4969df23027ef16b
--- Core/Common/src/Core.Common.Gui/Style/DeltaresGeneralStyle.xaml	(.../DeltaresGeneralStyle.xaml)	(revision 9fe54eadf770f3d09bf43ea8456104bfe59da6d6)
+++ Core/Common/src/Core.Common.Gui/Style/DeltaresGeneralStyle.xaml	(.../DeltaresGeneralStyle.xaml)	(revision 44a516877223b6aac9691eff4969df23027ef16b)
@@ -74,4 +74,11 @@
         <Setter Property="Width" Value="525" />
     </Style>
 
+    <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="{StaticResource SeparatorBackgroundBrush}" />
+    </Style>
+
 </ResourceDictionary>
\ No newline at end of file