Index: Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml
===================================================================
diff -u -r52a2236a7329cf22c7ec9296e87f35a647c3e037 -rb04de31eeefee5e789e57a830cb5438ae2b7e722
--- Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml	(.../MainWindow.xaml)	(revision 52a2236a7329cf22c7ec9296e87f35a647c3e037)
+++ Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml	(.../MainWindow.xaml)	(revision b04de31eeefee5e789e57a830cb5438ae2b7e722)
@@ -104,7 +104,7 @@
             </Style>
             
             <Style x:Key="MainButtonBarButtonStyle" TargetType="ButtonBase">
-                <Setter Property="Padding" Value="0 6" />
+                <Setter Property="Padding" Value="0 6 0 0" />
                 <Setter Property="Margin" Value="3 6 " />
                 <Setter Property="MinWidth" Value="66" />
                 <Setter Property="Height" Value="85" />
@@ -119,7 +119,7 @@
                                         <RowDefinition Height="auto"/>
                                         <RowDefinition Height="auto"/>
                                     </Grid.RowDefinitions>
-                                    <ContentPresenter Grid.Row="0" HorizontalAlignment="Center"/>
+                                    <ContentPresenter Grid.Row="0" HorizontalAlignment="Center" Margin="{TemplateBinding Padding}"/>
                                     <Label Grid.Row="1" Content="{Binding Path=Tag, RelativeSource={RelativeSource TemplatedParent}}"
                                            HorizontalAlignment="Center" Foreground="{TemplateBinding Foreground}"/>
                                 </Grid>
@@ -154,8 +154,8 @@
             <Style x:Key="SeparatorStyle" TargetType="{x:Type Separator}"
                    BasedOn="{StaticResource {x:Static ToolBar.SeparatorStyleKey}}">
                 <Setter Property="Width" Value="1"/>
-                <Setter Property="Height" Value="88"/>
-                <Setter Property="Background" Value="{StaticResource MainButtonBarBottomBorderBrush}" />
+                <Setter Property="Height" Value="84"/>
+                <Setter Property="Background" Value="#d2d2ca" />
             </Style>
         </ResourceDictionary>
     </metro:MetroWindow.Resources>
@@ -227,6 +227,7 @@
                     <TextBlock Style="{StaticResource ButtonIconStyle}"
                                Text="&#xE94B;"/>
                 </ToggleButton>
+                <Separator Style="{StaticResource SeparatorStyle}" />
             </StackPanel>
             
             <Border DockPanel.Dock="Top"