diff --git a/resources/qml/Sidebar.qml b/resources/qml/Sidebar.qml
index bdffee4ff3..ce13a5eddf 100755
--- a/resources/qml/Sidebar.qml
+++ b/resources/qml/Sidebar.qml
@@ -181,7 +181,7 @@ Rectangle
                             color: (control.checked || control.pressed) ? UM.Theme.getColor("action_button_active_text") :
                                        control.hovered ? UM.Theme.getColor("action_button_hovered_text") :
                                        UM.Theme.getColor("action_button_text")
-                            font: UM.Theme.getFont("default")
+                            font: (control.checked || control.pressed) ? UM.Theme.getFont("default_bold") : UM.Theme.getFont("default")
                             text: control.text;
                         }
                     }
diff --git a/resources/qml/SidebarHeader.qml b/resources/qml/SidebarHeader.qml
index 3c26638b0a..f2fc0c0027 100644
--- a/resources/qml/SidebarHeader.qml
+++ b/resources/qml/SidebarHeader.qml
@@ -123,8 +123,7 @@ Column
                         {
                             anchors.fill: parent
                             border.width: UM.Theme.getSize("default_lining").width
-                            border.color: (control.checked || control.pressed) ? UM.Theme.getColor("action_button_active_border") :
-                                          control.hovered ? UM.Theme.getColor("action_button_hovered_border") :
+                            border.color: control.hovered ? UM.Theme.getColor("action_button_hovered_border") :
                                           UM.Theme.getColor("action_button_border")
                             color: (control.checked || control.pressed) ? UM.Theme.getColor("action_button_active") :
                                    control.hovered ? UM.Theme.getColor("action_button_hovered") :
@@ -369,7 +368,7 @@ Column
                 //sourceSize.width: width + 5
                 //sourceSize.height: width + 5
 
-                color: UM.Theme.getColor("setting_validation_warning")
+                color: UM.Theme.getColor("material_compatibility_warning")
                 visible: !Cura.MachineManager.isCurrentSetupSupported
             }
 
diff --git a/resources/themes/cura-light/styles.qml b/resources/themes/cura-light/styles.qml
index cedb861da5..bb2b57509a 100755
--- a/resources/themes/cura-light/styles.qml
+++ b/resources/themes/cura-light/styles.qml
@@ -309,6 +309,8 @@ QtObject {
                     }
                     Behavior on color { ColorAnimation { duration: 50; } }
 
