diff --git a/resources/qml/Settings/SettingExtruder.qml b/resources/qml/Settings/SettingExtruder.qml
index d3a50a7eb3..6b2ac55066 100644
--- a/resources/qml/Settings/SettingExtruder.qml
+++ b/resources/qml/Settings/SettingExtruder.qml
@@ -225,7 +225,6 @@ SettingItem
             background: Rectangle
             {
                 color: parent.highlighted ? UM.Theme.getColor("setting_control_highlight") : "transparent"
-                border.color: parent.highlighted ? UM.Theme.getColor("setting_control_border_highlight") : "transparent"
             }
         }
     }
diff --git a/resources/qml/Settings/SettingOptionalExtruder.qml b/resources/qml/Settings/SettingOptionalExtruder.qml
index 5cde1c0ae9..1ac7afe967 100644
--- a/resources/qml/Settings/SettingOptionalExtruder.qml
+++ b/resources/qml/Settings/SettingOptionalExtruder.qml
@@ -235,7 +235,6 @@ SettingItem
             background: Rectangle
             {
                 color: parent.highlighted ? UM.Theme.getColor("setting_control_highlight") : "transparent"
-                border.color: parent.highlighted ? UM.Theme.getColor("setting_control_border_highlight") : "transparent"
             }
         }
     }
diff --git a/resources/qml/Widgets/ComboBox.qml b/resources/qml/Widgets/ComboBox.qml
index a9e48e5a60..f84772e609 100644
--- a/resources/qml/Widgets/ComboBox.qml
+++ b/resources/qml/Widgets/ComboBox.qml
@@ -146,7 +146,6 @@ ComboBox
             Rectangle
             {
                 color: delegateItem.highlighted ? UM.Theme.getColor("setting_control_highlight") : "transparent"
-                border.color: delegateItem.highlighted ? UM.Theme.getColor("setting_control_border_highlight") : "transparent"
                 anchors.fill: parent
             }
             text: delegateLabel.truncated ? delegateItem.text : ""
diff --git a/resources/themes/cura-dark/theme.json b/resources/themes/cura-dark/theme.json
index 106290c71f..d877e3f788 100644
--- a/resources/themes/cura-dark/theme.json
+++ b/resources/themes/cura-dark/theme.json
@@ -130,7 +130,7 @@
 
         "setting_control": "background_2",
         "setting_control_selected": [34, 39, 42, 38],
-        "setting_control_highlight": "background_2",
+        "setting_control_highlight": "background_3",
         "setting_control_border": [255, 255, 255, 38],
         "setting_control_border_highlight": [12, 169, 227, 255],
         "setting_control_text": "text_default",
diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json
index 405d40f070..09edaf6a57 100644
--- a/resources/themes/cura-light/theme.json
+++ b/resources/themes/cura-light/theme.json
@@ -294,7 +294,7 @@
         "setting_category_active_text": [35, 35, 35, 255],
 
         "setting_control": "background_2",
-        "setting_control_highlight": "background_2",
+        "setting_control_highlight": "background_3",
         "setting_control_border": [199, 199, 199, 255],
         "setting_control_border_highlight": [50, 130, 255, 255],
         "setting_control_text": [35, 35, 35, 255],