diff --git a/resources/qml/SecondaryButton.qml b/resources/qml/SecondaryButton.qml
index ba4e0bb2c1..d8027af3fc 100644
--- a/resources/qml/SecondaryButton.qml
+++ b/resources/qml/SecondaryButton.qml
@@ -11,7 +11,7 @@ Cura.ActionButton
 {
     color: UM.Theme.getColor("secondary_button")
     textColor: UM.Theme.getColor("secondary_button_text")
-    outlineColor: UM.Theme.getColor("secondary_button_text")
+    outlineColor: UM.Theme.getColor("border_accent_1")
     disabledColor: UM.Theme.getColor("action_button_disabled")
     textDisabledColor: UM.Theme.getColor("action_button_disabled_text")
     hoverColor: UM.Theme.getColor("secondary_button_hover")
diff --git a/resources/qml/Widgets/ComboBox.qml b/resources/qml/Widgets/ComboBox.qml
index 121c5f15da..a9e48e5a60 100644
--- a/resources/qml/Widgets/ComboBox.qml
+++ b/resources/qml/Widgets/ComboBox.qml
@@ -26,21 +26,18 @@ ComboBox
         {
             name: "disabled"
             when: !control.enabled
-            PropertyChanges { target: backgroundRectangle; color: UM.Theme.getColor("setting_control_disabled")}
+            PropertyChanges { target: background; color: UM.Theme.getColor("setting_control_disabled")}
             PropertyChanges { target: contentLabel; color: UM.Theme.getColor("setting_control_disabled_text")}
         },
         State
         {
             name: "highlighted"
             when: control.hovered || control.activeFocus
-            PropertyChanges { target: backgroundRectangle; color: UM.Theme.getColor("setting_control_highlight")}
+            PropertyChanges { target: background; liningColor: UM.Theme.getColor("border_main_light")}
         }
     ]
 
-    background: UM.UnderlineBackground
-    {
-        id: backgroundRectangle
-    }
+    background: UM.UnderlineBackground{}
 
     indicator: UM.RecolorImage
     {
diff --git a/resources/qml/Widgets/RadioButton.qml b/resources/qml/Widgets/RadioButton.qml
index 96c2d95f56..428eb8a4e5 100644
--- a/resources/qml/Widgets/RadioButton.qml
+++ b/resources/qml/Widgets/RadioButton.qml
@@ -38,7 +38,7 @@ RadioButton
         {
             name: "highlighted"
             when: radioButton.hovered || radioButton.activeFocus
-            PropertyChanges { target: indicator; border.color: UM.Theme.getColor("accent_1")}
+            PropertyChanges { target: indicator; border.color: UM.Theme.getColor("border_main_light")}
         }
     ]
 
diff --git a/resources/qml/Widgets/TextField.qml b/resources/qml/Widgets/TextField.qml
index 66894eca69..7803c17396 100644
--- a/resources/qml/Widgets/TextField.qml
+++ b/resources/qml/Widgets/TextField.qml
@@ -44,6 +44,7 @@ TextField
         {
             name: "hovered"
             when: textField.hovered || textField.activeFocus
+            PropertyChanges { target: backgroundRectangle; liningColor: UM.Theme.getColor("border_main_light")}
         }
     ]
 
diff --git a/resources/themes/cura-dark/theme.json b/resources/themes/cura-dark/theme.json
index 55dc777fd7..28b977db83 100644
--- a/resources/themes/cura-dark/theme.json
+++ b/resources/themes/cura-dark/theme.json
@@ -56,6 +56,8 @@
         "main_window_header_background_gradient": "background_4",
         "main_window_header_button_background_hovered": [46, 46, 46, 255],
 
+        "secondary_button_text": "text_secondary_button",
+
         "account_sync_state_icon": [255, 255, 255, 204],
 
         "machine_selector_printer_icon": [204, 204, 204, 255],
@@ -155,7 +157,7 @@
         "checkbox": "background_1",
         "checkbox_hover": [43, 48, 52, 255],
         "checkbox_border": "text_disabled",
-        "checkbox_border_hover": [255, 255, 255, 38],
+        "checkbox_border_hover": "border_main",
         "checkbox_mark": "text_default",
         "checkbox_square": "text_disabled",
         "checkbox_text": "text_default",
diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json
index 9504ed6300..e01c0363fa 100644
--- a/resources/themes/cura-light/theme.json
+++ b/resources/themes/cura-light/theme.json
@@ -210,12 +210,11 @@
 
         "icon": [8, 7, 63, 255],
 
-        "primary_button": [25, 110, 240, 255],
         "primary_button": "accent_1",
         "primary_button_hover": [16, 70, 156, 255],
         "primary_button_text": [255, 255, 255, 255],
 
-        "secondary_button": "text_default",
+        "secondary_button": "background_1",
         "secondary_button_shadow": [216, 216, 216, 255],
         "secondary_button_hover": [232, 240, 253, 255],
         "secondary_button_text": "accent_1",
@@ -323,7 +322,7 @@
         "quality_slider_available": [0, 0, 0, 255],
 
         "checkbox": [255, 255, 255, 255],
-        "checkbox_hover": [255, 255, 255, 255],
+        "checkbox_hover": "border_main",
         "checkbox_border": [180, 180, 180, 255],
         "checkbox_border_hover": [25, 110, 240, 255],
         "checkbox_mark": [35, 35, 35, 255],
@@ -423,7 +422,10 @@
         "cloud_unavailable": [153, 153, 153, 255],
         "connection_badge_background": [255, 255, 255, 255],
         "warning_badge_background": [0, 0, 0, 255],
-        "error_badge_background": [255, 255, 255, 255]
+        "error_badge_background": [255, 255, 255, 255],
+
+        "border_field_light": [180, 180, 180, 255],
+        "border_main_light": [212, 212, 212, 255]
     },
 
     "sizes": {