Theme: Separate run/stop/interrupt icons in menus

And for that, we also need separate theme color roles.

Change-Id: I27bf4499acb516f7f824f5e57632797653b150ec
Reviewed-by: hjk <hjk@theqtcompany.com>

35 files changed, 129 insertions, 75 deletions

diff --git a/share/qtcreator/themes/dark.creatortheme b/share/qtcreator/themes/dark.creatortheme
index bc94ac1e19..93438cf403 100644
--- a/share/qtcreator/themes/dark.creatortheme
+++ b/share/qtcreator/themes/dark.creatortheme
@@ -58,9 +58,12 @@ IconsWarningToolBarColor=ffe0b716
 IconsErrorColor=ffd84044
 IconsErrorToolBarColor=ffd84044
 IconsRunColor=ff7fc341
+IconsRunToolBarColor=ff7fc341
 IconsStopColor=ffe7353b
-IconsDebugColor=ffb8c6ff
+IconsStopToolBarColor=ffe7353b
 IconsInterruptColor=ff7488db
+IconsInterruptToolBarColor=ff7488db
+IconsDebugColor=ffb8c6ff
 IconsNavigationArrowsColor=ffebc322
 IconsBuildHammerHandleColor=ffdd7710
 IconsBuildHammerHeadColor=ff989898
diff --git a/share/qtcreator/themes/default.creatortheme b/share/qtcreator/themes/default.creatortheme
index 28b7e642d6..eb9f528dd9 100644
--- a/share/qtcreator/themes/default.creatortheme
+++ b/share/qtcreator/themes/default.creatortheme
@@ -51,10 +51,13 @@ IconsWarningColor=ffecbc1c
 IconsWarningToolBarColor=fff2d76e
 IconsErrorColor=ffdf4f4f
 IconsErrorToolBarColor=ffdb6f71
-IconsRunColor=ffa4d576
-IconsStopColor=ffff8c8c
+IconsRunColor=ff6da838
+IconsRunToolBarColor=ffa4d576
+IconsStopColor=ffee6969
+IconsStopToolBarColor=ffff8c8c
+IconsInterruptColor=ff587ff7
+IconsInterruptToolBarColor=ff8f9dda
 IconsDebugColor=ffdcdcdc
-IconsInterruptColor=ff8f9dda
 IconsNavigationArrowsColor=ffebc322
 IconsBuildHammerHandleColor=ffdd7710
 IconsBuildHammerHeadColor=ff989898
diff --git a/share/qtcreator/themes/flat.creatortheme b/share/qtcreator/themes/flat.creatortheme
index 8affc8eb38..8410e8759a 100644
--- a/share/qtcreator/themes/flat.creatortheme
+++ b/share/qtcreator/themes/flat.creatortheme
@@ -61,10 +61,13 @@ IconsWarningColor=ffecbc1c
 IconsWarningToolBarColor=fff2d76e
 IconsErrorColor=ffdf4f4f
 IconsErrorToolBarColor=ffdb6f71
-IconsRunColor=ff93be6c
-IconsStopColor=ffe27f7f
+IconsRunColor=ff6da838
+IconsRunToolBarColor=ff93be6c
+IconsStopColor=ffee6969
+IconsStopToolBarColor=ffe27f7f
+IconsInterruptColor=ff587ff7
+IconsInterruptToolBarColor=ff6a7bc3
 IconsDebugColor=toolBarItem
-IconsInterruptColor=ff6a7bc3
 IconsNavigationArrowsColor=ffebc322
 IconsBuildHammerHandleColor=ffc26b14
 IconsBuildHammerHeadColor=ff868687
diff --git a/src/libs/extensionsystem/pluginview.cpp b/src/libs/extensionsystem/pluginview.cpp
index d3916daa4c..7d06a98d5b 100644
--- a/src/libs/extensionsystem/pluginview.cpp
+++ b/src/libs/extensionsystem/pluginview.cpp
@@ -91,7 +91,7 @@ static const QIcon &icon(IconIndex icon)
     case OkIcon: {
         static const QIcon ok =
                 Icon({{QLatin1String(":/extensionsystem/images/ok.png"),
-                       Theme::IconsRunColor}}, Icon::Tint).icon();
+                       Theme::IconsRunToolBarColor}}, Icon::Tint).icon();
         return ok;
     }
     case ErrorIcon: {
diff --git a/src/libs/utils/icon.h b/src/libs/utils/icon.h
index be012d3fea..e05a4edd44 100644
--- a/src/libs/utils/icon.h
+++ b/src/libs/utils/icon.h
@@ -52,7 +52,8 @@ public:
         DropShadow = 2,
         PunchEdges = 4,
 
-        ToolBarStyle = Tint | DropShadow | PunchEdges
+        ToolBarStyle = Tint | DropShadow | PunchEdges,
+        MenuTintedStyle = Tint | PunchEdges
     };
 
     Q_DECLARE_FLAGS(IconStyleOptions, IconStyleOption)
diff --git a/src/libs/utils/theme/theme.h b/src/libs/utils/theme/theme.h
index a3a9861d56..e490bf8212 100644
--- a/src/libs/utils/theme/theme.h
+++ b/src/libs/utils/theme/theme.h
@@ -137,8 +137,11 @@ public:
         IconsErrorColor,
         IconsErrorToolBarColor,
         IconsRunColor,
+        IconsRunToolBarColor,
         IconsStopColor,
+        IconsStopToolBarColor,
         IconsInterruptColor,
+        IconsInterruptToolBarColor,
         IconsDebugColor,
         IconsNavigationArrowsColor,
         IconsBuildHammerHandleColor,
diff --git a/src/plugins/android/androidruncontrol.cpp b/src/plugins/android/androidruncontrol.cpp
index 244fcf25ab..66d90056be 100644
--- a/src/plugins/android/androidruncontrol.cpp
+++ b/src/plugins/android/androidruncontrol.cpp
@@ -44,7 +44,7 @@ AndroidRunControl::AndroidRunControl(AndroidRunConfiguration *rc)
     , m_running(false)
 {
     setRunnable(m_runner->runnable());
-    setIcon(Core::Icons::RUN_SMALL);
+    setIcon(Core::Icons::RUN_SMALL_TOOLBAR);
 }
 
 AndroidRunControl::~AndroidRunControl()
diff --git a/src/plugins/autotest/testresultspane.cpp b/src/plugins/autotest/testresultspane.cpp
index 98fedd6228..42c5afcbac 100644
--- a/src/plugins/autotest/testresultspane.cpp
+++ b/src/plugins/autotest/testresultspane.cpp
@@ -158,13 +158,13 @@ void TestResultsPane::createToolButtons()
     });
 
     m_runAll = new QToolButton(m_treeView);
-    m_runAll->setIcon(Core::Icons::RUN_SMALL.icon());
+    m_runAll->setIcon(Core::Icons::RUN_SMALL_TOOLBAR.icon());
     m_runAll->setToolTip(tr("Run All Tests"));
     m_runAll->setEnabled(false);
     connect(m_runAll, &QToolButton::clicked, this, &TestResultsPane::onRunAllTriggered);
 
     m_runSelected = new QToolButton(m_treeView);
