Index: Core/Gui/src/Core.Gui/Commands/RelayCommand.cs
===================================================================
diff -u -rb441bd9ffa8a255a522abceffd49201e96808502 -rac11dc0cff110f04dfbbc62f42a12a3c2c2feb37
--- Core/Gui/src/Core.Gui/Commands/RelayCommand.cs	(.../RelayCommand.cs)	(revision b441bd9ffa8a255a522abceffd49201e96808502)
+++ Core/Gui/src/Core.Gui/Commands/RelayCommand.cs	(.../RelayCommand.cs)	(revision ac11dc0cff110f04dfbbc62f42a12a3c2c2feb37)
@@ -32,7 +32,11 @@
         private readonly Action<object> action;
         private readonly Func<object, bool> canExecute;
 
-        public event EventHandler CanExecuteChanged;
+        public event EventHandler CanExecuteChanged
+        {
+            add => CommandManager.RequerySuggested += value;
+            remove => CommandManager.RequerySuggested -= value;
+        }
 
         /// <summary>
         /// Creates a new instance of <see cref="RelayCommand"/>.
Index: Core/Gui/src/Core.Gui/Style/DeltaresButtonStyle.xaml
===================================================================
diff -u -rfa89f631e4a010e026b2523c000173d60e73c2fd -rac11dc0cff110f04dfbbc62f42a12a3c2c2feb37
--- Core/Gui/src/Core.Gui/Style/DeltaresButtonStyle.xaml	(.../DeltaresButtonStyle.xaml)	(revision fa89f631e4a010e026b2523c000173d60e73c2fd)
+++ Core/Gui/src/Core.Gui/Style/DeltaresButtonStyle.xaml	(.../DeltaresButtonStyle.xaml)	(revision ac11dc0cff110f04dfbbc62f42a12a3c2c2feb37)
@@ -16,42 +16,6 @@
         <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 DeltaresBlueBrush}" />
-        <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}" />
-        <Style.Triggers>
-            <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Background" Value="{StaticResource WhiteOverlayBrush}"/>
-            </Trigger>
-            <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
-                        Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type metro:MetroWindow}}, Path=IsActive}"
-                        Value="False" />
-                    <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsMouseOver}" Value="True" />
-                </MultiDataTrigger.Conditions>
-                <Setter Property="Background" Value="{StaticResource WhiteOverlayBrush}" />
-            </MultiDataTrigger>
-        </Style.Triggers>
-    </Style>
-
     <Style x:Key="RiskeerButtonStyle" TargetType="{x:Type ButtonBase}">
         <Setter Property="Background" Value="{StaticResource DeltaresBlueBrush}" />
         <Setter Property="BorderThickness" Value="0" />