diff --git a/plugins/PrepareStage/PrepareMenu.qml b/plugins/PrepareStage/PrepareMenu.qml
index b7980bc30b..b62d65254d 100644
--- a/plugins/PrepareStage/PrepareMenu.qml
+++ b/plugins/PrepareStage/PrepareMenu.qml
@@ -100,7 +100,7 @@ Item
                     source: UM.Theme.getIcon("load")
                     width: UM.Theme.getSize("button_icon").width
                     height: UM.Theme.getSize("button_icon").height
-                    color: UM.Theme.getColor("toolbar_button_text")
+                    color: UM.Theme.getColor("icon")
 
                     sourceSize.height: height
                 }
diff --git a/resources/qml/ActionPanel/PrintInformationWidget.qml b/resources/qml/ActionPanel/PrintInformationWidget.qml
index 554273a818..0826e2c715 100644
--- a/resources/qml/ActionPanel/PrintInformationWidget.qml
+++ b/resources/qml/ActionPanel/PrintInformationWidget.qml
@@ -15,7 +15,7 @@ UM.RecolorImage
     width: UM.Theme.getSize("section_icon").width
     height: UM.Theme.getSize("section_icon").height
 
-    color: popup.opened ? UM.Theme.getColor("primary") : UM.Theme.getColor("text_medium")
+    color: UM.Theme.getColor("icon")
 
     MouseArea
     {
diff --git a/resources/qml/IconWithText.qml b/resources/qml/IconWithText.qml
index 5530740040..f9220380f2 100644
--- a/resources/qml/IconWithText.qml
+++ b/resources/qml/IconWithText.qml
@@ -18,7 +18,7 @@ Item
     property alias color: label.color
     property alias text: label.text
     property alias font: label.font
-
+    property alias iconColor: icon.color
     property real margin: UM.Theme.getSize("narrow_margin").width
 
     // These properties can be used in combination with layouts.
@@ -39,7 +39,7 @@ Item
         width: UM.Theme.getSize("section_icon").width
         height: UM.Theme.getSize("section_icon").height
 
-        color: label.color
+        color: UM.Theme.getColor("icon")
 
         anchors
         {
diff --git a/resources/qml/Toolbar.qml b/resources/qml/Toolbar.qml
index 1e335472d4..c3c4c1cd6d 100644
--- a/resources/qml/Toolbar.qml
+++ b/resources/qml/Toolbar.qml
@@ -67,7 +67,7 @@ Item
                     toolItem: UM.RecolorImage
                     {
                         source: UM.Theme.getIcon(model.icon) != "" ? UM.Theme.getIcon(model.icon) : "file:///" + model.location + "/" + model.icon
-                        color: UM.Theme.getColor("toolbar_button_text")
+                        color: UM.Theme.getColor("icon")
 
                         sourceSize: UM.Theme.getSize("button_icon")
                     }
diff --git a/resources/themes/cura-dark/theme.json b/resources/themes/cura-dark/theme.json
index 8540abf61a..2fa96c8897 100644
--- a/resources/themes/cura-dark/theme.json
+++ b/resources/themes/cura-dark/theme.json
@@ -17,6 +17,12 @@
         "border": [127, 127, 127, 255],
         "secondary": [95, 95, 95, 255],
 
+        "icon": [204, 204, 204, 255],
+        "toolbar_background": [39, 44, 48, 255],
+        "toolbar_button_active": [95, 95, 95, 255],
+        "toolbar_button_hover": [95, 95, 95, 255],
+        "toolbar_button_active_hover": [95, 95, 95, 255],
+
         "main_window_header_button_text_inactive": [128, 128, 128, 255],
         "main_window_header_button_text_hovered": [255, 255, 255, 255],
 
diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json
index 6d76004739..b64190dd23 100644
--- a/resources/themes/cura-light/theme.json
+++ b/resources/themes/cura-light/theme.json
@@ -83,6 +83,8 @@
         "secondary": [240, 240, 240, 255],
         "secondary_shadow": [216, 216, 216, 255],
 
+        "icon": [8, 7, 63, 255],
+
         "primary_button": [38, 113, 231, 255],
         "primary_button_shadow": [27, 95, 202, 255],
         "primary_button_hover": [81, 145, 247, 255],