diff --git a/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml b/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml
index 47d25edd54..7cd03ff74a 100644
--- a/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml
+++ b/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml
@@ -74,6 +74,7 @@ Item
             id: closeButton
             width: UM.Theme.getSize("message_close").width
             height: UM.Theme.getSize("message_close").height
+            hoverEnabled: true
 
             anchors
             {
@@ -86,8 +87,7 @@ Item
             {
                 anchors.fill: parent
                 sourceSize.width: width
-                sourceSize.height: width
-                color: UM.Theme.getColor("message_text")
+                color: closeButton.hovered ? UM.Theme.getColor("small_button_text_hover") : UM.Theme.getColor("small_button_text")
                 source: UM.Theme.getIcon("cross1")
             }
 
diff --git a/resources/qml/Settings/SettingView.qml b/resources/qml/Settings/SettingView.qml
index 9904770281..c1b4b28d1d 100644
--- a/resources/qml/Settings/SettingView.qml
+++ b/resources/qml/Settings/SettingView.qml
@@ -178,7 +178,7 @@ Item
                     height: UM.Theme.getSize("standard_arrow").height
                     sourceSize.width: width
                     sourceSize.height: height
-                    color: control.enabled ? UM.Theme.getColor("setting_category_text") : UM.Theme.getColor("setting_category_disabled_text")
+                    color: control.hovered ? UM.Theme.getColor("small_button_text_hover") : UM.Theme.getColor("small_button_text")
                     source: UM.Theme.getIcon("menu")
                 }
             }
diff --git a/resources/qml/ViewOrientationButton.qml b/resources/qml/ViewOrientationButton.qml
index 682fd71b4e..5371f8549b 100644
--- a/resources/qml/ViewOrientationButton.qml
+++ b/resources/qml/ViewOrientationButton.qml
@@ -9,7 +9,6 @@ UM.SimpleButton
 {
     width: UM.Theme.getSize("small_button").width
     height: UM.Theme.getSize("small_button").height
-    hoverBackgroundColor: UM.Theme.getColor("small_button_hover")
     hoverColor: UM.Theme.getColor("small_button_text_hover")
     color: UM.Theme.getColor("small_button_text")
     iconMargin: 0.5 * UM.Theme.getSize("wide_lining").width
diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json
index d4fb59b7a1..0ef6c24bfb 100644
--- a/resources/themes/cura-light/theme.json
+++ b/resources/themes/cura-light/theme.json
@@ -80,7 +80,7 @@
         "primary_hover": [48, 182, 231, 255],
         "primary_text": [255, 255, 255, 255],
         "border": [127, 127, 127, 255],
-        "secondary": [245, 245, 245, 255],
+        "secondary": [240, 240, 240, 255],
         "secondary_shadow": [216, 216, 216, 255],
 
         "primary_button": [38, 113, 231, 255],
@@ -150,7 +150,7 @@
         "small_button_active": [10, 8, 80, 255],
         "small_button_active_hover": [10, 8, 80, 255],
         "small_button_text": [102, 102, 102, 255],
-        "small_button_text_hover": [255, 255, 255, 255],
+        "small_button_text_hover": [8, 7, 63, 255],
         "small_button_text_active": [255, 255, 255, 255],
         "small_button_text_active_hover": [255, 255, 255, 255],
 
@@ -183,18 +183,18 @@
         "scrollbar_handle_hover": [50, 130, 255, 255],
         "scrollbar_handle_down": [50, 130, 255, 255],
 
-        "setting_category": [245, 245, 245, 255],
+        "setting_category": [240, 240, 240, 255],
         "setting_category_disabled": [255, 255, 255, 255],
         "setting_category_hover": [232, 242, 252, 255],
-        "setting_category_active": [245, 245, 245, 255],
+        "setting_category_active": [240, 240, 240, 255],
         "setting_category_active_hover": [232, 242, 252, 255],
         "setting_category_text": [35, 35, 35, 255],
         "setting_category_disabled_text": [24, 41, 77, 101],
         "setting_category_hover_text": [35, 35, 35, 255],
         "setting_category_active_text": [35, 35, 35, 255],
         "setting_category_active_hover_text": [35, 35, 35, 255],
-        "setting_category_border": [245, 245, 245, 255],
-        "setting_category_disabled_border": [245, 245, 245, 255],
+        "setting_category_border": [240, 240, 240, 255],
+        "setting_category_disabled_border": [240, 240, 240, 255],
         "setting_category_hover_border": [50, 130, 255, 255],
         "setting_category_active_border": [50, 130, 255, 255],
         "setting_category_active_hover_border": [50, 130, 255, 255],
@@ -274,7 +274,7 @@
         "z_axis": [0, 255, 0, 255],
         "all_axis": [255, 255, 255, 255],
 
-        "viewport_background": [245, 245, 245, 255],
+        "viewport_background": [250, 250, 250, 255],
         "volume_outline": [50, 130, 255, 255],
         "buildplate": [244, 244, 244, 255],
         "buildplate_grid": [129, 131, 134, 255],