Index: Core/Gui/src/Core.Gui/Forms/Backstage/BackstageControl.xaml
===================================================================
diff -u -r8339a812e145eab080917a65ceb6d27472b7c076 -r4afc152d0772fc332322be61875569b61ef5e13f
--- Core/Gui/src/Core.Gui/Forms/Backstage/BackstageControl.xaml	(.../BackstageControl.xaml)	(revision 8339a812e145eab080917a65ceb6d27472b7c076)
+++ Core/Gui/src/Core.Gui/Forms/Backstage/BackstageControl.xaml	(.../BackstageControl.xaml)	(revision 4afc152d0772fc332322be61875569b61ef5e13f)
@@ -27,30 +27,55 @@
                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                    xmlns:commands="clr-namespace:Core.Gui.Commands"
                    mc:Ignorable="d">
-    
+
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="pack://application:,,,/Core.Gui;component/Style/DeltaresStyle.xaml" /> 
             </ResourceDictionary.MergedDictionaries>
+            
+            <Style x:Key="BackstageButtonStyle" TargetType="{x:Type ButtonBase}"
+                   BasedOn="{StaticResource RiskeerButtonStyle}">
+                <Setter Property="Height" Value="40"/>
+            </Style>
+            
+            <Style x:Key="BackstageToggleButtonStyle" TargetType="{x:Type ToggleButton}"
+                   BasedOn="{StaticResource RiskeerToggleButtonStyle}">
+                <Setter Property="Height" Value="40"/>
+            </Style>
         </ResourceDictionary>
     </UserControl.Resources>
     
     <Grid>
         <DockPanel>
-            <StackPanel Width="150" DockPanel.Dock="Left" Background="{StaticResource WindowTitleColorBrush}">
-                <Button Command="{x:Static commands:MainWindowCommands.ToggleBackstageCommand}">Terug</Button>
+            <StackPanel Width="140" DockPanel.Dock="Left" Style="{StaticResource PanelBackgroundWindowTitleStyle}">
+                <Button Style="{StaticResource BackstageButtonStyle}" 
+                        Command="{x:Static commands:MainWindowCommands.ToggleBackstageCommand}"
+                        Content="Terug" />
+                <Separator />
+                <ToggleButton Style="{StaticResource BackstageToggleButtonStyle}"
+                              Content="Info" />
+                <ToggleButton Style="{StaticResource BackstageToggleButtonStyle}"
+                              Content="Openen" />
+                <Button Style="{StaticResource BackstageButtonStyle}"
+                        Command="{x:Static commands:MainWindowCommands.SaveProjectCommand}"
+                        Content="Opslaan" />
+                <Button Style="{StaticResource BackstageButtonStyle}"
+                        Command="{x:Static commands:MainWindowCommands.SaveProjectAsCommand}"
+                        Content="Opslaan Als" />
+                <Separator />
+                <ToggleButton Style="{StaticResource BackstageToggleButtonStyle}"
+                              Content="Over" />
+                <Button Style="{StaticResource BackstageButtonStyle}"
+                        Command="{x:Static commands:MainWindowCommands.OpenLogFileCommand}"
+                        Content="Toon log"/>
+                <Button Style="{StaticResource BackstageButtonStyle}"
+                        Command="{x:Static commands:MainWindowCommands.OpenUserManualCommand}"
+                        Content="Handleiding" />
                 <Separator/>
-                <ToggleButton>INFO</ToggleButton>
-                <ToggleButton>OPENEN</ToggleButton>
-                <Button Command="{x:Static commands:MainWindowCommands.SaveProjectCommand}">Opslaan</Button>
-                <Button Command="{x:Static commands:MainWindowCommands.SaveProjectAsCommand}">Opslaan Als</Button>
-                <Separator/>
-                <ToggleButton>OVER</ToggleButton>
-                <Button Command="{x:Static commands:MainWindowCommands.OpenLogFileCommand}">Toon log</Button>
-                <Button Command="{x:Static commands:MainWindowCommands.OpenUserManualCommand}">Handleiding</Button>
-                <Separator/>
-                <Button Command="{x:Static commands:MainWindowCommands.CloseApplicationCommand}">Afsluiten</Button>
+                <Button Style="{StaticResource BackstageButtonStyle}"
+                        Command="{x:Static commands:MainWindowCommands.CloseApplicationCommand}"
+                        Content="Afsluiten" />
             </StackPanel>
             
             <Border/>
