Index: Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml
===================================================================
diff -u -r4b23d2bcfe8c8bb98f5f727cc0dbf066cb62e683 -r982679dfc9f7442bd5f21755ad8c57a0c528cc07
--- Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml	(.../MainWindow.xaml)	(revision 4b23d2bcfe8c8bb98f5f727cc0dbf066cb62e683)
+++ Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml	(.../MainWindow.xaml)	(revision 982679dfc9f7442bd5f21755ad8c57a0c528cc07)
@@ -1,4 +1,4 @@
-<!--
+<!--
 Copyright (C) Stichting Deltares 2021. All rights reserved.
 
 This file is part of Riskeer.
@@ -79,8 +79,10 @@
                 <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="Padding" Value="3 3" />
                 <Setter Property="Margin" Value="0" />
+                <Setter Property="Width" Value="25"/>
+                <Setter Property="Height" Value="25"/>
                 
                 <Style.Triggers>
                     <DataTrigger
@@ -132,60 +134,58 @@
     </metro:MetroWindow.LeftWindowCommands>
     
     <Grid Background="{StaticResource BackgroundColorBrush}">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="*"/>
-            <RowDefinition Height="30"/>
-        </Grid.RowDefinitions>
-
-        <viewHost:AvalonDockViewHost Grid.Row="0" x:Name="AvalonDockViewHost" />
-
-        <Grid Grid.Row="1" Style="{StaticResource PanelBackgroundWindowTitleStyle}">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="100"/>
-                <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"
-                              Style="{StaticResource TopAndBottomBarButtonStyle}">
-                    <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"
-                              Style="{StaticResource TopAndBottomBarButtonStyle}">
-                    <Image Source="/Core.Common.Gui;component\Resources\application_view_list.png" />
-                </ToggleButton>
-            </StackPanel>
-            <StackPanel Grid.Column="1" Orientation="Horizontal">
-                <Button ToolTip="{x:Static properties:Resources.Ribbon_Show_Log}"
-                        Click="OnFileHelpShowLog_Clicked"
-                        Style="{StaticResource TopAndBottomBarButtonStyle}">
-                    <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"
-                        Style="{StaticResource TopAndBottomBarButtonStyle}">
-                    <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"
-                        Style="{StaticResource TopAndBottomBarButtonStyle}">
-                    <Image Source="/Core.Common.Gui;component\Resources\information.png"/>
-                </Button>
-                <Button ToolTip="{x:Static properties:Resources.Ribbon_Exit}"
-                        Click="OnFileExitClicked"
-                        Style="{StaticResource TopAndBottomBarButtonStyle}">
-                    <Image Source="/Core.Common.Gui;component\Resources\ClosePreviewHH.png"/>
-                </Button>
-            </StackPanel>
-        </Grid>
+        <DockPanel>
+            
+            <DockPanel Height="25" DockPanel.Dock="Bottom" Style="{StaticResource PanelBackgroundWindowTitleStyle}">
+                <StackPanel Orientation="Horizontal" DockPanel.Dock="Left">
+                    <ToggleButton Name="ButtonShowProperties"
+                                  ToolTip="{x:Static properties:Resources.Ribbon_Properties}"
+                                  Click="ButtonShowProperties_Click"
+                                  Style="{StaticResource TopAndBottomBarButtonStyle}">
+                        <Image Source="/Core.Common.Gui;component\Resources\PropertiesHS.png" />
+                    </ToggleButton>
+                    <ToggleButton Name="ButtonShowMessages"
+                                  ToolTip="{x:Static properties:Resources.Ribbon_Messages}"
+                                  Click="ButtonShowMessages_Click"
+                                  Style="{StaticResource TopAndBottomBarButtonStyle}">
+                        <Image Source="/Core.Common.Gui;component\Resources\application_view_list.png" />
+                    </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"
+                            Click="OnFileHelpShowLog_Clicked"
+                            Style="{StaticResource TopAndBottomBarButtonStyle}">
+                        <Image Source="/Core.Common.Gui;component\Resources\application_view_list.png"/>
+                    </Button>
+                    <Button Name="FileManualButton"
+                            DockPanel.Dock="Left"
+                            ToolTip="{x:Static properties:Resources.Ribbon_Open_Manual}"
+                            Click="OnFileManual_Clicked"
+                            x:FieldModifier="private"
+                            Style="{StaticResource TopAndBottomBarButtonStyle}">
+                        <Image Source="/Core.Common.Gui;component\Resources\manual.png"/>
+                    </Button>
+                    <Button Name="AboutButton"
+                            DockPanel.Dock="Left"
+                            ToolTip="{x:Static properties:Resources.Ribbon_About}"
+                            Click="OnAboutDialog_Clicked"
+                            x:FieldModifier="private"
+                            Style="{StaticResource TopAndBottomBarButtonStyle}">
+                        <Image Source="/Core.Common.Gui;component\Resources\information.png"/>
+                    </Button>
+                    <Button ToolTip="{x:Static properties:Resources.Ribbon_Exit}"
+                            DockPanel.Dock="Left"
+                            Click="OnFileExitClicked"
+                            Style="{StaticResource TopAndBottomBarButtonStyle}">
+                        <Image Source="/Core.Common.Gui;component\Resources\ClosePreviewHH.png"/>
+                    </Button>
+                </StackPanel>
+            </DockPanel>
+            
+            <viewHost:AvalonDockViewHost x:Name="AvalonDockViewHost" />
+            
+        </DockPanel>
     </Grid>
 </metro:MetroWindow>