diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp b/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp
index 9383123bbfe..ea1d6364011 100644
--- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp
+++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp
@@ -30,7 +30,6 @@
 #include "clangstaticanalyzersettings.h"
 #include "clangstaticanalyzerutils.h"
 
-#include <debugger/analyzer/analyzermanager.h>
 #include <debugger/analyzer/analyzerutils.h>
 
 #include <clangcodemodel/clangutils.h>
@@ -47,6 +46,7 @@
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/project.h>
+#include <projectexplorer/projectexplorericons.h>
 #include <projectexplorer/runconfiguration.h>
 #include <projectexplorer/target.h>
 #include <projectexplorer/taskhub.h>
@@ -76,6 +76,8 @@ ClangStaticAnalyzerRunControl::ClangStaticAnalyzerRunControl(
     , m_filesNotAnalyzed(0)
 {
     setDisplayName(tr("Clang Static Analyzer"));
+    setIcon(ProjectExplorer::Icons::ANALYZER_START_SMALL_TOOLBAR);
+
     Target *target = runConfiguration->target();
     BuildConfiguration *buildConfiguration = target->activeBuildConfiguration();
     QTC_ASSERT(buildConfiguration, return);
diff --git a/src/plugins/debugger/analyzer/analyzerruncontrol.cpp b/src/plugins/debugger/analyzer/analyzerruncontrol.cpp
index 41b1b5ea8f7..6d5b83e51e9 100644
--- a/src/plugins/debugger/analyzer/analyzerruncontrol.cpp
+++ b/src/plugins/debugger/analyzer/analyzerruncontrol.cpp
@@ -24,25 +24,14 @@
 **
 ****************************************************************************/
 
-#include "analyzermanager.h"
 #include "analyzerruncontrol.h"
 
-#include <projectexplorer/project.h>
-#include <projectexplorer/runconfigurationaspects.h>
-#include <projectexplorer/projectexplorericons.h>
-#include <projectexplorer/target.h>
-
-#include <QDebug>
-#include <QAction>
-
 using namespace ProjectExplorer;
 
 namespace Debugger {
 
 AnalyzerRunControl::AnalyzerRunControl(RunConfiguration *runConfiguration, Core::Id runMode)
     : RunControl(runConfiguration, runMode)
-{
-    setIcon(Icons::ANALYZER_START_SMALL_TOOLBAR);
-}
+{}
 
 } // namespace Debugger
diff --git a/src/plugins/debugger/analyzer/analyzerruncontrol.h b/src/plugins/debugger/analyzer/analyzerruncontrol.h
index a44760f80d0..97ce85e69a9 100644
--- a/src/plugins/debugger/analyzer/analyzerruncontrol.h
+++ b/src/plugins/debugger/analyzer/analyzerruncontrol.h
@@ -30,7 +30,6 @@
 
 #include <projectexplorer/runconfiguration.h>
 
-#include <utils/outputformat.h>
 #include <utils/port.h>
 
 namespace Debugger {
diff --git a/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp b/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp
index eeca421bbf9..dbd056aad95 100644
--- a/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp
@@ -31,17 +31,21 @@
 #include <debugger/analyzer/analyzerstartparameters.h>
 
 #include <coreplugin/icore.h>
-#include <utils/qtcassert.h>
 #include <coreplugin/helpmanager.h>
-#include <projectexplorer/projectexplorerconstants.h>
-#include <projectexplorer/kitinformation.h>
-#include <projectexplorer/target.h>
+
 #include <projectexplorer/environmentaspect.h>
+#include <projectexplorer/kitinformation.h>
 #include <projectexplorer/localapplicationruncontrol.h>
+#include <projectexplorer/projectexplorerconstants.h>
+#include <projectexplorer/projectexplorericons.h>
 #include <projectexplorer/runnables.h>
+#include <projectexplorer/target.h>
+
 #include <qtsupport/qtsupportconstants.h>
 #include <qmldebug/qmloutputparser.h>
 
+#include <utils/qtcassert.h>
+
 #include <QMainWindow>
 #include <QMessageBox>
 #include <QTimer>
@@ -79,6 +83,8 @@ QmlProfilerRunControl::QmlProfilerRunControl(RunConfiguration *runConfiguration,
     : AnalyzerRunControl(runConfiguration, ProjectExplorer::Constants::QML_PROFILER_RUN_MODE)
     , d(new QmlProfilerRunControlPrivate)
 {
+    setIcon(ProjectExplorer::Icons::ANALYZER_START_SMALL_TOOLBAR);
+
     d->m_tool = tool;
     // Only wait 4 seconds for the 'Waiting for connection' on application output, then just try to connect
     // (application output might be redirected / blocked)
diff --git a/src/plugins/valgrind/valgrindengine.cpp b/src/plugins/valgrind/valgrindengine.cpp
index dde2ae7fd0e..6e08ae66dc4 100644
--- a/src/plugins/valgrind/valgrindengine.cpp
+++ b/src/plugins/valgrind/valgrindengine.cpp
@@ -36,6 +36,8 @@
 #include <coreplugin/progressmanager/progressmanager.h>
 #include <coreplugin/progressmanager/futureprogress.h>
 #include <extensionsystem/pluginmanager.h>
+
+#include <projectexplorer/projectexplorericons.h>
 #include <projectexplorer/runconfiguration.h>
 
 #include <QApplication>
@@ -54,6 +56,7 @@ namespace Internal {
 ValgrindRunControl::ValgrindRunControl(RunConfiguration *runConfiguration, Core::Id runMode)
     : AnalyzerRunControl(runConfiguration, runMode)
 {
+    setIcon(ProjectExplorer::Icons::ANALYZER_START_SMALL_TOOLBAR);
     QTC_ASSERT(runConfiguration, return);
     setRunnable(runConfiguration->runnable());