diff --git a/Changelog.md b/Changelog.md
index 6bcdbdd36..57eb8b763 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -6,6 +6,7 @@
 
   - Fixing window button layout when DPI != 100%
   - [#860](../../issues/860) - Quick access buttons do not show when first item is added
+  - [#862](../../issues/862) - Hover effects on minimize/maximize icons (colorful theme)
   - [#869](../../issues/869) - Crash if Ribbon is collapsed (after Update to Version 8.0.1)
 
 ## 8.0.1
diff --git a/Fluent.Ribbon/Themes/Themes/GeneratorParameters.json b/Fluent.Ribbon/Themes/Themes/GeneratorParameters.json
index 2947f551e..95ee89c5a 100644
--- a/Fluent.Ribbon/Themes/Themes/GeneratorParameters.json
+++ b/Fluent.Ribbon/Themes/Themes/GeneratorParameters.json
@@ -6,11 +6,13 @@
     "Fluent.Ribbon.Colors.DarkExtremeHighlightColor": "#FFF29536",
     "Fluent.Ribbon.Colors.Images.DefaultColor": "{StaticResource BlackColor}",
     "Fluent.Ribbon.Brushes.ApplicationMenuItem.CheckBox.Background": "#FFFCF1C2",
-    "Fluent.Ribbon.Brushes.ApplicationMenuItem.CheckBox.BorderBrush": "#FFF29536",    
+    "Fluent.Ribbon.Brushes.ApplicationMenuItem.CheckBox.BorderBrush": "#FFF29536",
     "Fluent.Ribbon.Brushes.RibbonTabControl.Background": "{StaticResource WhiteColor}",
     "Fluent.Ribbon.Brushes.RibbonWindow.TitleBackground": "Transparent",
     "Fluent.Ribbon.Brushes.RibbonWindow.TitleForeground": "{StaticResource BlackColor}",
-    "Fluent.Ribbon.Brushes.WindowCommands.CaptionButton.Foreground": "{StaticResource BlackColor}"
+    "Fluent.Ribbon.Brushes.WindowCommands.CaptionButton.Foreground": "{StaticResource BlackColor}",
+    "Fluent.Ribbon.Brushes.WindowCommands.CaptionButton.MouseOver.Background": "{StaticResource Fluent.Ribbon.Colors.AccentColor20}",
+    "Fluent.Ribbon.Brushes.WindowCommands.CaptionButton.Pressed.Background": "{StaticResource Fluent.Ribbon.Colors.AccentColor40}"
   },
   "BaseColorSchemes": [
     {
@@ -109,7 +111,9 @@
         "Fluent.Ribbon.Brushes.RibbonTabItem.Selected.MouseOver.Foreground": "{StaticResource Gray1}",
         "Fluent.Ribbon.Brushes.RibbonWindow.TitleBackground": "{StaticResource Fluent.Ribbon.Colors.AccentBaseColor}",
         "Fluent.Ribbon.Brushes.RibbonWindow.TitleForeground": "{StaticResource Fluent.Ribbon.Colors.IdealForegroundColor}",
-        "Fluent.Ribbon.Brushes.WindowCommands.CaptionButton.Foreground": "{StaticResource Fluent.Ribbon.Colors.IdealForegroundColor}"
+        "Fluent.Ribbon.Brushes.WindowCommands.CaptionButton.Foreground": "{StaticResource Fluent.Ribbon.Colors.IdealForegroundColor}",
+        "Fluent.Ribbon.Brushes.WindowCommands.CaptionButton.MouseOver.Background": "{StaticResource WhiteColor20}",
+        "Fluent.Ribbon.Brushes.WindowCommands.CaptionButton.Pressed.Background": "{StaticResource WhiteColor}"
       }
     }
   ],
diff --git a/Fluent.Ribbon/Themes/Themes/Theme.Template.xaml b/Fluent.Ribbon/Themes/Themes/Theme.Template.xaml
index 0f8b01e14..1fa447783 100644
--- a/Fluent.Ribbon/Themes/Themes/Theme.Template.xaml
+++ b/Fluent.Ribbon/Themes/Themes/Theme.Template.xaml
@@ -257,8 +257,8 @@
     <!-- WindowCommands -->
     <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.WindowCommands.CaptionButton.Foreground" Color="{{Fluent.Ribbon.Brushes.WindowCommands.CaptionButton.Foreground}}" options:Freeze="True" />
     <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.WindowCommands.CaptionButton.Background" Color="{StaticResource TransparentWhiteColor}" options:Freeze="True" />
-    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.WindowCommands.CaptionButton.MouseOver.Background" Color="{StaticResource Fluent.Ribbon.Colors.AccentColor20}" options:Freeze="True" />
-    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.WindowCommands.CaptionButton.Pressed.Background" Color="{StaticResource Fluent.Ribbon.Colors.AccentColor40}" options:Freeze="True" />
+    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.WindowCommands.CaptionButton.MouseOver.Background" Color="{{Fluent.Ribbon.Brushes.WindowCommands.CaptionButton.MouseOver.Background}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.WindowCommands.CaptionButton.Pressed.Background" Color="{{Fluent.Ribbon.Brushes.WindowCommands.CaptionButton.Pressed.Background}}" options:Freeze="True" />
 
     <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.WindowCommands.CloseButton.MouseOver.Background" Color="#E81123" options:Freeze="True" />
     <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.WindowCommands.CloseButton.Pressed.Background" Color="#A92831" options:Freeze="True" />