diff --git a/src/main/java/forge/gui/toolbox/FSkin.java b/src/main/java/forge/gui/toolbox/FSkin.java
index 5e68569a0fe..d6207fa07c4 100644
--- a/src/main/java/forge/gui/toolbox/FSkin.java
+++ b/src/main/java/forge/gui/toolbox/FSkin.java
@@ -1994,6 +1994,7 @@ public enum FSkin {
                     setComboBoxLookAndFeel();
                     setTabbedPaneLookAndFeel();
                     setButtonLookAndFeel();
+                    setToolTipLookAndFeel();
                 }
             }
             onInit = false;
@@ -2086,10 +2087,8 @@ public enum FSkin {
             UIManager.put("ComboBox.disabledBackground", BACK_COLOR);
             UIManager.put("ComboBox.disabledForeground", BACK_COLOR.darker());
             UIManager.put("ComboBox.font", getDefaultFont("ComboBox.font"));
-            UIManager.put("Button.select", HIGHLIGHT_COLOR);
             boolean isBright = isColorBright(FORE_COLOR);
             UIManager.put("ComboBox.border", BorderFactory.createLineBorder(isBright ? FORE_COLOR.darker() : FORE_COLOR.brighter(), 1));
-            UIManager.put("Button.select", HIGHLIGHT_COLOR);
         }
 
         private void setButtonLookAndFeel() {
@@ -2099,6 +2098,12 @@ public enum FSkin {
             UIManager.put("Button.focus", FORE_COLOR.darker());
             UIManager.put("Button.rollover", false);
         }
+        
+        private void setToolTipLookAndFeel() {
+            UIManager.put("ToolTip.background", BACK_COLOR);
+            UIManager.put("ToolTip.foreground", FORE_COLOR);
+            UIManager.put("ToolTip.border", LINE_BORDER);
+        }
 
         /**
          * Determines whether theme styles should be applied to GUI.