Index: Core/Gui/src/Core.Gui/Forms/MainWindow/MainWindow.xaml
===================================================================
diff -u -r8339a812e145eab080917a65ceb6d27472b7c076 -r4afc152d0772fc332322be61875569b61ef5e13f
--- Core/Gui/src/Core.Gui/Forms/MainWindow/MainWindow.xaml	(.../MainWindow.xaml)	(revision 8339a812e145eab080917a65ceb6d27472b7c076)
+++ Core/Gui/src/Core.Gui/Forms/MainWindow/MainWindow.xaml	(.../MainWindow.xaml)	(revision 4afc152d0772fc332322be61875569b61ef5e13f)
@@ -73,16 +73,10 @@
                 <ResourceDictionary Source="pack://application:,,,/Core.Gui;component/Style/DeltaresStyle.xaml" /> 
             </ResourceDictionary.MergedDictionaries>
 
-            <Style x:Key="PanelBackgroundWindowTitleStyle" TargetType="{x:Type Panel}">
-                <Setter Property="Background" Value="{StaticResource WindowTitleColorBrush}" />
-                <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 x:Key="ViewStateBarToggleButtonStyle" TargetType="{x:Type ToggleButton}"
+                   BasedOn="{StaticResource RiskeerToggleButtonStyle}">
+                <Setter Property="Height" Value="30"/>
+                <Setter Property="Width" Value="30"/>
             </Style>
         </ResourceDictionary>
     </metro:MetroWindow.Resources>
@@ -176,33 +170,6 @@
                         <TextBlock Style="{StaticResource ButtonIconStyle}" Text="&#xE943;"/>
                     </ToggleButton>
                 </StackPanel>
-
-                <StackPanel Orientation="Horizontal" DockPanel.Dock="Left" Margin="40 0 0 0">
-                    <Button Style="{StaticResource ViewStateBarButtonStyle}"
-                            ToolTip="{x:Static properties:Resources.ViewStateBar_ShowLog_ToolTip}"
-                            Command="{x:Static commands:MainWindowCommands.OpenLogFileCommand}"
-                            AutomationProperties.AutomationId="ViewStateButtonBarShowLog">
-                        <TextBlock Style="{StaticResource ButtonIconStyle}" Text="&#xE946;"/>
-                    </Button>
-                    <Button Style="{StaticResource ViewStateBarButtonStyle}"
-                            ToolTip="{x:Static properties:Resources.ViewStateBar_OpenManual_ToolTip}"
-                            Command="{x:Static commands:MainWindowCommands.OpenUserManualCommand}"
-                            AutomationProperties.AutomationId="ViewStateButtonBarOpenManual">
-                        <TextBlock Style="{StaticResource ButtonIconStyle}" Text="&#xE92D;"/>
-                    </Button>
-                    <Button Style="{StaticResource ViewStateBarButtonStyle}"
-                            ToolTip="{x:Static properties:Resources.ViewStateBar_About_ToolTip}"
-                            Click="OnAboutDialog_Clicked"
-                            AutomationProperties.AutomationId="ViewStateButtonBarShowAbout">
-                        <TextBlock Style="{StaticResource ButtonIconStyle}" Text="&#xE921;"/>
-                    </Button>
-                    <Button Style="{StaticResource ViewStateBarButtonStyle}"
-                            ToolTip="{x:Static properties:Resources.ViewStateBar_Exit_ToolTip}"
-                            Command="{x:Static commands:MainWindowCommands.CloseApplicationCommand}"
-                            AutomationProperties.AutomationId="ViewStateButtonBarExit">
-                        <TextBlock Style="{StaticResource ButtonIconStyle}" Text="&#xE901;"/>
-                    </Button>
-                </StackPanel>
             </DockPanel>
 
             <viewHost:AvalonDockViewHost x:Name="AvalonDockViewHost" />
