Index: Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml
===================================================================
diff -u -rf2309153694672ed41170cb1cf4e54cdf77a1731 -rf58017aff480aff6ec84601692fe53832dd48bc3
--- Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml	(.../MainWindow.xaml)	(revision f2309153694672ed41170cb1cf4e54cdf77a1731)
+++ Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml	(.../MainWindow.xaml)	(revision f58017aff480aff6ec84601692fe53832dd48bc3)
@@ -83,6 +83,25 @@
                     </DataTrigger>
                 </Style.Triggers>
             </Style>
+            
+            <SolidColorBrush x:Key="BorderBrush" Color="{StaticResource Transparent}" />
+            
+            <Style x:Key="StatusBarButtonStyle" TargetType="{x:Type ButtonBase}">
+                <Setter Property="Background" Value="{StaticResource WindowTitleColorBrush}" />
+                <Setter Property="BorderThickness" Value="1" />
+                <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}" />
+                <Setter Property="Padding" Value="6 6" />
+                <Setter Property="Margin" Value="0" />
+                
+                <Style.Triggers>
+                    <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>
+                </Style.Triggers>
+            </Style>
         </ResourceDictionary>
     </metro:MetroWindow.Resources>
     
@@ -94,17 +113,25 @@
 
         <viewHost:AvalonDockViewHost Grid.Row="0" x:Name="AvalonDockViewHost" />
 
-        <Grid Grid.Row="1">
+        <Grid Grid.Row="1" Style="{StaticResource PanelBackgroundWindowTitleStyle}">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="100"/>
                 <ColumnDefinition Width="160"/>
                 <ColumnDefinition Width="*"/>
             </Grid.ColumnDefinitions>
             <StackPanel Grid.Column="0" Orientation="Horizontal">
-                <ToggleButton Name="ButtonShowProperties" Width="30" ToolTip="{x:Static properties:Resources.Ribbon_Properties}" Click="ButtonShowProperties_Click">
+                <ToggleButton Name="ButtonShowProperties"
+                              Width="30"
+                              ToolTip="{x:Static properties:Resources.Ribbon_Properties}"
+                              Click="ButtonShowProperties_Click"
+                              Style="{StaticResource StatusBarButtonStyle}">
                     <Image Source="/Core.Common.Gui;component\Resources\PropertiesHS.png" />
                 </ToggleButton>
-                <ToggleButton Name="ButtonShowMessages" Width="30" ToolTip="{x:Static properties:Resources.Ribbon_Messages}" Click="ButtonShowMessages_Click">
+                <ToggleButton Name="ButtonShowMessages"
+                              Width="30"
+                              ToolTip="{x:Static properties:Resources.Ribbon_Messages}"
+                              Click="ButtonShowMessages_Click"
+                              Style="{StaticResource StatusBarButtonStyle}">
                     <Image Source="/Core.Common.Gui;component\Resources\application_view_list.png" />
                 </ToggleButton>
             </StackPanel>
@@ -114,49 +141,57 @@
                         AutomationProperties.AutomationId="ButtonMenuFileNewProject"
                         AutomationProperties.Name="ButtonMenuFileNewProject"
                         Click="OnFileNewClicked"
-                        x:FieldModifier="private">
+                        x:FieldModifier="private"
+                        Style="{StaticResource StatusBarButtonStyle}">
                     <Image Source="/Core.Common.Gui;component\Resources\DocumentHS.png"/>
                 </Button>
                 <Button Name="ButtonMenuFileSaveProject"
                         ToolTip="{x:Static properties:Resources.Ribbon_Command_Save}"
                         Click="OnFileSaveClicked"
-                        x:FieldModifier="private">
+                        x:FieldModifier="private"
+                        Style="{StaticResource StatusBarButtonStyle}">
                     <Image Source="/Core.Common.Gui;component\Resources\saveHS.png"/>
                 </Button>
                 <Button Name="ButtonMenuFileSaveProjectAs"
                         ToolTip="{x:Static properties:Resources.Ribbon_Command_Save_As}"
                         AutomationProperties.AutomationId="ButtonMenuFileSaveProjectAs"
                         Click="OnFileSaveAsClicked"
-                        x:FieldModifier="private">
+                        x:FieldModifier="private"
+                        Style="{StaticResource StatusBarButtonStyle}">
                     <Image Source="/Core.Common.Gui;component\Resources\SaveAsHH.png"/>
                 </Button>
                 <Button Name="ButtonMenuFileOpenProject"
                         ToolTip="{x:Static properties:Resources.Ribbon_Command_Open}"
                         AutomationProperties.AutomationId= "ButtonMenuFileOpenProject"
                         Click="OnFileOpenClicked"
-                        x:FieldModifier="private">
+                        x:FieldModifier="private"
+                        Style="{StaticResource StatusBarButtonStyle}">
                     <Image Source="/Core.Common.Gui;component\Resources\openfolderHS.png"/>
                 </Button>
             </StackPanel>
             <StackPanel Grid.Column="2" Orientation="Horizontal">
                 <Button ToolTip="{x:Static properties:Resources.Ribbon_Show_Log}"
-                        Click="OnFileHelpShowLog_Clicked">
+                        Click="OnFileHelpShowLog_Clicked"
+                        Style="{StaticResource StatusBarButtonStyle}">
                     <Image Source="/Core.Common.Gui;component\Resources\application_view_list.png"/>
                 </Button>
                 <Button Name="FileManualButton"
                         ToolTip="{x:Static properties:Resources.Ribbon_Open_Manual}"
                         Click="OnFileManual_Clicked"
-                        x:FieldModifier="private">
+                        x:FieldModifier="private"
+                        Style="{StaticResource StatusBarButtonStyle}">
                     <Image Source="/Core.Common.Gui;component\Resources\manual.png"/>
                 </Button>
                 <Button Name="AboutButton"
                         ToolTip="{x:Static properties:Resources.Ribbon_About}"
                         Click="OnAboutDialog_Clicked"
-                        x:FieldModifier="private">
+                        x:FieldModifier="private"
+                        Style="{StaticResource StatusBarButtonStyle}">
                     <Image Source="/Core.Common.Gui;component\Resources\information.png"/>
                 </Button>
                 <Button ToolTip="{x:Static properties:Resources.Ribbon_Exit}"
-                        Click="OnFileExitClicked">
+                        Click="OnFileExitClicked"
+                        Style="{StaticResource StatusBarButtonStyle}">
                     <Image Source="/Core.Common.Gui;component\Resources\ClosePreviewHH.png"/>
                 </Button>
             </StackPanel>