diff --git a/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml b/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml
index ae97a82207..e4c4683869 100644
--- a/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml
+++ b/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml
@@ -17,10 +17,15 @@ Rectangle
 
     height: childrenRect.height
     border.width: UM.Theme.getSize("default_lining").width
-    border.color: UM.Theme.getColor("sidebar_lining_thin")
+    border.color: updateBorderColor()
     color: selected ? UM.Theme.getColor("configuration_item_active") : UM.Theme.getColor("configuration_item")
     property var textColor: selected ? UM.Theme.getColor("configuration_item_text_active") : UM.Theme.getColor("configuration_item_text")
 
+    function updateBorderColor()
+    {
+        border.color = selected ? UM.Theme.getColor("configuration_item_border_active") : UM.Theme.getColor("configuration_item_border")
+    }
+
     Column
     {
         id: contentColumn
@@ -52,7 +57,8 @@ Rectangle
         }
 
         //Buildplate row separator
-        Rectangle {
+        Rectangle
+        {
             id: separator
 
             visible: buildplateInformation.visible
@@ -98,18 +104,22 @@ Rectangle
         anchors.fill: parent
         onClicked: activateConfiguration()
         hoverEnabled: true
-        onEntered: parent.border.color = UM.Theme.getColor("primary_hover")
-        onExited: parent.border.color = "black"
+        onEntered: parent.border.color = UM.Theme.getColor("configuration_item_border_hover")
+        onExited:  updateBorderColor()
     }
 
-    Connections {
+    Connections
+    {
         target: Cura.MachineManager
         onCurrentConfigurationChanged: {
             configurationItem.selected = Cura.MachineManager.matchesConfiguration(configuration)
+            updateBorderColor()
         }
     }
 
-    Component.onCompleted: {
+    Component.onCompleted:
+    {
         configurationItem.selected = Cura.MachineManager.matchesConfiguration(configuration)
+        updateBorderColor()
     }
 }
\ No newline at end of file
diff --git a/resources/qml/Menus/LocalPrinterMenu.qml b/resources/qml/Menus/LocalPrinterMenu.qml
index 1c3064499b..0bdd4f33b9 100644
--- a/resources/qml/Menus/LocalPrinterMenu.qml
+++ b/resources/qml/Menus/LocalPrinterMenu.qml
@@ -12,7 +12,6 @@ Instantiator {
         filter: {"type": "machine", "um_network_key": null}
     }
     MenuItem {
-        iconSource: UM.Theme.getIcon("printer_single")
         text: model.name;
         checkable: true;
         checked: Cura.MachineManager.activeMachineId == model.id
diff --git a/resources/qml/Menus/NetworkPrinterMenu.qml b/resources/qml/Menus/NetworkPrinterMenu.qml
index fda99d065c..64539c9892 100644
--- a/resources/qml/Menus/NetworkPrinterMenu.qml
+++ b/resources/qml/Menus/NetworkPrinterMenu.qml
@@ -12,8 +12,8 @@ Instantiator {
         filter: {"type": "machine", "um_network_key": "*"}
     }
     MenuItem {
-        // TODO: Use printer_group icon when it's a cluster.
-        iconSource: UM.Theme.getIcon("printer_single")
+        // TODO: Use printer_group icon when it's a cluster. Not use it for now since it doesn't look as expected
+//        iconSource: UM.Theme.getIcon("printer_single")
         text: model.name;
         checkable: true;
         checked: Cura.MachineManager.activeMachineId == model.id
diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json
index 46ea0fc49e..d97970e566 100644
--- a/resources/themes/cura-light/theme.json
+++ b/resources/themes/cura-light/theme.json
@@ -302,9 +302,12 @@
         "layerview_nozzle": [181, 166, 66, 50],
 
         "configuration_item": [255, 255, 255, 0],
-        "configuration_item_active": [31, 36, 39, 255],
+        "configuration_item_active": [12, 169, 227, 32],
         "configuration_item_text": [0, 0, 0, 255],
-        "configuration_item_text_active": [255, 255, 255, 255]
+        "configuration_item_text_active": [0, 0, 0, 255],
+        "configuration_item_border": [127, 127, 127, 255],
+        "configuration_item_border_active": [12, 169, 227, 32],
+        "configuration_item_border_hover": [12, 169, 227, 255]
     },
 
     "sizes": {