Index: Core/Gui/src/Core.Gui/Style/DeltaresButtonStyle.xaml
===================================================================
diff -u -r434415295de74c310ce6d3cdd0100c28838cf9ea -r4afc152d0772fc332322be61875569b61ef5e13f
--- Core/Gui/src/Core.Gui/Style/DeltaresButtonStyle.xaml	(.../DeltaresButtonStyle.xaml)	(revision 434415295de74c310ce6d3cdd0100c28838cf9ea)
+++ Core/Gui/src/Core.Gui/Style/DeltaresButtonStyle.xaml	(.../DeltaresButtonStyle.xaml)	(revision 4afc152d0772fc332322be61875569b61ef5e13f)
@@ -52,13 +52,11 @@
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="ViewStateBarButtonStyle" TargetType="{x:Type ButtonBase}">
+    <Style x:Key="RiskeerButtonStyle" TargetType="{x:Type ButtonBase}">
         <Setter Property="Background" Value="{StaticResource WindowTitleColorBrush}" />
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="Margin" Value="0" />
         <Setter Property="Padding" Value="0" />
-        <Setter Property="Width" Value="30"/>
-        <Setter Property="Height" Value="30"/>
         <Setter Property="Foreground" Value="{StaticResource WhiteBrush}" />
         <Setter Property="Template">
             <Setter.Value>
@@ -105,8 +103,14 @@
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="ViewStateBarToggleButtonStyle" TargetType="{x:Type ToggleButton}"
-           BasedOn="{StaticResource ViewStateBarButtonStyle}">
+    <Style x:Key="ViewStateBarButtonStyle" TargetType="{x:Type ButtonBase}"
+           BasedOn="{StaticResource RiskeerButtonStyle}">
+        <Setter Property="Width" Value="30"/>
+        <Setter Property="Height" Value="30"/>
+    </Style>
+
+    <Style x:Key="RiskeerToggleButtonStyle" TargetType="{x:Type ToggleButton}"
+           BasedOn="{StaticResource RiskeerButtonStyle}">
         <Style.Triggers>
             <Trigger Property="IsChecked" Value="True">
                 <Setter Property="Background" Value="{StaticResource DeltaresDarkerBlueBrush}" />
Index: Core/Gui/src/Core.Gui/Style/DeltaresGeneralStyle.xaml
===================================================================
diff -u -r434415295de74c310ce6d3cdd0100c28838cf9ea -r4afc152d0772fc332322be61875569b61ef5e13f
--- Core/Gui/src/Core.Gui/Style/DeltaresGeneralStyle.xaml	(.../DeltaresGeneralStyle.xaml)	(revision 434415295de74c310ce6d3cdd0100c28838cf9ea)
+++ Core/Gui/src/Core.Gui/Style/DeltaresGeneralStyle.xaml	(.../DeltaresGeneralStyle.xaml)	(revision 4afc152d0772fc332322be61875569b61ef5e13f)
@@ -23,7 +23,8 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:options="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
-                    xmlns:mainWindow="clr-namespace:Core.Gui.Forms.MainWindow">
+                    xmlns:mainWindow="clr-namespace:Core.Gui.Forms.MainWindow"
+                    xmlns:metro="http://metro.mahapps.com/winfx/xaml/controls">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="pack://application:,,,/Core.Gui;component/Style/Symbols/RiskeerSymbols.xaml" />
     </ResourceDictionary.MergedDictionaries>
@@ -81,4 +82,16 @@
         <Setter Property="Background" Value="{StaticResource SeparatorBackgroundBrush}" />
     </Style>
 
+    <Style x:Key="PanelBackgroundWindowTitleStyle" TargetType="{x:Type Panel}">
+        <Setter Property="Background" Value="{StaticResource WindowTitleColorBrush}" />
+        <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>
\ No newline at end of file