Index: Core/Common/src/Core.Common.Controls/Forms/CustomToolStripRenderer.cs
===================================================================
diff -u -r2e4f3c407c9e64820dbce6db4e4bc67675e0d4de -r541f1964d071b0861356adff2417393a78d6feff
--- Core/Common/src/Core.Common.Controls/Forms/CustomToolStripRenderer.cs	(.../CustomToolStripRenderer.cs)	(revision 2e4f3c407c9e64820dbce6db4e4bc67675e0d4de)
+++ Core/Common/src/Core.Common.Controls/Forms/CustomToolStripRenderer.cs	(.../CustomToolStripRenderer.cs)	(revision 541f1964d071b0861356adff2417393a78d6feff)
@@ -34,20 +34,18 @@
         {
             if (e.Item is ToolStripButton btn)
             {
-                if (btn.Checked || btn.Pressed)
+                if (btn.Checked || btn.Pressed || btn.Selected)
                 {
                     var bounds = new Rectangle(Point.Empty, e.Item.Size);
 
                     e.Graphics.FillRectangle(new SolidBrush(ColorDefinitions.ButtonBackgroundColor), bounds);
                     e.Graphics.DrawRectangle(new Pen(ColorDefinitions.ButtonBorderColor), bounds);
-
-                    btn.ForeColor = ColorDefinitions.ButtonActiveFrontColor;
                 }
-                else
-                {
-                    btn.ForeColor = ColorDefinitions.ButtonInactiveFrontColor;
-                }
 
+                btn.ForeColor = btn.Checked || btn.Pressed
+                                    ? ColorDefinitions.ButtonActiveFrontColor
+                                    : ColorDefinitions.ButtonInactiveFrontColor;
+
                 return;
             }