-    Utils::Icon runSelectedIcon = Core::Icons::RUN_SMALL;
+    Utils::Icon runSelectedIcon = Core::Icons::RUN_SMALL_TOOLBAR;
     foreach (const Utils::IconMaskAndColor &maskAndColor, Icons::RUN_SELECTED_OVERLAY)
         runSelectedIcon.append(maskAndColor);
     m_runSelected->setIcon(runSelectedIcon.icon());
@@ -173,7 +173,7 @@ void TestResultsPane::createToolButtons()
     connect(m_runSelected, &QToolButton::clicked, this, &TestResultsPane::onRunSelectedTriggered);
 
     m_stopTestRun = new QToolButton(m_treeView);
-    m_stopTestRun->setIcon(Core::Icons::STOP_SMALL.icon());
+    m_stopTestRun->setIcon(Core::Icons::STOP_SMALL_TOOLBAR.icon());
     m_stopTestRun->setToolTip(tr("Stop Test Run"));
     m_stopTestRun->setEnabled(false);
     connect(m_stopTestRun, &QToolButton::clicked, TestRunner::instance(), &TestRunner::requestStopTestRun);
diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzertool.cpp b/src/plugins/clangstaticanalyzer/clangstaticanalyzertool.cpp
index 239846a028..78498dace5 100644
--- a/src/plugins/clangstaticanalyzer/clangstaticanalyzertool.cpp
+++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzertool.cpp
@@ -123,7 +123,7 @@ ClangStaticAnalyzerTool::ClangStaticAnalyzerTool(QObject *parent)
     // Go to previous diagnostic
     auto action = new QAction(this);
     action->setDisabled(true);
-    action->setIcon(Core::Icons::PREV.icon());
+    action->setIcon(Core::Icons::PREV_TOOLBAR.icon());
     action->setToolTip(tr("Go to previous bug."));
     connect(action, &QAction::triggered, m_diagnosticView, &DetailedErrorView::goBack);
     m_goBack = action;
@@ -131,7 +131,7 @@ ClangStaticAnalyzerTool::ClangStaticAnalyzerTool(QObject *parent)
     // Go to next diagnostic
     action = new QAction(this);
     action->setDisabled(true);
-    action->setIcon(Core::Icons::NEXT.icon());
+    action->setIcon(Core::Icons::NEXT_TOOLBAR.icon());
     action->setToolTip(tr("Go to next bug."));
     connect(action, &QAction::triggered, m_diagnosticView, &DetailedErrorView::goNext);
     m_goNext = action;