+                    border.width: (control.hasOwnProperty("needBorder") && control.needBorder) ? 2 : 0
+                    border.color: Theme.getColor("tool_button_border")
 
                     UM.RecolorImage {
                         id: tool_button_arrow
diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json
index d4d12c24cd..530dbbd487 100644
--- a/resources/themes/cura-light/theme.json
+++ b/resources/themes/cura-light/theme.json
@@ -54,7 +54,7 @@
 
     "colors": {
         "sidebar": [255, 255, 255, 255],
-        "lining": [127, 127, 127, 255],
+        "lining": [192, 193, 194, 255],
         "viewport_overlay": [24, 41, 77, 192],
 
         "primary": [12, 169, 227, 255],
@@ -67,32 +67,32 @@
         "topbar_button_text_inactive": [128, 128, 128, 255],
         "topbar_button_text_hovered": [0, 0, 0, 255],
 
-        "text": [24, 41, 77, 255],
+        "text": [0, 0, 0, 255],
         "text_detail": [174, 174, 174, 128],
         "text_link": [12, 169, 227, 255],
         "text_inactive": [174, 174, 174, 255],
         "text_hover": [70, 84, 113, 255],
         "text_pressed": [12, 169, 227, 255],
-        "text_subtext": [70, 84, 113, 255],
+        "text_subtext": [0, 0, 0, 255],
         "text_emphasis": [255, 255, 255, 255],
         "text_scene": [24, 41, 77, 255],
         "text_scene_hover": [70, 84, 113, 255],
 
         "error": [255, 140, 0, 255],
-        "sidebar_header_bar": [24, 41, 77, 255],
-        "sidebar_header_active": [70, 84, 113, 255],
-        "sidebar_header_hover": [24, 41, 77, 255],
-        "sidebar_header_highlight": [12, 169, 227, 255],
-        "sidebar_header_highlight_hover": [255, 255, 255, 255],
+        "sidebar_header_bar": [31, 36, 39, 255],
+        "sidebar_header_active": [68, 72, 75, 255],
+        "sidebar_header_hover": [68, 72, 75, 255],
+        "sidebar_header_highlight": [68, 192, 255, 255],
+        "sidebar_header_highlight_hover": [68, 192, 255, 255],
         "sidebar_header_text_inactive": [255, 255, 255, 255],
         "sidebar_header_text_active": [255, 255, 255, 255],
         "sidebar_header_text_hover": [255, 255, 255, 255],
         "sidebar_lining": [245, 245, 245, 255],
 
-        "button": [24, 41, 77, 255],
-        "button_hover": [70, 84, 113, 255],
-        "button_active": [32, 166, 219, 255],
-        "button_active_hover": [12, 169, 227, 255],
+        "button": [31, 36, 39, 255],
+        "button_hover": [68, 72, 75, 255],
+        "button_active": [68, 72, 75, 255],
+        "button_active_hover": [68, 72, 75, 255],
         "button_text": [255, 255, 255, 255],
         "button_text_hover": [255, 255, 255, 255],
         "button_text_active": [255, 255, 255, 255],
@@ -100,9 +100,9 @@
         "button_disabled": [24, 41, 77, 255],
         "button_disabled_text": [255, 255, 255, 101],
 
-        "button_tooltip": [12, 169, 227, 255],
-        "button_tooltip_border": [24, 41, 77, 255],
-        "button_tooltip_text": [24, 41, 77, 255],
+        "button_tooltip": [31, 36, 39, 255],
+        "button_tooltip_border": [68, 192, 255, 255],
+        "button_tooltip_text": [192, 193, 194, 255],
 
         "extruder_button_material_border": [255, 255, 255, 255],
 
@@ -123,14 +123,14 @@
         "tab_active_text": [24, 41, 77, 255],
         "tab_background": [245, 245, 245, 255],
 
-        "action_button": [255, 255, 255, 255],
-        "action_button_text": [24, 41, 77, 255],
+        "action_button": [242, 242, 242, 255],
+        "action_button_text": [0, 0, 0, 255],
         "action_button_border": [127, 127, 127, 255],
         "action_button_hovered": [255, 255, 255, 255],
         "action_button_hovered_text": [24, 41, 77, 255],
         "action_button_hovered_border": [12, 169, 227, 255],
-        "action_button_active": [12, 169, 227, 255],
-        "action_button_active_text": [255, 255, 255, 255],
+        "action_button_active": [255, 255, 255, 255],
+        "action_button_active_text": [0, 0, 0, 255],
         "action_button_active_border": [12, 169, 227, 255],
         "action_button_disabled": [245, 245, 245, 255],
         "action_button_disabled_text": [127, 127, 127, 255],
@@ -170,12 +170,14 @@
         "setting_control_disabled_text": [127, 127, 127, 255],
         "setting_control_disabled_border": [127, 127, 127, 255],
         "setting_unit": [127, 127, 127, 255],
-        "setting_validation_error_background": [255, 57, 14, 255],
+        "setting_validation_error_background": [255, 66, 60, 255],
         "setting_validation_error": [127, 127, 127, 255],
-        "setting_validation_warning_background": [255, 186, 15, 255],
-        "setting_validation_warning": [0, 0, 0, 255],
+        "setting_validation_warning_background": [255, 145, 62, 255],
+        "setting_validation_warning": [127, 127, 127, 255],
         "setting_validation_ok": [255, 255, 255, 255],
 
+        "material_compatibility_warning": [0, 0, 0, 255],
+
         "progressbar_background": [245, 245, 245, 255],
         "progressbar_control": [24, 41, 77, 255],
 
@@ -186,12 +188,12 @@
         "slider_handle_hover": [77, 182, 226, 255],
         "slider_text_background": [255, 255, 255, 255],
 
-        "checkbox": [255, 255, 255, 255],
-        "checkbox_hover": [255, 255, 255, 255],
-        "checkbox_border": [127, 127, 127, 255],
+        "checkbox": [39, 44, 48, 255],
+        "checkbox_hover": [68, 72, 75, 255],
+        "checkbox_border": [64, 69, 72, 255],
         "checkbox_border_hover": [12, 169, 227, 255],
-        "checkbox_mark": [24, 41, 77, 255],
-        "checkbox_text": [24, 41, 77, 255],
+        "checkbox_mark": [119, 122, 124, 255],
+        "checkbox_text": [166, 168, 169, 255],
 
         "mode_switch": [255, 255, 255, 255],
         "mode_switch_hover": [255, 255, 255, 255],
@@ -202,9 +204,11 @@
         "mode_switch_text_hover": [24, 41, 77, 255],
         "mode_switch_text_checked": [12, 169, 227, 255],
 
-        "tooltip": [12, 169, 227, 255],
+        "tooltip": [68, 192, 255, 255],
         "tooltip_text": [255, 255, 255, 255],
 
+        "tool_button_border": [39, 44, 48, 255],
+
         "message_background": [24, 41, 77, 255],
         "message_text": [255, 255, 255, 255],
         "message_border": [24, 41, 77, 255],
@@ -217,7 +221,7 @@
         "message_progressbar_background": [255, 255, 255, 255],
         "message_progressbar_control": [12, 169, 227, 255],
 
-        "tool_panel_background": [255, 255, 255, 255],
+        "tool_panel_background": [31, 36, 39, 255],
 
         "status_offline": [0, 0, 0, 255],
         "status_ready": [0, 205, 0, 255],