diff --git a/src/plugins/coreplugin/coreicons.cpp b/src/plugins/coreplugin/coreicons.cpp
index fbaf2a9a7b..03d65ddb3d 100644
--- a/src/plugins/coreplugin/coreicons.cpp
+++ b/src/plugins/coreplugin/coreicons.cpp
@@ -84,8 +84,12 @@ const Icon MINUS({
 const Icon PLUS({
         {QLatin1String(":/core/images/plus.png"), Theme::IconsBaseColor}});
 const Icon NEXT({
+        {QLatin1String(":/core/images/next.png"), Theme::IconsWarningColor}}, Icon::MenuTintedStyle);
+const Icon NEXT_TOOLBAR({
         {QLatin1String(":/core/images/next.png"), Theme::IconsNavigationArrowsColor}});
 const Icon PREV({
+        {QLatin1String(":/core/images/prev.png"), Theme::IconsWarningColor}}, Icon::MenuTintedStyle);
+const Icon PREV_TOOLBAR({
         {QLatin1String(":/core/images/prev.png"), Theme::IconsNavigationArrowsColor}});
 const Icon MAGNIFIER({
         {QLatin1String(":/core/images/magnifier.png"), Theme::PanelTextColorMid}}, Icon::Tint);
@@ -94,6 +98,8 @@ const Icon CLEAN_PANE({
 const Icon RELOAD({
         {QLatin1String(":/core/images/reload_gray.png"), Theme::IconsBaseColor}});
 const Icon TOGGLE_SIDEBAR({
+        {QLatin1String(":/core/images/sidebaricon.png"), Theme::PanelTextColorMid}}, Icon::MenuTintedStyle);
+const Icon TOGGLE_SIDEBAR_TOOLBAR({
         {QLatin1String(":/core/images/sidebaricon.png"), Theme::IconsBaseColor}});
 const Icon CLOSE_TOOLBAR({
         {QLatin1String(":/core/images/close.png"), Theme::IconsBaseColor}});
@@ -102,8 +108,12 @@ const Icon CLOSE_FOREGROUND({
 const Icon CLOSE_BACKGROUND({
         {QLatin1String(":/core/images/close.png"), Theme::PanelTextColorLight}}, Icon::Tint);
 const Icon SPLIT_HORIZONTAL({
+        {QLatin1String(":/core/images/splitbutton_horizontal.png"), Theme::PanelTextColorMid}}, Icon::MenuTintedStyle);
+const Icon SPLIT_HORIZONTAL_TOOLBAR({
         {QLatin1String(":/core/images/splitbutton_horizontal.png"), Theme::IconsBaseColor}});
 const Icon SPLIT_VERTICAL({
+        {QLatin1String(":/core/images/splitbutton_vertical.png"), Theme::PanelTextColorMid}}, Icon::MenuTintedStyle);
+const Icon SPLIT_VERTICAL_TOOLBAR({
         {QLatin1String(":/core/images/splitbutton_vertical.png"), Theme::IconsBaseColor}});
 const Icon CLOSE_SPLIT_TOP({
         {QLatin1String(":/core/images/splitbutton_closetop.png"), Theme::IconsBaseColor}});
@@ -143,11 +153,17 @@ const Icon ZOOM_TOOLBAR({
 const Icon TOOLBAR_EXTENSION({
         {QLatin1String(":/core/images/extension.png"), Theme::IconsBaseColor}});
 const Utils::Icon RUN_SMALL({
-        {QLatin1String(":/core/images/run_small.png"), Utils::Theme::IconsRunColor}});
+        {QLatin1String(":/core/images/run_small.png"), Utils::Theme::IconsRunColor}}, Utils::Icon::MenuTintedStyle);
+const Utils::Icon RUN_SMALL_TOOLBAR({
+        {QLatin1String(":/core/images/run_small.png"), Utils::Theme::IconsRunToolBarColor}});
 const Utils::Icon STOP_SMALL({
-        {QLatin1String(":/core/images/stop_small.png"), Utils::Theme::IconsStopColor}});
+        {QLatin1String(":/core/images/stop_small.png"), Utils::Theme::IconsStopColor}}, Utils::Icon::MenuTintedStyle);
+const Utils::Icon STOP_SMALL_TOOLBAR({
+        {QLatin1String(":/core/images/stop_small.png"), Utils::Theme::IconsStopToolBarColor}});
 const Utils::Icon INTERRUPT_SMALL({
-        {QLatin1String(":/core/images/interrupt_small.png"), Utils::Theme::IconsInterruptColor}});
+        {QLatin1String(":/core/images/interrupt_small.png"), Utils::Theme::IconsInterruptColor}}, Utils::Icon::MenuTintedStyle);
+const Utils::Icon INTERRUPT_SMALL_TOOLBAR({
+        {QLatin1String(":/core/images/interrupt_small.png"), Utils::Theme::IconsInterruptToolBarColor}});
 const Icon BOUNDING_RECT({
         {QLatin1String(":/core/images/boundingrect.png"), Theme::IconsBaseColor}});
 const Icon EYE_OPEN_TOOLBAR({
diff --git a/src/plugins/coreplugin/coreicons.h b/src/plugins/coreplugin/coreicons.h
index 537a349271..cce1603854 100644
--- a/src/plugins/coreplugin/coreicons.h
+++ b/src/plugins/coreplugin/coreicons.h
@@ -61,16 +61,21 @@ CORE_EXPORT extern const Utils::Icon ARROW_DOWN;
 CORE_EXPORT extern const Utils::Icon MINUS;
 CORE_EXPORT extern const Utils::Icon PLUS;
 CORE_EXPORT extern const Utils::Icon NEXT;
+CORE_EXPORT extern const Utils::Icon NEXT_TOOLBAR;
 CORE_EXPORT extern const Utils::Icon PREV;
+CORE_EXPORT extern const Utils::Icon PREV_TOOLBAR;
 CORE_EXPORT extern const Utils::Icon MAGNIFIER;
 CORE_EXPORT extern const Utils::Icon CLEAN_PANE;
 CORE_EXPORT extern const Utils::Icon RELOAD;
 CORE_EXPORT extern const Utils::Icon TOGGLE_SIDEBAR;
+CORE_EXPORT extern const Utils::Icon TOGGLE_SIDEBAR_TOOLBAR;
 CORE_EXPORT extern const Utils::Icon CLOSE_TOOLBAR;
 CORE_EXPORT extern const Utils::Icon CLOSE_FOREGROUND;
 CORE_EXPORT extern const Utils::Icon CLOSE_BACKGROUND;
 CORE_EXPORT extern const Utils::Icon SPLIT_HORIZONTAL;
+CORE_EXPORT extern const Utils::Icon SPLIT_HORIZONTAL_TOOLBAR;
 CORE_EXPORT extern const Utils::Icon SPLIT_VERTICAL;
+CORE_EXPORT extern const Utils::Icon SPLIT_VERTICAL_TOOLBAR;
 CORE_EXPORT extern const Utils::Icon CLOSE_SPLIT_TOP;
 CORE_EXPORT extern const Utils::Icon CLOSE_SPLIT_BOTTOM;
 CORE_EXPORT extern const Utils::Icon CLOSE_SPLIT_LEFT;
@@ -89,8 +94,11 @@ CORE_EXPORT extern const Utils::Icon ZOOM;
 CORE_EXPORT extern const Utils::Icon ZOOM_TOOLBAR;
 CORE_EXPORT extern const Utils::Icon TOOLBAR_EXTENSION;
 CORE_EXPORT extern const Utils::Icon RUN_SMALL;
+CORE_EXPORT extern const Utils::Icon RUN_SMALL_TOOLBAR;
 CORE_EXPORT extern const Utils::Icon STOP_SMALL;
+CORE_EXPORT extern const Utils::Icon STOP_SMALL_TOOLBAR;
 CORE_EXPORT extern const Utils::Icon INTERRUPT_SMALL;
+CORE_EXPORT extern const Utils::Icon INTERRUPT_SMALL_TOOLBAR;
 CORE_EXPORT extern const Utils::Icon BOUNDING_RECT;
 CORE_EXPORT extern const Utils::Icon EYE_OPEN_TOOLBAR;
 CORE_EXPORT extern const Utils::Icon EYE_CLOSED_TOOLBAR;
diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index 994da5f9e0..09c0c02b8c 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -208,8 +208,8 @@ EditorManagerPrivate::EditorManagerPrivate(QObject *parent) :
     m_closeAllEditorsExceptVisibleAction(new QAction(EditorManager::tr("Close All Except Visible"), this)),
     m_gotoNextDocHistoryAction(new QAction(EditorManager::tr("Next Open Document in History"), this)),
     m_gotoPreviousDocHistoryAction(new QAction(EditorManager::tr("Previous Open Document in History"), this)),
-    m_goBackAction(new QAction(Icons::PREV.icon(), EditorManager::tr("Go Back"), this)),
-    m_goForwardAction(new QAction(Icons::NEXT.icon(), EditorManager::tr("Go Forward"), this)),
+    m_goBackAction(new QAction(Icons::PREV_TOOLBAR.icon(), EditorManager::tr("Go Back"), this)),
+    m_goForwardAction(new QAction(Icons::NEXT_TOOLBAR.icon(), EditorManager::tr("Go Forward"), this)),
     m_copyFilePathContextAction(new QAction(EditorManager::tr("Copy Full Path"), this)),
     m_copyLocationContextAction(new QAction(EditorManager::tr("Copy Path and Line Number"), this)),
     m_copyFileNameContextAction(new QAction(EditorManager::tr("Copy File Name"), this)),
diff --git a/src/plugins/coreplugin/editortoolbar.cpp b/src/plugins/coreplugin/editortoolbar.cpp
index c472c8c29c..702d11c3f0 100644
--- a/src/plugins/coreplugin/editortoolbar.cpp
+++ b/src/plugins/coreplugin/editortoolbar.cpp
@@ -94,13 +94,13 @@ EditorToolBarPrivate::EditorToolBarPrivate(QWidget *parent, EditorToolBar *q) :
     m_lockButton(new QToolButton(q)),
     m_dragHandle(new QToolButton(q)),
     m_dragHandleMenu(0),
-    m_goBackAction(new QAction(Icons::PREV.icon(), EditorManager::tr("Go Back"), parent)),
-    m_goForwardAction(new QAction(Icons::NEXT.icon(), EditorManager::tr("Go Forward"), parent)),
+    m_goBackAction(new QAction(Icons::PREV_TOOLBAR.icon(), EditorManager::tr("Go Back"), parent)),
+    m_goForwardAction(new QAction(Icons::NEXT_TOOLBAR.icon(), EditorManager::tr("Go Forward"), parent)),
     m_backButton(new QToolButton(q)),
     m_forwardButton(new QToolButton(q)),
     m_splitButton(new QToolButton(q)),
-    m_horizontalSplitAction(new QAction(Icons::SPLIT_HORIZONTAL.icon(), EditorManager::tr("Split"), parent)),
-    m_verticalSplitAction(new QAction(Icons::SPLIT_VERTICAL.icon(), EditorManager::tr("Split Side by Side"), parent)),
+    m_horizontalSplitAction(new QAction(Icons::SPLIT_HORIZONTAL_TOOLBAR.icon(), EditorManager::tr("Split"), parent)),
+    m_verticalSplitAction(new QAction(Icons::SPLIT_VERTICAL_TOOLBAR.icon(), EditorManager::tr("Split Side by Side"), parent)),
     m_splitNewWindowAction(new QAction(EditorManager::tr("Open in New Window"), parent)),
     m_closeSplitButton(new QToolButton(q)),
     m_activeToolBar(0),
@@ -163,7 +163,7 @@ EditorToolBar::EditorToolBar(QWidget *parent) :
         d->m_splitNewWindowAction->setIconVisibleInMenu(false);
     }
 
-    d->m_splitButton->setIcon(Icons::SPLIT_HORIZONTAL.icon());
+    d->m_splitButton->setIcon(Icons::SPLIT_HORIZONTAL_TOOLBAR.icon());
     d->m_splitButton->setToolTip(tr("Split"));
     d->m_splitButton->setPopupMode(QToolButton::InstantPopup);
     d->m_splitButton->setProperty("noArrow", true);
diff --git a/src/plugins/coreplugin/find/findtoolbar.cpp b/src/plugins/coreplugin/find/findtoolbar.cpp
index 5d5cda35fe..9c42bc4f99 100644
--- a/src/plugins/coreplugin/find/findtoolbar.cpp
+++ b/src/plugins/coreplugin/find/findtoolbar.cpp
@@ -963,9 +963,9 @@ void FindToolBar::setLightColoredIcon(bool lightColored)
         m_ui.findPreviousButton->setArrowType(Qt::LeftArrow);
         m_ui.close->setIcon(Icons::CLOSE_FOREGROUND.icon());
     } else {
-        m_ui.findNextButton->setIcon(Icons::NEXT.icon());
+        m_ui.findNextButton->setIcon(Icons::NEXT_TOOLBAR.icon());
         m_ui.findNextButton->setArrowType(Qt::NoArrow);
-        m_ui.findPreviousButton->setIcon(Icons::PREV.icon());
+        m_ui.findPreviousButton->setIcon(Icons::PREV_TOOLBAR.icon());
         m_ui.findPreviousButton->setArrowType(Qt::NoArrow);
         m_ui.close->setIcon(Icons::CLOSE_TOOLBAR.icon());
     }
diff --git a/src/plugins/coreplugin/locator/locatorfiltersfilter.cpp b/src/plugins/coreplugin/locator/locatorfiltersfilter.cpp
index ca14d00ca4..c09ba186e6 100644
--- a/src/plugins/coreplugin/locator/locatorfiltersfilter.cpp
+++ b/src/plugins/coreplugin/locator/locatorfiltersfilter.cpp
@@ -27,9 +27,8 @@
 #include "locatorfiltersfilter.h"
 #include "locatorwidget.h"
 
-#include <utils/icon.h>
+#include <coreplugin/coreicons.h>
 #include <utils/qtcassert.h>
-#include <utils/theme/theme.h>
 
 using namespace Core;
 using namespace Core::Internal;
@@ -40,8 +39,7 @@ LocatorFiltersFilter::LocatorFiltersFilter(Locator *plugin,
                                                LocatorWidget *locatorWidget):
     m_plugin(plugin),
     m_locatorWidget(locatorWidget),
-    m_icon(Utils::Icon({{QLatin1String(":/core/images/next.png"), Utils::Theme::IconsWarningColor}},
-                       Utils::Icon::Tint).pixmap())
+    m_icon(Icons::NEXT.icon())
 {
     setId("FiltersFilter");
     setDisplayName(tr("Available filters"));
diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp
index 347bf72226..e5d79f46a4 100644
--- a/src/plugins/coreplugin/mainwindow.cpp
+++ b/src/plugins/coreplugin/mainwindow.cpp
@@ -691,7 +691,7 @@ void MainWindow::registerDefaultActions()
     }
 
     // Show Sidebar Action
-    m_toggleSideBarAction = new QAction(Icons::TOGGLE_SIDEBAR.icon(),
+    m_toggleSideBarAction = new QAction(Icons::TOGGLE_SIDEBAR_TOOLBAR.icon(),
                                         QCoreApplication::translate("Core", Constants::TR_SHOW_SIDEBAR),
                                         this);
     m_toggleSideBarAction->setCheckable(true);
diff --git a/src/plugins/coreplugin/navigationsubwidget.cpp b/src/plugins/coreplugin/navigationsubwidget.cpp
index 129db3d5fc..dd99034cf7 100644
--- a/src/plugins/coreplugin/navigationsubwidget.cpp
+++ b/src/plugins/coreplugin/navigationsubwidget.cpp
@@ -69,7 +69,7 @@ NavigationSubWidget::NavigationSubWidget(NavigationWidget *parentWidget, int pos
     toolBarLayout->addWidget(m_navigationComboBox);
 
     QToolButton *splitAction = new QToolButton();
-    splitAction->setIcon(Icons::SPLIT_HORIZONTAL.icon());
+    splitAction->setIcon(Icons::SPLIT_HORIZONTAL_TOOLBAR.icon());
     splitAction->setToolTip(tr("Split"));
     splitAction->setPopupMode(QToolButton::InstantPopup);
     splitAction->setProperty("noArrow", true);
diff --git a/src/plugins/coreplugin/outputpanemanager.cpp b/src/plugins/coreplugin/outputpanemanager.cpp
index 8b46dff623..0041ef63e5 100644
--- a/src/plugins/coreplugin/outputpanemanager.cpp
+++ b/src/plugins/coreplugin/outputpanemanager.cpp
@@ -145,12 +145,12 @@ OutputPaneManager::OutputPaneManager(QWidget *parent) :
     connect(m_clearAction, &QAction::triggered, this, &OutputPaneManager::clearPage);
 
     m_nextAction = new QAction(this);
-    m_nextAction->setIcon(Icons::NEXT.icon());
+    m_nextAction->setIcon(Icons::NEXT_TOOLBAR.icon());
     m_nextAction->setText(tr("Next Item"));
     connect(m_nextAction, &QAction::triggered, this, &OutputPaneManager::slotNext);
 
     m_prevAction = new QAction(this);
-    m_prevAction->setIcon(Icons::PREV.icon());
+    m_prevAction->setIcon(Icons::PREV_TOOLBAR.icon());
     m_prevAction->setText(tr("Previous Item"));
     connect(m_prevAction, &QAction::triggered, this, &OutputPaneManager::slotPrev);
 
diff --git a/src/plugins/coreplugin/sidebarwidget.cpp b/src/plugins/coreplugin/sidebarwidget.cpp
index bb3b5b8187..1a2e0e3716 100644
--- a/src/plugins/coreplugin/sidebarwidget.cpp
+++ b/src/plugins/coreplugin/sidebarwidget.cpp
@@ -72,7 +72,7 @@ SideBarWidget::SideBarWidget(SideBar *sideBar, const QString &id)
 
     m_splitAction = new QAction(tr("Split"), m_toolbar);
     m_splitAction->setToolTip(tr("Split"));
-    m_splitAction->setIcon(Icons::SPLIT_HORIZONTAL.icon());
+    m_splitAction->setIcon(Icons::SPLIT_HORIZONTAL_TOOLBAR.icon());
     connect(m_splitAction, &QAction::triggered, this, &SideBarWidget::splitMe);
     m_toolbar->addAction(m_splitAction);
 
diff --git a/src/plugins/debugger/analyzer/analyzericons.h b/src/plugins/debugger/analyzer/analyzericons.h
index c12014220f..6a79efcc3a 100644
--- a/src/plugins/debugger/analyzer/analyzericons.h
+++ b/src/plugins/debugger/analyzer/analyzericons.h
@@ -32,7 +32,7 @@ namespace Debugger {
 namespace Icons {
 
 const Utils::Icon ANALYZER_CONTROL_START({
-        {QLatin1String(":/core/images/run_small.png"), Utils::Theme::IconsRunColor},
+        {QLatin1String(":/core/images/run_small.png"), Utils::Theme::IconsRunToolBarColor},
         {QLatin1String(":/images/analyzer_overlay_small.png"), Utils::Theme::IconsBaseColor}});
 const Utils::Icon MODE_ANALYZE_CLASSIC(
         QLatin1String(":/images/mode_analyze.png"));
diff --git a/src/plugins/debugger/debuggericons.h b/src/plugins/debugger/debuggericons.h
index 15cf5f114c..71f426d63b 100644
--- a/src/plugins/debugger/debuggericons.h
+++ b/src/plugins/debugger/debuggericons.h
@@ -48,23 +48,33 @@ const Utils::Icon TRACEPOINT({
 const Utils::Icon CONTINUE(
         QLatin1String(":/debugger/images/debugger_continue.png"));
 const Utils::Icon CONTINUE_FLAT({
-        {QLatin1String(":/debugger/images/debugger_continue_1_mask.png"), Utils::Theme::IconsInterruptColor},
-        {QLatin1String(":/debugger/images/debugger_continue_2_mask.png"), Utils::Theme::IconsRunColor},
+        {QLatin1String(":/debugger/images/debugger_continue_1_mask.png"), Utils::Theme::IconsInterruptToolBarColor},
+        {QLatin1String(":/debugger/images/debugger_continue_2_mask.png"), Utils::Theme::IconsRunToolBarColor},
         {QLatin1String(":/projectexplorer/images/debugger_beetle_mask.png"), Utils::Theme::IconsDebugColor}});
 const Utils::Icon DEBUG_CONTINUE_SMALL({
         {QLatin1String(":/projectexplorer/images/continue_1_small.png"), Utils::Theme::IconsInterruptColor},
         {QLatin1String(":/projectexplorer/images/continue_2_small.png"), Utils::Theme::IconsRunColor},
+        {QLatin1String(":/projectexplorer/images/debugger_overlay_small.png"), Utils::Theme::PanelTextColorMid}}, Utils::Icon::MenuTintedStyle);
+const Utils::Icon DEBUG_CONTINUE_SMALL_TOOLBAR({
+        {QLatin1String(":/projectexplorer/images/continue_1_small.png"), Utils::Theme::IconsInterruptToolBarColor},
+        {QLatin1String(":/projectexplorer/images/continue_2_small.png"), Utils::Theme::IconsRunToolBarColor},
         {QLatin1String(":/projectexplorer/images/debugger_overlay_small.png"), Utils::Theme::IconsDebugColor}});
 const Utils::Icon INTERRUPT(
         QLatin1String(":/debugger/images/debugger_interrupt.png"));
 const Utils::Icon INTERRUPT_FLAT({
-        {QLatin1String(":/debugger/images/debugger_interrupt_mask.png"), Utils::Theme::IconsInterruptColor},
+        {QLatin1String(":/debugger/images/debugger_interrupt_mask.png"), Utils::Theme::IconsInterruptToolBarColor},
         {QLatin1String(":/projectexplorer/images/debugger_beetle_mask.png"), Utils::Theme::IconsDebugColor}});
 const Utils::Icon DEBUG_INTERRUPT_SMALL({
         {QLatin1String(":/core/images/interrupt_small.png"), Utils::Theme::IconsInterruptColor},
+        {QLatin1String(":/projectexplorer/images/debugger_overlay_small.png"), Utils::Theme::PanelTextColorMid}}, Utils::Icon::MenuTintedStyle);
+const Utils::Icon DEBUG_INTERRUPT_SMALL_TOOLBAR({
+        {QLatin1String(":/core/images/interrupt_small.png"), Utils::Theme::IconsInterruptToolBarColor},
         {QLatin1String(":/projectexplorer/images/debugger_overlay_small.png"), Utils::Theme::IconsDebugColor}});
 const Utils::Icon DEBUG_EXIT_SMALL({
         {QLatin1String(":/core/images/stop_small.png"), Utils::Theme::IconsStopColor},
+        {QLatin1String(":/projectexplorer/images/debugger_overlay_small.png"), Utils::Theme::PanelTextColorMid}}, Utils::Icon::MenuTintedStyle);
+const Utils::Icon DEBUG_EXIT_SMALL_TOOLBAR({
+        {QLatin1String(":/core/images/stop_small.png"), Utils::Theme::IconsStopToolBarColor},
         {QLatin1String(":/projectexplorer/images/debugger_overlay_small.png"), Utils::Theme::IconsDebugColor}});
 const Utils::Icon LOCATION({
         {QLatin1String(":/debugger/images/location_background.png"), Utils::Theme::IconsCodeModelOverlayForegroundColor},
@@ -86,15 +96,21 @@ const Utils::Icon RECORD_OFF({
         {QLatin1String(":/debugger/images/recordoutline.png"), Utils::Theme::IconsBaseColor}}, Utils::Icon::Tint | Utils::Icon::DropShadow);
 
 const Utils::Icon STEP_OVER({
+        {QLatin1String(":/debugger/images/debugger_stepover_small.png"), Utils::Theme::PanelTextColorMid}}, Utils::Icon::MenuTintedStyle);
+const Utils::Icon STEP_OVER_TOOLBAR({
         {QLatin1String(":/debugger/images/debugger_stepover_small.png"), Utils::Theme::IconsBaseColor}});
-const Utils::Icon STEP_OVER_TOOLBUTTON({
-        {QLatin1String(":/debugger/images/debugger_stepover_small.png"), Utils::Theme::TextColorNormal}}, Utils::Icon::Tint);
 const Utils::Icon STEP_INTO({
+        {QLatin1String(":/debugger/images/debugger_stepinto_small.png"), Utils::Theme::PanelTextColorMid}}, Utils::Icon::MenuTintedStyle);
+const Utils::Icon STEP_INTO_TOOLBAR({
         {QLatin1String(":/debugger/images/debugger_stepinto_small.png"), Utils::Theme::IconsBaseColor}});
 const Utils::Icon STEP_OUT({
+        {QLatin1String(":/debugger/images/debugger_stepout_small.png"), Utils::Theme::PanelTextColorMid}}, Utils::Icon::MenuTintedStyle);
+const Utils::Icon STEP_OUT_TOOLBAR({
         {QLatin1String(":/debugger/images/debugger_stepout_small.png"), Utils::Theme::IconsBaseColor}});
 const Utils::Icon RESTART({
-        {QLatin1String(":/debugger/images/debugger_restart_small.png"), Utils::Theme::IconsRunColor}});
+        {QLatin1String(":/debugger/images/debugger_restart_small.png"), Utils::Theme::PanelTextColorMid}}, Utils::Icon::MenuTintedStyle);
+const Utils::Icon RESTART_TOOLBAR({
+        {QLatin1String(":/debugger/images/debugger_restart_small.png"), Utils::Theme::IconsRunToolBarColor}});
 const Utils::Icon SINGLE_INSTRUCTION_MODE({
         {QLatin1String(":/debugger/images/debugger_singleinstructionmode.png"), Utils::Theme::IconsBaseColor}});
 
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 6c171d7ad9..5d76bdfb84 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -1349,14 +1349,14 @@ bool DebuggerPluginPrivate::initialize(const QStringList &arguments,
         this, &DebuggerPluginPrivate::updateWatchersHeader, Qt::QueuedConnection);
 
     auto act = m_continueAction = new QAction(tr("Continue"), this);
-    act->setIcon(Icon::combinedIcon({Icons::DEBUG_CONTINUE_SMALL.icon(), continueSideBarIcon}));
+    act->setIcon(Icon::combinedIcon({Icons::DEBUG_CONTINUE_SMALL_TOOLBAR.icon(), continueSideBarIcon}));
     connect(act, &QAction::triggered, this, &DebuggerPluginPrivate::handleExecContinue);
 
     act = m_exitAction = new QAction(tr("Stop Debugger"), this);
-    act->setIcon(Icons::DEBUG_EXIT_SMALL.icon());
+    act->setIcon(Icons::DEBUG_EXIT_SMALL_TOOLBAR.icon());
     connect(act, &QAction::triggered, this, &DebuggerPluginPrivate::handleExecExit);
 
-    auto interruptIcon = Icon::combinedIcon({Icons::DEBUG_INTERRUPT_SMALL.icon(), interruptSideBarIcon});
+    auto interruptIcon = Icon::combinedIcon({Icons::DEBUG_INTERRUPT_SMALL_TOOLBAR.icon(), interruptSideBarIcon});
     act = m_interruptAction = new QAction(tr("Interrupt"), this);
     act->setIcon(interruptIcon);
     connect(act, &QAction::triggered, this, &DebuggerPluginPrivate::handleExecInterrupt);
@@ -1373,19 +1373,19 @@ bool DebuggerPluginPrivate::initialize(const QStringList &arguments,
 
     act = m_resetAction = new QAction(tr("Restart Debugging"),this);
     act->setToolTip(tr("Restart the debugging session."));
-    act->setIcon(Icons::RESTART.icon());
+    act->setIcon(Icons::RESTART_TOOLBAR.icon());
     connect(act, &QAction::triggered, this, &DebuggerPluginPrivate::handleReset);
 
     act = m_nextAction = new QAction(tr("Step Over"), this);
-    act->setIcon(Icons::STEP_OVER.icon());
+    act->setIcon(Icons::STEP_OVER_TOOLBAR.icon());
     connect(act, &QAction::triggered, this, &DebuggerPluginPrivate::handleExecNext);
 
     act = m_stepAction = new QAction(tr("Step Into"), this);
-    act->setIcon(Icons::STEP_INTO.icon());
+    act->setIcon(Icons::STEP_INTO_TOOLBAR.icon());
     connect(act, &QAction::triggered, this, &DebuggerPluginPrivate::handleExecStep);
 
     act = m_stepOutAction = new QAction(tr("Step Out"), this);
-    act->setIcon(Icons::STEP_OUT.icon());
+    act->setIcon(Icons::STEP_OUT_TOOLBAR.icon());
     connect(act, &QAction::triggered, this, &DebuggerPluginPrivate::handleExecStepOut);
 
     act = m_runToLineAction = new QAction(tr("Run to Line"), this);
@@ -1443,7 +1443,7 @@ bool DebuggerPluginPrivate::initialize(const QStringList &arguments,
     act = m_startAction = new QAction(this);
     const QIcon sideBarIcon =
             Icon::sideBarIcon(ProjectExplorer::Icons::DEBUG_START, ProjectExplorer::Icons::DEBUG_START_FLAT);
-    const QIcon debuggerIcon = Icon::combinedIcon({ProjectExplorer::Icons::DEBUG_START_SMALL.icon(), sideBarIcon});
+    const QIcon debuggerIcon = Icon::combinedIcon({ProjectExplorer::Icons::DEBUG_START_SMALL_TOOLBAR.icon(), sideBarIcon});
     act->setIcon(debuggerIcon);
     act->setText(tr("Start Debugging"));
     connect(act, &QAction::triggered, [] { ProjectExplorerPlugin::runStartupProject(ProjectExplorer::Constants::DEBUG_RUN_MODE); });
@@ -3551,7 +3551,7 @@ QAction *createStartAction()
 QAction *createStopAction()
 {
     auto action = new QAction(DebuggerMainWindow::tr("Stop"), DebuggerPlugin::instance());
-    action->setIcon(Core::Icons::STOP_SMALL.icon());
+    action->setIcon(Core::Icons::STOP_SMALL_TOOLBAR.icon());
     action->setEnabled(true);
     return action;
 }
diff --git a/src/plugins/debugger/logwindow.cpp b/src/plugins/debugger/logwindow.cpp
index 59defbeab9..be79d31790 100644
--- a/src/plugins/debugger/logwindow.cpp
+++ b/src/plugins/debugger/logwindow.cpp
@@ -374,7 +374,7 @@ LogWindow::LogWindow(QWidget *parent)
     m_commandEdit->setHistoryCompleter(QLatin1String("DebuggerInput"));
 
     auto repeatButton = new QToolButton(this);
-    repeatButton->setIcon(Icons::STEP_OVER_TOOLBUTTON.icon());
+    repeatButton->setIcon(Icons::STEP_OVER.icon());
     repeatButton->setFixedSize(QSize(18, 18));
     repeatButton->setToolTip(tr("Repeat last command for debug reasons."));
 
diff --git a/src/plugins/help/helpwidget.cpp b/src/plugins/help/helpwidget.cpp
index 284cfec2b6..1223d92904 100644
--- a/src/plugins/help/helpwidget.cpp
+++ b/src/plugins/help/helpwidget.cpp
@@ -128,7 +128,7 @@ HelpWidget::HelpWidget(const Core::Context &context, WidgetStyle style, QWidget
         setAttribute(Qt::WA_QuitOnClose, false); // don't prevent Qt Creator from closing
     }
     if (style != SideBarWidget) {
-        m_toggleSideBarAction = new QAction(Core::Icons::TOGGLE_SIDEBAR.icon(),
+        m_toggleSideBarAction = new QAction(Core::Icons::TOGGLE_SIDEBAR_TOOLBAR.icon(),
                                             QCoreApplication::translate("Core", Core::Constants::TR_SHOW_SIDEBAR),
                                             toolBar);
         m_toggleSideBarAction->setCheckable(true);
@@ -164,7 +164,7 @@ HelpWidget::HelpWidget(const Core::Context &context, WidgetStyle style, QWidget
     connect(m_homeAction, &QAction::triggered, this, &HelpWidget::goHome);
     layout->addWidget(Core::Command::toolButtonWithAppendedShortcut(m_homeAction, cmd));
 
-    m_backAction = new QAction(Core::Icons::PREV.icon(), tr("Back"), toolBar);
+    m_backAction = new QAction(Core::Icons::PREV_TOOLBAR.icon(), tr("Back"), toolBar);
     connect(m_backAction, &QAction::triggered, this, &HelpWidget::backward);
     m_backMenu = new QMenu(toolBar);
     connect(m_backMenu, &QMenu::aboutToShow, this, &HelpWidget::updateBackMenu);
@@ -175,7 +175,7 @@ HelpWidget::HelpWidget(const Core::Context &context, WidgetStyle style, QWidget
     button->setPopupMode(QToolButton::DelayedPopup);
     layout->addWidget(button);
 
-    m_forwardAction = new QAction(Core::Icons::NEXT.icon(), tr("Forward"), toolBar);
+    m_forwardAction = new QAction(Core::Icons::NEXT_TOOLBAR.icon(), tr("Forward"), toolBar);
     connect(m_forwardAction, &QAction::triggered, this, &HelpWidget::forward);
     m_forwardMenu = new QMenu(toolBar);
     connect(m_forwardMenu, &QMenu::aboutToShow, this, &HelpWidget::updateForwardMenu);
diff --git a/src/plugins/imageviewer/imageviewer.cpp b/src/plugins/imageviewer/imageviewer.cpp
index f279125f38..f5e3cb503c 100644
--- a/src/plugins/imageviewer/imageviewer.cpp
+++ b/src/plugins/imageviewer/imageviewer.cpp
@@ -260,10 +260,10 @@ void ImageViewer::updatePauseAction()
     bool isMovie = d->file->type() == ImageViewerFile::TypeMovie;
     if (isMovie && !d->file->isPaused()) {
         d->ui_toolbar.toolButtonPlayPause->setToolTipBase(tr("Pause Animation"));
-        d->ui_toolbar.toolButtonPlayPause->setIcon(Core::Icons::INTERRUPT_SMALL.icon());
+        d->ui_toolbar.toolButtonPlayPause->setIcon(Core::Icons::INTERRUPT_SMALL_TOOLBAR.icon());
     } else {
         d->ui_toolbar.toolButtonPlayPause->setToolTipBase(tr("Play Animation"));
-        d->ui_toolbar.toolButtonPlayPause->setIcon(Core::Icons::RUN_SMALL.icon());
+        d->ui_toolbar.toolButtonPlayPause->setIcon(Core::Icons::RUN_SMALL_TOOLBAR.icon());
         d->ui_toolbar.toolButtonPlayPause->setEnabled(isMovie);
     }
 }
diff --git a/src/plugins/ios/iosruncontrol.cpp b/src/plugins/ios/iosruncontrol.cpp
index 237790fff3..c174ded36d 100644
--- a/src/plugins/ios/iosruncontrol.cpp
+++ b/src/plugins/ios/iosruncontrol.cpp
@@ -42,7 +42,7 @@ IosRunControl::IosRunControl(IosRunConfiguration *rc)
     , m_runner(new IosRunner(this, rc, false, QmlDebug::NoQmlDebugServices))
     , m_running(false)
 {
-    setIcon(Core::Icons::RUN_SMALL);
+    setIcon(Core::Icons::RUN_SMALL_TOOLBAR);
 }
 
 IosRunControl::~IosRunControl()
diff --git a/src/plugins/projectexplorer/appoutputpane.cpp b/src/plugins/projectexplorer/appoutputpane.cpp
index 8346697f6c..3a7b605892 100644
--- a/src/plugins/projectexplorer/appoutputpane.cpp
+++ b/src/plugins/projectexplorer/appoutputpane.cpp
@@ -158,7 +158,7 @@ AppOutputPane::AppOutputPane() :
     setObjectName(QLatin1String("AppOutputPane")); // Used in valgrind engine
 
     // Rerun
-    m_reRunButton->setIcon(Core::Icons::RUN_SMALL.icon());
+    m_reRunButton->setIcon(Core::Icons::RUN_SMALL_TOOLBAR.icon());
     m_reRunButton->setToolTip(tr("Re-run this run-configuration"));
     m_reRunButton->setAutoRaise(true);
     m_reRunButton->setEnabled(false);
@@ -166,7 +166,7 @@ AppOutputPane::AppOutputPane() :
             this, &AppOutputPane::reRunRunControl);
 
     // Stop
-    m_stopAction->setIcon(Core::Icons::STOP_SMALL.icon());
+    m_stopAction->setIcon(Core::Icons::STOP_SMALL_TOOLBAR.icon());
     m_stopAction->setToolTip(tr("Stop"));
     m_stopAction->setEnabled(false);
 
@@ -644,7 +644,7 @@ void AppOutputPane::enableButtons(const RunControl *rc /* = 0 */, bool isRunning
         m_zoomOutButton->setEnabled(true);
     } else {
         m_reRunButton->setEnabled(false);
-        m_reRunButton->setIcon(Core::Icons::RUN_SMALL.icon());
+        m_reRunButton->setIcon(Core::Icons::RUN_SMALL_TOOLBAR.icon());
         m_attachButton->setEnabled(false);
         m_attachButton->setToolTip(msgAttachDebuggerTooltip());
         m_stopAction->setEnabled(false);
diff --git a/src/plugins/projectexplorer/localapplicationruncontrol.cpp b/src/plugins/projectexplorer/localapplicationruncontrol.cpp
index 2e99c51b18..02afe6d422 100644
--- a/src/plugins/projectexplorer/localapplicationruncontrol.cpp
+++ b/src/plugins/projectexplorer/localapplicationruncontrol.cpp
@@ -63,7 +63,7 @@ LocalApplicationRunControl::LocalApplicationRunControl(RunConfiguration *rc, Cor
     : RunControl(rc, mode)
 {
     setRunnable(rc->runnable());
-    setIcon(Core::Icons::RUN_SMALL);
+    setIcon(Core::Icons::RUN_SMALL_TOOLBAR);
     connect(&m_applicationLauncher, &ApplicationLauncher::appendMessage,
             this, static_cast<void(RunControl::*)(const QString &, Utils::OutputFormat)>(&RunControl::appendMessage));
     connect(&m_applicationLauncher, &ApplicationLauncher::processStarted,
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index 7f16707f06..1972c3e240 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -699,7 +699,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
     ActionContainer *runMenu = ActionManager::createMenu(Constants::RUNMENUCONTEXTMENU);
     runMenu->setOnAllDisabledBehavior(ActionContainer::Hide);
     QIcon runIcon = Utils::Icon::sideBarIcon(Icons::RUN, Icons::RUN_FLAT);
-    runIcon.addPixmap(Core::Icons::RUN_SMALL.pixmap());
+    runIcon.addPixmap(Core::Icons::RUN_SMALL_TOOLBAR.pixmap());
     runMenu->menu()->setIcon(runIcon);
     runMenu->menu()->setTitle(tr("Run"));
     msubProjectContextMenu->addMenu(runMenu, ProjectExplorer::Constants::G_PROJECT_RUN);
@@ -897,7 +897,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
     mbuild->addAction(cmd, Constants::G_BUILD_CLEAN);
 
     // cancel build action
-    dd->m_cancelBuildAction = new QAction(Core::Icons::STOP_SMALL.icon(), tr("Cancel Build"), this);
+    dd->m_cancelBuildAction = new QAction(Core::Icons::STOP_SMALL_TOOLBAR.icon(), tr("Cancel Build"), this);
     cmd = ActionManager::registerAction(dd->m_cancelBuildAction, Constants::CANCELBUILD);
     mbuild->addAction(cmd, Constants::G_BUILD_CANCEL);
 
diff --git a/src/plugins/projectexplorer/projectexplorericons.h b/src/plugins/projectexplorer/projectexplorericons.h
index 55c8baffb6..23e665ac4d 100644
--- a/src/plugins/projectexplorer/projectexplorericons.h
+++ b/src/plugins/projectexplorer/projectexplorericons.h
@@ -45,17 +45,20 @@ const Utils::Icon REBUILD({
 const Utils::Icon RUN(
         QLatin1String(":/projectexplorer/images/run.png"));
 const Utils::Icon RUN_FLAT({
-        {QLatin1String(":/projectexplorer/images/run_mask.png"), Utils::Theme::IconsRunColor}});
+        {QLatin1String(":/projectexplorer/images/run_mask.png"), Utils::Theme::IconsRunToolBarColor}});
 const Utils::Icon WINDOW(
         QLatin1String(":/projectexplorer/images/window.png"));
 const Utils::Icon DEBUG_START(
         QLatin1String(":/projectexplorer/images/debugger_start.png"));
 
 const Utils::Icon DEBUG_START_FLAT({
-        {QLatin1String(":/projectexplorer/images/run_mask.png"), Utils::Theme::IconsRunColor},
+        {QLatin1String(":/projectexplorer/images/run_mask.png"), Utils::Theme::IconsRunToolBarColor},
         {QLatin1String(":/projectexplorer/images/debugger_beetle_mask.png"), Utils::Theme::IconsDebugColor}});
 const Utils::Icon DEBUG_START_SMALL({
         {QLatin1String(":/core/images/run_small.png"), Utils::Theme::IconsRunColor},
+        {QLatin1String(":/projectexplorer/images/debugger_overlay_small.png"), Utils::Theme::PanelTextColorMid}}, Utils::Icon::MenuTintedStyle);
+const Utils::Icon DEBUG_START_SMALL_TOOLBAR({
+        {QLatin1String(":/core/images/run_small.png"), Utils::Theme::IconsRunToolBarColor},
         {QLatin1String(":/projectexplorer/images/debugger_overlay_small.png"), Utils::Theme::IconsDebugColor}});
 
 const Utils::Icon BUILDSTEP_MOVEUP({
diff --git a/src/plugins/pythoneditor/pythoneditorplugin.cpp b/src/plugins/pythoneditor/pythoneditorplugin.cpp
index efa9057997..c47910323b 100644
--- a/src/plugins/pythoneditor/pythoneditorplugin.cpp
+++ b/src/plugins/pythoneditor/pythoneditorplugin.cpp
@@ -1061,7 +1061,7 @@ RunControl *PythonRunControlFactory::create(RunConfiguration *runConfiguration,
 PythonRunControl::PythonRunControl(PythonRunConfiguration *rc, Core::Id mode)
     : RunControl(rc, mode), m_running(false)
 {
-    setIcon(Core::Icons::RUN_SMALL);
+    setIcon(Core::Icons::RUN_SMALL_TOOLBAR);
 
     m_interpreter = rc->interpreter();
     m_mainScript = rc->mainScript();
diff --git a/src/plugins/remotelinux/remotelinuxruncontrol.cpp b/src/plugins/remotelinux/remotelinuxruncontrol.cpp
index 9108b8597d..b33341a4fc 100644
--- a/src/plugins/remotelinux/remotelinuxruncontrol.cpp
+++ b/src/plugins/remotelinux/remotelinuxruncontrol.cpp
@@ -43,7 +43,7 @@ public:
 RemoteLinuxRunControl::RemoteLinuxRunControl(RunConfiguration *rc)
         : RunControl(rc, ProjectExplorer::Constants::NORMAL_RUN_MODE), d(new RemoteLinuxRunControlPrivate)
 {
-    setIcon(Core::Icons::RUN_SMALL);
+    setIcon(Core::Icons::RUN_SMALL_TOOLBAR);
     setRunnable(rc->runnable());
 
     d->running = false;
diff --git a/src/plugins/valgrind/callgrindtool.cpp b/src/plugins/valgrind/callgrindtool.cpp
index 94351cb853..52aecc64d6 100644
--- a/src/plugins/valgrind/callgrindtool.cpp
+++ b/src/plugins/valgrind/callgrindtool.cpp
@@ -370,7 +370,7 @@ CallgrindTool::CallgrindTool(QObject *parent)
     // pause action
     m_pauseAction = action = new QAction(this);
     action->setCheckable(true);
-    action->setIcon(Core::Icons::INTERRUPT_SMALL.icon());
+    action->setIcon(Core::Icons::INTERRUPT_SMALL_TOOLBAR.icon());
     //action->setText(tr("Ignore"));
     action->setToolTip(tr("Pause event logging. No events are counted which will speed up program execution during profiling."));
     connect(action, &QAction::toggled, this, &CallgrindTool::pauseToggled);
@@ -379,14 +379,14 @@ CallgrindTool::CallgrindTool(QObject *parent)
     // go back
     m_goBack = action = new QAction(this);
     action->setDisabled(true);
-    action->setIcon(Core::Icons::PREV.icon());
+    action->setIcon(Core::Icons::PREV_TOOLBAR.icon());
     action->setToolTip(tr("Go back one step in history. This will select the previously selected item."));
     connect(action, &QAction::triggered, &m_stackBrowser, &StackBrowser::goBack);
 
     // go forward
     m_goNext = action = new QAction(this);
     action->setDisabled(true);
-    action->setIcon(Core::Icons::NEXT.icon());
+    action->setIcon(Core::Icons::NEXT_TOOLBAR.icon());
     action->setToolTip(tr("Go forward one step in history."));
     connect(action, &QAction::triggered, &m_stackBrowser, &StackBrowser::goNext);
 
diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp
index 412418d202..21f2c0ad56 100644
--- a/src/plugins/valgrind/memchecktool.cpp
+++ b/src/plugins/valgrind/memchecktool.cpp
@@ -383,7 +383,7 @@ MemcheckTool::MemcheckTool(QObject *parent)
     // Go to previous leak.
     action = new QAction(this);
     action->setDisabled(true);
-    action->setIcon(Core::Icons::PREV.icon());
+    action->setIcon(Core::Icons::PREV_TOOLBAR.icon());
     action->setToolTip(tr("Go to previous leak."));
     connect(action, &QAction::triggered, m_errorView, &MemcheckErrorView::goBack);
     m_goBack = action;
@@ -391,7 +391,7 @@ MemcheckTool::MemcheckTool(QObject *parent)
     // Go to next leak.
     action = new QAction(this);
     action->setDisabled(true);
-    action->setIcon(Core::Icons::NEXT.icon());
+    action->setIcon(Core::Icons::NEXT_TOOLBAR.icon());
     action->setToolTip(tr("Go to next leak."));
     connect(action, &QAction::triggered, m_errorView, &MemcheckErrorView::goNext);
     m_goNext = action;
diff --git a/src/plugins/winrt/winrtruncontrol.cpp b/src/plugins/winrt/winrtruncontrol.cpp
index d8be5885ea..900b9ea49d 100644
--- a/src/plugins/winrt/winrtruncontrol.cpp
+++ b/src/plugins/winrt/winrtruncontrol.cpp
@@ -56,7 +56,7 @@ WinRtRunControl::WinRtRunControl(WinRtRunConfiguration *runConfiguration, Core::
     , m_state(StoppedState)
     , m_runner(0)
 {
-    setIcon(Core::Icons::RUN_SMALL);
+    setIcon(Core::Icons::RUN_SMALL_TOOLBAR);
 }
 
 void WinRtRunControl::start()