Icon refresh: First step towards the new Qt Creator themes

http://blog.qt.io/blog/author/didesous/ announced new designs/themes for Qt Creator. This patch replaces many of the existing toolbar icons with recolorizable masks for better theming support. Change-Id: I557aa485205fe2624f33724226f698c303342b40 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
author: Alessandro Portale <alessandro.portale@theqtcompany.com> 2015-10-19 12:55:13 +0200
committer: Alessandro Portale <alessandro.portale@theqtcompany.com> 2015-10-23 16:04:52 +0000
commit: b8bdc6f669d0949292be217e84fe046ea8450e1c (patch)
tree: adf7521912f2c28b3b571049938f81ce0146207e /src
parent: e6d038364fe44d96b93fa2f5e40334e7ecad13c2 (diff)
download: qt-creator-b8bdc6f669d0949292be217e84fe046ea8450e1c.tar.gz
224 files changed, 1371 insertions, 878 deletions
diff --git a/src/libs/utils/fancylineedit.cpp b/src/libs/utils/fancylineedit.cpp
index a4a6e2d183..2e057dc70f 100644
--- a/src/libs/utils/fancylineedit.cpp
+++ b/src/libs/utils/fancylineedit.cpp
@@ -33,6 +33,8 @@
 #include "historycompleter.h"
 #include "hostosinfo.h"
 #include "qtcassert.h"
+#include "themehelper.h"
+#include "stylehelper.h"
 
 #include <QAbstractItemView>
 #include <QDebug>
@@ -366,7 +368,10 @@ void FancyLineEdit::setFiltering(bool on)
         QIcon icon = QIcon::fromTheme(layoutDirection() == Qt::LeftToRight ?
                          QLatin1String("edit-clear-locationbar-rtl") :
                          QLatin1String("edit-clear-locationbar-ltr"),
-                         QIcon::fromTheme(QLatin1String("edit-clear"), QIcon(QLatin1String(":/core/images/editclear.png"))));
+                         QIcon::fromTheme(QLatin1String("edit-clear"),
+                                          ThemeHelper::recoloredPixmap(
+                                              QLatin1String(":/core/images/editclear.png"),
+                                              ThemeHelper::inputfieldIconColor())));
 
         setButtonPixmap(Right, icon.pixmap(16));
         setButtonVisible(Right, true);
diff --git a/src/plugins/analyzerbase/analyzerbase.qbs b/src/plugins/analyzerbase/analyzerbase.qbs
index 05db2a4022..b54dcaf9c7 100644
--- a/src/plugins/analyzerbase/analyzerbase.qbs
+++ b/src/plugins/analyzerbase/analyzerbase.qbs
@@ -35,15 +35,15 @@ QtcPlugin {
         "ianalyzertool.h",
         "startremotedialog.cpp",
         "startremotedialog.h",
-        "images/analyzer_category.png",
-        "images/analyzer_start_small.png",
-        "images/analyzer_stop_small.png",
-        "images/mode_analyze.png",
-        "images/mode_analyze@2x.png",
     ]
 
+    Group {
+        name: "Images"
+        prefix: "images/"
+        files: ["*.png"]
+    }
+
     Export {
         Depends { name: "CPlusPlus" }
     }
 }
-
diff --git a/src/plugins/analyzerbase/analyzerbase.qrc b/src/plugins/analyzerbase/analyzerbase.qrc
index 96643b0278..b6c5662d1f 100644
--- a/src/plugins/analyzerbase/analyzerbase.qrc
+++ b/src/plugins/analyzerbase/analyzerbase.qrc
@@ -3,7 +3,7 @@
         <file>images/mode_analyze.png</file>
         <file>images/mode_analyze@2x.png</file>
         <file>images/analyzer_category.png</file>
-        <file>images/analyzer_start_small.png</file>
-        <file>images/analyzer_stop_small.png</file>
+        <file>images/analyzer_overlay_small.png</file>
+        <file>images/analyzer_overlay_small@2x.png</file>
     </qresource>
 </RCC>
diff --git a/src/plugins/analyzerbase/analyzerconstants.h b/src/plugins/analyzerbase/analyzerconstants.h
index bfe65bf5e8..a38b939953 100644
--- a/src/plugins/analyzerbase/analyzerconstants.h
+++ b/src/plugins/analyzerbase/analyzerconstants.h
@@ -54,8 +54,7 @@ const char G_ANALYZER_REMOTE_TOOLS[] = "Menu.Group.Analyzer.RemoteTools";
 const char G_ANALYZER_OPTIONS[] = "Menu.Group.Analyzer.Options";
 
 // Manager controls.
-const char ANALYZER_CONTROL_START_ICON[] = ":/images/analyzer_start_small.png";
-const char ANALYZER_CONTROL_STOP_ICON[] = ":/images/analyzer_stop_small.png";
+const char ANALYZER_CONTROL_START_ICON[] = ":/images/analyzer_overlay_small.png,:/core/images/run_overlay_small.png|IconsRunColor";
 
 const char ANALYZERTASK_ID[] = "Analyzer.TaskId";
 
diff --git a/src/plugins/analyzerbase/analyzermanager.cpp b/src/plugins/analyzerbase/analyzermanager.cpp
index 47d01234f5..83d867fdfa 100644
--- a/src/plugins/analyzerbase/analyzermanager.cpp
+++ b/src/plugins/analyzerbase/analyzermanager.cpp
@@ -61,6 +61,7 @@
 #include <utils/qtcassert.h>
 #include <utils/checkablemessagebox.h>
 #include <utils/statuslabel.h>
+#include <utils/themehelper.h>
 
 #include <QVariant>
 #include <QDebug>
@@ -240,14 +241,16 @@ void AnalyzerManagerPrivate::setupActions()
     menubar->addMenu(mtools, m_menu);
 
     m_startAction = new QAction(tr("Start"), m_menu);
-    m_startAction->setIcon(QIcon(QLatin1String(ANALYZER_CONTROL_START_ICON)));
+    m_startAction->setIcon(Utils::ThemeHelper::themedIcon(
+                               QLatin1String(ANALYZER_CONTROL_START_ICON)));
     ActionManager::registerAction(m_startAction, "Analyzer.Start");
     connect(m_startAction, &QAction::triggered,
             this, &AnalyzerManagerPrivate::startCurrentTool);
 
     m_stopAction = new QAction(tr("Stop"), m_menu);
     m_stopAction->setEnabled(false);
-    m_stopAction->setIcon(QIcon(QLatin1String(ANALYZER_CONTROL_STOP_ICON)));
+    m_stopAction->setIcon(Utils::ThemeHelper::themedIcon(
+                              QLatin1String(ProjectExplorer::Constants::ICON_STOP_SMALL)));
     command = ActionManager::registerAction(m_stopAction, "Analyzer.Stop");
     m_menu->addAction(command, G_ANALYZER_CONTROL);
 
diff --git a/src/plugins/analyzerbase/analyzerruncontrol.cpp b/src/plugins/analyzerbase/analyzerruncontrol.cpp
index 48f6103bcc..7cfd7a5ae0 100644
--- a/src/plugins/analyzerbase/analyzerruncontrol.cpp
+++ b/src/plugins/analyzerbase/analyzerruncontrol.cpp
@@ -51,7 +51,7 @@ AnalyzerRunControl::AnalyzerRunControl(const AnalyzerStartParameters &sp,
         RunConfiguration *runConfiguration)
     : RunControl(runConfiguration, sp.runMode)
 {
-    setIcon(QLatin1String(":/images/analyzer_start_small.png"));
+    setIcon(QLatin1String(Constants::ANALYZER_CONTROL_START_ICON));
 
     m_sp = sp;
 
diff --git a/src/plugins/analyzerbase/images/analyzer_overlay_small.png b/src/plugins/analyzerbase/images/analyzer_overlay_small.png
new file mode 100644
index 0000000000..138391ddd0
--- /dev/null
+++ b/src/plugins/analyzerbase/images/analyzer_overlay_small.png
diff --git a/src/plugins/analyzerbase/images/analyzer_overlay_small@2x.png b/src/plugins/analyzerbase/images/analyzer_overlay_small@2x.png
new file mode 100644
index 0000000000..7fb5ea48b7
--- /dev/null
+++ b/src/plugins/analyzerbase/images/analyzer_overlay_small@2x.png
diff --git a/src/plugins/analyzerbase/images/analyzer_start_small.png b/src/plugins/analyzerbase/images/analyzer_start_small.png
deleted file mode 100644
index 4a5f7e4092..0000000000
--- a/src/plugins/analyzerbase/images/analyzer_start_small.png
+++ /dev/null
diff --git a/src/plugins/analyzerbase/images/analyzer_stop_small.png b/src/plugins/analyzerbase/images/analyzer_stop_small.png
deleted file mode 100644
index 1063d08998..0000000000
--- a/src/plugins/analyzerbase/images/analyzer_stop_small.png
+++ /dev/null
diff --git a/src/plugins/android/androidbuildapkwidget.cpp b/src/plugins/android/androidbuildapkwidget.cpp
index 476da0c957..b9774b407b 100644
--- a/src/plugins/android/androidbuildapkwidget.cpp
+++ b/src/plugins/android/androidbuildapkwidget.cpp
@@ -36,6 +36,7 @@
 #include "androidmanager.h"
 #include "ui_androidbuildapkwidget.h"
 
+#include <coreplugin/coreconstants.h>
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/target.h>
@@ -43,6 +44,7 @@
 
 #include <utils/fancylineedit.h>
 #include <utils/pathchooser.h>
+#include <utils/themehelper.h>
 
 #include <QFileDialog>
 
@@ -89,8 +91,12 @@ AndroidBuildApkWidget::AndroidBuildApkWidget(AndroidBuildApkStep *step)
     m_ui->KeystoreLocationPathChooser->setInitialBrowsePathBackup(QDir::homePath());
     m_ui->KeystoreLocationPathChooser->setPromptDialogFilter(tr("Keystore files (*.keystore *.jks)"));
     m_ui->KeystoreLocationPathChooser->setPromptDialogTitle(tr("Select Keystore File"));
+    m_ui->signingDebugWarningIcon->setPixmap(
+                Utils::ThemeHelper::themedIconPixmap(QLatin1String(Core::Constants::ICON_WARNING)));
     m_ui->signingDebugWarningIcon->hide();
     m_ui->signingDebugWarningLabel->hide();
+    m_ui->signingDebugDeployErrorIcon->setPixmap(
+                Utils::ThemeHelper::themedIconPixmap(QLatin1String(Core::Constants::ICON_ERROR)));
     signPackageCheckBoxToggled(m_step->signPackage());
 
     m_ui->useGradleCheckBox->setChecked(m_step->useGradle());
diff --git a/src/plugins/android/androidbuildapkwidget.ui b/src/plugins/android/androidbuildapkwidget.ui
index dd084a72c3..e5565873af 100644
--- a/src/plugins/android/androidbuildapkwidget.ui
+++ b/src/plugins/android/androidbuildapkwidget.ui
@@ -65,12 +65,6 @@
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
-          <property name="text">
-           <string/>
-          </property>
-          <property name="pixmap">
-           <pixmap resource="../coreplugin/core.qrc">:/core/images/warning.png</pixmap>
-          </property>
          </widget>
         </item>
         <item>
@@ -133,12 +127,6 @@
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
-          <property name="text">
-           <string/>
-          </property>
-          <property name="pixmap">
-           <pixmap resource="../coreplugin/core.qrc">:/core/images/error.png</pixmap>
-          </property>
           <property name="alignment">
            <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
           </property>
@@ -265,8 +253,6 @@ The APK will not be usable on any other device.</string>
    <container>1</container>
   </customwidget>
  </customwidgets>
- <resources>
-  <include location="../coreplugin/core.qrc"/>
- </resources>
+ <resources/>
  <connections/>
 </ui>
diff --git a/src/plugins/android/androidmanifesteditorwidget.cpp b/src/plugins/android/androidmanifesteditorwidget.cpp
index 178c3fe4f1..ce5929e992 100644
--- a/src/plugins/android/androidmanifesteditorwidget.cpp
+++ b/src/plugins/android/androidmanifesteditorwidget.cpp
@@ -50,6 +50,7 @@
 #include <texteditor/texteditoractionhandler.h>
 #include <texteditor/texteditor.h>
 #include <utils/algorithm.h>
+#include <utils/themehelper.h>
 
 #include <QLineEdit>
 #include <QFileInfo>
@@ -166,7 +167,8 @@ void AndroidManifestEditorWidget::initializePage()
         m_packageNameWarning->setVisible(false);
 
         m_packageNameWarningIcon = new QLabel;
-        m_packageNameWarningIcon->setPixmap(QPixmap(QLatin1String(Core::Constants::ICON_WARNING)));
+        m_packageNameWarningIcon->setPixmap(
+                    Utils::ThemeHelper::themedIconPixmap(QLatin1String(Core::Constants::ICON_WARNING)));
         m_packageNameWarningIcon->setVisible(false);
         m_packageNameWarningIcon->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
 
diff --git a/src/plugins/android/androidpotentialkit.cpp b/src/plugins/android/androidpotentialkit.cpp
index d1d5d9dcce..086787fb69 100644
--- a/src/plugins/android/androidpotentialkit.cpp
+++ b/src/plugins/android/androidpotentialkit.cpp
@@ -33,6 +33,7 @@
 #include "androidconfigurations.h"
 
 #include <utils/detailswidget.h>
+#include <utils/themehelper.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/icore.h>
 #include <projectexplorer/kitmanager.h>
@@ -92,7 +93,7 @@ AndroidPotentialKitWidget::AndroidPotentialKitWidget(QWidget *parent)
     : Utils::DetailsWidget(parent)
 {
     setSummaryText(QLatin1String("<b>Android has not been configured. Create Android kits.</b>"));
-    setIcon(QIcon(QLatin1String(Core::Constants::ICON_WARNING)));
+    setIcon(Utils::ThemeHelper::themedIcon(QLatin1String(Core::Constants::ICON_WARNING)));
     //detailsWidget->setState(Utils::DetailsWidget::NoSummary);
     QWidget *mainWidget = new QWidget(this);
     setWidget(mainWidget);
diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp
index 0d90bb65da..c57332902c 100644
--- a/src/plugins/android/androidsettingswidget.cpp
+++ b/src/plugins/android/androidsettingswidget.cpp
@@ -36,9 +36,11 @@
 #include "androidconstants.h"
 #include "androidtoolchain.h"
 
+#include <coreplugin/coreconstants.h>
 #include <utils/environment.h>
 #include <utils/hostosinfo.h>
 #include <utils/pathchooser.h>
+#include <utils/themehelper.h>
 #include <projectexplorer/toolchainmanager.h>
 #include <projectexplorer/kitmanager.h>
 #include <projectexplorer/kitinformation.h>
@@ -174,6 +176,17 @@ AndroidSettingsWidget::AndroidSettingsWidget(QWidget *parent)
     m_ui->downloadAntToolButton->setVisible(!Utils::HostOsInfo::isLinuxHost());
     m_ui->downloadOpenJDKToolButton->setVisible(!Utils::HostOsInfo::isLinuxHost());
 
+    const QPixmap warningPixmap = Utils::ThemeHelper::themedIconPixmap(
+                QLatin1String(Core::Constants::ICON_WARNING));
+    m_ui->jdkWarningIconLabel->setPixmap(warningPixmap);
+    m_ui->kitWarningIconLabel->setPixmap(warningPixmap);
+
+    const QPixmap errorPixmap = Utils::ThemeHelper::themedIconPixmap(
+                QLatin1String(Core::Constants::ICON_ERROR));
+    m_ui->sdkWarningIconLabel->setPixmap(errorPixmap);
+    m_ui->gdbWarningIconLabel->setPixmap(errorPixmap);
+    m_ui->ndkWarningIconLabel->setPixmap(errorPixmap);
+
     connect(m_ui->gdbWarningLabel, SIGNAL(linkActivated(QString)),
             this, SLOT(showGdbWarningDialog()));
 
diff --git a/src/plugins/android/androidsettingswidget.ui b/src/plugins/android/androidsettingswidget.ui
index 23d0951046..330de5f768 100644
--- a/src/plugins/android/androidsettingswidget.ui
+++ b/src/plugins/android/androidsettingswidget.ui
@@ -46,9 +46,6 @@
        <property name="text">
         <string/>
        </property>
-       <property name="pixmap">
-        <pixmap resource="../coreplugin/core.qrc">:/core/images/warning.png</pixmap>
-       </property>
       </widget>
      </item>
      <item>
@@ -123,9 +120,6 @@
        <property name="text">
         <string/>
        </property>
-       <property name="pixmap">
-        <pixmap resource="../coreplugin/core.qrc">:/core/images/error.png</pixmap>
-       </property>
       </widget>
      </item>
      <item>
@@ -192,9 +186,6 @@
        <property name="text">
         <string/>
        </property>
-       <property name="pixmap">
-        <pixmap resource="../coreplugin/core.qrc">:/core/images/error.png</pixmap>
-       </property>
       </widget>
      </item>
      <item>
@@ -228,9 +219,6 @@
        <property name="text">
         <string/>
        </property>
-       <property name="pixmap">
-        <pixmap resource="../coreplugin/core.qrc">:/core/images/error.png</pixmap>
-       </property>
       </widget>
      </item>
      <item>
@@ -280,9 +268,6 @@
        <property name="text">
         <string/>
        </property>
-       <property name="pixmap">
-        <pixmap resource="../coreplugin/core.qrc">:/core/images/warning.png</pixmap>
-       </property>
       </widget>
      </item>
      <item>
@@ -476,7 +461,6 @@
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="../coreplugin/core.qrc"/>
   <include location="android.qrc"/>
  </resources>
  <connections>
diff --git a/src/plugins/android/avddialog.cpp b/src/plugins/android/avddialog.cpp
index 05236100a4..d8e3be5de3 100644
--- a/src/plugins/android/avddialog.cpp
+++ b/src/plugins/android/avddialog.cpp
@@ -33,6 +33,7 @@
 
 #include <coreplugin/coreconstants.h>
 #include <utils/tooltip/tooltip.h>
+#include <utils/themehelper.h>
 
 #include <QKeyEvent>
 #include <QMessageBox>
@@ -62,7 +63,8 @@ AvdDialog::AvdDialog(int minApiLevel, const QString &targetArch, const AndroidCo
     m_avdDialog.nameLineEdit->setValidator(v);
     m_avdDialog.nameLineEdit->installEventFilter(this);
 
-    m_avdDialog.warningIcon->setPixmap(QPixmap(QLatin1String(Core::Constants::ICON_WARNING)));
+    m_avdDialog.warningIcon->setPixmap(Utils::ThemeHelper::themedIconPixmap(
+                                           QLatin1String(Core::Constants::ICON_WARNING)));
 
     updateApiLevelComboBox();
 
diff --git a/src/plugins/baremetal/baremetalrunconfigurationwidget.cpp b/src/plugins/baremetal/baremetalrunconfigurationwidget.cpp
index cdcdc60bbe..8d9e392547 100644
--- a/src/plugins/baremetal/baremetalrunconfigurationwidget.cpp
+++ b/src/plugins/baremetal/baremetalrunconfigurationwidget.cpp
@@ -33,6 +33,7 @@
 
 #include <coreplugin/coreconstants.h>
 #include <utils/detailswidget.h>
+#include <utils/themehelper.h>
 
 #include <QLineEdit>
 #include <QFormLayout>
@@ -90,7 +91,8 @@ void BareMetalRunConfigurationWidget::addDisabledLabel(QVBoxLayout *topLayout)
 {
     QHBoxLayout * const hl = new QHBoxLayout;
     hl->addStretch();
-    d->disabledIcon.setPixmap(QPixmap(QLatin1String(Core::Constants::ICON_WARNING)));
+    d->disabledIcon.setPixmap(Utils::ThemeHelper::themedIconPixmap(
+                              QLatin1String(Core::Constants::ICON_WARNING)));
     hl->addWidget(&d->disabledIcon);
     d->disabledReason.setVisible(false);
     hl->addWidget(&d->disabledReason);
diff --git a/src/plugins/clangcodemodel/clangtextmark.cpp b/src/plugins/clangcodemodel/clangtextmark.cpp
index dfb1905992..64a2d91bcc 100644
--- a/src/plugins/clangcodemodel/clangtextmark.cpp
+++ b/src/plugins/clangcodemodel/clangtextmark.cpp
@@ -38,6 +38,7 @@
 #include <QApplication>
 
 #include <utils/tooltip/tooltip.h>
+#include <utils/themehelper.h>
 
 namespace ClangCodeModel {
 
@@ -73,8 +74,8 @@ ClangTextMark::ClangTextMark(const QString &fileName, int lineNumber, ClangBackE
 
 void ClangTextMark::setIcon(ClangBackEnd::DiagnosticSeverity severity)
 {
-    static const QIcon errorIcon{QLatin1String(Core::Constants::ICON_ERROR)};
-    static const QIcon warningIcon{QLatin1String(Core::Constants::ICON_WARNING)};
+    static const QIcon errorIcon{Utils::ThemeHelper::themedIcon(QLatin1String(Core::Constants::ICON_ERROR))};
+    static const QIcon warningIcon{Utils::ThemeHelper::themedIcon(QLatin1String(Core::Constants::ICON_WARNING))};
 
     if (isWarningOrNote(severity))
         TextMark::setIcon(warningIcon);
diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc
index 3b20ee263c..a383424b1b 100644
--- a/src/plugins/coreplugin/core.qrc
+++ b/src/plugins/coreplugin/core.qrc
@@ -1,6 +1,7 @@
 <RCC>
     <qresource prefix="/core">
         <file>images/clean_pane_small.png</file>
+        <file>images/clean_pane_small@2x.png</file>
         <file>images/clear.png</file>
         <file>images/clear@2x.png</file>
         <file>images/closebutton.png</file>
@@ -26,10 +27,10 @@
         <file>images/locked@2x.png</file>
         <file>images/magnifier.png</file>
         <file>images/magnifier@2x.png</file>
-        <file>images/dark_magnifier.png</file>
-        <file>images/dark_magnifier@2x.png</file>
         <file>images/minus.png</file>
+        <file>images/minus@2x.png</file>
         <file>images/next.png</file>
+        <file>images/next@2x.png</file>
         <file>images/panel_button.png</file>
         <file>images/panel_button@2x.png</file>
         <file>images/panel_button_checked.png</file>
@@ -41,7 +42,9 @@
         <file>images/panel_button_pressed.png</file>
         <file>images/panel_button_pressed@2x.png</file>
         <file>images/plus.png</file>
+        <file>images/plus@2x.png</file>
         <file>images/prev.png</file>
+        <file>images/prev@2x.png</file>
         <file>images/pushbutton.png</file>
         <file>images/pushbutton_hover.png</file>
         <file>images/pushbutton_pressed.png</file>
@@ -49,6 +52,7 @@
         <file>images/replace.png</file>
         <file>images/reset.png</file>
         <file>images/sidebaricon.png</file>
+        <file>images/sidebaricon@2x.png</file>
         <file>images/splitbutton_horizontal.png</file>
         <file>images/splitbutton_horizontal@2x.png</file>
         <file>images/statusbar.png</file>
@@ -113,5 +117,17 @@
         <file>images/dark_fileicon.png</file>
         <file>images/dark_foldericon.png</file>
         <file>images/Desktop.png</file>
+        <file>images/run_overlay_small.png</file>
+        <file>images/run_overlay_small@2x.png</file>
+        <file>images/stop_overlay_small.png</file>
+        <file>images/stop_overlay_small@2x.png</file>
+        <file>images/debugger_overlay_small.png</file>
+        <file>images/debugger_overlay_small@2x.png</file>
+        <file>images/interrupt_overlay_small.png</file>
+        <file>images/interrupt_overlay_small@2x.png</file>
+        <file>images/continue_overlay_small.png</file>
+        <file>images/continue_overlay_small@2x.png</file>
+        <file>images/zoom.png</file>
+        <file>images/zoom@2x.png</file>
     </qresource>
 </RCC>
diff --git a/src/plugins/coreplugin/coreconstants.h b/src/plugins/coreplugin/coreconstants.h
index 499e77854e..8d6c2d8bee 100644
--- a/src/plugins/coreplugin/coreconstants.h
+++ b/src/plugins/coreplugin/coreconstants.h
@@ -194,8 +194,8 @@ const char ICON_REDO[]               = ":/core/images/redo.png";
 const char ICON_COPY[]               = ":/core/images/editcopy.png";
 const char ICON_PASTE[]              = ":/core/images/editpaste.png";
 const char ICON_CUT[]                = ":/core/images/editcut.png";
-const char ICON_NEXT[]               = ":/core/images/next.png";
-const char ICON_PREV[]               = ":/core/images/prev.png";
+const char ICON_NEXT[]               = ":/core/images/next.png|IconsNavigationArrowsColor";
+const char ICON_PREV[]               = ":/core/images/prev.png|IconsNavigationArrowsColor";
 const char ICON_DIR[]                = ":/core/images/dir.png";
 const char ICON_CLEAN_PANE[]         = ":/core/images/clean_pane_small.png";
 const char ICON_CLEAR[]              = ":/core/images/clear.png";
@@ -219,9 +219,14 @@ const char ICON_PAUSE[]              = ":/core/images/pause.png";
 const char ICON_QTLOGO_32[]          = ":/core/images/logo/32/QtProject-qtcreator.png";
 const char ICON_QTLOGO_64[]          = ":/core/images/logo/64/QtProject-qtcreator.png";
 const char ICON_QTLOGO_128[]         = ":/core/images/logo/128/QtProject-qtcreator.png";
-const char ICON_WARNING[]            = ":/core/images/warning.png";
-const char ICON_ERROR[]              = ":/core/images/error.png";
-const char ICON_INFO[]               = ":/core/images/info.png";
+const char ICON_WARNING[]            = ":/core/images/warning.png|IconsWarningColor";
+const char ICON_ERROR[]              = ":/core/images/error.png|IconsErrorColor";
+const char ICON_INFO[]               = ":/core/images/info.png|IconsInfoColor";
+const char ICON_DEBUG_START_SMALL[]  = ":/core/images/debugger_overlay_small.png|IconsDebugColor,:/core/images/run_overlay_small.png|IconsRunColor";
+const char ICON_DEBUG_EXIT_SMALL[]   = ":/core/images/debugger_overlay_small.png|IconsDebugColor,:/core/images/stop_overlay_small.png|IconsStopColor";
+const char ICON_DEBUG_INTERRUPT_SMALL[] = ":/core/images/debugger_overlay_small.png|IconsDebugColor,:/core/images/interrupt_overlay_small.png|IconsInterruptColor";
+const char ICON_DEBUG_CONTINUE_SMALL[] = ":/core/images/debugger_overlay_small.png|IconsDebugColor,:/core/images/continue_overlay_small.png|IconsRunColor";
+const char ICON_ZOOM[]               = ":/core/images/zoom.png";
 
 const char WIZARD_CATEGORY_QT[] = "R.Qt";
 const char WIZARD_TR_CATEGORY_QT[] = QT_TRANSLATE_NOOP("Core", "Qt");
diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index 493d928fa7..9c45744ffe 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -74,6 +74,7 @@
 #include <utils/mimetypes/mimetype.h>
 #include <utils/qtcassert.h>
 #include <utils/overridecursor.h>
+#include <utils/themehelper.h>
 
 #include <QClipboard>
 #include <QDateTime>
@@ -267,8 +268,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(QIcon(QLatin1String(Constants::ICON_PREV)), EditorManager::tr("Go Back"), this)),
-    m_goForwardAction(new QAction(QIcon(QLatin1String(Constants::ICON_NEXT)), EditorManager::tr("Go Forward"), this)),
+    m_goBackAction(new QAction(Utils::ThemeHelper::themedIcon(QLatin1String(Constants::ICON_PREV)), EditorManager::tr("Go Back"), this)),
+    m_goForwardAction(new QAction(Utils::ThemeHelper::themedIcon(QLatin1String(Constants::ICON_NEXT)), 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/editormanager/editorview.cpp b/src/plugins/coreplugin/editormanager/editorview.cpp
index 525a684cdc..479de2ff55 100644
--- a/src/plugins/coreplugin/editormanager/editorview.cpp
+++ b/src/plugins/coreplugin/editormanager/editorview.cpp
@@ -45,6 +45,7 @@
 #include <coreplugin/findplaceholder.h>
 #include <utils/qtcassert.h>
 #include <utils/theme/theme.h>
+#include <utils/themehelper.h>
 
 #include <QDebug>
 
@@ -703,11 +704,15 @@ void SplitterOrView::split(Qt::Orientation orientation)
     view->view()->setCurrentEditor(duplicate);
 
     if (orientation == Qt::Horizontal) {
-        view->view()->setCloseSplitIcon(QIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_LEFT)));
-        otherView->view()->setCloseSplitIcon(QIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_RIGHT)));
+        view->view()->setCloseSplitIcon(
+                    Utils::ThemeHelper::themedIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_LEFT)));
+        otherView->view()->setCloseSplitIcon(
+                    Utils::ThemeHelper::themedIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_RIGHT)));
     } else {
-        view->view()->setCloseSplitIcon(QIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_TOP)));
-        otherView->view()->setCloseSplitIcon(QIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_BOTTOM)));
+        view->view()->setCloseSplitIcon(
+                    Utils::ThemeHelper::themedIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_TOP)));
+        otherView->view()->setCloseSplitIcon(
+                    Utils::ThemeHelper::themedIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_BOTTOM)));
     }
 
     EditorManagerPrivate::activateView(otherView->view());
@@ -795,17 +800,14 @@ void SplitterOrView::unsplit()
             m_layout->addWidget(m_view);
             QSplitter *parentSplitter = qobject_cast<QSplitter *>(parentWidget());
             if (parentSplitter) { // not the toplevel splitterOrView
-                if (parentSplitter->orientation() == Qt::Horizontal) {
-                    if (parentSplitter->widget(0) == this)
-                        m_view->setCloseSplitIcon(QIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_LEFT)));
-                    else
-                        m_view->setCloseSplitIcon(QIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_RIGHT)));
-                } else {
-                    if (parentSplitter->widget(0) == this)
-                        m_view->setCloseSplitIcon(QIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_TOP)));
-                    else
-                        m_view->setCloseSplitIcon(QIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_BOTTOM)));
-                }
+                if (parentSplitter->orientation() == Qt::Horizontal)
+                    Utils::ThemeHelper::themedIcon(QLatin1String(parentSplitter->widget(0) == this ?
+                                                                     Constants::ICON_CLOSE_SPLIT_LEFT
+                                                                   : Constants::ICON_CLOSE_SPLIT_RIGHT));
+                else
+                    Utils::ThemeHelper::themedIcon(QLatin1String(parentSplitter->widget(0) == this ?
+                                                                     Constants::ICON_CLOSE_SPLIT_TOP
+                                                                   : Constants::ICON_CLOSE_SPLIT_BOTTOM));
             }
         }
         m_layout->setCurrentWidget(m_view);
diff --git a/src/plugins/coreplugin/editortoolbar.cpp b/src/plugins/coreplugin/editortoolbar.cpp
index 0af71226f7..0c2affe99d 100644
--- a/src/plugins/coreplugin/editortoolbar.cpp
+++ b/src/plugins/coreplugin/editortoolbar.cpp
@@ -43,6 +43,7 @@
 #include <utils/fileutils.h>
 #include <utils/hostosinfo.h>
 #include <utils/qtcassert.h>
+#include <utils/themehelper.h>
 
 #include <QApplication>
 #include <QComboBox>
@@ -99,13 +100,13 @@ EditorToolBarPrivate::EditorToolBarPrivate(QWidget *parent, EditorToolBar *q) :
     m_lockButton(new QToolButton(q)),
     m_dragHandle(new QToolButton(q)),
     m_dragHandleMenu(0),
-    m_goBackAction(new QAction(QIcon(QLatin1String(Constants::ICON_PREV)), EditorManager::tr("Go Back"), parent)),
-    m_goForwardAction(new QAction(QIcon(QLatin1String(Constants::ICON_NEXT)), EditorManager::tr("Go Forward"), parent)),
+    m_goBackAction(new QAction(Utils::ThemeHelper::themedIcon(QLatin1String(Constants::ICON_PREV)), EditorManager::tr("Go Back"), parent)),
+    m_goForwardAction(new QAction(Utils::ThemeHelper::themedIcon(QLatin1String(Constants::ICON_NEXT)), EditorManager::tr("Go Forward"), parent)),
     m_backButton(new QToolButton(q)),
     m_forwardButton(new QToolButton(q)),
     m_splitButton(new QToolButton(q)),
-    m_horizontalSplitAction(new QAction(QIcon(QLatin1String(Constants::ICON_SPLIT_HORIZONTAL)), EditorManager::tr("Split"), parent)),
-    m_verticalSplitAction(new QAction(QIcon(QLatin1String(Constants::ICON_SPLIT_VERTICAL)), EditorManager::tr("Split Side by Side"), parent)),
+    m_horizontalSplitAction(new QAction(Utils::ThemeHelper::themedIcon(QLatin1String(Constants::ICON_SPLIT_HORIZONTAL)), EditorManager::tr("Split"), parent)),
+    m_verticalSplitAction(new QAction(Utils::ThemeHelper::themedIcon(QLatin1String(Constants::ICON_SPLIT_VERTICAL)), 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),
@@ -152,7 +153,8 @@ EditorToolBar::EditorToolBar(QWidget *parent) :
     d->m_editorList->setContextMenuPolicy(Qt::CustomContextMenu);
 
     d->m_closeEditorButton->setAutoRaise(true);
-    d->m_closeEditorButton->setIcon(QIcon(QLatin1String(Constants::ICON_BUTTON_CLOSE)));
+    d->m_closeEditorButton->setIcon(
+                Utils::ThemeHelper::themedIcon(QLatin1String(Constants::ICON_BUTTON_CLOSE)));
     d->m_closeEditorButton->setEnabled(false);
     d->m_closeEditorButton->setProperty("showborder", true);
 
@@ -168,7 +170,8 @@ EditorToolBar::EditorToolBar(QWidget *parent) :
         d->m_splitNewWindowAction->setIconVisibleInMenu(false);
     }
 
-    d->m_splitButton->setIcon(QIcon(QLatin1String(Constants::ICON_SPLIT_HORIZONTAL)));
+    d->m_splitButton->setIcon(
+                Utils::ThemeHelper::themedIcon(QLatin1String(Constants::ICON_SPLIT_HORIZONTAL)));
     d->m_splitButton->setToolTip(tr("Split"));
     d->m_splitButton->setPopupMode(QToolButton::InstantPopup);
     d->m_splitButton->setProperty("noArrow", true);
@@ -179,7 +182,8 @@ EditorToolBar::EditorToolBar(QWidget *parent) :
     d->m_splitButton->setMenu(splitMenu);
 
     d->m_closeSplitButton->setAutoRaise(true);
-    d->m_closeSplitButton->setIcon(QIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_BOTTOM)));
+    d->m_closeSplitButton->setIcon(
+                Utils::ThemeHelper::themedIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_BOTTOM)));
 
     QHBoxLayout *toplayout = new QHBoxLayout(this);
     toplayout->setSpacing(0);
diff --git a/src/plugins/coreplugin/find/find.qrc b/src/plugins/coreplugin/find/find.qrc
index 0c4e128101..dc4b240bfe 100644
--- a/src/plugins/coreplugin/find/find.qrc
+++ b/src/plugins/coreplugin/find/find.qrc
@@ -4,6 +4,7 @@
         <file>images/wholewords.png</file>
         <file>images/regexp.png</file>
         <file>images/expand.png</file>
+        <file>images/expand@2x.png</file>
         <file>images/wrapindicator.png</file>
         <file>images/preservecase.png</file>
     </qresource>
diff --git a/src/plugins/coreplugin/find/findtoolbar.cpp b/src/plugins/coreplugin/find/findtoolbar.cpp
index c29f63ba4f..a5e3786718 100644
--- a/src/plugins/coreplugin/find/findtoolbar.cpp
+++ b/src/plugins/coreplugin/find/findtoolbar.cpp
@@ -47,6 +47,7 @@
 #include <utils/qtcassert.h>
 #include <utils/stylehelper.h>
 #include <utils/theme/theme.h>
+#include <utils/themehelper.h>
 
 #include <QDebug>
 #include <QSettings>
@@ -667,8 +668,10 @@ void FindToolBar::updateIcons()
     bool regexp = effectiveFlags & FindRegularExpression;
     bool preserveCase = effectiveFlags & FindPreserveCase;
     if (!casesensitive && !wholewords && !regexp && !preserveCase) {
-        m_ui.findEdit->setButtonPixmap(Utils::FancyLineEdit::Left,
-                                       Utils::StyleHelper::dpiSpecificImageFile(QLatin1Literal(Constants::ICON_MAGNIFIER)));
+        const QPixmap pixmap = Utils::ThemeHelper::recoloredPixmap(
+                    QLatin1String(Constants::ICON_MAGNIFIER),
+                    Utils::ThemeHelper::inputfieldIconColor());
+        m_ui.findEdit->setButtonPixmap(Utils::FancyLineEdit::Left, pixmap);
     } else {
         m_ui.findEdit->setButtonPixmap(Utils::FancyLineEdit::Left,
                                        IFindFilter::pixmapForFindFlags(effectiveFlags));
@@ -958,8 +961,19 @@ void FindToolBar::setBackward(bool backward)
 
 void FindToolBar::setLightColoredIcon(bool lightColored)
 {
-    m_ui.close->setIcon(lightColored ? QIcon(QLatin1String(Constants::ICON_DARK_CLOSE))
-                                     : QIcon(QLatin1String(Constants::ICON_BUTTON_CLOSE)));
+    if (lightColored) {
+        m_ui.findNextButton->setIcon(QIcon());
+        m_ui.findNextButton->setArrowType(Qt::RightArrow);
+        m_ui.findPreviousButton->setIcon(QIcon());
+        m_ui.findPreviousButton->setArrowType(Qt::LeftArrow);
+        m_ui.close->setIcon(QIcon(QLatin1String(Constants::ICON_DARK_CLOSE)));
+    } else {
+        m_ui.findNextButton->setIcon(Utils::ThemeHelper::themedIcon(QLatin1String(Core::Constants::ICON_NEXT)));
+        m_ui.findNextButton->setArrowType(Qt::NoArrow);
+        m_ui.findPreviousButton->setIcon(Utils::ThemeHelper::themedIcon(QLatin1String(Core::Constants::ICON_PREV)));
+        m_ui.findPreviousButton->setArrowType(Qt::NoArrow);
+        m_ui.close->setIcon(Utils::ThemeHelper::themedIcon(QLatin1String(Constants::ICON_BUTTON_CLOSE)));
+    }
 }
 
 OptionsPopup::OptionsPopup(QWidget *parent)
diff --git a/src/plugins/coreplugin/find/findwidget.ui b/src/plugins/coreplugin/find/findwidget.ui
index 453928438f..f283bece6d 100644
--- a/src/plugins/coreplugin/find/findwidget.ui
+++ b/src/plugins/coreplugin/find/findwidget.ui
@@ -68,21 +68,10 @@
        <number>0</number>
       </property>
       <item>
-       <widget class="QToolButton" name="findPreviousButton">
-        <property name="arrowType">
-         <enum>Qt::LeftArrow</enum>
-        </property>
-       </widget>
+       <widget class="QToolButton" name="findPreviousButton"/>
       </item>
       <item>
-       <widget class="QToolButton" name="findNextButton">
-        <property name="font">
-         <font/>
-        </property>
-        <property name="arrowType">
-         <enum>Qt::RightArrow</enum>
-        </property>
-       </widget>
+       <widget class="QToolButton" name="findNextButton"/>
       </item>
       <item>
        <spacer name="horizontalSpacer">
@@ -98,11 +87,7 @@
        </spacer>
       </item>
       <item>
-       <widget class="QToolButton" name="close">
-        <property name="text">
-         <string>...</string>
-        </property>
-       </widget>
+       <widget class="QToolButton" name="close"/>
       </item>
      </layout>
     </widget>
diff --git a/src/plugins/coreplugin/find/images/all.png b/src/plugins/coreplugin/find/images/all.png
deleted file mode 100644
index f5c1c1f767..0000000000
--- a/src/plugins/coreplugin/find/images/all.png
+++ /dev/null
diff --git a/src/plugins/coreplugin/find/images/expand.png b/src/plugins/coreplugin/find/images/expand.png
index 48fcb9b703..3ad2592c9b 100644
--- a/src/plugins/coreplugin/find/images/expand.png
+++ b/src/plugins/coreplugin/find/images/expand.png
diff --git a/src/plugins/coreplugin/find/images/expand@2x.png b/src/plugins/coreplugin/find/images/expand@2x.png
new file mode 100644
index 0000000000..01f02b7afe
--- /dev/null
+++ b/src/plugins/coreplugin/find/images/expand@2x.png
diff --git a/src/plugins/coreplugin/find/images/next.png b/src/plugins/coreplugin/find/images/next.png
deleted file mode 100644
index 1844929119..0000000000
--- a/src/plugins/coreplugin/find/images/next.png
+++ /dev/null
diff --git a/src/plugins/coreplugin/find/images/previous.png b/src/plugins/coreplugin/find/images/previous.png
deleted file mode 100644
index 4fe50af9a8..0000000000
--- a/src/plugins/coreplugin/find/images/previous.png
+++ /dev/null
diff --git a/src/plugins/coreplugin/find/searchresultwindow.cpp b/src/plugins/coreplugin/find/searchresultwindow.cpp
index 3b73bd83b6..a283dfee0c 100644
--- a/src/plugins/coreplugin/find/searchresultwindow.cpp
+++ b/src/plugins/coreplugin/find/searchresultwindow.cpp
@@ -39,6 +39,7 @@
 #include <coreplugin/icontext.h>
 #include <utils/qtcassert.h>
 #include <utils/styledbar.h>
+#include <utils/themehelper.h>
 
 #include <QAction>
 #include <QComboBox>
@@ -141,7 +142,7 @@ namespace Internal {
         m_expandCollapseButton->setAutoRaise(true);
 
         m_expandCollapseAction->setCheckable(true);
-        m_expandCollapseAction->setIcon(QIcon(QLatin1String(":/find/images/expand.png")));
+        m_expandCollapseAction->setIcon(Utils::ThemeHelper::themedIcon(QLatin1String(":/find/images/expand.png")));
         Command *cmd = ActionManager::registerAction(m_expandCollapseAction, "Find.ExpandAll");
         cmd->setAttribute(Command::CA_UpdateText);
         m_expandCollapseButton->setDefaultAction(cmd->action());
diff --git a/src/plugins/coreplugin/images/arrowdown.png b/src/plugins/coreplugin/images/arrowdown.png
index f94254fa26..fff77a48e6 100644
--- a/src/plugins/coreplugin/images/arrowdown.png
+++ b/src/plugins/coreplugin/images/arrowdown.png
diff --git a/src/plugins/coreplugin/images/arrowdown@2x.png b/src/plugins/coreplugin/images/arrowdown@2x.png
index 17fdf05941..9e4873fa0b 100644
--- a/src/plugins/coreplugin/images/arrowdown@2x.png
+++ b/src/plugins/coreplugin/images/arrowdown@2x.png
diff --git a/src/plugins/coreplugin/images/arrowup.png b/src/plugins/coreplugin/images/arrowup.png
index 14aa28454f..c1058ce1ee 100644
--- a/src/plugins/coreplugin/images/arrowup.png
+++ b/src/plugins/coreplugin/images/arrowup.png
diff --git a/src/plugins/coreplugin/images/arrowup@2x.png b/src/plugins/coreplugin/images/arrowup@2x.png
index 46387753cc..a382645265 100644
--- a/src/plugins/coreplugin/images/arrowup@2x.png
+++ b/src/plugins/coreplugin/images/arrowup@2x.png
diff --git a/src/plugins/coreplugin/images/button_close.png b/src/plugins/coreplugin/images/button_close.png
index 8a36ba481d..dfe3144d14 100644
--- a/src/plugins/coreplugin/images/button_close.png
+++ b/src/plugins/coreplugin/images/button_close.png
diff --git a/src/plugins/coreplugin/images/button_close@2x.png b/src/plugins/coreplugin/images/button_close@2x.png
index ddc0550a6c..3e2f1a706a 100644
--- a/src/plugins/coreplugin/images/button_close@2x.png
+++ b/src/plugins/coreplugin/images/button_close@2x.png
diff --git a/src/plugins/coreplugin/images/clean_pane_small.png b/src/plugins/coreplugin/images/clean_pane_small.png
index 341e23861a..c75262d64a 100644
--- a/src/plugins/coreplugin/images/clean_pane_small.png
+++ b/src/plugins/coreplugin/images/clean_pane_small.png
diff --git a/src/plugins/coreplugin/images/clean_pane_small@2x.png b/src/plugins/coreplugin/images/clean_pane_small@2x.png
new file mode 100644
index 0000000000..b2ea1226ab
--- /dev/null
+++ b/src/plugins/coreplugin/images/clean_pane_small@2x.png
diff --git a/src/plugins/coreplugin/images/continue_overlay_small.png b/src/plugins/coreplugin/images/continue_overlay_small.png
new file mode 100644
index 0000000000..36612491d0
--- /dev/null
+++ b/src/plugins/coreplugin/images/continue_overlay_small.png
diff --git a/src/plugins/coreplugin/images/continue_overlay_small@2x.png b/src/plugins/coreplugin/images/continue_overlay_small@2x.png
new file mode 100644
index 0000000000..8fe9c7f679
--- /dev/null
+++ b/src/plugins/coreplugin/images/continue_overlay_small@2x.png
diff --git a/src/plugins/coreplugin/images/dark_magnifier.png b/src/plugins/coreplugin/images/dark_magnifier.png
deleted file mode 100644
index 322a542a0e..0000000000
--- a/src/plugins/coreplugin/images/dark_magnifier.png
+++ /dev/null
diff --git a/src/plugins/coreplugin/images/dark_magnifier@2x.png b/src/plugins/coreplugin/images/dark_magnifier@2x.png
deleted file mode 100644
index ed82c37dd0..0000000000
--- a/src/plugins/coreplugin/images/dark_magnifier@2x.png
+++ /dev/null
diff --git a/src/plugins/coreplugin/images/debugger_overlay_small.png b/src/plugins/coreplugin/images/debugger_overlay_small.png
new file mode 100644
index 0000000000..c4a156e444
--- /dev/null
+++ b/src/plugins/coreplugin/images/debugger_overlay_small.png
diff --git a/src/plugins/coreplugin/images/debugger_overlay_small@2x.png b/src/plugins/coreplugin/images/debugger_overlay_small@2x.png
new file mode 100644
index 0000000000..56fc623483
--- /dev/null
+++ b/src/plugins/coreplugin/images/debugger_overlay_small@2x.png
diff --git a/src/plugins/coreplugin/images/editclear.png b/src/plugins/coreplugin/images/editclear.png
index e8aa21a2a4..7a6fcb86ac 100644
--- a/src/plugins/coreplugin/images/editclear.png
+++ b/src/plugins/coreplugin/images/editclear.png
diff --git a/src/plugins/coreplugin/images/editclear@2x.png b/src/plugins/coreplugin/images/editclear@2x.png
index b4f1730c24..5279b6d707 100644
--- a/src/plugins/coreplugin/images/editclear@2x.png
+++ b/src/plugins/coreplugin/images/editclear@2x.png
diff --git a/src/plugins/coreplugin/images/error.png b/src/plugins/coreplugin/images/error.png
index 8f9f3bb161..b1537b886f 100644
--- a/src/plugins/coreplugin/images/error.png
+++ b/src/plugins/coreplugin/images/error.png
diff --git a/src/plugins/coreplugin/images/error@2x.png b/src/plugins/coreplugin/images/error@2x.png
index 464072347b..76ec6a5f47 100644
--- a/src/plugins/coreplugin/images/error@2x.png
+++ b/src/plugins/coreplugin/images/error@2x.png
diff --git a/src/plugins/coreplugin/images/extension.png b/src/plugins/coreplugin/images/extension.png
index 54494460d8..57d4825486 100644
--- a/src/plugins/coreplugin/images/extension.png
+++ b/src/plugins/coreplugin/images/extension.png
diff --git a/src/plugins/coreplugin/images/extension@2x.png b/src/plugins/coreplugin/images/extension@2x.png
index 0d5c1be575..e90faa2ac0 100644
--- a/src/plugins/coreplugin/images/extension@2x.png
+++ b/src/plugins/coreplugin/images/extension@2x.png
diff --git a/src/plugins/coreplugin/images/filtericon.png b/src/plugins/coreplugin/images/filtericon.png
index 456466a727..0ced0c1ebe 100644
--- a/src/plugins/coreplugin/images/filtericon.png
+++ b/src/plugins/coreplugin/images/filtericon.png
diff --git a/src/plugins/coreplugin/images/filtericon@2x.png b/src/plugins/coreplugin/images/filtericon@2x.png
index 80dcb27985..caa4c03081 100644
--- a/src/plugins/coreplugin/images/filtericon@2x.png
+++ b/src/plugins/coreplugin/images/filtericon@2x.png
diff --git a/src/plugins/coreplugin/images/info.png b/src/plugins/coreplugin/images/info.png
index 4fcbe4068e..76cc0664c3 100644
--- a/src/plugins/coreplugin/images/info.png
+++ b/src/plugins/coreplugin/images/info.png
diff --git a/src/plugins/coreplugin/images/info@2x.png b/src/plugins/coreplugin/images/info@2x.png
index 816f4d75a6..d8f7b03ef8 100644
--- a/src/plugins/coreplugin/images/info@2x.png
+++ b/src/plugins/coreplugin/images/info@2x.png
diff --git a/src/plugins/coreplugin/images/interrupt_overlay_small.png b/src/plugins/coreplugin/images/interrupt_overlay_small.png
new file mode 100644
index 0000000000..e61b75384a
--- /dev/null
+++ b/src/plugins/coreplugin/images/interrupt_overlay_small.png
diff --git a/src/plugins/coreplugin/images/interrupt_overlay_small@2x.png b/src/plugins/coreplugin/images/interrupt_overlay_small@2x.png
new file mode 100644
index 0000000000..2d686964bf
--- /dev/null
+++ b/src/plugins/coreplugin/images/interrupt_overlay_small@2x.png
diff --git a/src/plugins/coreplugin/images/linkicon.png b/src/plugins/coreplugin/images/linkicon.png
index e22ad7ffc0..b205b3eaf1 100644
--- a/src/plugins/coreplugin/images/linkicon.png
+++ b/src/plugins/coreplugin/images/linkicon.png
diff --git a/src/plugins/coreplugin/images/linkicon@2x.png b/src/plugins/coreplugin/images/linkicon@2x.png
index 9ade2143dd..971985470a 100644
--- a/src/plugins/coreplugin/images/linkicon@2x.png
+++ b/src/plugins/coreplugin/images/linkicon@2x.png
diff --git a/src/plugins/coreplugin/images/magnifier.png b/src/plugins/coreplugin/images/magnifier.png
index 0e652c945e..ba945dd6f1 100644
--- a/src/plugins/coreplugin/images/magnifier.png
+++ b/src/plugins/coreplugin/images/magnifier.png
diff --git a/src/plugins/coreplugin/images/magnifier@2x.png b/src/plugins/coreplugin/images/magnifier@2x.png
index 384cb7927d..304dd5427d 100644
--- a/src/plugins/coreplugin/images/magnifier@2x.png
+++ b/src/plugins/coreplugin/images/magnifier@2x.png
diff --git a/src/plugins/coreplugin/images/minus.png b/src/plugins/coreplugin/images/minus.png
index 4466844662..0a16b38681 100644
--- a/src/plugins/coreplugin/images/minus.png
+++ b/src/plugins/coreplugin/images/minus.png
diff --git a/src/plugins/coreplugin/images/minus@2x.png b/src/plugins/coreplugin/images/minus@2x.png
new file mode 100644
index 0000000000..c21397be3c
--- /dev/null
+++ b/src/plugins/coreplugin/images/minus@2x.png
diff --git a/src/plugins/coreplugin/images/next.png b/src/plugins/coreplugin/images/next.png
index 7700d6fce6..5ab267510e 100644
--- a/src/plugins/coreplugin/images/next.png
+++ b/src/plugins/coreplugin/images/next.png
diff --git a/src/plugins/coreplugin/images/next@2x.png b/src/plugins/coreplugin/images/next@2x.png
new file mode 100644
index 0000000000..47af647875
--- /dev/null
+++ b/src/plugins/coreplugin/images/next@2x.png
diff --git a/src/plugins/coreplugin/images/plus.png b/src/plugins/coreplugin/images/plus.png
index be8c961df1..795229ec6c 100644
--- a/src/plugins/coreplugin/images/plus.png
+++ b/src/plugins/coreplugin/images/plus.png
diff --git a/src/plugins/coreplugin/images/plus@2x.png b/src/plugins/coreplugin/images/plus@2x.png
new file mode 100644
index 0000000000..f276dd94ff
--- /dev/null
+++ b/src/plugins/coreplugin/images/plus@2x.png
diff --git a/src/plugins/coreplugin/images/prev.png b/src/plugins/coreplugin/images/prev.png
index 99dc8733c7..c9bd18a7de 100644
--- a/src/plugins/coreplugin/images/prev.png
+++ b/src/plugins/coreplugin/images/prev.png
diff --git a/src/plugins/coreplugin/images/prev@2x.png b/src/plugins/coreplugin/images/prev@2x.png
new file mode 100644
index 0000000000..6c5114bc84
--- /dev/null
+++ b/src/plugins/coreplugin/images/prev@2x.png
diff --git a/src/plugins/coreplugin/images/run_overlay_small.png b/src/plugins/coreplugin/images/run_overlay_small.png
new file mode 100644
index 0000000000..db22edd2fb
--- /dev/null
+++ b/src/plugins/coreplugin/images/run_overlay_small.png
diff --git a/src/plugins/coreplugin/images/run_overlay_small@2x.png b/src/plugins/coreplugin/images/run_overlay_small@2x.png
new file mode 100644
index 0000000000..a5ec8416b6
--- /dev/null
+++ b/src/plugins/coreplugin/images/run_overlay_small@2x.png
diff --git a/src/plugins/coreplugin/images/sidebaricon.png b/src/plugins/coreplugin/images/sidebaricon.png
index 8a1392748b..413bed7c49 100644
--- a/src/plugins/coreplugin/images/sidebaricon.png
+++ b/src/plugins/coreplugin/images/sidebaricon.png
diff --git a/src/plugins/coreplugin/images/sidebaricon@2x.png b/src/plugins/coreplugin/images/sidebaricon@2x.png
new file mode 100644
index 0000000000..81937400b4
--- /dev/null
+++ b/src/plugins/coreplugin/images/sidebaricon@2x.png
diff --git a/src/plugins/coreplugin/images/splitbutton_closebottom.png b/src/plugins/coreplugin/images/splitbutton_closebottom.png
index b47b31d8d0..f791573900 100644
--- a/src/plugins/coreplugin/images/splitbutton_closebottom.png
+++ b/src/plugins/coreplugin/images/splitbutton_closebottom.png
diff --git a/src/plugins/coreplugin/images/splitbutton_closebottom@2x.png b/src/plugins/coreplugin/images/splitbutton_closebottom@2x.png
index 44f465e23f..e0279be494 100644
--- a/src/plugins/coreplugin/images/splitbutton_closebottom@2x.png
+++ b/src/plugins/coreplugin/images/splitbutton_closebottom@2x.png
diff --git a/src/plugins/coreplugin/images/splitbutton_closeleft.png b/src/plugins/coreplugin/images/splitbutton_closeleft.png
index d5fab50194..5360a5747e 100644
--- a/src/plugins/coreplugin/images/splitbutton_closeleft.png
+++ b/src/plugins/coreplugin/images/splitbutton_closeleft.png
diff --git a/src/plugins/coreplugin/images/splitbutton_closeleft@2x.png b/src/plugins/coreplugin/images/splitbutton_closeleft@2x.png
index 37f51fa6ef..8ed36bfe6a 100644
--- a/src/plugins/coreplugin/images/splitbutton_closeleft@2x.png
+++ b/src/plugins/coreplugin/images/splitbutton_closeleft@2x.png
diff --git a/src/plugins/coreplugin/images/splitbutton_closeright.png b/src/plugins/coreplugin/images/splitbutton_closeright.png
index 8221ab2023..5bf79bea0b 100644
--- a/src/plugins/coreplugin/images/splitbutton_closeright.png
+++ b/src/plugins/coreplugin/images/splitbutton_closeright.png
diff --git a/src/plugins/coreplugin/images/splitbutton_closeright@2x.png b/src/plugins/coreplugin/images/splitbutton_closeright@2x.png
index 84856ea819..4ec186c3f5 100644
--- a/src/plugins/coreplugin/images/splitbutton_closeright@2x.png
+++ b/src/plugins/coreplugin/images/splitbutton_closeright@2x.png
diff --git a/src/plugins/coreplugin/images/splitbutton_closetop.png b/src/plugins/coreplugin/images/splitbutton_closetop.png
index b6004bf1f6..4f58e4eae9 100644
--- a/src/plugins/coreplugin/images/splitbutton_closetop.png
+++ b/src/plugins/coreplugin/images/splitbutton_closetop.png
diff --git a/src/plugins/coreplugin/images/splitbutton_closetop@2x.png b/src/plugins/coreplugin/images/splitbutton_closetop@2x.png
index 99aaa56570..0ca02834ed 100644
--- a/src/plugins/coreplugin/images/splitbutton_closetop@2x.png
+++ b/src/plugins/coreplugin/images/splitbutton_closetop@2x.png
diff --git a/src/plugins/coreplugin/images/splitbutton_horizontal.png b/src/plugins/coreplugin/images/splitbutton_horizontal.png
index 7b945ac281..2a8f953b8b 100644
--- a/src/plugins/coreplugin/images/splitbutton_horizontal.png
+++ b/src/plugins/coreplugin/images/splitbutton_horizontal.png
diff --git a/src/plugins/coreplugin/images/splitbutton_horizontal@2x.png b/src/plugins/coreplugin/images/splitbutton_horizontal@2x.png
index 63911b6319..dc31e40019 100644
--- a/src/plugins/coreplugin/images/splitbutton_horizontal@2x.png
+++ b/src/plugins/coreplugin/images/splitbutton_horizontal@2x.png
diff --git a/src/plugins/coreplugin/images/splitbutton_vertical.png b/src/plugins/coreplugin/images/splitbutton_vertical.png
index 72abc914cf..0e8b98b3d7 100644
--- a/src/plugins/coreplugin/images/splitbutton_vertical.png
+++ b/src/plugins/coreplugin/images/splitbutton_vertical.png
diff --git a/src/plugins/coreplugin/images/splitbutton_vertical@2x.png b/src/plugins/coreplugin/images/splitbutton_vertical@2x.png
index 87bac3879d..2a36833d5e 100644
--- a/src/plugins/coreplugin/images/splitbutton_vertical@2x.png
+++ b/src/plugins/coreplugin/images/splitbutton_vertical@2x.png
diff --git a/src/plugins/coreplugin/images/stop_overlay_small.png b/src/plugins/coreplugin/images/stop_overlay_small.png
new file mode 100644
index 0000000000..8350ba9eec
--- /dev/null
+++ b/src/plugins/coreplugin/images/stop_overlay_small.png
diff --git a/src/plugins/coreplugin/images/stop_overlay_small@2x.png b/src/plugins/coreplugin/images/stop_overlay_small@2x.png
new file mode 100644
index 0000000000..f0fb92f670
--- /dev/null
+++ b/src/plugins/coreplugin/images/stop_overlay_small@2x.png
diff --git a/src/plugins/coreplugin/images/warning.png b/src/plugins/coreplugin/images/warning.png
index 74e67dbae8..da6905bf9a 100644
--- a/src/plugins/coreplugin/images/warning.png
+++ b/src/plugins/coreplugin/images/warning.png
diff --git a/src/plugins/coreplugin/images/warning@2x.png b/src/plugins/coreplugin/images/warning@2x.png
index b362e6c555..c3d9024c9b 100644
--- a/src/plugins/coreplugin/images/warning@2x.png
+++ b/src/plugins/coreplugin/images/warning@2x.png
diff --git a/src/plugins/coreplugin/images/zoom.png b/src/plugins/coreplugin/images/zoom.png
new file mode 100644
index 0000000000..a3e9dd0b6b
--- /dev/null
+++ b/src/plugins/coreplugin/images/zoom.png
diff --git a/src/plugins/coreplugin/images/zoom@2x.png b/src/plugins/coreplugin/images/zoom@2x.png
new file mode 100644
index 0000000000..96976de58b
--- /dev/null
+++ b/src/plugins/coreplugin/images/zoom@2x.png
diff --git a/src/plugins/coreplugin/locator/locatorfiltersfilter.cpp b/src/plugins/coreplugin/locator/locatorfiltersfilter.cpp
index 146a4d9824..73c9c8bb97 100644
--- a/src/plugins/coreplugin/locator/locatorfiltersfilter.cpp
+++ b/src/plugins/coreplugin/locator/locatorfiltersfilter.cpp
@@ -34,6 +34,7 @@
 
 #include <coreplugin/coreconstants.h>
 #include <utils/qtcassert.h>
+#include <utils/themehelper.h>
 
 using namespace Core;
 using namespace Core::Internal;
@@ -44,7 +45,7 @@ LocatorFiltersFilter::LocatorFiltersFilter(Locator *plugin,
                                                LocatorWidget *locatorWidget):
     m_plugin(plugin),
     m_locatorWidget(locatorWidget),
-    m_icon(QIcon(QLatin1String(Constants::ICON_NEXT)))
+    m_icon(Utils::ThemeHelper::themedIcon(QLatin1String(Constants::ICON_NEXT)))
 {
     setId("FiltersFilter");
     setDisplayName(tr("Available filters"));
diff --git a/src/plugins/coreplugin/locator/locatorwidget.cpp b/src/plugins/coreplugin/locator/locatorwidget.cpp
index afe793e1dd..21f0b50026 100644
--- a/src/plugins/coreplugin/locator/locatorwidget.cpp
+++ b/src/plugins/coreplugin/locator/locatorwidget.cpp
@@ -47,6 +47,7 @@
 #include <utils/qtcassert.h>
 #include <utils/runextensions.h>
 #include <utils/stylehelper.h>
+#include <utils/themehelper.h>
 
 #include <QColor>
 #include <QFileInfo>
@@ -252,9 +253,11 @@ LocatorWidget::LocatorWidget(Locator *qop) :
     layout->addWidget(m_fileLineEdit);
 
     setWindowIcon(QIcon(QLatin1String(":/locator/images/locator.png")));
-    const QPixmap image = Utils::StyleHelper::dpiSpecificImageFile(QLatin1String(Constants::ICON_MAGNIFIER));
+    const QPixmap pixmap = Utils::ThemeHelper::recoloredPixmap(
+                QLatin1String(Constants::ICON_MAGNIFIER),
+                Utils::ThemeHelper::inputfieldIconColor());
     m_fileLineEdit->setFiltering(true);
-    m_fileLineEdit->setButtonPixmap(Utils::FancyLineEdit::Left, image);
+    m_fileLineEdit->setButtonPixmap(Utils::FancyLineEdit::Left, pixmap);
     m_fileLineEdit->setButtonToolTip(Utils::FancyLineEdit::Left, tr("Options"));
     m_fileLineEdit->setFocusPolicy(Qt::ClickFocus);
     m_fileLineEdit->setButtonVisible(Utils::FancyLineEdit::Left, true);
diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp
index 1c6ab39548..8f0b311a27 100644
--- a/src/plugins/coreplugin/mainwindow.cpp
+++ b/src/plugins/coreplugin/mainwindow.cpp
@@ -82,6 +82,7 @@
 #include <utils/qtcassert.h>
 #include <utils/stylehelper.h>
 #include <utils/theme/theme.h>
+#include <utils/themehelper.h>
 #include <utils/stringutils.h>
 
 #include <QApplication>
@@ -677,7 +678,7 @@ void MainWindow::registerDefaultActions()
     }
 
     // Show Sidebar Action
-    m_toggleSideBarAction = new QAction(QIcon(QLatin1String(Constants::ICON_TOGGLE_SIDEBAR)),
+    m_toggleSideBarAction = new QAction(Utils::ThemeHelper::themedIcon(QLatin1String(Constants::ICON_TOGGLE_SIDEBAR)),
                                         QCoreApplication::translate("Core", Constants::TR_SHOW_SIDEBAR),
                                         this);
     m_toggleSideBarAction->setCheckable(true);
diff --git a/src/plugins/coreplugin/manhattanstyle.cpp b/src/plugins/coreplugin/manhattanstyle.cpp
index ab76a278f7..9e8f4a48cd 100644
--- a/src/plugins/coreplugin/manhattanstyle.cpp
+++ b/src/plugins/coreplugin/manhattanstyle.cpp
@@ -40,6 +40,7 @@
 
 #include <utils/fancymainwindow.h>
 #include <utils/theme/theme.h>
+#include <utils/themehelper.h>
 
 #include <QApplication>
 #include <QComboBox>
@@ -138,7 +139,7 @@ public:
 ManhattanStylePrivate::ManhattanStylePrivate() :
     lineeditImage(StyleHelper::dpiSpecificImageFile(QStringLiteral(":/core/images/inputfield.png"))),
     lineeditImage_disabled(StyleHelper::dpiSpecificImageFile(QStringLiteral(":/core/images/inputfield_disabled.png"))),
-    extButtonPixmap(QLatin1String(":/core/images/extension.png")),
+    extButtonPixmap(ThemeHelper::themedIconPixmap(QLatin1String(":/core/images/extension.png"))),
     closeButtonPixmap(QLatin1String(Core::Constants::ICON_CLOSE_BUTTON))
 {
 }
diff --git a/src/plugins/coreplugin/navigationsubwidget.cpp b/src/plugins/coreplugin/navigationsubwidget.cpp
index 39c23b45bd..80ad67c0a9 100644
--- a/src/plugins/coreplugin/navigationsubwidget.cpp
+++ b/src/plugins/coreplugin/navigationsubwidget.cpp
@@ -37,6 +37,7 @@
 #include "id.h"
 
 #include <utils/styledbar.h>
+#include <utils/themehelper.h>
 
 #include <QDebug>
 
@@ -74,7 +75,8 @@ NavigationSubWidget::NavigationSubWidget(NavigationWidget *parentWidget, int pos
     toolBarLayout->addWidget(m_navigationComboBox);
 
     QToolButton *splitAction = new QToolButton();
-    splitAction->setIcon(QIcon(QLatin1String(Constants::ICON_SPLIT_HORIZONTAL)));
+    splitAction->setIcon(Utils::ThemeHelper::themedIcon(
+                             QLatin1String(Constants::ICON_SPLIT_HORIZONTAL)));
     splitAction->setToolTip(tr("Split"));
     splitAction->setPopupMode(QToolButton::InstantPopup);
     splitAction->setProperty("noArrow", true);
@@ -83,7 +85,8 @@ NavigationSubWidget::NavigationSubWidget(NavigationWidget *parentWidget, int pos
     connect(m_splitMenu, &QMenu::aboutToShow, this, &NavigationSubWidget::populateSplitMenu);
 
     m_closeButton = new QToolButton();
-    m_closeButton->setIcon(QIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_BOTTOM)));
+    m_closeButton->setIcon(
+                Utils::ThemeHelper::themedIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_BOTTOM)));
     m_closeButton->setToolTip(tr("Close"));
 
     toolBarLayout->addWidget(splitAction);
diff --git a/src/plugins/coreplugin/navigationwidget.cpp b/src/plugins/coreplugin/navigationwidget.cpp
index 599b4cf5d5..dd07140744 100644
--- a/src/plugins/coreplugin/navigationwidget.cpp
+++ b/src/plugins/coreplugin/navigationwidget.cpp
@@ -40,6 +40,8 @@
 #include "id.h"
 #include "imode.h"
 
+#include <utils/themehelper.h>
+
 #include <QCoreApplication>
 #include <QDebug>
 #include <QSettings>
@@ -248,7 +250,8 @@ Internal::NavigationSubWidget *NavigationWidget::insertSubItem(int position,int
     }
 
     if (!d->m_subWidgets.isEmpty()) // Make all icons the bottom icon
-        d->m_subWidgets.at(0)->setCloseIcon(QIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_BOTTOM)));
+        d->m_subWidgets.at(0)->setCloseIcon(
+                    Utils::ThemeHelper::themedIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_BOTTOM)));
 
     Internal::NavigationSubWidget *nsw = new Internal::NavigationSubWidget(this, position, index);
     connect(nsw, &Internal::NavigationSubWidget::splitMe,
@@ -257,9 +260,11 @@ Internal::NavigationSubWidget *NavigationWidget::insertSubItem(int position,int
     insertWidget(position, nsw);
     d->m_subWidgets.insert(position, nsw);
     if (d->m_subWidgets.size() == 1)
-        d->m_subWidgets.at(0)->setCloseIcon(QIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_LEFT)));
+        d->m_subWidgets.at(0)->setCloseIcon(
+                    Utils::ThemeHelper::themedIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_LEFT)));
     else
-        d->m_subWidgets.at(0)->setCloseIcon(QIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_TOP)));
+        d->m_subWidgets.at(0)->setCloseIcon(
+                    Utils::ThemeHelper::themedIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_TOP)));
     return nsw;
 }
 
@@ -308,9 +313,11 @@ void NavigationWidget::closeSubWidget()
         subWidget->deleteLater();
         // update close button of top item
         if (d->m_subWidgets.size() == 1)
-            d->m_subWidgets.at(0)->setCloseIcon(QIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_LEFT)));
+            d->m_subWidgets.at(0)->setCloseIcon(
+                        Utils::ThemeHelper::themedIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_LEFT)));
         else
-            d->m_subWidgets.at(0)->setCloseIcon(QIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_TOP)));
+            d->m_subWidgets.at(0)->setCloseIcon(
+                        Utils::ThemeHelper::themedIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_TOP)));
     } else {
         setShown(false);
     }
diff --git a/src/plugins/coreplugin/outputpanemanager.cpp b/src/plugins/coreplugin/outputpanemanager.cpp
index fa2672713e..f1950c2b69 100644
--- a/src/plugins/coreplugin/outputpanemanager.cpp
+++ b/src/plugins/coreplugin/outputpanemanager.cpp
@@ -51,6 +51,7 @@
 #include <utils/stylehelper.h>
 #include <utils/qtcassert.h>
 #include <utils/theme/theme.h>
+#include <utils/themehelper.h>
 
 #include <QDebug>
 
@@ -123,8 +124,8 @@ OutputPaneManager::OutputPaneManager(QWidget *parent) :
     m_prevAction(0),
     m_outputWidgetPane(new QStackedWidget),
     m_opToolBarWidgets(new QStackedWidget),
-    m_minimizeIcon(QLatin1String(":/core/images/arrowdown.png")),
-    m_maximizeIcon(QLatin1String(":/core/images/arrowup.png")),
+    m_minimizeIcon(ThemeHelper::themedIcon(QLatin1String(":/core/images/arrowdown.png"))),
+    m_maximizeIcon(ThemeHelper::themedIcon(QLatin1String(":/core/images/arrowup.png"))),
     m_maximised(false),
     m_outputPaneHeight(0)
 {
@@ -133,17 +134,17 @@ OutputPaneManager::OutputPaneManager(QWidget *parent) :
     m_titleLabel->setContentsMargins(5, 0, 5, 0);
 
     m_clearAction = new QAction(this);
-    m_clearAction->setIcon(QIcon(QLatin1String(Constants::ICON_CLEAN_PANE)));
+    m_clearAction->setIcon(Utils::ThemeHelper::themedIcon(QLatin1String(Constants::ICON_CLEAN_PANE)));
     m_clearAction->setText(tr("Clear"));
     connect(m_clearAction, SIGNAL(triggered()), this, SLOT(clearPage()));
 
     m_nextAction = new QAction(this);
-    m_nextAction->setIcon(QIcon(QLatin1String(Constants::ICON_NEXT)));
+    m_nextAction->setIcon(Utils::ThemeHelper::themedIcon(QLatin1String(Constants::ICON_NEXT)));
     m_nextAction->setText(tr("Next Item"));
     connect(m_nextAction, SIGNAL(triggered()), this, SLOT(slotNext()));
 
     m_prevAction = new QAction(this);
-    m_prevAction->setIcon(QIcon(QLatin1String(Constants::ICON_PREV)));
+    m_prevAction->setIcon(Utils::ThemeHelper::themedIcon(QLatin1String(Constants::ICON_PREV)));
     m_prevAction->setText(tr("Previous Item"));
     connect(m_prevAction, SIGNAL(triggered()), this, SLOT(slotPrev()));
 
@@ -151,7 +152,8 @@ OutputPaneManager::OutputPaneManager(QWidget *parent) :
     m_minMaxAction->setIcon(m_maximizeIcon);
     m_minMaxAction->setText(tr("Maximize Output Pane"));
 
-    m_closeButton->setIcon(QIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_BOTTOM)));
+    m_closeButton->setIcon(
+                Utils::ThemeHelper::themedIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_BOTTOM)));
     connect(m_closeButton, SIGNAL(clicked()), this, SLOT(slotHide()));
 
     connect(ICore::instance(), SIGNAL(saveSettingsRequested()), this, SLOT(saveSettings()));
diff --git a/src/plugins/coreplugin/sidebar.cpp b/src/plugins/coreplugin/sidebar.cpp
index 6365fbfc7e..69ab9a5ebf 100644
--- a/src/plugins/coreplugin/sidebar.cpp
+++ b/src/plugins/coreplugin/sidebar.cpp
@@ -35,6 +35,7 @@
 #include "actionmanager/command.h"
 #include <utils/algorithm.h>
 #include <utils/qtcassert.h>
+#include <utils/themehelper.h>
 
 #include <QSettings>
 #include <QPointer>
@@ -204,7 +205,8 @@ SideBarItem *SideBar::item(const QString &id)
 Internal::SideBarWidget *SideBar::insertSideBarWidget(int position, const QString &id)
 {
     if (!d->m_widgets.isEmpty())
-        d->m_widgets.at(0)->setCloseIcon(QIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_BOTTOM)));
+        d->m_widgets.at(0)->setCloseIcon(
+                    Utils::ThemeHelper::themedIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_BOTTOM)));
 
     Internal::SideBarWidget *item = new Internal::SideBarWidget(this, id);
     connect(item, SIGNAL(splitMe()), this, SLOT(splitSubWidget()));
@@ -213,9 +215,11 @@ Internal::SideBarWidget *SideBar::insertSideBarWidget(int position, const QStrin
     insertWidget(position, item);
     d->m_widgets.insert(position, item);
     if (d->m_widgets.size() == 1)
-        d->m_widgets.at(0)->setCloseIcon(QIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_LEFT)));
+        d->m_widgets.at(0)->setCloseIcon(
+                    Utils::ThemeHelper::themedIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_LEFT)));
     else
-        d->m_widgets.at(0)->setCloseIcon(QIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_TOP)));
+        d->m_widgets.at(0)->setCloseIcon(
+                    Utils::ThemeHelper::themedIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_TOP)));
     updateWidgets();
     return item;
 }
@@ -245,9 +249,11 @@ void SideBar::closeSubWidget()
         removeSideBarWidget(widget);
         // update close button of top item
         if (d->m_widgets.size() == 1)
-            d->m_widgets.at(0)->setCloseIcon(QIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_LEFT)));
+            d->m_widgets.at(0)->setCloseIcon(
+                        Utils::ThemeHelper::themedIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_LEFT)));
         else
-            d->m_widgets.at(0)->setCloseIcon(QIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_TOP)));
+            d->m_widgets.at(0)->setCloseIcon(
+                        Utils::ThemeHelper::themedIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_TOP)));
         updateWidgets();
     } else {
         if (d->m_closeWhenEmpty) {
diff --git a/src/plugins/coreplugin/sidebarwidget.cpp b/src/plugins/coreplugin/sidebarwidget.cpp
index 8fce8187ab..3b5c3be752 100644
--- a/src/plugins/coreplugin/sidebarwidget.cpp
+++ b/src/plugins/coreplugin/sidebarwidget.cpp
@@ -34,6 +34,7 @@
 
 #include <coreplugin/coreconstants.h>
 #include <utils/algorithm.h>
+#include <utils/themehelper.h>
 
 #include <QToolBar>
 #include <QToolButton>
@@ -76,13 +77,15 @@ SideBarWidget::SideBarWidget(SideBar *sideBar, const QString &id)
 
     m_splitAction = new QAction(tr("Split"), m_toolbar);
     m_splitAction->setToolTip(tr("Split"));
-    m_splitAction->setIcon(QIcon(QLatin1String(Constants::ICON_SPLIT_HORIZONTAL)));
+    m_splitAction->setIcon(Utils::ThemeHelper::themedIcon(
+                               QLatin1String(Constants::ICON_SPLIT_HORIZONTAL)));
     connect(m_splitAction, SIGNAL(triggered()), this, SIGNAL(splitMe()));
     m_toolbar->addAction(m_splitAction);
 
     m_closeAction = new QAction(tr("Close"), m_toolbar);
     m_closeAction->setToolTip(tr("Close"));
-    m_closeAction->setIcon(QIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_BOTTOM)));
+    m_closeAction->setIcon(
+                Utils::ThemeHelper::themedIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_BOTTOM)));
     connect(m_closeAction, SIGNAL(triggered()), this, SIGNAL(closeMe()));
     m_toolbar->addAction(m_closeAction);
 
diff --git a/src/plugins/cppeditor/cppinsertvirtualmethods.cpp b/src/plugins/cppeditor/cppinsertvirtualmethods.cpp
index ab6d15ead4..711c1b056d 100644
--- a/src/plugins/cppeditor/cppinsertvirtualmethods.cpp
+++ b/src/plugins/cppeditor/cppinsertvirtualmethods.cpp
@@ -44,6 +44,7 @@
 #include <cplusplus/Overview.h>
 #include <utils/changeset.h>
 #include <utils/qtcassert.h>
+#include <utils/themehelper.h>
 
 #include <QAction>
 #include <QCheckBox>
@@ -1028,7 +1029,7 @@ void InsertVirtualMethodsDialog::initGui()
             m_overrideReplacementComboBox, &QComboBox::setEnabled);
 
     QAction *clearUserAddedReplacements = new QAction(this);
-    clearUserAddedReplacements->setIcon(QIcon(QLatin1String(Core::Constants::ICON_CLEAN_PANE)));
+    clearUserAddedReplacements->setIcon(Utils::ThemeHelper::themedIcon(QLatin1String(Core::Constants::ICON_CLEAN_PANE)));
     clearUserAddedReplacements->setText(tr("Clear Added \"override\" Equivalents"));
     connect(clearUserAddedReplacements, &QAction::triggered, [this]() {
        m_availableOverrideReplacements = defaultOverrideReplacements();
diff --git a/src/plugins/debugger/debugger.qbs b/src/plugins/debugger/debugger.qbs
index c165487a9f..24aa2dc43c 100644
--- a/src/plugins/debugger/debugger.qbs
+++ b/src/plugins/debugger/debugger.qbs
@@ -171,39 +171,13 @@ QtcPlugin {
     Group {
         name: "Images"
         prefix: "images/"
-        files: [
-            "breakpoint_16.png",
-            "breakpoint_24.png",
-            "breakpoint_disabled_16.png",
-            "breakpoint_disabled_24.png",
-            "breakpoint_disabled_32.png",
-            "breakpoint_pending_16.png",
-            "breakpoint_pending_24.png",
-            "debugger_breakpoints.png",
-            "debugger_continue.png",
-            "debugger_continue_32.png",
-            "debugger_continue_small.png",
-            "debugger_empty_14.png",
-            "debugger_interrupt.png",
-            "debugger_interrupt_32.png",
-            "debugger_reversemode_16.png",
-            "debugger_singleinstructionmode.png",
-            "debugger_snapshot_small.png",
-            "debugger_start.png",
-            "debugger_start_small.png",
-            "debugger_stepinto_small.png",
-            "debugger_steponeproc_small.png",
-            "debugger_stepout_small.png",
-            "debugger_stepover_small.png",
-            "debugger_stepoverproc_small.png",
-            "debugger_stop.png",
-            "debugger_stop_32.png",
-            "debugger_stop_small.png",
-            "location_16.png",
-            "location_24.png",
-            "tracepoint.png",
-            "watchpoint.png",
-        ]
+        files: ["*.png", "*.xpm"]
+    }
+
+    Group {
+        name: "Images/qml"
+        prefix: "images/qml/"
+        files: ["*.png"]
     }
 
     Group {
diff --git a/src/plugins/debugger/debugger.qrc b/src/plugins/debugger/debugger.qrc
index 4e930511e0..a61acc6d8b 100644
--- a/src/plugins/debugger/debugger.qrc
+++ b/src/plugins/debugger/debugger.qrc
@@ -3,21 +3,20 @@
         <file>images/category_debug.png</file>
         <file>images/debugger_breakpoints.png</file>
         <file>images/debugger_continue.png</file>
-        <file>images/debugger_continue_small.png</file>
         <file>images/debugger_empty_14.png</file>
         <file>images/debugger_interrupt.png</file>
         <file>images/debugger_reversemode_16.png</file>
         <file>images/debugger_singleinstructionmode.png</file>
+        <file>images/debugger_singleinstructionmode@2x.png</file>
         <file>images/debugger_snapshot_small.png</file>
-        <file>images/debugger_start.png</file>
-        <file>images/debugger_start_small.png</file>
         <file>images/debugger_stepinto_small.png</file>
+        <file>images/debugger_stepinto_small@2x.png</file>
         <file>images/debugger_steponeproc_small.png</file>
         <file>images/debugger_stepout_small.png</file>
+        <file>images/debugger_stepout_small@2x.png</file>
         <file>images/debugger_stepover_small.png</file>
+        <file>images/debugger_stepover_small@2x.png</file>
         <file>images/debugger_stepoverproc_small.png</file>
-        <file>images/debugger_stop.png</file>
-        <file>images/debugger_stop_small.png</file>
         <file>images/watchpoint.png</file>
         <file>images/tracepoint.png</file>
         <file>images/breakpoint_16.png</file>
@@ -32,12 +31,11 @@
         <file>images/mode_debug.png</file>
         <file>images/mode_debug@2x.png</file>
         <file>images/pin.xpm</file>
-        <file>images/qml/zoom.png</file>
         <file>images/qml/select.png</file>
         <file>images/qml/app-on-top.png</file>
         <file>images/qml/apply-on-save.png</file>
-        <file>images/debugger_restart.png</file>
         <file>images/debugger_restart_small.png</file>
+        <file>images/debugger_restart_small@2x.png</file>
         <file>Debugger.mimetypes.xml</file>
     </qresource>
 </RCC>
diff --git a/src/plugins/debugger/debuggeractions.cpp b/src/plugins/debugger/debuggeractions.cpp
index b1d7e193dc..0b04200725 100644
--- a/src/plugins/debugger/debuggeractions.cpp
+++ b/src/plugins/debugger/debuggeractions.cpp
@@ -38,6 +38,7 @@
 #include <coreplugin/icore.h>
 #include <utils/savedaction.h>
 #include <utils/qtcassert.h>
+#include <utils/themehelper.h>
 
 #include <QDebug>
 #include <QSettings>
@@ -176,7 +177,8 @@ DebuggerSettings::DebuggerSettings()
     item->setText(tr("Operate by Instruction"));
     item->setCheckable(true);
     item->setDefaultValue(false);
-    item->setIcon(QIcon(QLatin1String(":/debugger/images/debugger_singleinstructionmode.png")));
+    item->setIcon(Utils::ThemeHelper::themedIcon(
+                      QLatin1String(":/debugger/images/debugger_singleinstructionmode.png")));
     item->setToolTip(tr("<p>This switches the debugger to instruction-wise "
         "operation mode. In this mode, stepping operates on single "
         "instructions and the source location view also shows the "
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index d644824e19..a92816b6e8 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -116,6 +116,7 @@
 #include <utils/savedaction.h>
 #include <utils/statuslabel.h>
 #include <utils/styledbar.h>
+#include <utils/themehelper.h>
 #include <utils/winutils.h>
 
 #include <QApplication>
@@ -2345,17 +2346,14 @@ void DebuggerPluginPrivate::extensionsInitialized()
     const Context cppDebuggercontext(C_CPPDEBUGGER);
     const Context cppeditorcontext(CppEditor::Constants::CPPEDITOR_ID);
 
-    m_startIcon = QIcon(_(":/debugger/images/debugger_start_small.png"));
-    m_startIcon.addFile(QLatin1String(":/debugger/images/debugger_start.png"));
-    m_exitIcon = QIcon(_(":/debugger/images/debugger_stop_small.png"));
-    m_exitIcon.addFile(QLatin1String(":/debugger/images/debugger_stop.png"));
-    m_continueIcon = QIcon(QLatin1String(":/debugger/images/debugger_continue_small.png"));
-    m_continueIcon.addFile(QLatin1String(":/debugger/images/debugger_continue.png"));
-    m_interruptIcon = QIcon(_(Core::Constants::ICON_PAUSE));
-    m_interruptIcon.addFile(QLatin1String(":/debugger/images/debugger_interrupt.png"));
+    m_startIcon = ThemeHelper::themedIcon(_(Core::Constants::ICON_DEBUG_START_SMALL));
+    m_exitIcon = ThemeHelper::themedIcon(_(Core::Constants::ICON_DEBUG_EXIT_SMALL));
+    m_continueIcon = ThemeHelper::themedIcon(_(Core::Constants::ICON_DEBUG_CONTINUE_SMALL));
+    m_continueIcon.addFile(_(":/debugger/images/debugger_continue.png"));
+    m_interruptIcon = ThemeHelper::themedIcon(_(Core::Constants::ICON_DEBUG_INTERRUPT_SMALL));
+    m_interruptIcon.addFile(_(":/debugger/images/debugger_interrupt.png"));
     m_locationMarkIcon = QIcon(_(":/debugger/images/location_16.png"));
-    m_resetIcon = QIcon(_(":/debugger/images/debugger_restart_small.png:"));
-    m_resetIcon.addFile(QLatin1String(":/debugger/images/debugger_restart.png"));
+    m_resetIcon = ThemeHelper::themedIcon(_(":/debugger/images/debugger_restart_small.png|IconsRunColor"));
 
     m_busy = false;
 
@@ -2445,15 +2443,15 @@ void DebuggerPluginPrivate::extensionsInitialized()
     connect(act, &QAction::triggered, this, &DebuggerPluginPrivate::handleReset);
 
     act = m_nextAction = new QAction(tr("Step Over"), this);
-    act->setIcon(QIcon(QLatin1String(":/debugger/images/debugger_stepover_small.png")));
+    act->setIcon(ThemeHelper::themedIcon(_(":/debugger/images/debugger_stepover_small.png")));
     connect(act, &QAction::triggered, this, &DebuggerPluginPrivate::handleExecNext);
 
     act = m_stepAction = new QAction(tr("Step Into"), this);
-    act->setIcon(QIcon(QLatin1String(":/debugger/images/debugger_stepinto_small.png")));
+    act->setIcon(ThemeHelper::themedIcon(_(":/debugger/images/debugger_stepinto_small.png")));
     connect(act, &QAction::triggered, this, &DebuggerPluginPrivate::handleExecStep);
 
     act = m_stepOutAction = new QAction(tr("Step Out"), this);
-    act->setIcon(QIcon(QLatin1String(":/debugger/images/debugger_stepout_small.png")));
+    act->setIcon(ThemeHelper::themedIcon(_(":/debugger/images/debugger_stepout_small.png")));
     connect(act, &QAction::triggered, this, &DebuggerPluginPrivate::handleExecStepOut);
 
     act = m_runToLineAction = new QAction(tr("Run to Line"), this);
@@ -2538,7 +2536,7 @@ void DebuggerPluginPrivate::extensionsInitialized()
 
     // The main "Start Debugging" action.
     act = m_startAction = new QAction(this);
-    QIcon debuggerIcon(QLatin1String(":/projectexplorer/images/debugger_start_small.png"));
+    QIcon debuggerIcon(ThemeHelper::themedIcon(_(Core::Constants::ICON_DEBUG_START_SMALL)));
     debuggerIcon.addFile(QLatin1String(":/projectexplorer/images/debugger_start.png"));
     act->setIcon(debuggerIcon);
     act->setText(tr("Start Debugging"));
@@ -2789,7 +2787,7 @@ void DebuggerPluginPrivate::extensionsInitialized()
 
     QAction *qmlZoomDummyAction = new QAction(tr("Zoom"), this);
     qmlZoomDummyAction->setCheckable(true);
-    qmlZoomDummyAction->setIcon(QIcon(_(":/debugger/images/qml/zoom.png")));
+    qmlZoomDummyAction->setIcon(ThemeHelper::themedIcon(_(Core::Constants::ICON_ZOOM)));
     qmlZoomDummyAction->setEnabled(false);
     cmd = ActionManager::registerAction(qmlZoomDummyAction, Constants::QML_ZOOMTOOL);
     debugMenu->addAction(cmd);
diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp
index 2c323a3b1e..c57fcc0bb7 100644
--- a/src/plugins/debugger/debuggerruncontrol.cpp
+++ b/src/plugins/debugger/debuggerruncontrol.cpp
@@ -57,6 +57,7 @@
 #include <utils/qtcassert.h>
 #include <utils/qtcprocess.h>
 #include <coreplugin/icore.h>
+#include <coreplugin/coreconstants.h>
 #include <qmldebug/qmldebugcommandlinearguments.h>
 
 #include <qtsupport/qtkitinformation.h>
@@ -113,7 +114,7 @@ DebuggerRunControl::DebuggerRunControl(RunConfiguration *runConfig, DebuggerEngi
       m_engine(engine),
       m_running(false)
 {
-    setIcon(QLatin1String(ProjectExplorer::Constants::ICON_DEBUG_SMALL));
+    setIcon(QLatin1String(Core::Constants::ICON_DEBUG_START_SMALL));
     connect(this, &RunControl::finished, this, &DebuggerRunControl::handleFinished);
 
     connect(engine, &DebuggerEngine::requestRemoteSetup,
diff --git a/src/plugins/debugger/images/debugger_continue_small.png b/src/plugins/debugger/images/debugger_continue_small.png
deleted file mode 100644
index 3f49f3fef3..0000000000
--- a/src/plugins/debugger/images/debugger_continue_small.png
+++ /dev/null
diff --git a/src/plugins/debugger/images/debugger_restart.png b/src/plugins/debugger/images/debugger_restart.png
deleted file mode 100644
index 2c64931207..0000000000
--- a/src/plugins/debugger/images/debugger_restart.png
+++ /dev/null
diff --git a/src/plugins/debugger/images/debugger_restart.svg b/src/plugins/debugger/images/debugger_restart.svg
deleted file mode 100644
index 08af9db3e3..0000000000
--- a/src/plugins/debugger/images/debugger_restart.svg
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg2403"
-   height="16"
-   width="16"
-   version="1.0"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="restartF.svg"
-   inkscape:export-filename="/home/tstone/projekte/stm32/qt-creator/src/plugins/debugger/images/restart.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <metadata
-     id="metadata9">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs7" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="812"
-     inkscape:window-height="480"
-     id="namedview5"
-     showgrid="false"
-     inkscape:zoom="2.6074563"
-     inkscape:cx="29.713525"
-     inkscape:cy="39.686584"
-     inkscape:window-x="528"
-     inkscape:window-y="112"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg2403" />
-  <path
-     id="circle"
-     style="fill:none;stroke:#39a200;stroke-width:3;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-     d="M 4.3814407,4.7280695 C 1.0195763,7.1548695 2.1753174,13.61748 7.4891237,13.770186 12.207451,13.905779 15.5821,9.9571474 11.885043,4.5928762"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="csc" />
-  <path
-     id="topmark"
-     style="stroke:#39a200;stroke-linecap:round;stroke-width:3;fill:none;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
-     d="m8 6.9952v-4.9904" />
-  <path
-     style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-     d="M 4.677966,4.5423729 C 0.38168193,7.6562328 2.6923842,13.541247 7.5932203,13.627119"
-     id="arrow"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cc" />
-  <path
-     style="fill:#ffffff;fill-opacity:0.94117647;stroke:#39a200;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-     d="M 7.8291211,15.145082 11.463143,13.540112 7.7592641,12.467117 z"
-     id="arrowhead"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cccc" />
-</svg>
diff --git a/src/plugins/debugger/images/debugger_restart_small.png b/src/plugins/debugger/images/debugger_restart_small.png
index 6b10c8fe79..a1e5e8bb6c 100644
--- a/src/plugins/debugger/images/debugger_restart_small.png
+++ b/src/plugins/debugger/images/debugger_restart_small.png
diff --git a/src/plugins/debugger/images/debugger_restart_small@2x.png b/src/plugins/debugger/images/debugger_restart_small@2x.png
new file mode 100644
index 0000000000..cf1743da33
--- /dev/null
+++ b/src/plugins/debugger/images/debugger_restart_small@2x.png
diff --git a/src/plugins/debugger/images/debugger_singleinstructionmode.png b/src/plugins/debugger/images/debugger_singleinstructionmode.png
index d32007c18f..41529e91fd 100644
--- a/src/plugins/debugger/images/debugger_singleinstructionmode.png
+++ b/src/plugins/debugger/images/debugger_singleinstructionmode.png
diff --git a/src/plugins/debugger/images/debugger_singleinstructionmode@2x.png b/src/plugins/debugger/images/debugger_singleinstructionmode@2x.png
new file mode 100644
index 0000000000..db475f81fa
--- /dev/null
+++ b/src/plugins/debugger/images/debugger_singleinstructionmode@2x.png
diff --git a/src/plugins/debugger/images/debugger_start.png b/src/plugins/debugger/images/debugger_start.png
deleted file mode 100644
index 8eed81a899..0000000000
--- a/src/plugins/debugger/images/debugger_start.png
+++ /dev/null
diff --git a/src/plugins/debugger/images/debugger_start_small.png b/src/plugins/debugger/images/debugger_start_small.png
deleted file mode 100644
index 4a3788c149..0000000000
--- a/src/plugins/debugger/images/debugger_start_small.png
+++ /dev/null
diff --git a/src/plugins/debugger/images/debugger_stepinto_small.png b/src/plugins/debugger/images/debugger_stepinto_small.png
index 729cb25e11..8e24fba5a2 100644
--- a/src/plugins/debugger/images/debugger_stepinto_small.png
+++ b/src/plugins/debugger/images/debugger_stepinto_small.png
diff --git a/src/plugins/debugger/images/debugger_stepinto_small@2x.png b/src/plugins/debugger/images/debugger_stepinto_small@2x.png
new file mode 100644
index 0000000000..c93456a878
--- /dev/null
+++ b/src/plugins/debugger/images/debugger_stepinto_small@2x.png
diff --git a/src/plugins/debugger/images/debugger_stepout_small.png b/src/plugins/debugger/images/debugger_stepout_small.png
index 39a2412427..615c022419 100644
--- a/src/plugins/debugger/images/debugger_stepout_small.png
+++ b/src/plugins/debugger/images/debugger_stepout_small.png
diff --git a/src/plugins/debugger/images/debugger_stepout_small@2x.png b/src/plugins/debugger/images/debugger_stepout_small@2x.png
new file mode 100644
index 0000000000..5eb9aa9fea
--- /dev/null
+++ b/src/plugins/debugger/images/debugger_stepout_small@2x.png
diff --git a/src/plugins/debugger/images/debugger_stepover_small.png b/src/plugins/debugger/images/debugger_stepover_small.png
index 2e5acd2256..e7dc6fb20b 100644
--- a/src/plugins/debugger/images/debugger_stepover_small.png
+++ b/src/plugins/debugger/images/debugger_stepover_small.png
diff --git a/src/plugins/debugger/images/debugger_stepover_small@2x.png b/src/plugins/debugger/images/debugger_stepover_small@2x.png
new file mode 100644
index 0000000000..74ff28cfa0
--- /dev/null
+++ b/src/plugins/debugger/images/debugger_stepover_small@2x.png
diff --git a/src/plugins/debugger/images/debugger_stop.png b/src/plugins/debugger/images/debugger_stop.png
deleted file mode 100644
index c96dac37b0..0000000000
--- a/src/plugins/debugger/images/debugger_stop.png
+++ /dev/null
diff --git a/src/plugins/debugger/images/debugger_stop_small.png b/src/plugins/debugger/images/debugger_stop_small.png
deleted file mode 100644
index 1063d08998..0000000000
--- a/src/plugins/debugger/images/debugger_stop_small.png
+++ /dev/null
diff --git a/src/plugins/debugger/images/qml/zoom.png b/src/plugins/debugger/images/qml/zoom.png
deleted file mode 100644
index 7f54ec1191..0000000000
--- a/src/plugins/debugger/images/qml/zoom.png
+++ /dev/null
diff --git a/src/plugins/diffeditor/diffeditor.cpp b/src/plugins/diffeditor/diffeditor.cpp
index f22d191b35..fe4759f44b 100644
--- a/src/plugins/diffeditor/diffeditor.cpp
+++ b/src/plugins/diffeditor/diffeditor.cpp
@@ -45,6 +45,7 @@
 #include <utils/algorithm.h>
 #include <utils/fileutils.h>
 #include <utils/qtcassert.h>
+#include <utils/themehelper.h>
 
 #include <QAction>
 #include <QStackedWidget>
@@ -282,16 +283,16 @@ DiffEditor::DiffEditor()
     m_whitespaceButtonAction = m_toolBar->addAction(tr("Ignore Whitespace"));
     m_whitespaceButtonAction->setCheckable(true);
 
-    m_toggleDescriptionAction = m_toolBar->addAction(QIcon(QLatin1String(Constants::ICON_TOP_BAR)),
-                                               QString());
+    m_toggleDescriptionAction = m_toolBar->addAction(
+                Utils::ThemeHelper::themedIcon(QLatin1String(Constants::ICON_TOP_BAR)), QString());
     m_toggleDescriptionAction->setCheckable(true);
 
     m_reloadAction = m_toolBar->addAction(QIcon(QLatin1String(Core::Constants::ICON_RELOAD_GRAY)),
                                           tr("Reload Diff"));
     m_reloadAction->setToolTip(tr("Reload Diff"));
 
-    m_toggleSyncAction = m_toolBar->addAction(QIcon(QLatin1String(Core::Constants::ICON_LINK)),
-                                        QString());
+    m_toggleSyncAction = m_toolBar->addAction(
+                Utils::ThemeHelper::themedIcon(QLatin1String(Core::Constants::ICON_LINK)), QString());
     m_toggleSyncAction->setCheckable(true);
 
     m_viewSwitcherAction = m_toolBar->addAction(QIcon(), QString());
diff --git a/src/plugins/diffeditor/diffview.cpp b/src/plugins/diffeditor/diffview.cpp
index 98e75f2ce2..bb70085c90 100644
--- a/src/plugins/diffeditor/diffview.cpp
+++ b/src/plugins/diffeditor/diffview.cpp
@@ -34,6 +34,7 @@
 #include "sidebysidediffeditorwidget.h"
 
 #include <utils/qtcassert.h>
+#include <utils/themehelper.h>
 
 #include <QCoreApplication>
 
@@ -96,7 +97,8 @@ void IDiffView::setSyncToolTip(const QString &text)
 UnifiedView::UnifiedView() : m_widget(0)
 {
     setId(UNIFIED_VIEW_ID);
-    setIcon(QIcon(QLatin1String(":/diffeditor/images/unifieddiff.png")));
+    setIcon(Utils::ThemeHelper::themedIcon(
+                QLatin1String(":/diffeditor/images/unifieddiff.png")));
     setToolTip(QCoreApplication::translate("DiffEditor::UnifiedView", "Switch to Unified Diff Editor"));
 }
 
@@ -152,7 +154,8 @@ void UnifiedView::setSync(bool sync)
 SideBySideView::SideBySideView() : m_widget(0)
 {
     setId(SIDE_BY_SIDE_VIEW_ID);
-    setIcon(QIcon(QLatin1String(":/diffeditor/images/sidebysidediff.png")));
+    setIcon(Utils::ThemeHelper::themedIcon(
+                QLatin1String(":/diffeditor/images/sidebysidediff.png")));
     setToolTip(QCoreApplication::translate("DiffEditor::SideBySideView",
                                            "Switch to Side By Side Diff Editor"));
     setSupportsSync(true);
diff --git a/src/plugins/diffeditor/images/sidebysidediff.png b/src/plugins/diffeditor/images/sidebysidediff.png
index f0b2e45844..21dfa6a0a5 100644
--- a/src/plugins/diffeditor/images/sidebysidediff.png
+++ b/src/plugins/diffeditor/images/sidebysidediff.png
diff --git a/src/plugins/diffeditor/images/sidebysidediff@2x.png b/src/plugins/diffeditor/images/sidebysidediff@2x.png
index 41476fffcd..d45d1b8d68 100644
--- a/src/plugins/diffeditor/images/sidebysidediff@2x.png
+++ b/src/plugins/diffeditor/images/sidebysidediff@2x.png
diff --git a/src/plugins/diffeditor/images/topbar.png b/src/plugins/diffeditor/images/topbar.png
index 7a15c16cab..1ba7235dea 100644
--- a/src/plugins/diffeditor/images/topbar.png
+++ b/src/plugins/diffeditor/images/topbar.png
diff --git a/src/plugins/diffeditor/images/topbar@2x.png b/src/plugins/diffeditor/images/topbar@2x.png
index 3a1c15c1bc..894bcbf587 100644
--- a/src/plugins/diffeditor/images/topbar@2x.png
+++ b/src/plugins/diffeditor/images/topbar@2x.png
diff --git a/src/plugins/diffeditor/images/unifieddiff.png b/src/plugins/diffeditor/images/unifieddiff.png
index 70975187e9..ff989cd5d2 100644
--- a/src/plugins/diffeditor/images/unifieddiff.png
+++ b/src/plugins/diffeditor/images/unifieddiff.png
diff --git a/src/plugins/diffeditor/images/unifieddiff@2x.png b/src/plugins/diffeditor/images/unifieddiff@2x.png
index bd7826f4e1..671f47dd55 100644
--- a/src/plugins/diffeditor/images/unifieddiff@2x.png
+++ b/src/plugins/diffeditor/images/unifieddiff@2x.png
diff --git a/src/plugins/git/gitsubmiteditorwidget.cpp b/src/plugins/git/gitsubmiteditorwidget.cpp
index 29750c3554..e0a33d07c0 100644
--- a/src/plugins/git/gitsubmiteditorwidget.cpp
+++ b/src/plugins/git/gitsubmiteditorwidget.cpp
@@ -33,7 +33,9 @@
 #include "githighlighters.h"
 #include "logchangedialog.h"
 
+#include <coreplugin/coreconstants.h>
 #include <utils/completingtextedit.h>
+#include <utils/themehelper.h>
 
 #include <QRegExpValidator>
 #include <QTextEdit>
@@ -59,7 +61,11 @@ GitSubmitEditorWidget::GitSubmitEditorWidget() :
     new GitSubmitHighlighter(descriptionEdit());
 
     m_emailValidator = new QRegExpValidator(QRegExp(QLatin1String("[^@ ]+@[^@ ]+\\.[a-zA-Z]+")), this);
+    const QPixmap error =
+            Utils::ThemeHelper::themedIconPixmap(QLatin1String(Core::Constants::ICON_ERROR));
+    m_gitSubmitPanelUi.invalidAuthorLabel->setPixmap(error);
     m_gitSubmitPanelUi.invalidEmailLabel->setToolTip(tr("Provide a valid email to commit."));
+    m_gitSubmitPanelUi.invalidEmailLabel->setPixmap(error);
 
     connect(m_gitSubmitPanelUi.authorLineEdit, &QLineEdit::textChanged,
             this, &GitSubmitEditorWidget::authorInformationChanged);
diff --git a/src/plugins/git/gitsubmitpanel.ui b/src/plugins/git/gitsubmitpanel.ui
index ce03c47076..f4a05eabd6 100644
--- a/src/plugins/git/gitsubmitpanel.ui
+++ b/src/plugins/git/gitsubmitpanel.ui
@@ -94,12 +94,6 @@
           <height>20</height>
          </size>
         </property>
-        <property name="text">
-         <string/>
-        </property>
-        <property name="pixmap">
-         <pixmap resource="../coreplugin/core.qrc">:/core/images/error.png</pixmap>
-        </property>
        </widget>
       </item>
       <item row="0" column="3">
@@ -143,12 +137,6 @@
           <height>20</height>
          </size>
         </property>
-        <property name="text">
-         <string/>
-        </property>
-        <property name="pixmap">
-         <pixmap resource="../coreplugin/core.qrc">:/core/images/error.png</pixmap>
-        </property>
        </widget>
       </item>
       <item row="2" column="1">
@@ -173,8 +161,6 @@
    </item>
   </layout>
  </widget>
- <resources>
-  <include location="../coreplugin/core.qrc"/>
- </resources>
+ <resources/>
  <connections/>
 </ui>
diff --git a/src/plugins/help/help.qrc b/src/plugins/help/help.qrc
index f3e038b594..f38a578e14 100644
--- a/src/plugins/help/help.qrc
+++ b/src/plugins/help/help.qrc
@@ -1,9 +1,7 @@
 <RCC>
-    <qresource prefix="/help" >
+    <qresource prefix="/help">
         <file>images/find.png</file>
         <file>images/book.png</file>
-        <file>images/previous.png</file>
-        <file>images/next.png</file>
         <file>images/home.png</file>
         <file>images/bookmark.png</file>
         <file>images/category_help.png</file>
diff --git a/src/plugins/help/helpwidget.cpp b/src/plugins/help/helpwidget.cpp
index 0f6fcbd907..873a8a3c2c 100644
--- a/src/plugins/help/helpwidget.cpp
+++ b/src/plugins/help/helpwidget.cpp
@@ -52,6 +52,7 @@
 #include <texteditor/texteditorconstants.h>
 #include <utils/qtcassert.h>
 #include <utils/styledbar.h>
+#include <utils/themehelper.h>
 
 #include <QCoreApplication>
 #include <QHBoxLayout>
@@ -131,7 +132,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(QIcon(QLatin1String(Core::Constants::ICON_TOGGLE_SIDEBAR)),
+        m_toggleSideBarAction = new QAction(Utils::ThemeHelper::themedIcon(QLatin1String(Core::Constants::ICON_TOGGLE_SIDEBAR)),
                                             QCoreApplication::translate("Core", Core::Constants::TR_SHOW_SIDEBAR),
                                             toolBar);
         m_toggleSideBarAction->setCheckable(true);
@@ -168,7 +169,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(QIcon(QLatin1String(":/help/images/previous.png")),
+    m_backAction = new QAction(Utils::ThemeHelper::themedIcon(QLatin1String(Core::Constants::ICON_PREV)),
         tr("Back"), toolBar);
     connect(m_backAction, &QAction::triggered, this, &HelpWidget::backward);
     m_backMenu = new QMenu(toolBar);
@@ -180,7 +181,7 @@ HelpWidget::HelpWidget(const Core::Context &context, WidgetStyle style, QWidget
     button->setPopupMode(QToolButton::DelayedPopup);
     layout->addWidget(button);
 
-    m_forwardAction = new QAction(QIcon(QLatin1String(":/help/images/next.png")),
+    m_forwardAction = new QAction(Utils::ThemeHelper::themedIcon(QLatin1String(Core::Constants::ICON_NEXT)),
         tr("Forward"), toolBar);
     connect(m_forwardAction, &QAction::triggered, this, &HelpWidget::forward);
     m_forwardMenu = new QMenu(toolBar);
@@ -252,7 +253,7 @@ HelpWidget::HelpWidget(const Core::Context &context, WidgetStyle style, QWidget
     }
 
     if (style != ExternalWindow) {
-        m_closeAction = new QAction(QIcon(QLatin1String(Core::Constants::ICON_BUTTON_CLOSE)),
+        m_closeAction = new QAction(Utils::ThemeHelper::themedIcon(QLatin1String(Core::Constants::ICON_BUTTON_CLOSE)),
             QString(), toolBar);
         connect(m_closeAction, SIGNAL(triggered()), this, SIGNAL(closeButtonClicked()));
         button = new QToolButton;
diff --git a/src/plugins/help/images/next.png b/src/plugins/help/images/next.png
deleted file mode 100644
index 7700d6fce6..0000000000
--- a/src/plugins/help/images/next.png
+++ /dev/null
diff --git a/src/plugins/help/images/previous.png b/src/plugins/help/images/previous.png
deleted file mode 100644
index 99dc8733c7..0000000000
--- a/src/plugins/help/images/previous.png
+++ /dev/null
diff --git a/src/plugins/imageviewer/images/fitinscreen.png b/src/plugins/imageviewer/images/fitinscreen.png
deleted file mode 100644
index cbe2f31521..0000000000
--- a/src/plugins/imageviewer/images/fitinscreen.png
+++ /dev/null
diff --git a/src/plugins/imageviewer/images/zoomin.png b/src/plugins/imageviewer/images/zoomin.png
deleted file mode 100644
index be8c961df1..0000000000
--- a/src/plugins/imageviewer/images/zoomin.png
+++ /dev/null
diff --git a/src/plugins/imageviewer/images/zoomout.png b/src/plugins/imageviewer/images/zoomout.png
deleted file mode 100644
index 4466844662..0000000000
--- a/src/plugins/imageviewer/images/zoomout.png
+++ /dev/null
diff --git a/src/plugins/imageviewer/imageviewer.cpp b/src/plugins/imageviewer/imageviewer.cpp
index 2d420a4b76..1614ea3032 100644
--- a/src/plugins/imageviewer/imageviewer.cpp
+++ b/src/plugins/imageviewer/imageviewer.cpp
@@ -41,6 +41,7 @@
 #include <coreplugin/actionmanager/command.h>
 #include <utils/fileutils.h>
 #include <utils/qtcassert.h>
+#include <utils/themehelper.h>
 
 #include <QMap>
 #include <QFileInfo>
@@ -105,6 +106,12 @@ void ImageViewer::ctor()
     // toolbar
     d->toolbar = new QWidget();
     d->ui_toolbar.setupUi(d->toolbar);
+    d->ui_toolbar.toolButtonZoomIn->setIcon(Utils::ThemeHelper::themedIcon(
+                                                QLatin1String(Core::Constants::ICON_PLUS)));
+    d->ui_toolbar.toolButtonZoomOut->setIcon(Utils::ThemeHelper::themedIcon(
+                                                 QLatin1String(Core::Constants::ICON_MINUS)));
+    d->ui_toolbar.toolButtonFitToScreen->setIcon(Utils::ThemeHelper::themedIcon(
+                                                     QLatin1String(Core::Constants::ICON_ZOOM)));
 
     // icons update - try to use system theme
     updateButtonIconByTheme(d->ui_toolbar.toolButtonZoomIn, QLatin1String("zoom-in"));
diff --git a/src/plugins/imageviewer/imageviewer.qrc b/src/plugins/imageviewer/imageviewer.qrc
index 662722baf7..e39039ade1 100644
--- a/src/plugins/imageviewer/imageviewer.qrc
+++ b/src/plugins/imageviewer/imageviewer.qrc
@@ -1,9 +1,6 @@
 <RCC>
     <qresource prefix="/imageviewer">
         <file>images/outline.png</file>
-        <file>images/zoomin.png</file>
-        <file>images/zoomout.png</file>
-        <file>images/fitinscreen.png</file>
         <file>images/originalsize.png</file>
         <file>images/background.png</file>
         <file>images/pause-small.png</file>
diff --git a/src/plugins/imageviewer/imageviewertoolbar.ui b/src/plugins/imageviewer/imageviewertoolbar.ui
index df23c185fb..3c673fb871 100644
--- a/src/plugins/imageviewer/imageviewertoolbar.ui
+++ b/src/plugins/imageviewer/imageviewertoolbar.ui
@@ -56,10 +56,6 @@
      <property name="toolTipBase">
       <string>Fit to Screen</string>
      </property>
-     <property name="icon">
-      <iconset resource="imageviewer.qrc">
-       <normaloff>:/imageviewer/images/fitinscreen.png</normaloff>:/imageviewer/images/fitinscreen.png</iconset>
-     </property>
      <property name="checkable">
       <bool>false</bool>
      </property>
@@ -81,10 +77,6 @@
      <property name="toolTipBase">
       <string>Zoom In</string>
      </property>
-     <property name="icon">
-      <iconset resource="imageviewer.qrc">
-       <normaloff>:/imageviewer/images/zoomin.png</normaloff>:/imageviewer/images/zoomin.png</iconset>
-     </property>
      <property name="autoRepeat">
       <bool>true</bool>
      </property>
@@ -95,10 +87,6 @@
      <property name="toolTipBase">
       <string>Zoom Out</string>
      </property>
-     <property name="icon">
-      <iconset resource="imageviewer.qrc">
-       <normaloff>:/imageviewer/images/zoomout.png</normaloff>:/imageviewer/images/zoomout.png</iconset>
-     </property>
      <property name="autoRepeat">
       <bool>true</bool>
      </property>
@@ -153,7 +141,6 @@
  </customwidgets>
  <resources>
   <include location="imageviewer.qrc"/>
-  <include location="../coreplugin/core.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/src/plugins/ios/iosruncontrol.cpp b/src/plugins/ios/iosruncontrol.cpp
index 0b982fa287..b4ce5689fc 100644
--- a/src/plugins/ios/iosruncontrol.cpp
+++ b/src/plugins/ios/iosruncontrol.cpp
@@ -33,6 +33,7 @@
 #include "iosrunconfiguration.h"
 #include "iosrunner.h"
 
+#include <coreplugin/coreconstants.h>
 #include <projectexplorer/projectexplorerconstants.h>
 
 using namespace ProjectExplorer;
@@ -45,7 +46,7 @@ IosRunControl::IosRunControl(IosRunConfiguration *rc)
     , m_runner(new IosRunner(this, rc, false, QmlDebug::NoQmlDebugServices))
     , m_running(false)
 {
-    setIcon(QLatin1String(ProjectExplorer::Constants::ICON_DEBUG_SMALL));
+    setIcon(QLatin1String(Core::Constants::ICON_DEBUG_START_SMALL));
 }
 
 IosRunControl::~IosRunControl()
diff --git a/src/plugins/projectexplorer/appoutputpane.cpp b/src/plugins/projectexplorer/appoutputpane.cpp
index a79c9b19ae..237bea2a61 100644
--- a/src/plugins/projectexplorer/appoutputpane.cpp
+++ b/src/plugins/projectexplorer/appoutputpane.cpp
@@ -51,6 +51,7 @@
 #include <utils/algorithm.h>
 #include <utils/outputformatter.h>
 #include <utils/qtcassert.h>
+#include <utils/themehelper.h>
 
 #include <QAction>
 #include <QVBoxLayout>
@@ -163,7 +164,7 @@ AppOutputPane::AppOutputPane() :
     setObjectName(QLatin1String("AppOutputPane")); // Used in valgrind engine
 
     // Rerun
-    m_reRunButton->setIcon(QIcon(QLatin1String(Constants::ICON_RUN_SMALL)));
+    m_reRunButton->setIcon(Utils::ThemeHelper::themedIcon(QLatin1String(Constants::ICON_RUN_SMALL)));
     m_reRunButton->setToolTip(tr("Re-run this run-configuration"));
     m_reRunButton->setAutoRaise(true);
     m_reRunButton->setEnabled(false);
@@ -171,9 +172,7 @@ AppOutputPane::AppOutputPane() :
             this, SLOT(reRunRunControl()));
 
     // Stop
-    QIcon stopIcon = QIcon(QLatin1String(Constants::ICON_STOP));
-    stopIcon.addFile(QLatin1String(Constants::ICON_STOP_SMALL));
-    m_stopAction->setIcon(stopIcon);
+    m_stopAction->setIcon(Utils::ThemeHelper::themedIcon(QLatin1String(Constants::ICON_STOP_SMALL)));
     m_stopAction->setToolTip(tr("Stop"));
     m_stopAction->setEnabled(false);
 
@@ -188,21 +187,24 @@ AppOutputPane::AppOutputPane() :
     // Attach
     m_attachButton->setToolTip(msgAttachDebuggerTooltip());
     m_attachButton->setEnabled(false);
-    m_attachButton->setIcon(QIcon(QLatin1String(Constants::ICON_DEBUG_SMALL)));
+    m_attachButton->setIcon(Utils::ThemeHelper::themedIcon(
+                                QLatin1String(Core::Constants::ICON_DEBUG_START_SMALL)));
     m_attachButton->setAutoRaise(true);
 
     connect(m_attachButton, SIGNAL(clicked()),
             this, SLOT(attachToRunControl()));
 
     m_zoomInButton->setToolTip(tr("Increase Font Size"));
-    m_zoomInButton->setIcon(QIcon(QLatin1String(Core::Constants::ICON_PLUS)));
+    m_zoomInButton->setIcon(Utils::ThemeHelper::themedIcon(
+                                QLatin1String(Core::Constants::ICON_PLUS)));
     m_zoomInButton->setAutoRaise(true);
 
     connect(m_zoomInButton, &QToolButton::clicked,
             this, &AppOutputPane::zoomIn);
 
     m_zoomOutButton->setToolTip(tr("Decrease Font Size"));
-    m_zoomOutButton->setIcon(QIcon(QLatin1String(Core::Constants::ICON_MINUS)));
+    m_zoomOutButton->setIcon(Utils::ThemeHelper::themedIcon(
+                                 QLatin1String(Core::Constants::ICON_MINUS)));
     m_zoomOutButton->setAutoRaise(true);
 
     connect(m_zoomOutButton, &QToolButton::clicked,
@@ -640,7 +642,7 @@ void AppOutputPane::enableButtons(const RunControl *rc /* = 0 */, bool isRunning
 {
     if (rc) {
         m_reRunButton->setEnabled(!isRunning && rc->supportsReRunning());
-        m_reRunButton->setIcon(QIcon(rc->icon()));
+        m_reRunButton->setIcon(Utils::ThemeHelper::themedIcon(rc->icon()));
         m_stopAction->setEnabled(isRunning);
         if (isRunning && debuggerPlugin() && rc->applicationProcessHandle().isValid()) {
             m_attachButton->setEnabled(true);
@@ -653,7 +655,7 @@ void AppOutputPane::enableButtons(const RunControl *rc /* = 0 */, bool isRunning
         m_zoomOutButton->setEnabled(true);
     } else {
         m_reRunButton->setEnabled(false);
-        m_reRunButton->setIcon(QIcon(QLatin1String(Constants::ICON_RUN_SMALL)));
+        m_reRunButton->setIcon(Utils::ThemeHelper::themedIcon(QLatin1String(Constants::ICON_RUN_SMALL)));
         m_attachButton->setEnabled(false);
         m_attachButton->setToolTip(msgAttachDebuggerTooltip());
         m_stopAction->setEnabled(false);
diff --git a/src/plugins/projectexplorer/buildprogress.cpp b/src/plugins/projectexplorer/buildprogress.cpp
index f96d85b76f..c44194a952 100644
--- a/src/plugins/projectexplorer/buildprogress.cpp
+++ b/src/plugins/projectexplorer/buildprogress.cpp
@@ -33,6 +33,7 @@
 
 #include <coreplugin/coreconstants.h>
 #include <utils/stylehelper.h>
+#include <utils/themehelper.h>
 
 #include <QVBoxLayout>
 #include <QHBoxLayout>
@@ -87,10 +88,10 @@ BuildProgress::BuildProgress(TaskWindow *taskWindow, Qt::Orientation orientation
 
     m_errorIcon->setAlignment(Qt::AlignRight);
     m_warningIcon->setAlignment(Qt::AlignRight);
-    m_errorIcon->setPixmap(QPixmap(Utils::StyleHelper::dpiSpecificImageFile(
-                                       QLatin1String(Core::Constants::ICON_ERROR))));
-    m_warningIcon->setPixmap(QPixmap(Utils::StyleHelper::dpiSpecificImageFile(
-                                         QLatin1String(Core::Constants::ICON_WARNING))));
+    m_errorIcon->setPixmap(Utils::ThemeHelper::themedIconPixmap(
+                               QLatin1String(Core::Constants::ICON_ERROR)));
+    m_warningIcon->setPixmap(Utils::ThemeHelper::themedIconPixmap(
+                                 QLatin1String(Core::Constants::ICON_WARNING)));
 
     m_contentWidget->hide();
 
diff --git a/src/plugins/projectexplorer/compileoutputwindow.cpp b/src/plugins/projectexplorer/compileoutputwindow.cpp
index 09cbfe319e..fb484b8b06 100644
--- a/src/plugins/projectexplorer/compileoutputwindow.cpp
+++ b/src/plugins/projectexplorer/compileoutputwindow.cpp
@@ -46,6 +46,7 @@
 #include <texteditor/behaviorsettings.h>
 #include <utils/ansiescapecodehandler.h>
 #include <utils/theme/theme.h>
+#include <utils/themehelper.h>
 
 #include <QIcon>
 #include <QTextCharFormat>
@@ -171,9 +172,11 @@ CompileOutputWindow::CompileOutputWindow(QAction *cancelBuildAction) :
 
     m_cancelBuildButton->setDefaultAction(cancelBuildAction);
     m_zoomInButton->setToolTip(tr("Increase Font Size"));
-    m_zoomInButton->setIcon(QIcon(QLatin1String(Core::Constants::ICON_PLUS)));
+    m_zoomInButton->setIcon(Utils::ThemeHelper::themedIcon(
+                                QLatin1String(Core::Constants::ICON_PLUS)));
     m_zoomOutButton->setToolTip(tr("Decrease Font Size"));
-    m_zoomOutButton->setIcon(QIcon(QLatin1String(Core::Constants::ICON_MINUS)));
+    m_zoomOutButton->setIcon(Utils::ThemeHelper::themedIcon(
+                                 QLatin1String(Core::Constants::ICON_MINUS)));
 
     updateZoomEnabled();
 
diff --git a/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.cpp b/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.cpp
index 8a42c080aa..63257945b1 100644
--- a/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.cpp
+++ b/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.cpp
@@ -35,6 +35,7 @@
 #include <coreplugin/coreconstants.h>
 #include <utils/portlist.h>
 #include <utils/qtcassert.h>
+#include <utils/themehelper.h>
 
 using namespace ProjectExplorer::Constants;
 
@@ -75,7 +76,7 @@ void DesktopDeviceConfigurationWidget::initGui()
     m_ui->freePortsLineEdit->setPlaceholderText(
                 QString::fromLatin1("eg: %1-%2").arg(DESKTOP_PORT_START).arg(DESKTOP_PORT_END));
     m_ui->portsWarningLabel->setPixmap(
-                QPixmap(QLatin1String(Core::Constants::ICON_WARNING)));
+                Utils::ThemeHelper::themedIconPixmap(QLatin1String(Core::Constants::ICON_WARNING)));
     m_ui->portsWarningLabel->setToolTip(QLatin1String("<font color=\"red\">")
                                         + tr("You will need at least one port for QML debugging.")
                                         + QLatin1String("</font>"));
diff --git a/src/plugins/projectexplorer/foldernavigationwidget.cpp b/src/plugins/projectexplorer/foldernavigationwidget.cpp
index 779fe77529..6dbcc602da 100644
--- a/src/plugins/projectexplorer/foldernavigationwidget.cpp
+++ b/src/plugins/projectexplorer/foldernavigationwidget.cpp
@@ -50,6 +50,7 @@
 #include <utils/qtcassert.h>
 #include <utils/elidinglabel.h>
 #include <utils/itemviews.h>
+#include <utils/themehelper.h>
 
 #include <QDebug>
 #include <QSize>
@@ -167,7 +168,8 @@ FolderNavigationWidget::FolderNavigationWidget(QWidget *parent)
     layout->setContentsMargins(0, 0, 0, 0);
     setLayout(layout);
 
-    m_toggleSync->setIcon(QIcon(QLatin1String(Core::Constants::ICON_LINK)));
+    m_toggleSync->setIcon(
+                Utils::ThemeHelper::themedIcon(QLatin1String(Core::Constants::ICON_LINK)));
     m_toggleSync->setCheckable(true);
     m_toggleSync->setToolTip(tr("Synchronize with Editor"));
     setAutoSynchronization(true);
@@ -446,7 +448,7 @@ Core::NavigationView FolderNavigationWidgetFactory::createWidget()
     FolderNavigationWidget *fnw = new FolderNavigationWidget;
     n.widget = fnw;
     QToolButton *filter = new QToolButton;
-    filter->setIcon(QIcon(QLatin1String(Core::Constants::ICON_FILTER)));
+    filter->setIcon(Utils::ThemeHelper::themedIcon(QLatin1String(Core::Constants::ICON_FILTER)));
     filter->setToolTip(tr("Filter Files"));
     filter->setPopupMode(QToolButton::InstantPopup);
     filter->setProperty("noArrow", true);
diff --git a/src/plugins/projectexplorer/images/debugger_start_small.png b/src/plugins/projectexplorer/images/debugger_start_small.png
deleted file mode 100644
index 98e8ccd001..0000000000
--- a/src/plugins/projectexplorer/images/debugger_start_small.png
+++ /dev/null
diff --git a/src/plugins/projectexplorer/images/run_small.png b/src/plugins/projectexplorer/images/run_small.png
index 940af831f8..d1a9c205a5 100644
--- a/src/plugins/projectexplorer/images/run_small.png
+++ b/src/plugins/projectexplorer/images/run_small.png
diff --git a/src/plugins/projectexplorer/images/run_small@2x.png b/src/plugins/projectexplorer/images/run_small@2x.png
new file mode 100644
index 0000000000..6672a17739
--- /dev/null
+++ b/src/plugins/projectexplorer/images/run_small@2x.png
diff --git a/src/plugins/projectexplorer/images/stop.png b/src/plugins/projectexplorer/images/stop.png
deleted file mode 100644
index 5a9f49c1c6..0000000000
--- a/src/plugins/projectexplorer/images/stop.png
+++ /dev/null
diff --git a/src/plugins/projectexplorer/images/stop_small.png b/src/plugins/projectexplorer/images/stop_small.png
index 1063d08998..50571390da 100644
--- a/src/plugins/projectexplorer/images/stop_small.png
+++ b/src/plugins/projectexplorer/images/stop_small.png
diff --git a/src/plugins/projectexplorer/images/stop_small@2x.png b/src/plugins/projectexplorer/images/stop_small@2x.png
new file mode 100644
index 0000000000..59b578d1c0
--- /dev/null
+++ b/src/plugins/projectexplorer/images/stop_small@2x.png
diff --git a/src/plugins/projectexplorer/kitmodel.cpp b/src/plugins/projectexplorer/kitmodel.cpp
index cd676c70fc..370ea09a85 100644
--- a/src/plugins/projectexplorer/kitmodel.cpp
+++ b/src/plugins/projectexplorer/kitmodel.cpp
@@ -37,6 +37,7 @@
 #include <coreplugin/coreconstants.h>
 #include <utils/algorithm.h>
 #include <utils/qtcassert.h>
+#include <utils/themehelper.h>
 
 #include <QApplication>
 #include <QLayout>
@@ -66,9 +67,6 @@ public:
 
     QVariant data(int, int role) const
     {
-        static QIcon warningIcon(QString::fromLatin1(Core::Constants::ICON_WARNING));
-        static QIcon errorIcon(QString::fromLatin1(Core::Constants::ICON_ERROR));
-
         if (widget) {
             if (role == Qt::FontRole) {
                 QFont f = QApplication::font();
@@ -86,10 +84,16 @@ public:
                 return baseName;
             }
             if (role == Qt::DecorationRole) {
-                if (!widget->isValid())
+                if (!widget->isValid()) {
+                    static const QIcon errorIcon(Utils::ThemeHelper::themedIcon(
+                                                     QLatin1String(Core::Constants::ICON_ERROR)));
                     return errorIcon;
-                if (widget->hasWarning())
+                }
+                if (widget->hasWarning()) {
+                    static const QIcon warningIcon(Utils::ThemeHelper::themedIcon(
+                                                       QLatin1String(Core::Constants::ICON_WARNING)));
                     return warningIcon;
+                }
                 return QIcon();
             }
             if (role == Qt::ToolTipRole) {
diff --git a/src/plugins/projectexplorer/localapplicationruncontrol.cpp b/src/plugins/projectexplorer/localapplicationruncontrol.cpp
index 1ce1869c7c..ad131c7742 100644
--- a/src/plugins/projectexplorer/localapplicationruncontrol.cpp
+++ b/src/plugins/projectexplorer/localapplicationruncontrol.cpp
@@ -30,8 +30,9 @@
 
 #include "localapplicationruncontrol.h"
 #include "localapplicationrunconfiguration.h"
+#include "environmentaspect.h"
 
-#include <projectexplorer/environmentaspect.h>
+#include <projectexplorer/projectexplorerconstants.h>
 #include <utils/qtcassert.h>
 #include <utils/environment.h>
 
@@ -75,7 +76,7 @@ RunControl *LocalApplicationRunControlFactory::create(RunConfiguration *runConfi
 LocalApplicationRunControl::LocalApplicationRunControl(RunConfiguration *rc, Core::Id mode)
     : RunControl(rc, mode), m_runMode(ApplicationLauncher::Console), m_running(false)
 {
-    setIcon(QLatin1String(Constants::ICON_RUN_SMALL));
+    setIcon(QLatin1String(ProjectExplorer::Constants::ICON_RUN_SMALL));
     EnvironmentAspect *environment = rc->extraAspect<EnvironmentAspect>();
     Utils::Environment env;
     if (environment)
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index 266d00e4ad..dcec85c9d2 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -134,6 +134,7 @@
 #include <utils/parameteraction.h>
 #include <utils/qtcassert.h>
 #include <utils/stringutils.h>
+#include <utils/themehelper.h>
 
 #include <QtPlugin>
 #include <QDebug>
@@ -706,7 +707,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
     ActionContainer *runMenu = ActionManager::createMenu(Constants::RUNMENUCONTEXTMENU);
     runMenu->setOnAllDisabledBehavior(ActionContainer::Hide);
     QIcon runIcon = QIcon(QLatin1String(Constants::ICON_RUN));
-    runIcon.addFile(QLatin1String(Constants::ICON_RUN_SMALL));
+    runIcon.addPixmap(Utils::ThemeHelper::themedIconPixmap(QLatin1String(Constants::ICON_RUN_SMALL)));
     runMenu->menu()->setIcon(runIcon);
     runMenu->menu()->setTitle(tr("Run"));
     msubProjectContextMenu->addMenu(runMenu, ProjectExplorer::Constants::G_PROJECT_RUN);
@@ -908,8 +909,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
     mbuild->addAction(cmd, Constants::G_BUILD_CLEAN);
 
     // cancel build action
-    QIcon stopIcon = QIcon(QLatin1String(Constants::ICON_STOP));
-    stopIcon.addFile(QLatin1String(Constants::ICON_STOP_SMALL));
+    const QIcon stopIcon = Utils::ThemeHelper::themedIcon(QLatin1String(Constants::ICON_STOP_SMALL));
     dd->m_cancelBuildAction = new QAction(stopIcon, 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/projectexplorer.qbs b/src/plugins/projectexplorer/projectexplorer.qbs
index 4cba524ee7..26784c8492 100644
--- a/src/plugins/projectexplorer/projectexplorer.qbs
+++ b/src/plugins/projectexplorer/projectexplorer.qbs
@@ -230,48 +230,7 @@ QtcPlugin {
     Group {
         name: "Images"
         prefix: "images/"
-        files: [
-            "BuildSettings.png",
-            "CodeStyleSettings.png",
-            "DeviceConnected.png",
-            "DeviceDisconnected.png",
-            "DeviceReadyToUse.png",
-            "EditorSettings.png",
-            "MaemoDevice.png",
-            "ProjectDependencies.png",
-            "RunSettings.png",
-            "Simulator.png",
-            "build.png",
-            "build_32.png",
-            "build_small.png",
-            "clean.png",
-            "clean_small.png",
-            "closetab.png",
-            "debugger_start.png",
-            "debugger_start_small.png",
-            "findallprojects.png",
-            "findproject.png",
-            "leftselection.png",
-            "midselection.png",
-            "projectexplorer.png",
-            "rebuild.png",
-            "rebuild_small.png",
-            "rightselection.png",
-            "run.png",
-            "run_small.png",
-            "session.png",
-            "stop.png",
-            "stop_small.png",
-            "targetbuildselected.png",
-            "targetleftbutton.png",
-            "targetpanel_bottom.png",
-            "targetpanel_gradient.png",
-            "targetrightbutton.png",
-            "targetrunselected.png",
-            "targetseparatorbackground.png",
-            "targetunselected.png",
-            "window.png",
-        ]
+        files: ["*.png"]
     }
 
     Group {
diff --git a/src/plugins/projectexplorer/projectexplorer.qrc b/src/plugins/projectexplorer/projectexplorer.qrc
index 4fd236b7cd..a3ec3b8bf9 100644
--- a/src/plugins/projectexplorer/projectexplorer.qrc
+++ b/src/plugins/projectexplorer/projectexplorer.qrc
@@ -7,7 +7,6 @@
         <file>images/closetab.png</file>
         <file>images/debugger_start.png</file>
         <file>images/debugger_start@2x.png</file>
-        <file>images/debugger_start_small.png</file>
         <file>images/mode_project.png</file>
         <file>images/mode_project@2x.png</file>
         <file>images/projectexplorer.png</file>
@@ -16,8 +15,8 @@
         <file>images/run.png</file>
         <file>images/run@2x.png</file>
         <file>images/run_small.png</file>
+        <file>images/run_small@2x.png</file>
         <file>images/session.png</file>
-        <file>images/stop.png</file>
         <file>images/targetbuildselected.png</file>
         <file>images/targetrunselected.png</file>
         <file>images/targetseparatorbackground.png</file>
@@ -41,6 +40,7 @@
         <file>images/targetpanel_gradient.png</file>
         <file>images/window.png</file>
         <file>images/stop_small.png</file>
+        <file>images/stop_small@2x.png</file>
         <file>images/disabledbuildstep.png</file>
         <file>images/disabledbuildstep@2x.png</file>
         <file>images/lightdisabledbuildstep.png</file>
diff --git a/src/plugins/projectexplorer/projectexplorerconstants.h b/src/plugins/projectexplorer/projectexplorerconstants.h
index d96c3759b3..394190fcfc 100644
--- a/src/plugins/projectexplorer/projectexplorerconstants.h
+++ b/src/plugins/projectexplorer/projectexplorerconstants.h
@@ -163,10 +163,9 @@ const char ICON_CLEAN_SMALL[]     = ":/projectexplorer/images/clean_small.png";
 const char ICON_REBUILD[]         = ":/projectexplorer/images/rebuild.png";
 const char ICON_REBUILD_SMALL[]   = ":/projectexplorer/images/rebuild_small.png";
 const char ICON_RUN[]             = ":/projectexplorer/images/run.png";
-const char ICON_RUN_SMALL[]       = ":/projectexplorer/images/run_small.png";
-const char ICON_DEBUG_SMALL[]     = ":/projectexplorer/images/debugger_start_small.png";
+const char ICON_RUN_SMALL[]       = ":/projectexplorer/images/run_small.png|IconsRunColor";
 const char ICON_STOP[]            = ":/projectexplorer/images/stop.png";
-const char ICON_STOP_SMALL[]      = ":/projectexplorer/images/stop_small.png";
+const char ICON_STOP_SMALL[]      = ":/projectexplorer/images/stop_small.png|IconsStopColor";
 const char ICON_WINDOW[]          = ":/projectexplorer/images/window.png";
 
 // Mime types
diff --git a/src/plugins/projectexplorer/projecttreewidget.cpp b/src/plugins/projectexplorer/projecttreewidget.cpp
index 5b37b09432..4698a622b1 100644
--- a/src/plugins/projectexplorer/projecttreewidget.cpp
+++ b/src/plugins/projectexplorer/projecttreewidget.cpp
@@ -49,6 +49,7 @@
 #include <utils/navigationtreeview.h>
 #include <utils/algorithm.h>
 #include <utils/tooltip/tooltip.h>
+#include <utils/themehelper.h>
 
 #include <QDebug>
 #include <QSettings>
@@ -233,7 +234,8 @@ ProjectTreeWidget::ProjectTreeWidget(QWidget *parent)
             this, SLOT(saveExpandData()));
 
     m_toggleSync = new QToolButton;
-    m_toggleSync->setIcon(QIcon(QLatin1String(Core::Constants::ICON_LINK)));
+    m_toggleSync->setIcon(
+                Utils::ThemeHelper::themedIcon(QLatin1String(Core::Constants::ICON_LINK)));
     m_toggleSync->setCheckable(true);
     m_toggleSync->setChecked(autoSynchronization());
     m_toggleSync->setToolTip(tr("Synchronize with Editor"));
@@ -586,7 +588,7 @@ NavigationView ProjectTreeWidgetFactory::createWidget()
     n.widget = ptw;
 
     QToolButton *filter = new QToolButton;
-    filter->setIcon(QIcon(QLatin1String(Core::Constants::ICON_FILTER)));
+    filter->setIcon(Utils::ThemeHelper::themedIcon(QLatin1String(Core::Constants::ICON_FILTER)));
     filter->setToolTip(tr("Filter Tree"));
     filter->setPopupMode(QToolButton::InstantPopup);
     filter->setProperty("noArrow", true);
diff --git a/src/plugins/projectexplorer/task.cpp b/src/plugins/projectexplorer/task.cpp
index 2f83d14e51..2f9c2ba92e 100644
--- a/src/plugins/projectexplorer/task.cpp
+++ b/src/plugins/projectexplorer/task.cpp
@@ -32,6 +32,7 @@
 
 #include <coreplugin/coreconstants.h>
 #include <utils/qtcassert.h>
+#include <utils/themehelper.h>
 
 #include "projectexplorerconstants.h"
 
@@ -41,8 +42,8 @@ namespace ProjectExplorer
 static QIcon taskTypeIcon(Task::TaskType t)
 {
     static QIcon icons[3] = { QIcon(),
-                              QIcon(QLatin1String(Core::Constants::ICON_ERROR)),
-                              QIcon(QLatin1String(Core::Constants::ICON_WARNING)) };
+                              Utils::ThemeHelper::themedIcon(QLatin1String(Core::Constants::ICON_ERROR)),
+                              Utils::ThemeHelper::themedIcon(QLatin1String(Core::Constants::ICON_WARNING))};
 
     if (t < 0 || t > 2)
         t = Task::Unknown;
diff --git a/src/plugins/projectexplorer/taskhub.cpp b/src/plugins/projectexplorer/taskhub.cpp
index 62a6515171..a4baf6b706 100644
--- a/src/plugins/projectexplorer/taskhub.cpp
+++ b/src/plugins/projectexplorer/taskhub.cpp
@@ -35,6 +35,7 @@
 #include <coreplugin/ioutputpane.h>
 #include <utils/qtcassert.h>
 #include <utils/theme/theme.h>
+#include <utils/themehelper.h>
 
 using namespace ProjectExplorer;
 
@@ -101,8 +102,8 @@ void TaskMark::clicked()
 }
 
 TaskHub::TaskHub()
-    : m_errorIcon(QLatin1String(Core::Constants::ICON_ERROR)),
-      m_warningIcon(QLatin1String(Core::Constants::ICON_WARNING))
+    : m_errorIcon(Utils::ThemeHelper::themedIcon(QLatin1String(Core::Constants::ICON_ERROR))),
+      m_warningIcon(Utils::ThemeHelper::themedIcon(QLatin1String(Core::Constants::ICON_WARNING)))
 {
     m_instance = this;
     qRegisterMetaType<ProjectExplorer::Task>("ProjectExplorer::Task");
diff --git a/src/plugins/projectexplorer/taskwindow.cpp b/src/plugins/projectexplorer/taskwindow.cpp
index d069a50f6d..bb98290e37 100644
--- a/src/plugins/projectexplorer/taskwindow.cpp
+++ b/src/plugins/projectexplorer/taskwindow.cpp
@@ -46,6 +46,7 @@
 #include <utils/algorithm.h>
 #include <utils/qtcassert.h>
 #include <utils/itemviews.h>
+#include <utils/themehelper.h>
 
 #include <QDir>
 #include <QPainter>
@@ -264,11 +265,12 @@ TaskWindow::TaskWindow() : d(new TaskWindowPrivate)
     d->m_listview->setContextMenuPolicy(Qt::ActionsContextMenu);
 
     d->m_filterWarningsButton = createFilterButton(
-                QIcon(QLatin1String(Core::Constants::ICON_WARNING)),
+                Utils::ThemeHelper::themedIcon(QLatin1String(Core::Constants::ICON_WARNING)),
                 tr("Show Warnings"), this, SLOT(setShowWarnings(bool)));
 
     d->m_categoriesButton = new QToolButton;
-    d->m_categoriesButton->setIcon(QIcon(QLatin1String(Core::Constants::ICON_FILTER)));
+    d->m_categoriesButton->setIcon(
+                Utils::ThemeHelper::themedIcon(QLatin1String(Core::Constants::ICON_FILTER)));
     d->m_categoriesButton->setToolTip(tr("Filter by categories"));
     d->m_categoriesButton->setProperty("noArrow", true);
     d->m_categoriesButton->setAutoRaise(true);
diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
index 111264fb85..95c60da7fd 100644
--- a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
+++ b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
@@ -38,6 +38,7 @@
 #include "ui_qbsbuildstepconfigwidget.h"
 
 #include <coreplugin/icore.h>
+#include <coreplugin/coreconstants.h>
 #include <projectexplorer/buildsteplist.h>
 #include <projectexplorer/kit.h>
 #include <projectexplorer/projectexplorerconstants.h>
@@ -46,6 +47,7 @@
 #include <qtsupport/qtversionmanager.h>
 #include <utils/qtcassert.h>
 #include <utils/qtcprocess.h>
+#include <utils/themehelper.h>
 
 #include <qbs.h>
 
@@ -482,6 +484,8 @@ QbsBuildStepConfigWidget::QbsBuildStepConfigWidget(QbsBuildStep *step) :
                                                      QString *errorMessage) {
         return validateProperties(edit, errorMessage);
     });
+    m_ui->qmlDebuggingWarningText->setPixmap(
+                Utils::ThemeHelper::themedIconPixmap(QLatin1String(Core::Constants::ICON_WARNING)));
 
     connect(m_ui->buildVariantComboBox, SIGNAL(currentIndexChanged(int)),
             this, SLOT(changeBuildVariant(int)));
diff --git a/src/plugins/qbsprojectmanager/qbsbuildstepconfigwidget.ui b/src/plugins/qbsprojectmanager/qbsbuildstepconfigwidget.ui
index 235d475793..b6469bc539 100644
--- a/src/plugins/qbsprojectmanager/qbsbuildstepconfigwidget.ui
+++ b/src/plugins/qbsprojectmanager/qbsbuildstepconfigwidget.ui
@@ -103,14 +103,7 @@
       </widget>
      </item>
      <item>
-      <widget class="QLabel" name="qmlDebuggingWarningIcon">
-       <property name="text">
-        <string/>
-       </property>
-       <property name="pixmap">
-        <pixmap resource="../coreplugin/core.qrc">:/core/images/warning.png</pixmap>
-       </property>
-      </widget>
+      <widget class="QLabel" name="qmlDebuggingWarningIcon"/>
      </item>
      <item>
       <widget class="QLabel" name="qmlDebuggingWarningText">
@@ -259,8 +252,6 @@
    <header location="global">utils/fancylineedit.h</header>
   </customwidget>
  </customwidgets>
- <resources>
-  <include location="../coreplugin/core.qrc"/>
- </resources>
+ <resources/>
  <connections/>
 </ui>
diff --git a/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp b/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
index 7b5112bdb2..eddbaf1dc0 100644
--- a/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
+++ b/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
@@ -49,6 +49,7 @@
 #include <utils/detailswidget.h>
 #include <utils/stringutils.h>
 #include <utils/persistentsettings.h>
+#include <utils/themehelper.h>
 #include <qtsupport/qtoutputformatter.h>
 #include <qtsupport/qtsupportconstants.h>
 #include <qtsupport/qtkitinformation.h>
@@ -341,7 +342,8 @@ QbsRunConfigurationWidget::QbsRunConfigurationWidget(QbsRunConfiguration *rc, QW
     QHBoxLayout *hl = new QHBoxLayout();
     hl->addStretch();
     m_disabledIcon = new QLabel(this);
-    m_disabledIcon->setPixmap(QPixmap(QLatin1String(Core::Constants::ICON_WARNING)));
+    m_disabledIcon->setPixmap(Utils::ThemeHelper::themedIconPixmap(
+                                  QLatin1String(Core::Constants::ICON_WARNING)));
     hl->addWidget(m_disabledIcon);
     m_disabledReason = new QLabel(this);
     m_disabledReason->setVisible(false);
diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkwidget.cpp b/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkwidget.cpp
index 518f801c9a..9ff70cfda4 100644
--- a/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkwidget.cpp
+++ b/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkwidget.cpp
@@ -35,8 +35,10 @@
 
 #include <android/androidbuildapkwidget.h>
 #include <android/androidmanager.h>
+#include <coreplugin/coreconstants.h>
 #include <qmakeprojectmanager/qmakenodes.h>
 #include <qmakeprojectmanager/qmakeproject.h>
+#include <utils/themehelper.h>
 
 #include <QFileDialog>
 #include <QLabel>
@@ -64,7 +66,8 @@ QmakeAndroidBuildApkWidget::QmakeAndroidBuildApkWidget(QmakeAndroidBuildApkStep
     sizePolicy.setVerticalStretch(0);
     sizePolicy.setHeightForWidth(oldFilesWarningIcon->sizePolicy().hasHeightForWidth());
     oldFilesWarningIcon->setSizePolicy(sizePolicy);
-    oldFilesWarningIcon->setPixmap(QPixmap(QLatin1String(":/core/images/warning.png")));
+    oldFilesWarningIcon->setPixmap(
+                Utils::ThemeHelper::themedIconPixmap(QLatin1String(Core::Constants::ICON_WARNING)));
     oldFilesWarningIcon->setAlignment(Qt::Alignment(Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop));
     qt51WarningLayout->addWidget(oldFilesWarningIcon);
 
diff --git a/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwidgetswizardpage.cpp b/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwidgetswizardpage.cpp
index 34bcba4a34..8ef77ddd2f 100644
--- a/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwidgetswizardpage.cpp
+++ b/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwidgetswizardpage.cpp
@@ -35,6 +35,7 @@
 #include <coreplugin/coreconstants.h>
 
 #include <utils/wizard.h>
+#include <utils/themehelper.h>
 
 #include <QTimer>
 
@@ -52,9 +53,11 @@ CustomWidgetWidgetsWizardPage::CustomWidgetWidgetsWizardPage(QWidget *parent) :
 {
     m_ui->setupUi(this);
     m_ui->tabStackWidget->setLayout(m_tabStackLayout);
-    m_ui->addButton->setIcon(QIcon(QLatin1String(Core::Constants::ICON_PLUS)));
+    m_ui->addButton->setIcon(Utils::ThemeHelper::themedIcon(
+                                 QLatin1String(Core::Constants::ICON_PLUS)));
     connect(m_ui->addButton, SIGNAL(clicked()), m_ui->classList, SLOT(startEditingNewClassItem()));
-    m_ui->deleteButton->setIcon(QIcon(QLatin1String(Core::Constants::ICON_MINUS)));
+    m_ui->deleteButton->setIcon(Utils::ThemeHelper::themedIcon(
+                                    QLatin1String(Core::Constants::ICON_MINUS)));
     connect(m_ui->deleteButton, SIGNAL(clicked()), m_ui->classList, SLOT(removeCurrentClass()));
     m_ui->deleteButton->setEnabled(false);
 
diff --git a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp
index b1cf4495fe..f1e81e3943 100644
--- a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp
+++ b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp
@@ -49,6 +49,7 @@
 #include <utils/persistentsettings.h>
 #include <utils/qtcprocess.h>
 #include <utils/stringutils.h>
+#include <utils/themehelper.h>
 
 #include <QCheckBox>
 #include <QComboBox>
@@ -183,7 +184,8 @@ DesktopQmakeRunConfigurationWidget::DesktopQmakeRunConfigurationWidget(DesktopQm
     QHBoxLayout *hl = new QHBoxLayout();
     hl->addStretch();
     m_disabledIcon = new QLabel(this);
-    m_disabledIcon->setPixmap(QPixmap(QLatin1String(Core::Constants::ICON_WARNING)));
+    m_disabledIcon->setPixmap(Utils::ThemeHelper::themedIconPixmap(
+                                  QLatin1String(Core::Constants::ICON_WARNING)));
     hl->addWidget(m_disabledIcon);
     m_disabledReason = new QLabel(this);
     m_disabledReason->setVisible(false);
diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.cpp b/src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.cpp
index 74ec429593..a32afee7d8 100644
--- a/src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.cpp
@@ -35,11 +35,13 @@
 #include "qmakenodes.h"
 #include "ui_qmakeprojectconfigwidget.h"
 
+#include <coreplugin/coreconstants.h>
 #include <projectexplorer/target.h>
 #include <qtsupport/qtkitinformation.h>
 
 #include <utils/algorithm.h>
 #include <utils/detailswidget.h>
+#include <utils/themehelper.h>
 
 using namespace QmakeProjectManager;
 using namespace QmakeProjectManager::Internal;
@@ -66,6 +68,8 @@ QmakeProjectConfigWidget::QmakeProjectConfigWidget(QmakeBuildConfiguration *bc)
 
     m_browseButton = m_ui->shadowBuildDirEdit->buttonAtIndex(0);
 
+    m_ui->warningLabel->setPixmap(Utils::ThemeHelper::themedIconPixmap(
+                                      QLatin1String(Core::Constants::ICON_WARNING)));
     m_ui->shadowBuildDirEdit->setPromptDialogTitle(tr("Shadow Build Directory"));
     m_ui->shadowBuildDirEdit->setExpectedKind(Utils::PathChooser::ExistingDirectory);
     m_ui->shadowBuildDirEdit->setHistoryCompleter(QLatin1String("Qmake.BuildDir.History"));
diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.ui b/src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.ui
index 33b53f8925..75740d0990 100644
--- a/src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.ui
+++ b/src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.ui
@@ -58,11 +58,7 @@
    <item row="2" column="1">
     <layout class="QHBoxLayout" name="horizontalLayout_2">
      <item>
-      <widget class="QLabel" name="warningLabel">
-       <property name="pixmap">
-        <pixmap resource="../coreplugin/core.qrc">:/core/images/warning.png</pixmap>
-       </property>
-      </widget>
+      <widget class="QLabel" name="warningLabel"/>
      </item>
      <item>
       <widget class="QLabel" name="problemLabel">
@@ -92,8 +88,6 @@
    <container>1</container>
   </customwidget>
  </customwidgets>
- <resources>
-  <include location="../projectexplorer/projectexplorer.qrc"/>
- </resources>
+ <resources/>
  <connections/>
 </ui>
diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp
index 3ade2569e4..5a363d2495 100644
--- a/src/plugins/qmakeprojectmanager/qmakestep.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakestep.cpp
@@ -44,6 +44,7 @@
 #include <projectexplorer/target.h>
 #include <projectexplorer/toolchain.h>
 
+#include <coreplugin/coreconstants.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/icontext.h>
 #include <qtsupport/debugginghelperbuildtask.h>
@@ -53,6 +54,7 @@
 #include <utils/algorithm.h>
 #include <utils/hostosinfo.h>
 #include <utils/qtcprocess.h>
+#include <utils/themehelper.h>
 
 #include <QDir>
 #include <QMessageBox>
@@ -453,6 +455,9 @@ QMakeStepConfigWidget::QMakeStepConfigWidget(QMakeStep *step)
     m_ui->qmlDebuggingLibraryCheckBox->setChecked(m_step->linkQmlDebuggingLibrary());
     m_ui->qtQuickCompilerCheckBox->setChecked(m_step->useQtQuickCompiler());
     m_ui->separateDebugInfoCheckBox->setChecked(m_step->separateDebugInfo());
+    const QPixmap warning = Utils::ThemeHelper::themedIconPixmap(QLatin1String(Core::Constants::ICON_WARNING));
+    m_ui->qmlDebuggingWarningIcon->setPixmap(warning);
+    m_ui->qtQuickCompilerWarningIcon->setPixmap(warning);
 
     qmakeBuildConfigChanged();
 
diff --git a/src/plugins/qmakeprojectmanager/qmakestep.ui b/src/plugins/qmakeprojectmanager/qmakestep.ui
index 7165a81b0b..40e2fd877a 100644
--- a/src/plugins/qmakeprojectmanager/qmakestep.ui
+++ b/src/plugins/qmakeprojectmanager/qmakestep.ui
@@ -169,11 +169,7 @@
        </widget>
       </item>
       <item>
-       <widget class="QLabel" name="qmlDebuggingWarningIcon">
-        <property name="pixmap">
-         <pixmap resource="../coreplugin/core.qrc">:/core/images/warning.png</pixmap>
-        </property>
-       </widget>
+       <widget class="QLabel" name="qmlDebuggingWarningIcon"/>
       </item>
       <item>
        <widget class="QLabel" name="qmlDebuggingWarningText">
@@ -228,11 +224,7 @@
        </widget>
       </item>
       <item>
-       <widget class="QLabel" name="qtQuickCompilerWarningIcon">
-        <property name="pixmap">
-         <pixmap resource="../coreplugin/core.qrc">:/core/images/warning.png</pixmap>
-        </property>
-       </widget>
+       <widget class="QLabel" name="qtQuickCompilerWarningIcon"/>
       </item>
       <item>
        <widget class="QLabel" name="qtQuickCompilerWarningText">
@@ -285,9 +277,6 @@
    </item>
   </layout>
  </widget>
- <resources>
-  <include location="../projectexplorer/projectexplorer.qrc"/>
-  <include location="../coreplugin/core.qrc"/>
- </resources>
+ <resources/>
  <connections/>
 </ui>
diff --git a/src/plugins/qmldesigner/components/formeditor/boundingrect.png b/src/plugins/qmldesigner/components/formeditor/boundingrect.png
index e8b6b96857..0a91478d6d 100644
--- a/src/plugins/qmldesigner/components/formeditor/boundingrect.png
+++ b/src/plugins/qmldesigner/components/formeditor/boundingrect.png
diff --git a/src/plugins/qmldesigner/components/formeditor/boundingrect@2x.png b/src/plugins/qmldesigner/components/formeditor/boundingrect@2x.png
new file mode 100644
index 0000000000..43ea7993fb
--- /dev/null
+++ b/src/plugins/qmldesigner/components/formeditor/boundingrect@2x.png
diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp
index 563a942222..8bebd76d9f 100644
--- a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp
@@ -39,6 +39,7 @@
 #include <backgroundaction.h>
 
 #include <utils/fileutils.h>
+#include <utils/themehelper.h>
 
 namespace QmlDesigner {
 
@@ -65,21 +66,21 @@ FormEditorWidget::FormEditorWidget(FormEditorView *view)
     m_noSnappingAction->setShortcutContext(Qt::WidgetWithChildrenShortcut);
     m_noSnappingAction->setCheckable(true);
     m_noSnappingAction->setChecked(true);
-    m_noSnappingAction->setIcon(QPixmap(QLatin1String(":/icon/layout/no_snapping.png")));
+    m_noSnappingAction->setIcon(Utils::ThemeHelper::themedIcon(QLatin1String(":/icon/layout/no_snapping.png")));
 
     m_snappingAndAnchoringAction = layoutActionGroup->addAction(tr("Snap to parent or sibling items and generate anchors (W)."));
     m_snappingAndAnchoringAction->setShortcut(Qt::Key_W);
     m_snappingAndAnchoringAction->setShortcutContext(Qt::WidgetWithChildrenShortcut);
     m_snappingAndAnchoringAction->setCheckable(true);
     m_snappingAndAnchoringAction->setChecked(true);
-    m_snappingAndAnchoringAction->setIcon(QPixmap(QLatin1String(":/icon/layout/snapping_and_anchoring.png")));
+    m_snappingAndAnchoringAction->setIcon(Utils::ThemeHelper::themedIcon(QLatin1String(":/icon/layout/snapping_and_anchoring.png")));
 
     m_snappingAction = layoutActionGroup->addAction(tr("Snap to parent or sibling items but do not generate anchors (E)."));
     m_snappingAction->setShortcut(Qt::Key_E);
     m_snappingAction->setShortcutContext(Qt::WidgetWithChildrenShortcut);
     m_snappingAction->setCheckable(true);
     m_snappingAction->setChecked(true);
-    m_snappingAction->setIcon(QPixmap(QLatin1String(":/icon/layout/snapping.png")));
+    m_snappingAction->setIcon(Utils::ThemeHelper::themedIcon(QLatin1String(":/icon/layout/snapping.png")));
 
 
     addActions(layoutActionGroup->actions());
@@ -95,7 +96,7 @@ FormEditorWidget::FormEditorWidget(FormEditorView *view)
     m_showBoundingRectAction->setShortcutContext(Qt::WidgetWithChildrenShortcut);
     m_showBoundingRectAction->setCheckable(true);
     m_showBoundingRectAction->setChecked(true);
-    m_showBoundingRectAction->setIcon(QPixmap(QLatin1String(":/icon/layout/boundingrect.png")));
+    m_showBoundingRectAction->setIcon(Utils::ThemeHelper::themedIcon(QLatin1String(":/icon/layout/boundingrect.png")));
 
     addAction(m_showBoundingRectAction.data());
     upperActions.append(m_showBoundingRectAction.data());
@@ -134,7 +135,7 @@ FormEditorWidget::FormEditorWidget(FormEditorView *view)
     m_resetAction = new QAction(tr("Reset view (R)."), this);
     m_resetAction->setShortcut(Qt::Key_R);
     m_resetAction->setShortcutContext(Qt::WidgetWithChildrenShortcut);
-    m_resetAction->setIcon(QPixmap(QLatin1String(":/icon/reset.png")));
+    m_resetAction->setIcon(Utils::ThemeHelper::themedIcon(QLatin1String(":/icon/reset.png")));
     connect(m_resetAction.data(), SIGNAL(triggered(bool)), this, SLOT(resetNodeInstanceView()));
     addAction(m_resetAction.data());
     upperActions.append(m_resetAction.data());
diff --git a/src/plugins/qmldesigner/components/formeditor/no_snapping.png b/src/plugins/qmldesigner/components/formeditor/no_snapping.png
index 49393dbd80..8120c85739 100644
--- a/src/plugins/qmldesigner/components/formeditor/no_snapping.png
+++ b/src/plugins/qmldesigner/components/formeditor/no_snapping.png
diff --git a/src/plugins/qmldesigner/components/formeditor/no_snapping@2x.png b/src/plugins/qmldesigner/components/formeditor/no_snapping@2x.png
new file mode 100644
index 0000000000..c6f41dd827
--- /dev/null
+++ b/src/plugins/qmldesigner/components/formeditor/no_snapping@2x.png
diff --git a/src/plugins/qmldesigner/components/formeditor/reset.png b/src/plugins/qmldesigner/components/formeditor/reset.png
index 6e8d0911a6..b3308cf5c1 100644
--- a/src/plugins/qmldesigner/components/formeditor/reset.png
+++ b/src/plugins/qmldesigner/components/formeditor/reset.png
diff --git a/src/plugins/qmldesigner/components/formeditor/reset@2x.png b/src/plugins/qmldesigner/components/formeditor/reset@2x.png
new file mode 100644
index 0000000000..60abc11e26
--- /dev/null
+++ b/src/plugins/qmldesigner/components/formeditor/reset@2x.png
diff --git a/src/plugins/qmldesigner/components/formeditor/snapping.png b/src/plugins/qmldesigner/components/formeditor/snapping.png
index 6c916f10bd..fbe4a14d93 100644
--- a/src/plugins/qmldesigner/components/formeditor/snapping.png
+++ b/src/plugins/qmldesigner/components/formeditor/snapping.png
diff --git a/src/plugins/qmldesigner/components/formeditor/snapping@2x.png b/src/plugins/qmldesigner/components/formeditor/snapping@2x.png
new file mode 100644
index 0000000000..2c7305b624
--- /dev/null
+++ b/src/plugins/qmldesigner/components/formeditor/snapping@2x.png
diff --git a/src/plugins/qmldesigner/components/formeditor/snapping_and_anchoring.png b/src/plugins/qmldesigner/components/formeditor/snapping_and_anchoring.png
index 9e2a68d98d..e0e92e3a5b 100644
--- a/src/plugins/qmldesigner/components/formeditor/snapping_and_anchoring.png
+++ b/src/plugins/qmldesigner/components/formeditor/snapping_and_anchoring.png
diff --git a/src/plugins/qmldesigner/components/formeditor/snapping_and_anchoring@2x.png b/src/plugins/qmldesigner/components/formeditor/snapping_and_anchoring@2x.png
new file mode 100644
index 0000000000..70ddd4edae
--- /dev/null
+++ b/src/plugins/qmldesigner/components/formeditor/snapping_and_anchoring@2x.png
diff --git a/src/plugins/qmldesigner/components/navigator/arrowdown.png b/src/plugins/qmldesigner/components/navigator/arrowdown.png
index 1373966176..ff55e005cd 100644
--- a/src/plugins/qmldesigner/components/navigator/arrowdown.png
+++ b/src/plugins/qmldesigner/components/navigator/arrowdown.png
diff --git a/src/plugins/qmldesigner/components/navigator/arrowdown@2x.png b/src/plugins/qmldesigner/components/navigator/arrowdown@2x.png
new file mode 100644
index 0000000000..a60b7275f3
--- /dev/null
+++ b/src/plugins/qmldesigner/components/navigator/arrowdown@2x.png
diff --git a/src/plugins/qmldesigner/components/navigator/arrowleft.png b/src/plugins/qmldesigner/components/navigator/arrowleft.png
index 4a34318b3a..cdf5b0cc7c 100644
--- a/src/plugins/qmldesigner/components/navigator/arrowleft.png
+++ b/src/plugins/qmldesigner/components/navigator/arrowleft.png
diff --git a/src/plugins/qmldesigner/components/navigator/arrowleft@2x.png b/src/plugins/qmldesigner/components/navigator/arrowleft@2x.png
new file mode 100644
index 0000000000..23acf1c688
--- /dev/null
+++ b/src/plugins/qmldesigner/components/navigator/arrowleft@2x.png
diff --git a/src/plugins/qmldesigner/components/navigator/arrowright.png b/src/plugins/qmldesigner/components/navigator/arrowright.png
index b2f8bfde8b..627b2eccf9 100644
--- a/src/plugins/qmldesigner/components/navigator/arrowright.png
+++ b/src/plugins/qmldesigner/components/navigator/arrowright.png
diff --git a/src/plugins/qmldesigner/components/navigator/arrowright@2x.png b/src/plugins/qmldesigner/components/navigator/arrowright@2x.png
new file mode 100644
index 0000000000..3a322e740c
--- /dev/null
+++ b/src/plugins/qmldesigner/components/navigator/arrowright@2x.png
diff --git a/src/plugins/qmldesigner/components/navigator/arrowup.png b/src/plugins/qmldesigner/components/navigator/arrowup.png
index f9ef97a25c..a9498573cf 100644
--- a/src/plugins/qmldesigner/components/navigator/arrowup.png
+++ b/src/plugins/qmldesigner/components/navigator/arrowup.png
diff --git a/src/plugins/qmldesigner/components/navigator/arrowup@2x.png b/src/plugins/qmldesigner/components/navigator/arrowup@2x.png
new file mode 100644
index 0000000000..4c995ceb9c
--- /dev/null
+++ b/src/plugins/qmldesigner/components/navigator/arrowup@2x.png
diff --git a/src/plugins/qmldesigner/components/navigator/export_checked.png b/src/plugins/qmldesigner/components/navigator/export_checked.png
index 9021b7b086..f0c3b230c0 100644
--- a/src/plugins/qmldesigner/components/navigator/export_checked.png
+++ b/src/plugins/qmldesigner/components/navigator/export_checked.png
diff --git a/src/plugins/qmldesigner/components/navigator/export_checked@2x.png b/src/plugins/qmldesigner/components/navigator/export_checked@2x.png
new file mode 100644
index 0000000000..07f49a8f26
--- /dev/null
+++ b/src/plugins/qmldesigner/components/navigator/export_checked@2x.png
diff --git a/src/plugins/qmldesigner/components/navigator/export_unchecked.png b/src/plugins/qmldesigner/components/navigator/export_unchecked.png
index 36bb3d2bbc..8f981200da 100644
--- a/src/plugins/qmldesigner/components/navigator/export_unchecked.png
+++ b/src/plugins/qmldesigner/components/navigator/export_unchecked.png
diff --git a/src/plugins/qmldesigner/components/navigator/export_unchecked@2x.png b/src/plugins/qmldesigner/components/navigator/export_unchecked@2x.png
new file mode 100644
index 0000000000..cbfb9d512a
--- /dev/null
+++ b/src/plugins/qmldesigner/components/navigator/export_unchecked@2x.png
diff --git a/src/plugins/qmldesigner/components/navigator/eye_closed.png b/src/plugins/qmldesigner/components/navigator/eye_closed.png
index 5ba632573a..e5a5dead1c 100644
--- a/src/plugins/qmldesigner/components/navigator/eye_closed.png
+++ b/src/plugins/qmldesigner/components/navigator/eye_closed.png
diff --git a/src/plugins/qmldesigner/components/navigator/eye_closed@2x.png b/src/plugins/qmldesigner/components/navigator/eye_closed@2x.png
new file mode 100644
index 0000000000..327e70a138
--- /dev/null
+++ b/src/plugins/qmldesigner/components/navigator/eye_closed@2x.png
diff --git a/src/plugins/qmldesigner/components/navigator/eye_open.png b/src/plugins/qmldesigner/components/navigator/eye_open.png
index 3acdc9982a..7cb34bf982 100644
--- a/src/plugins/qmldesigner/components/navigator/eye_open.png
+++ b/src/plugins/qmldesigner/components/navigator/eye_open.png
diff --git a/src/plugins/qmldesigner/components/navigator/eye_open@2x.png b/src/plugins/qmldesigner/components/navigator/eye_open@2x.png
new file mode 100644
index 0000000000..1974307141
--- /dev/null
+++ b/src/plugins/qmldesigner/components/navigator/eye_open@2x.png
diff --git a/src/plugins/qmldesigner/components/navigator/iconcheckboxitemdelegate.cpp b/src/plugins/qmldesigner/components/navigator/iconcheckboxitemdelegate.cpp
index f0fccc21bf..728f1c8fe6 100644
--- a/src/plugins/qmldesigner/components/navigator/iconcheckboxitemdelegate.cpp
+++ b/src/plugins/qmldesigner/components/navigator/iconcheckboxitemdelegate.cpp
@@ -39,6 +39,8 @@
 #include <QMouseEvent>
 #include <QPainter>
 
+#include <utils/themehelper.h>
+
 namespace QmlDesigner {
 
 IconCheckboxItemDelegate::IconCheckboxItemDelegate(QObject *parent,
@@ -46,8 +48,8 @@ IconCheckboxItemDelegate::IconCheckboxItemDelegate(QObject *parent,
                                                    QString uncheckedPixmapURL,
                                                    NavigatorTreeModel *treeModel)
     : QStyledItemDelegate(parent),
-      offPixmap(uncheckedPixmapURL),
-      onPixmap(checkedPixmapURL),
+      offPixmap(Utils::ThemeHelper::themedIconPixmap(uncheckedPixmapURL)),
+      onPixmap(Utils::ThemeHelper::themedIconPixmap(checkedPixmapURL)),
       m_navigatorTreeModel(treeModel)
 {}
 
@@ -74,7 +76,8 @@ void IconCheckboxItemDelegate::paint(QPainter *painter,
                                      const QStyleOptionViewItem &styleOption,
                                      const QModelIndex &modelIndex) const
 {
-    const int yOffset = (styleOption.rect.height() - onPixmap.height()) / 2;
+    const int yOffset = (styleOption.rect.height()
+                         - (onPixmap.height() / painter->device()->devicePixelRatio())) / 2;
     const int xOffset = 2;
     if (indexIsHolingModelNode(modelIndex)) {
         painter->save();
diff --git a/src/plugins/qmldesigner/components/navigator/navigator.qrc b/src/plugins/qmldesigner/components/navigator/navigator.qrc
index e0ae5883bf..f2451d00e8 100644
--- a/src/plugins/qmldesigner/components/navigator/navigator.qrc
+++ b/src/plugins/qmldesigner/components/navigator/navigator.qrc
@@ -1,13 +1,21 @@
 <RCC>
     <qresource prefix="/navigator/icon">
         <file>arrowdown.png</file>
+        <file>arrowdown@2x.png</file>
         <file>arrowleft.png</file>
+        <file>arrowleft@2x.png</file>
         <file>arrowright.png</file>
+        <file>arrowright@2x.png</file>
         <file>arrowup.png</file>
+        <file>arrowup@2x.png</file>
         <file>export_checked.png</file>
+        <file>export_checked@2x.png</file>
         <file>export_unchecked.png</file>
+        <file>export_unchecked@2x.png</file>
         <file>eye_open.png</file>
+        <file>eye_open@2x.png</file>
         <file>eye_closed.png</file>
+        <file>eye_closed@2x.png</file>
         <file>warning.png</file>
     </qresource>
 </RCC>
diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp
index 5abbc6169d..4df29ac2c9 100644
--- a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp
+++ b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp
@@ -39,6 +39,8 @@
 #include <qmlitemnode.h>
 
 #include <coreplugin/icore.h>
+#include <coreplugin/coreconstants.h>
+#include <utils/themehelper.h>
 
 #include <QMimeData>
 #include <QMessageBox>
@@ -379,7 +381,8 @@ void NavigatorTreeModel::updateItemRow(const ModelNode &modelNode, ItemRow items
     if (currentQmlObjectNode.hasError()) {
         items.idItem->setData(true, ErrorRole);
         items.idItem->setToolTip(currentQmlObjectNode.error());
-        items.idItem->setIcon(QIcon(":/navigator/icon/warning.png"));
+        items.idItem->setIcon(Utils::ThemeHelper::themedIcon(
+                                  QLatin1String(Core::Constants::ICON_WARNING)));
     } else {
         items.idItem->setData(false, ErrorRole);
         if (modelNode.metaInfo().isValid())
diff --git a/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp b/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp
index 058dc0be44..7c6bca74eb 100644
--- a/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp
+++ b/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp
@@ -32,7 +32,7 @@
 #include <QHeaderView>
 #include <QtDebug>
 #include <utils/fileutils.h>
-
+#include <utils/themehelper.h>
 
 namespace QmlDesigner {
 
@@ -77,24 +77,25 @@ QList<QToolButton *> NavigatorWidget::createToolBarWidgets()
     QList<QToolButton *> buttons;
 
     buttons.append(new QToolButton());
-    buttons.last()->setIcon(QIcon(QLatin1String(":/navigator/icon/arrowleft.png")));
+    buttons.last()->setIcon(Utils::ThemeHelper::themedIcon(QLatin1String(":/navigator/icon/arrowleft.png")));
     buttons.last()->setToolTip(tr("Become last sibling of parent (CTRL + Left)."));
     buttons.last()->setShortcut(QKeySequence(Qt::Key_Left | Qt::CTRL));
     connect(buttons.last(), SIGNAL(clicked()), this, SIGNAL(leftButtonClicked()));
+
     buttons.append(new QToolButton());
-    buttons.last()->setIcon(QIcon(QLatin1String(":/navigator/icon/arrowright.png")));
+    buttons.last()->setIcon(Utils::ThemeHelper::themedIcon(QLatin1String(":/navigator/icon/arrowright.png")));
     buttons.last()->setToolTip(tr("Become child of last sibling (CTRL + Right)."));
     buttons.last()->setShortcut(QKeySequence(Qt::Key_Right | Qt::CTRL));
     connect(buttons.last(), SIGNAL(clicked()), this, SIGNAL(rightButtonClicked()));
 
     buttons.append(new QToolButton());
-    buttons.last()->setIcon(QIcon(QLatin1String(":/navigator/icon/arrowdown.png")));
+    buttons.last()->setIcon(Utils::ThemeHelper::themedIcon(QLatin1String(":/navigator/icon/arrowdown.png")));
     buttons.last()->setToolTip(tr("Move down (CTRL + Down)."));
     buttons.last()->setShortcut(QKeySequence(Qt::Key_Down | Qt::CTRL));
     connect(buttons.last(), SIGNAL(clicked()), this, SIGNAL(downButtonClicked()));
 
     buttons.append(new QToolButton());
-    buttons.last()->setIcon(QIcon(QLatin1String(":/navigator/icon/arrowup.png")));
+    buttons.last()->setIcon(Utils::ThemeHelper::themedIcon(QLatin1String(":/navigator/icon/arrowup.png")));
     buttons.last()->setToolTip(tr("Move up (CTRL + Up)."));
     buttons.last()->setShortcut(QKeySequence(Qt::Key_Up | Qt::CTRL));
     connect(buttons.last(), SIGNAL(clicked()), this, SIGNAL(upButtonClicked()));
diff --git a/src/plugins/qmljstools/qmlconsoleitemdelegate.cpp b/src/plugins/qmljstools/qmlconsoleitemdelegate.cpp
index 208be88e7a..c4c3c7c0e8 100644
--- a/src/plugins/qmljstools/qmlconsoleitemdelegate.cpp
+++ b/src/plugins/qmljstools/qmlconsoleitemdelegate.cpp
@@ -32,6 +32,7 @@
 #include "qmlconsoleedit.h"
 
 #include <coreplugin/coreconstants.h>
+#include <utils/themehelper.h>
 
 #include <QPainter>
 #include <QTreeView>
@@ -71,9 +72,9 @@ namespace Internal {
 
 QmlConsoleItemDelegate::QmlConsoleItemDelegate(QObject *parent) :
     QStyledItemDelegate(parent),
-    m_logIcon(QLatin1String(Core::Constants::ICON_INFO)),
-    m_warningIcon(QLatin1String(Core::Constants::ICON_WARNING)),
-    m_errorIcon(QLatin1String(Core::Constants::ICON_ERROR)),
+    m_logIcon(Utils::ThemeHelper::themedIcon(QLatin1String(Core::Constants::ICON_INFO))),
+    m_warningIcon(Utils::ThemeHelper::themedIcon(QLatin1String(Core::Constants::ICON_WARNING))),
+    m_errorIcon(Utils::ThemeHelper::themedIcon(QLatin1String(Core::Constants::ICON_ERROR))),
     m_expandIcon(QLatin1String(":/qmljstools/images/expand.png")),
     m_collapseIcon(QLatin1String(":/qmljstools/images/collapse.png")),
     m_prompt(QLatin1String(":/qmljstools/images/prompt.png")),
diff --git a/src/plugins/qmljstools/qmlconsolepane.cpp b/src/plugins/qmljstools/qmlconsolepane.cpp
index 7111eb6a93..c5ca97eda9 100644
--- a/src/plugins/qmljstools/qmlconsolepane.cpp
+++ b/src/plugins/qmljstools/qmlconsolepane.cpp
@@ -37,6 +37,7 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/findplaceholder.h>
 #include <utils/savedaction.h>
+#include <utils/themehelper.h>
 #include <aggregation/aggregate.h>
 #include <coreplugin/find/itemviewfind.h>
 
@@ -112,7 +113,8 @@ QmlConsolePane::QmlConsolePane(QObject *parent)
     m_showDebugButtonAction->setToolTip(tr("Show debug, log, and info messages."));
     m_showDebugButtonAction->setCheckable(true);
     m_showDebugButtonAction->setChecked(true);
-    m_showDebugButtonAction->setIcon(QIcon(QLatin1String(Core::Constants::ICON_INFO)));
+    m_showDebugButtonAction->setIcon(
+                Utils::ThemeHelper::themedIcon(QLatin1String(Core::Constants::ICON_INFO)));
     connect(m_showDebugButtonAction, &Utils::SavedAction::toggled,
             m_proxyModel, &QmlConsoleProxyModel::setShowLogs);
     m_showDebugButton->setDefaultAction(m_showDebugButtonAction);
@@ -126,7 +128,8 @@ QmlConsolePane::QmlConsolePane(QObject *parent)
     m_showWarningButtonAction->setToolTip(tr("Show warning messages."));
     m_showWarningButtonAction->setCheckable(true);
     m_showWarningButtonAction->setChecked(true);
-    m_showWarningButtonAction->setIcon(QIcon(QLatin1String(Core::Constants::ICON_WARNING)));
+    m_showWarningButtonAction->setIcon(Utils::ThemeHelper::themedIcon(
+                                           QLatin1String(Core::Constants::ICON_WARNING)));
     connect(m_showWarningButtonAction, &Utils::SavedAction::toggled,
             m_proxyModel, &QmlConsoleProxyModel::setShowWarnings);
     m_showWarningButton->setDefaultAction(m_showWarningButtonAction);
@@ -140,7 +143,8 @@ QmlConsolePane::QmlConsolePane(QObject *parent)
     m_showErrorButtonAction->setToolTip(tr("Show error messages."));
     m_showErrorButtonAction->setCheckable(true);
     m_showErrorButtonAction->setChecked(true);
-    m_showErrorButtonAction->setIcon(QIcon(QLatin1String(Core::Constants::ICON_ERROR)));
+    m_showErrorButtonAction->setIcon(Utils::ThemeHelper::themedIcon(
+                                         QLatin1String(Core::Constants::ICON_ERROR)));
     connect(m_showErrorButtonAction, &Utils::SavedAction::toggled, m_proxyModel, &QmlConsoleProxyModel::setShowErrors);
     m_showErrorButton->setDefaultAction(m_showErrorButtonAction);
 
diff --git a/src/plugins/qmlprofiler/qml/clean_pane_small.png b/src/plugins/qmlprofiler/qml/clean_pane_small.png
deleted file mode 100644
index 22efdbab5d..0000000000
--- a/src/plugins/qmlprofiler/qml/clean_pane_small.png
+++ /dev/null
diff --git a/src/plugins/qmlprofiler/qml/qmlprofiler.qrc b/src/plugins/qmlprofiler/qml/qmlprofiler.qrc
index 9bf2978507..ffef45e6a8 100644
--- a/src/plugins/qmlprofiler/qml/qmlprofiler.qrc
+++ b/src/plugins/qmlprofiler/qml/qmlprofiler.qrc
@@ -1,6 +1,5 @@
 <RCC>
     <qresource prefix="/qmlprofiler">
-        <file>clean_pane_small.png</file>
         <file>recordOff.png</file>
         <file>recordOn.png</file>
         <file>bindingloops.vert</file>
diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp
index 37e4d6ad22..bc7b99f261 100644
--- a/src/plugins/qmlprofiler/qmlprofilertool.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp
@@ -48,6 +48,7 @@
 #include <utils/fancymainwindow.h>
 #include <utils/fileinprojectfinder.h>
 #include <utils/qtcassert.h>
+#include <utils/themehelper.h>
 #include <projectexplorer/environmentaspect.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/project.h>
@@ -277,7 +278,7 @@ QWidget *QmlProfilerTool::createWidgets()
     layout->addWidget(d->m_recordButton);
 
     d->m_clearButton = new QToolButton(toolbarWidget);
-    d->m_clearButton->setIcon(QIcon(QLatin1String(":/qmlprofiler/clean_pane_small.png")));
+    d->m_clearButton->setIcon(Utils::ThemeHelper::themedIcon(QLatin1String(ICON_CLEAN_PANE)));
     d->m_clearButton->setToolTip(tr("Discard data"));
 
     connect(d->m_clearButton, &QAbstractButton::clicked, [this](){
@@ -288,14 +289,14 @@ QWidget *QmlProfilerTool::createWidgets()
     layout->addWidget(d->m_clearButton);
 
     d->m_searchButton = new QToolButton;
-    d->m_searchButton->setIcon(QIcon(QStringLiteral(":/timeline/ico_zoom.png")));
+    d->m_searchButton->setIcon(Utils::ThemeHelper::themedIcon(QLatin1String(ICON_ZOOM)));
     d->m_searchButton->setToolTip(tr("Search timeline event notes."));
     layout->addWidget(d->m_searchButton);
 
     connect(d->m_searchButton, &QToolButton::clicked, this, &QmlProfilerTool::showTimeLineSearch);
 
     d->m_displayFeaturesButton = new QToolButton;
-    d->m_displayFeaturesButton->setIcon(QIcon(QLatin1String(ICON_FILTER)));
+    d->m_displayFeaturesButton->setIcon(Utils::ThemeHelper::themedIcon(QLatin1String(ICON_FILTER)));
     d->m_displayFeaturesButton->setToolTip(tr("Hide or show event categories."));
     d->m_displayFeaturesButton->setPopupMode(QToolButton::InstantPopup);
     d->m_displayFeaturesButton->setProperty("noArrow", true);
diff --git a/src/plugins/qtsupport/qtoptionspage.cpp b/src/plugins/qtsupport/qtoptionspage.cpp
index 73838474df..33723eb4c1 100644
--- a/src/plugins/qtsupport/qtoptionspage.cpp
+++ b/src/plugins/qtsupport/qtoptionspage.cpp
@@ -50,6 +50,7 @@
 #include <utils/qtcassert.h>
 #include <utils/runextensions.h>
 #include <utils/algorithm.h>
+#include <utils/themehelper.h>
 #include <utils/treemodel.h>
 
 #include <QDir>
@@ -206,8 +207,8 @@ QtOptionsPageWidget::QtOptionsPageWidget(QWidget *parent)
     , m_versionUi(new Internal::Ui::QtVersionInfo())
     , m_debuggingHelperUi(new Internal::Ui::DebuggingHelper())
     , m_infoBrowser(new QTextBrowser)
-    , m_invalidVersionIcon(QLatin1String(Core::Constants::ICON_ERROR))
-    , m_warningVersionIcon(QLatin1String(Core::Constants::ICON_WARNING))
+    , m_invalidVersionIcon(Utils::ThemeHelper::themedIcon(QLatin1String(Core::Constants::ICON_ERROR)))
+    , m_warningVersionIcon(Utils::ThemeHelper::themedIcon(QLatin1String(Core::Constants::ICON_WARNING)))
     , m_configurationWidget(0)
     , m_autoItem(0)
     , m_manualItem(0)
diff --git a/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.cpp b/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.cpp
index 304708809c..ddffcf06f2 100644
--- a/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.cpp
+++ b/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.cpp
@@ -34,6 +34,7 @@
 #include <coreplugin/coreconstants.h>
 #include <utils/detailswidget.h>
 #include <utils/qtcprocess.h>
+#include <utils/themehelper.h>
 
 #include <QCoreApplication>
 #include <QDir>
@@ -111,7 +112,8 @@ void RemoteLinuxRunConfigurationWidget::addDisabledLabel(QVBoxLayout *topLayout)
 {
     QHBoxLayout * const hl = new QHBoxLayout;
     hl->addStretch();
-    d->disabledIcon.setPixmap(QPixmap(QLatin1String(Core::Constants::ICON_WARNING)));
+    d->disabledIcon.setPixmap(Utils::ThemeHelper::themedIconPixmap(
+                                  QLatin1String(Core::Constants::ICON_WARNING)));
     hl->addWidget(&d->disabledIcon);
     d->disabledReason.setVisible(false);
     hl->addWidget(&d->disabledReason);
diff --git a/src/plugins/texteditor/outlinefactory.cpp b/src/plugins/texteditor/outlinefactory.cpp
index b5db21d214..c73b88c440 100644
--- a/src/plugins/texteditor/outlinefactory.cpp
+++ b/src/plugins/texteditor/outlinefactory.cpp
@@ -32,6 +32,7 @@
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/editormanager/editormanager.h>
+#include <utils/themehelper.h>
 
 #include <QToolButton>
 #include <QLabel>
@@ -57,14 +58,16 @@ OutlineWidgetStack::OutlineWidgetStack(OutlineFactory *factory) :
     addWidget(label);
 
     m_toggleSync = new QToolButton;
-    m_toggleSync->setIcon(QIcon(QLatin1String(Core::Constants::ICON_LINK)));
+    m_toggleSync->setIcon(
+                Utils::ThemeHelper::themedIcon(QLatin1String(Core::Constants::ICON_LINK)));
     m_toggleSync->setCheckable(true);
     m_toggleSync->setChecked(true);
     m_toggleSync->setToolTip(tr("Synchronize with Editor"));
     connect(m_toggleSync, SIGNAL(clicked(bool)), this, SLOT(toggleCursorSynchronization()));
 
     m_filterButton = new QToolButton;
-    m_filterButton->setIcon(QIcon(QLatin1String(Core::Constants::ICON_FILTER)));
+    m_filterButton->setIcon(
+                Utils::ThemeHelper::themedIcon(QLatin1String(Core::Constants::ICON_FILTER)));
     m_filterButton->setToolTip(tr("Filter tree"));
     m_filterButton->setPopupMode(QToolButton::InstantPopup);
     m_filterButton->setProperty("noArrow", true);
diff --git a/src/plugins/todo/keyworddialog.cpp b/src/plugins/todo/keyworddialog.cpp
index 7110db011b..eb9ceeb860 100644
--- a/src/plugins/todo/keyworddialog.cpp
+++ b/src/plugins/todo/keyworddialog.cpp
@@ -36,6 +36,7 @@
 #include "lineparser.h"
 
 #include <coreplugin/coreconstants.h>
+#include <utils/themehelper.h>
 
 #include <QColorDialog>
 
@@ -89,19 +90,19 @@ void KeywordDialog::setupListWidget(const QString &selectedIcon)
     ui->listWidget->setViewMode(QListWidget::IconMode);
     ui->listWidget->setDragEnabled(false);
     const QString infoIconName = QLatin1String(Core::Constants::ICON_INFO);
-    QListWidgetItem *item = new QListWidgetItem(QIcon(infoIconName),
+    QListWidgetItem *item = new QListWidgetItem(Utils::ThemeHelper::themedIcon(infoIconName),
                                                 QLatin1String("information"));
     item->setData(Qt::UserRole, infoIconName);
     ui->listWidget->addItem(item);
 
     const QString warningIconName = QLatin1String(Core::Constants::ICON_WARNING);
-    item = new QListWidgetItem(QIcon(warningIconName),
+    item = new QListWidgetItem(Utils::ThemeHelper::themedIcon(warningIconName),
                                QLatin1String("warning"));
     item->setData(Qt::UserRole, warningIconName);
     ui->listWidget->addItem(item);
 
     const QString errorIconName = QLatin1String(Core::Constants::ICON_ERROR);
-    item = new QListWidgetItem(QIcon(errorIconName),
+    item = new QListWidgetItem(Utils::ThemeHelper::themedIcon(errorIconName),
                                QLatin1String("error"));
     item->setData(Qt::UserRole, errorIconName);
     ui->listWidget->addItem(item);
diff --git a/src/plugins/todo/optionsdialog.cpp b/src/plugins/todo/optionsdialog.cpp
index 8536455423..9c0e439e43 100644
--- a/src/plugins/todo/optionsdialog.cpp
+++ b/src/plugins/todo/optionsdialog.cpp
@@ -36,6 +36,8 @@
 #include "settings.h"
 #include "constants.h"
 
+#include <utils/themehelper.h>
+
 namespace Todo {
 namespace Internal {
 
@@ -69,7 +71,8 @@ void OptionsDialog::setSettings(const Settings &settings)
 
 void OptionsDialog::addToKeywordsList(const Keyword &keyword)
 {
-    QListWidgetItem *item = new QListWidgetItem(QIcon(keyword.iconResource), keyword.name);
+    QListWidgetItem *item = new QListWidgetItem(
+                Utils::ThemeHelper::themedIcon(keyword.iconResource), keyword.name);
     item->setData(Qt::UserRole, keyword.iconResource);
     item->setBackgroundColor(keyword.color);
     ui->keywordsList->addItem(item);
@@ -120,7 +123,7 @@ void OptionsDialog::editKeyword(QListWidgetItem *item)
     KeywordDialog *keywordDialog = new KeywordDialog(keyword, keywordNamesButThis, this);
     if (keywordDialog->exec() == QDialog::Accepted) {
         keyword = keywordDialog->keyword();
-        item->setIcon(QIcon(keyword.iconResource));
+        item->setIcon(Utils::ThemeHelper::themedIcon(keyword.iconResource));
         item->setText(keyword.name);
         item->setData(Qt::UserRole, keyword.iconResource);
         item->setBackgroundColor(keyword.color);
diff --git a/src/plugins/todo/todoitemsmodel.cpp b/src/plugins/todo/todoitemsmodel.cpp
index 68c07bf647..b212361f0d 100644
--- a/src/plugins/todo/todoitemsmodel.cpp
+++ b/src/plugins/todo/todoitemsmodel.cpp
@@ -35,6 +35,7 @@
 #include <utils/algorithm.h>
 
 #include <utils/theme/theme.h>
+#include <utils/themehelper.h>
 
 #include <QIcon>
 
@@ -99,7 +100,7 @@ QVariant TodoItemsModel::data(const QModelIndex &index, int role) const
                 case Qt::DisplayRole:
                     return item.text;
                 case Qt::DecorationRole:
-                    return QVariant::fromValue(QIcon(item.iconResource));
+                    return QVariant::fromValue(Utils::ThemeHelper::themedIcon(item.iconResource));
             }
             break;
 
diff --git a/src/plugins/valgrind/callgrindtool.cpp b/src/plugins/valgrind/callgrindtool.cpp
index d4956f7931..b612996563 100644
--- a/src/plugins/valgrind/callgrindtool.cpp
+++ b/src/plugins/valgrind/callgrindtool.cpp
@@ -68,6 +68,7 @@
 #include <utils/qtcassert.h>
 #include <utils/fancymainwindow.h>
 #include <utils/styledbar.h>
+#include <utils/themehelper.h>
 
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorer.h>
@@ -695,7 +696,7 @@ QWidget *CallgrindToolPrivate::createWidgets()
     // go back
     action = new QAction(this);
     action->setDisabled(true);
-    action->setIcon(QIcon(QLatin1String(Core::Constants::ICON_PREV)));
+    action->setIcon(Utils::ThemeHelper::themedIcon(QLatin1String(Core::Constants::ICON_PREV)));
     action->setToolTip(tr("Go back one step in history. This will select the previously selected item."));
     connect(action, &QAction::triggered, m_stackBrowser, &StackBrowser::goBack);
     layout->addWidget(createToolButton(action));
@@ -704,7 +705,7 @@ QWidget *CallgrindToolPrivate::createWidgets()
     // go forward
     action = new QAction(this);
     action->setDisabled(true);
-    action->setIcon(QIcon(QLatin1String(Core::Constants::ICON_NEXT)));
+    action->setIcon(Utils::ThemeHelper::themedIcon(QLatin1String(Core::Constants::ICON_NEXT)));
     action->setToolTip(tr("Go forward one step in history."));
     connect(action, &QAction::triggered, m_stackBrowser, &StackBrowser::goNext);
     layout->addWidget(createToolButton(action));
@@ -782,7 +783,7 @@ QWidget *CallgrindToolPrivate::createWidgets()
 
     // filtering
     action = new QAction(tr("Show Project Costs Only"), this);
-    action->setIcon(QIcon(QLatin1String(Core::Constants::ICON_FILTER)));
+    action->setIcon(Utils::ThemeHelper::themedIcon(QLatin1String(Core::Constants::ICON_FILTER)));
     action->setToolTip(tr("Show only profiling info that originated from this project source."));
     action->setCheckable(true);
     connect(action, &QAction::toggled, this, &CallgrindToolPrivate::handleFilterProjectCosts);
diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp
index 707f7f27bd..21bbce0cc8 100644
--- a/src/plugins/valgrind/memchecktool.cpp
+++ b/src/plugins/valgrind/memchecktool.cpp
@@ -69,6 +69,7 @@
 #include <utils/fancymainwindow.h>
 #include <utils/styledbar.h>
 #include <utils/qtcassert.h>
+#include <utils/themehelper.h>
 
 #include <QString>
 #include <QLatin1String>
@@ -386,7 +387,7 @@ QWidget *MemcheckTool::createWidgets()
     // Go to previous leak.
     action = new QAction(this);
     action->setDisabled(true);
-    action->setIcon(QIcon(QLatin1String(Core::Constants::ICON_PREV)));
+    action->setIcon(Utils::ThemeHelper::themedIcon(QLatin1String(Core::Constants::ICON_PREV)));
     action->setToolTip(tr("Go to previous leak."));
     connect(action, &QAction::triggered, m_errorView, &MemcheckErrorView::goBack);
     button = new QToolButton;
@@ -397,7 +398,7 @@ QWidget *MemcheckTool::createWidgets()
     // Go to next leak.
     action = new QAction(this);
     action->setDisabled(true);
-    action->setIcon(QIcon(QLatin1String(Core::Constants::ICON_NEXT)));
+    action->setIcon(Utils::ThemeHelper::themedIcon(QLatin1String(Core::Constants::ICON_NEXT)));
     action->setToolTip(tr("Go to next leak."));
     connect(action, &QAction::triggered, m_errorView, &MemcheckErrorView::goNext);
     button = new QToolButton;
@@ -406,7 +407,7 @@ QWidget *MemcheckTool::createWidgets()
     m_goNext = action;
 
     QToolButton *filterButton = new QToolButton;
-    filterButton->setIcon(QIcon(QLatin1String(Core::Constants::ICON_FILTER)));
+    filterButton->setIcon(Utils::ThemeHelper::themedIcon(QLatin1String(Core::Constants::ICON_FILTER)));
     filterButton->setText(tr("Error Filter"));
     filterButton->setPopupMode(QToolButton::InstantPopup);
     filterButton->setProperty("noArrow", true);
diff --git a/src/plugins/valgrind/valgrindplugin.cpp b/src/plugins/valgrind/valgrindplugin.cpp
index f92b648230..7fe89dba6f 100644
--- a/src/plugins/valgrind/valgrindplugin.cpp
+++ b/src/plugins/valgrind/valgrindplugin.cpp
@@ -56,6 +56,7 @@
 #include <projectexplorer/projectexplorer.h>
 
 #include <utils/hostosinfo.h>
+#include <utils/themehelper.h>
 
 #include <QtPlugin>
 #include <QCoreApplication>
@@ -248,7 +249,8 @@ void ValgrindPlugin::extensionsInitialized()
         editorContextMenu->addSeparator(analyzerContext);
 
         QAction *action = new QAction(tr("Profile Costs of This Function and Its Callees"), this);
-        action->setIcon(QIcon(QLatin1String(Analyzer::Constants::ANALYZER_CONTROL_START_ICON)));
+        action->setIcon(Utils::ThemeHelper::themedIcon(
+                            QLatin1String(Analyzer::Constants::ANALYZER_CONTROL_START_ICON)));
         connect(action, &QAction::triggered, cgTool,
                 &CallgrindTool::handleShowCostsOfFunction);
         Command *cmd = ActionManager::registerAction(action, "Analyzer.Callgrind.ShowCostsOfFunction",
diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg
index 87a7343f30..76446c18ef 100644
--- a/src/tools/icons/qtcreatoricons.svg
+++ b/src/tools/icons/qtcreatoricons.svg
@@ -14,7 +14,7 @@
    height="600"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
+   inkscape:version="0.91 r13725"
    sodipodi:docname="qtcreatoricons.svg">
   <defs
      id="defs4">
@@ -105,17 +105,6 @@
          id="stop4136" />
     </linearGradient>
     <linearGradient
-       id="linearGradient3975">
-      <stop
-         id="stop3977"
-         offset="0"
-         style="stop-color:#4a73f6;stop-opacity:1;" />
-      <stop
-         id="stop3979"
-         offset="1"
-         style="stop-color:#0e44f3;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient4061">
       <stop
          style="stop-color:#4a73f6;stop-opacity:1;"
@@ -127,17 +116,6 @@
          id="stop4065" />
     </linearGradient>
     <linearGradient
-       id="linearGradient3869">
-      <stop
-         style="stop-color:#ffb80c;stop-opacity:1;"
-         offset="0"
-         id="stop3871" />
-      <stop
-         style="stop-color:#ffdc5c;stop-opacity:1;"
-         offset="1"
-         id="stop3873" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient4482">
       <stop
          style="stop-color:#fa3e3e;stop-opacity:1;"
@@ -168,62 +146,6 @@
        x2="160.5"
        y2="588"
        gradientUnits="userSpaceOnUse" />
-    <filter
-       id="soft_shadow"
-       color-interpolation-filters="sRGB">
-      <feFlood
-         id="feFlood4468"
-         flood-opacity="1"
-         flood-color="rgb(0,0,0)"
-         result="flood" />
-      <feComposite
-         id="feComposite4470"
-         in2="SourceGraphic"
-         in="flood"
-         operator="in"
-         result="composite1" />
-      <feGaussianBlur
-         id="feGaussianBlur4472"
-         stdDeviation="1"
-         result="blur" />
-      <feOffset
-         id="feOffset4474"
-         dx="0"
-         dy="1"
-         result="offset" />
-      <feComposite
-         id="feComposite4476"
-         in2="offset"
-         in="SourceGraphic"
-         operator="over"
-         result="composite2" />
-    </filter>
-    <filter
-       id="1_pixel_shadow"
-       color-interpolation-filters="sRGB">
-      <feFlood
-         id="feFlood4726"
-         flood-opacity="0.2"
-         flood-color="rgb(0,0,0)"
-         result="flood" />
-      <feComposite
-         id="feComposite4728"
-         in2="SourceGraphic"
-         in="flood"
-         operator="in"
-         result="composite1" />
-      <feOffset
-         id="feOffset4732"
-         dx="0"
-         dy="1"
-         result="offset" />
-      <feComposite
-         id="feComposite4734"
-         in2="offset"
-         in="SourceGraphic"
-         operator="over"
-         result="composite2" />
-    </filter>
     <clipPath
        clipPathUnits="userSpaceOnUse"
        id="clipPath4754">
@@ -258,15 +180,6 @@
          y="584" />
     </clipPath>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3869"
-       id="linearGradient3875"
-       x1="461"
-       y1="597"
-       x2="461"
-       y2="589"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
        id="linearGradient3869-5">
       <stop
          style="stop-color:#ffb80c;stop-opacity:1;"
@@ -345,28 +258,6 @@
     </clipPath>
     <radialGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient4482"
-       id="radialGradient4553"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.5,0,0,1.5,-42,-296)"
-       cx="84"
-       cy="592"
-       fx="84"
-       fy="592"
-       r="6" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3975"
-       id="radialGradient3994"
-       cx="53.625004"
-       cy="541.62494"
-       fx="53.625004"
-       fy="541.62494"
-       r="6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3333331,-1.1619436e-5,1.161951e-5,1.3333416,-18.006285,-180.67045)" />
-    <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4061"
        id="radialGradient4067"
        cx="138.81819"
@@ -441,17 +332,6 @@
          id="rect3235"
          style="fill:none;stroke:none" />
     </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath3237">
-      <rect
-         style="fill:none;stroke:none"
-         id="rect3239"
-         width="16"
-         height="16"
-         x="218"
-         y="568" />
-    </clipPath>
     <filter
        id="filter4057"
        inkscape:label="Inner Shadow"
@@ -603,66 +483,6 @@
          x="329"
          y="536" />
     </clipPath>
-    <linearGradient
-       id="linearGradient4137-8">
-      <stop
-         style="stop-color:#b3b3b3;stop-opacity:1;"
-         offset="0"
-         id="stop4139-8" />
-      <stop
-         style="stop-color:#ededed;stop-opacity:1;"
-         offset="1"
-         id="stop4141-2" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4153-5">
-      <stop
-         style="stop-color:#d5d5d5;stop-opacity:1;"
-         offset="0"
-         id="stop4155-5" />
-      <stop
-         style="stop-color:#f1f1f1;stop-opacity:1;"
-         offset="1"
-         id="stop4157-1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4145-1">
-      <stop
-         style="stop-color:#eeeeee;stop-opacity:1;"
-         offset="0"
-         id="stop4147-1" />
-      <stop
-         style="stop-color:#bfbfbf;stop-opacity:1;"
-         offset="1"
-         id="stop4149-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4137-8"
-       id="linearGradient5590"
-       gradientUnits="userSpaceOnUse"
-       x1="26.476385"
-       y1="600"
-       x2="26.531254"
-       y2="590.90326" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4153-5"
-       id="linearGradient5592"
-       gradientUnits="userSpaceOnUse"
-       x1="24.057892"
-       y1="597.64093"
-       x2="30.210051"
-       y2="593.79718" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4145-1"
-       id="linearGradient5594"
-       gradientUnits="userSpaceOnUse"
-       x1="26.783928"
-       y1="595.09448"
-       x2="28.495188"
-       y2="598.53198" />
     <filter
        id="lightenUp"
        x="0"
@@ -702,11 +522,11 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="381.31904"
-     inkscape:cy="185.84959"
+     inkscape:zoom="45.254834"
+     inkscape:cx="453.11431"
+     inkscape:cy="22.83542"
      inkscape:document-units="px"
-     inkscape:current-layer="layer1"
+     inkscape:current-layer="layer2"
      showgrid="true"
      showguides="true"
      inkscape:guide-bbox="true"
@@ -1166,7 +986,7 @@
          x="0" />
     </g>
     <g
-       transform="matrix(-0.5,0,0,0.5,589.5,300)"
+       transform="matrix(-0.5,0,0,0.5,589.5,200)"
        clip-path="url(#clipPath3536)"
        id="src/libs/utils/images/progressindicator_medium">
       <g
@@ -1289,7 +1109,7 @@
     <g
        id="src/libs/utils/images/progressindicator_big"
        clip-path="url(#clipPath3536)"
-       transform="matrix(-1,0,0,1,722,0)">
+       transform="matrix(-1,0,0,1,722,-100)">
       <g
          id="g3369">
         <rect
@@ -1423,80 +1243,79 @@
        inkscape:export-ydpi="90"
        transform="translate(-32,-16)">
       <rect
-         style="fill:none"
          y="583.99994"
          x="32"
          height="16"
          width="16"
-         id="rect3855" />
+         id="rect3855"
+         style="fill:#ffffff" />
       <g
          id="g3920"
-         style="filter:url(#1_pixel_shadow)">
+         style="">
         <path
            inkscape:connector-curvature="0"
            id="path3973"
            d="m 35,588 9,9"
-           style="fill:none;stroke:#dbdbdb;stroke-width:1.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
+           style="fill:none;stroke:#000000;stroke-width:1.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
         <path
            inkscape:connector-curvature="0"
            id="path3975"
            d="m 35,597 9,-9"
-           style="fill:none;stroke:#dbdbdb;stroke-width:1.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
+           style="fill:none;stroke:#000000;stroke-width:1.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
       </g>
     </g>
     <g
        id="src/plugins/coreplugin/images/extension"
-       style="display:inline;filter:url(#1_pixel_shadow)"
+       style="display:inline;"
        clip-path="url(#clipPath4754)"
        transform="translate(-171,-20)">
       <rect
-         style="fill:none;stroke:none"
          id="use4527"
          width="9"
          height="9"
          x="187"
-         y="592" />
+         y="592"
+         style="fill:#ffffff" />
       <path
          sodipodi:nodetypes="ccc"
          inkscape:connector-curvature="0"
          id="path4529"
          d="m 189,594 2.5,2.5 -2.5,2.5"
-         style="fill:none;stroke:#dbdbdb;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:none;stroke:#000000;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
          sodipodi:nodetypes="ccc"
          inkscape:connector-curvature="0"
          id="path4529-0"
          d="m 192,594 2.5,2.5 -2.5,2.5"
-         style="fill:none;stroke:#dbdbdb;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:none;stroke:#000000;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     </g>
     <g
        id="src/plugins/coreplugin/images/filtericon"
-       style="display:inline;filter:url(#1_pixel_shadow)"
+       style="display:inline;"
        clip-path="url(#clipPath4845)"
        transform="translate(-170,-16)">
-      <path
-         sodipodi:nodetypes="ccccccccc"
-         inkscape:connector-curvature="0"
-         id="path4782"
-         d="m 197.5,587.5 9,0 0,2 -3,3 0,4 -3,0 0,-4 -3,-3 z"
-         style="fill:none;stroke:#dbdbdb;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
-         id="path4784"
-         d="m 210,595 -2.5,2.5 -2.5,-2.5 z"
-         style="fill:#dbdbdb;fill-opacity:1;stroke:none" />
       <rect
          y="584"
          x="195"
          height="16"
          width="16"
          id="rect3817-2-9-1-9-6-2"
-         style="opacity:0.60100002;fill:#ffffff;fill-opacity:0" />
+         style="fill:#ffffff" />
+      <path
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0"
+         id="path4784"
+         d="m 210,595 -2.5,2.5 -2.5,-2.5 z"
+         style="fill:#000000;fill-opacity:1;stroke:none" />
+      <polygon
+         transform="translate(93.999999,334)"
+         id="polygon4959-9"
+         points="107,262 107,258 103,255 103,253 113,253 113,255 109,258 109,264 "
+         style="display:inline;fill:#000000;stroke:none;fill-opacity:1.0" />
     </g>
     <g
        id="src/plugins/coreplugin/images/linkicon"
-       style="display:inline;filter:url(#1_pixel_shadow)"
+       style="display:inline;"
        clip-path="url(#clipPath3927)"
        transform="translate(-396,-16)">
       <rect
@@ -1505,25 +1324,26 @@
          height="16"
          width="16"
          id="rect3123"
-         style="fill:none;stroke:none" />
+         style="fill:#ffffff" />
       <path
-         style="fill:none;stroke:#dbdbdb;stroke-width:1.15;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 448.5,590.5 c 0,1.5 -1.5,3 -5,3 -3.5,0 -5,-1.5 -5,-3 0,-1.5 1.5,-3 5,-3 3.5,0 5,1.5 5,3 z"
-         id="path3917"
+         id="path4971-4"
+         d="m 444,594.216 c -0.531,0.483 -1.227,0.784 -2,0.784 -1.654,0 -3,-1.346 -3,-3 0,-1.654 1.346,-3 3,-3 0.773,0 1.469,0.302 2,0.785 l 0,-1.212 c -0.589,-0.351 -1.263,-0.573 -2,-0.573 -2.209,0 -4,1.791 -4,4 0,2.209 1.791,4 4,4 0.737,0 1.411,-0.222 2,-0.573 l 0,-1.211 z"
          inkscape:connector-curvature="0"
-         sodipodi:nodetypes="zzzzz" />
-      <use
-         x="0"
-         y="0"
-         xlink:href="#path3917"
-         id="use3148"
-         transform="translate(3,3)"
-         width="800"
-         height="600" />
+         style="fill:#000000;fill-opacity:1;stroke:none" />
+      <path
+         id="path4973-5"
+         d="m 448,588 c -0.737,0 -1.411,0.222 -2,0.572 l 0,1.212 c 0.531,-0.483 1.227,-0.785 2,-0.785 1.654,0 3,1.346 3,3 0,1.654 -1.346,3 -3,3 -0.773,0 -1.469,-0.302 -2,-0.784 l 0,1.212 c 0.589,0.351 1.263,0.573 2,0.573 2.208,0 4,-1.791 4,-4 0,-2.209 -1.792,-4 -4,-4 z"
+         inkscape:connector-curvature="0"
+         style="fill:#000000;fill-opacity:1;stroke:none" />
+      <path
+         style="fill:#000000;fill-opacity:1;stroke:none"
+         inkscape:connector-curvature="0"
+         d="m 448,593 -6,0 c -0.552,0 -1,-0.448 -1,-1 l 0,0 c 0,-0.552 0.448,-1 1,-1 l 6,0 c 0.552,0 1,0.448 1,1 l 0,0 c 0,0.552 -0.448,1 -1,1 z"
+         id="path4975-0" />
     </g>
     <g
        id="src/plugins/coreplugin/images/splitbutton_closebottom"
-       style="filter:url(#1_pixel_shadow)"
+       style=""
        clip-path="url(#clipPath3182)"
        transform="translate(1,0)">
       <rect
@@ -1532,14 +1352,14 @@
          height="16"
          width="16"
          id="rect3170"
-         style="fill:none;stroke:none" />
+         style="fill:#ffffff" />
       <path
          id="rect3161"
          d="m 59,573 0,9 11,0 0,-9 -11,0 z m 1,2 9,0 0,6 -9,0 0,-6 z"
-         style="fill:#dbdbdb;fill-opacity:1;stroke:none"
+         style="fill:#000000;fill-opacity:1;stroke:none"
          inkscape:connector-curvature="0" />
       <path
-         style="fill:#dbdbdb;fill-opacity:1;stroke:none;display:inline"
+         style="fill:#000000;fill-opacity:1;stroke:none;display:inline"
          d="M 67,577 64.5,579.5 62,577 z"
          id="path4784-1"
          inkscape:connector-curvature="0"
@@ -1547,7 +1367,7 @@
     </g>
     <g
        id="src/plugins/coreplugin/images/splitbutton_closeleft"
-       style="filter:url(#1_pixel_shadow)"
+       style=""
        clip-path="url(#clipPath3271)"
        transform="translate(17,0)">
       <rect
@@ -1556,14 +1376,14 @@
          height="16"
          width="16"
          id="rect3170-4"
-         style="fill:none;stroke:none" />
+         style="fill:#ffffff" />
       <path
          id="rect3161-5"
          d="m 83,571 -9,0 0,11 9,0 0,-11 z m -2,1 0,9 -6,0 0,-9 6,0 z"
-         style="fill:#dbdbdb;fill-opacity:1;stroke:none"
+         style="fill:#000000;fill-opacity:1;stroke:none"
          inkscape:connector-curvature="0" />
       <path
-         style="fill:#dbdbdb;fill-opacity:1;stroke:none;display:inline"
+         style="fill:#000000;fill-opacity:1;stroke:none;display:inline"
          d="M 79,579 76.5,576.5 79,574 z"
          id="path4784-1-5"
          inkscape:connector-curvature="0"
@@ -1572,7 +1392,7 @@
     <g
        transform="translate(33,0)"
        id="src/plugins/coreplugin/images/splitbutton_closeright"
-       style="display:inline;filter:url(#1_pixel_shadow)"
+       style="display:inline;"
        clip-path="url(#clipPath3271-1)">
       <rect
          y="568"
@@ -1580,14 +1400,14 @@
          height="16"
          width="16"
          id="rect3170-4-1"
-         style="fill:none;stroke:none" />
+         style="fill:#ffffff" />
       <path
          id="rect3161-5-4"
          d="m 74,571 9,0 0,11 -9,0 0,-11 z m 2,1 0,9 6,0 0,-9 -6,0 z"
-         style="fill:#dbdbdb;fill-opacity:1;stroke:none"
+         style="fill:#000000;fill-opacity:1;stroke:none"
          inkscape:connector-curvature="0" />
       <path
-         style="fill:#dbdbdb;fill-opacity:1;stroke:none;display:inline"
+         style="fill:#000000;fill-opacity:1;stroke:none;display:inline"
          d="M 78,579 80.5,576.5 78,574 z"
          id="path4784-1-5-2"
          inkscape:connector-curvature="0"
@@ -1596,7 +1416,7 @@
     <g
        transform="translate(16,0)"
        id="src/plugins/coreplugin/images/splitbutton_closetop"
-       style="display:inline;filter:url(#1_pixel_shadow)"
+       style="display:inline;"
        clip-path="url(#clipPath3182-1)">
       <rect
          y="568"
@@ -1604,14 +1424,14 @@
          height="16"
          width="16"
          id="rect3170-2"
-         style="fill:none;stroke:none" />
+         style="fill:#ffffff" />
       <path
          id="rect3161-4"
          d="m 59,582 0,-9 11,0 0,9 -11,0 z m 1,-2 9,0 0,-6 -9,0 0,6 z"
-         style="fill:#dbdbdb;fill-opacity:1;stroke:none"
+         style="fill:#000000;fill-opacity:1;stroke:none"
          inkscape:connector-curvature="0" />
       <path
-         style="fill:#dbdbdb;fill-opacity:1;stroke:none;display:inline"
+         style="fill:#000000;fill-opacity:1;stroke:none;display:inline"
          d="M 67,578 64.5,575.5 62,578 z"
          id="path4784-1-55"
          inkscape:connector-curvature="0"
@@ -1619,7 +1439,7 @@
     </g>
     <g
        id="src/plugins/coreplugin/images/splitbutton_horizontal"
-       style="filter:url(#1_pixel_shadow)"
+       style=""
        clip-path="url(#clipPath4080)"
        transform="translate(1,0)">
       <rect
@@ -1628,34 +1448,34 @@
          height="16"
          width="16"
          id="rect4068"
-         style="fill:none;stroke:none" />
+         style="fill:#ffffff" />
       <rect
          y="571.5"
          x="122.5"
          height="10"
          width="7"
          id="rect3290"
-         style="fill:none;stroke:#dbdbdb;stroke-opacity:1" />
+         style="fill:none;stroke:#000000;stroke-opacity:1" />
       <path
          inkscape:connector-curvature="0"
          id="path4060"
          d="m 122.5,576.5 7,0"
-         style="fill:none;stroke:#dbdbdb;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
          inkscape:connector-curvature="0"
          id="path4064"
          d="m 131,576.5 5,0"
-         style="fill:#ffffff;fill-opacity:0;stroke:#dbdbdb;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+         style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
          inkscape:connector-curvature="0"
          id="path4066"
          d="m 133.5,574 0,5"
-         style="fill:none;stroke:#dbdbdb;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     </g>
     <g
        transform="translate(17,0)"
        id="src/plugins/coreplugin/images/splitbutton_vertical"
-       style="display:inline;filter:url(#1_pixel_shadow)"
+       style="display:inline;"
        clip-path="url(#clipPath4080-1)">
       <rect
          y="568"
@@ -1663,40 +1483,48 @@
          height="16"
          width="16"
          id="rect4068-1"
-         style="fill:none;stroke:none" />
+         style="fill:#ffffff" />
       <rect
          y="572.5"
          x="121.5"
          height="8.0002642"
          width="8.0000114"
          id="rect3290-4"
-         style="fill:none;stroke:#dbdbdb;stroke-opacity:1" />
+         style="fill:none;stroke:#000000;stroke-opacity:1" />
       <path
          inkscape:connector-curvature="0"
          id="path4060-2"
          d="m 125.5,573 0,7"
-         style="fill:none;stroke:#dbdbdb;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          sodipodi:nodetypes="cc" />
       <path
          inkscape:connector-curvature="0"
          id="path4064-3"
          d="m 131,576.5 5,0"
-         style="fill:#ffffff;fill-opacity:0;stroke:#dbdbdb;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+         style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
          inkscape:connector-curvature="0"
          id="path4066-2"
          d="m 133.5,574 0,5"
-         style="fill:none;stroke:#dbdbdb;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     </g>
     <g
        id="src/plugins/coreplugin/images/reload_reset_gray"
-       style="filter:url(#1_pixel_shadow)"
+       style=""
        clip-path="url(#clipPath3204)">
+      <rect
+         style="fill:#ffffff"
+         id="rect3992"
+         width="16"
+         height="16"
+         x="153"
+         y="568" />
       <g
-         id="g3973">
+         id="g3973"
+         style="">
         <path
            sodipodi:type="arc"
-           style="fill:none;stroke:#dbdbdb;stroke-opacity:1;stroke-linecap:butt;stroke-width:1.15;stroke-miterlimit:4;stroke-dasharray:none"
+           style="fill:none;stroke:#000000;stroke-opacity:1;stroke-linecap:butt;stroke-width:1.15;stroke-miterlimit:4;stroke-dasharray:none"
            id="path3201"
            sodipodi:cx="161"
            sodipodi:cy="576"
@@ -1707,7 +1535,7 @@
            sodipodi:end="5.1422636"
            sodipodi:open="true" />
         <path
-           style="fill:#dbdbdb;fill-opacity:1;stroke:none"
+           style="fill:#000000;fill-opacity:1;stroke:none"
            d="m 161,574 6,0 -4,-4.5 z"
            id="path3971"
            inkscape:connector-curvature="0"
@@ -1720,14 +1548,8 @@
          id="use3977"
          xlink:href="#g3973"
          y="0"
-         x="0" />
-      <rect
-         style="fill:none;stroke:none"
-         id="rect3992"
-         width="16"
-         height="16"
-         x="153"
-         y="568" />
+         x="0"
+         style="" />
     </g>
     <g
        style="display:inline"
@@ -1798,84 +1620,93 @@
     </g>
     <g
        id="src/plugins/diffeditor/images/unifieddiff"
-       clip-path="url(#clipPath3218)">
+       clip-path="url(#clipPath3218)"
+       style="">
+      <rect
+         y="568"
+         x="169"
+         height="16"
+         width="16"
+         id="rect3203"
+         style="fill:#ffffff" />
       <g
-         style="stroke:#dbdbdb;stroke-opacity:1;filter:url(#1_pixel_shadow)"
+         style="stroke:#dbdbdb;stroke-opacity:1;"
          id="g3203">
         <path
            id="path3429"
-           style="fill:none;stroke:#dbdbdb;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
            d="m 178,578.5 4,0 m -7,3 5,-10 m -9,4 5,0 m -2.5,-2.5 0,5 m -4,-6.5 14,0 0,10 -14,0 z"
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="ccccccccccccc" />
-        <rect
-           y="568"
-           x="169"
-           height="16"
-           width="16"
-           id="rect3203"
-           style="fill:none;stroke:none" />
       </g>
     </g>
     <g
        id="src/plugins/diffeditor/images/sidebysidediff"
        clip-path="url(#clipPath4031)"
-       style="filter:url(#1_pixel_shadow)">
-      <path
-         id="rect4001"
-         style="fill:none;stroke:#dbdbdb;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
-         d="m 185.5,571.5 14,0 0,10 -14,0 z m 9,5 2,0 c 0,0 1,0.5 1,1.5 0,1 -1,1.5 -1,1.5 l -2,0 0,-6 2,0 c 0,0 1,0.5 1,1.5 0,1 -1,1.5 -1,1.5 m -9,1 3,0 m -3,2.5 c 0,-1.83333 0,-4 0,-5.5 0,0 0,-1 1.5,-1 1.5,0 1.5,1 1.5,1 l 0,5.5 0,0 m 2,-8.5 0,10"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccsccccscccccsccccc" />
+       style="">
       <rect
-         style="fill:none;stroke:none"
+         style="fill:#ffffff"
          id="rect4023"
          width="16"
          height="16"
          x="185"
          y="568" />
+      <path
+         id="rect4001"
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+         d="m 185.5,571.5 14,0 0,10 -14,0 z m 9,5 2,0 c 0,0 1,0.5 1,1.5 0,1 -1,1.5 -1,1.5 l -2,0 0,-6 2,0 c 0,0 1,0.5 1,1.5 0,1 -1,1.5 -1,1.5 m -9,1 3,0 m -3,2.5 c 0,-1.83333 0,-4 0,-5.5 0,0 0,-1 1.5,-1 1.5,0 1.5,1 1.5,1 l 0,5.5 0,0 m 2,-8.5 0,10"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccccsccccscccccsccccc" />
     </g>
     <g
        id="src/plugins/diffeditor/images/topbar"
-       style="filter:url(#1_pixel_shadow)"
+       style=""
        clip-path="url(#clipPath3233)">
-      <path
-         sodipodi:nodetypes="cccccccccc"
-         inkscape:connector-curvature="0"
-         id="rect3233"
-         d="m 204,571 0,11 10,0 0,-11 z m 1,5 8,0 0,5 -8,0 z"
-         style="fill:#dbdbdb;fill-opacity:1;stroke:none" />
       <rect
          y="568"
          x="201"
          height="16"
          width="16"
          id="rect3219"
-         style="fill:none;stroke:none" />
+         style="fill:#ffffff" />
+      <path
+         sodipodi:nodetypes="cccccccccc"
+         inkscape:connector-curvature="0"
+         id="rect3233"
+         d="m 204,571 0,11 10,0 0,-11 z m 1,5 8,0 0,5 -8,0 z"
+         style="fill:#000000;fill-opacity:1;stroke:none" />
     </g>
     <g
-       style="display:inline;filter:url(#1_pixel_shadow)"
+       style="display:inline;"
        id="src/plugins/coreplugin/images/arrowdown"
        transform="translate(217,-16)"
        clip-path="url(#clipPath4007)">
-      <path
-         style="fill:none;stroke:#dbdbdb;stroke-width:1.20000005;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="M 3,590 7.5,594.5 12,590"
-         id="path3970"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
       <rect
          y="584"
          x="0"
          height="16"
          width="16"
          id="rect3817"
-         style="fill:none" />
+         style="fill:#ffffff" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:1.20000005;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="M 3,590 7.5,594.5 12,590"
+         id="path3970"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccc" />
     </g>
     <g
        id="src/plugins/coreplugin/images/arrowup"
-       style="filter:url(#1_pixel_shadow)"
+       style=""
        clip-path="url(#clipPath4026)">
+      <rect
+         transform="scale(1,-1)"
+         style="fill:#ffffff"
+         id="rect4000"
+         width="16"
+         height="16"
+         x="233"
+         y="-584" />
       <use
          id="use3994"
          xlink:href="#path3970"
@@ -1883,15 +1714,754 @@
          x="0"
          width="800"
          height="600"
-         transform="matrix(1,0,0,-1,233,1169)" />
+         transform="matrix(1,0,0,-1,233,1169)"
+         style="" />
+    </g>
+    <g
+       transform="translate(-503,368)"
+       style="display:inline;fill:none;stroke:none"
+       id="src/plugins/coreplugin/images/prev">
       <rect
-         transform="scale(1,-1)"
-         style="fill:none"
-         id="rect4000"
+         id="rect4827-5"
+         height="16"
          width="16"
+         y="200"
+         x="750"
+         style="fill:#ffffff;fill-opacity:1;stroke:none" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.41;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 761,202 -5.5,6 5.5,6"
+         id="path5674"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccc" />
+    </g>
+    <use
+       x="0"
+       y="0"
+       xlink:href="#src/plugins/coreplugin/images/prev"
+       id="src/plugins/coreplugin/images/next"
+       transform="matrix(-1,0,0,1,526,0)"
+       width="100%"
+       height="100%" />
+    <g
+       transform="translate(485,418)"
+       id="src/plugins/coreplugin/find/images/expand">
+      <rect
+         id="rect4760-6"
          height="16"
-         x="233"
-         y="-584" />
+         width="16"
+         y="150"
+         x="100"
+         style="fill:#ffffff;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:connector-curvature="0"
+         id="rect4941-4"
+         d="m 102,153 0,2 12,0 0,-2 -12,0 z m 1,4 0,1 2,0 0,-1 -2,0 z m 4,0 0,1 7,0 0,-1 -7,0 z m -4,3 0,1 2,0 0,-1 -2,0 z m 4,0 0,1 7,0 0,-1 -7,0 z m -4,3 0,1 2,0 0,-1 -2,0 z m 4,0 0,1 7,0 0,-1 -7,0 z"
+         style="fill:#000000;fill-opacity:1;stroke:none" />
+    </g>
+    <g
+       id="src/plugins/projectexplorer/images/run_small"
+       transform="translate(112,0)">
+      <rect
+         id="rect4901-1"
+         height="16"
+         width="16"
+         y="568"
+         x="249"
+         style="fill:#ffffff;fill-opacity:1;stroke:none" />
+      <polygon
+         transform="translate(-201,318)"
+         id="polygon4899-2"
+         points="464,258 453,251 453,265 "
+         style="fill:#000000;fill-opacity:1;stroke:none" />
+    </g>
+    <g
+       id="src/plugins/projectexplorer/images/stop_small"
+       transform="translate(112,0)">
+      <rect
+         id="rect4907-4"
+         height="16"
+         width="16"
+         y="568"
+         x="265"
+         style="fill:#ffffff;fill-opacity:1;stroke:none" />
+      <rect
+         id="rect4905-9"
+         height="12"
+         width="12"
+         y="570"
+         x="267"
+         style="fill:#000000;fill-opacity:1;stroke:none" />
+    </g>
+    <g
+       id="src/plugins/coreplugin/images/run_overlay_small"
+       transform="translate(-32,0)">
+      <rect
+         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         x="425"
+         y="568"
+         width="16"
+         height="16"
+         id="rect4959-4-0" />
+      <polygon
+         style="fill:#000000;fill-opacity:1;stroke:none"
+         id="polygon4953-0-5"
+         points="616,262 610,258 610,266 "
+         transform="matrix(1.3333333,0,0,1.125,-381.33331,283.75)" />
+    </g>
+    <g
+       id="src/plugins/coreplugin/images/stop_overlay_small"
+       transform="translate(-32,0)">
+      <rect
+         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         x="441"
+         y="568"
+         width="16"
+         height="16"
+         id="rect4959-4-0-0" />
+      <rect
+         y="575"
+         x="448"
+         height="8"
+         width="8"
+         id="rect6539"
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+    <g
+       id="src/plugins/coreplugin/images/interrupt_overlay_small"
+       transform="translate(-32,0)">
+      <rect
+         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         x="457"
+         y="568"
+         width="16"
+         height="16"
+         id="rect4959-4-0-0-6" />
+      <rect
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect4608"
+         width="3"
+         height="8"
+         x="464"
+         y="575" />
+      <rect
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect4610"
+         width="3"
+         height="8"
+         x="469"
+         y="575" />
+    </g>
+    <g
+       id="src/plugins/coreplugin/images/continue_overlay_small">
+      <rect
+         id="rect4959-4-0-0-6-5"
+         height="16"
+         width="16"
+         y="568"
+         x="441"
+         style="fill:#ffffff;fill-opacity:1;stroke:none" />
+      <path
+         style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:2.35263491;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path5679"
+         sodipodi:type="arc"
+         sodipodi:cx="451.49854"
+         sodipodi:cy="578.72314"
+         sodipodi:rx="3.3180437"
+         sodipodi:ry="3.556159"
+         sodipodi:start="2.3561945"
+         sodipodi:end="0.61086524"
+         d="m 449.15232,581.23773 a 3.3180437,3.556159 0 0 1 -0.13245,-4.87871 3.3180437,3.556159 0 0 1 4.53663,-0.42538 3.3180437,3.556159 0 0 1 0.66002,4.82923"
+         sodipodi:open="true" />
+      <path
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 445.38724,581.53989 451,578.51118 451,583 Z"
+         id="path5681"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccc" />
+    </g>
+    <g
+       id="src/plugins/coreplugin/images/debugger_overlay_small">
+      <rect
+         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         x="457"
+         y="568"
+         width="16"
+         height="16"
+         id="rect4959-4" />
+      <g
+         id="g6659"
+         transform="translate(0,0.625)">
+        <path
+           id="asdfasdfasdf"
+           inkscape:connector-curvature="0"
+           d="m 463.334,569 c -0.678,0 -1.757,0.619 -2.071,1.453 l 2.071,1.164 2.07,-1.164 C 465.09,569.619 464.01,569 463.334,569 Z" />
+        <path
+           id="sdfgdsfgsdfg"
+           inkscape:connector-curvature="0"
+           d="m 459.744,571.939 -0.703,-0.703 c -0.131,-0.131 -0.342,-0.131 -0.473,0 l 0,0 c -0.129,0.129 -0.129,0.342 0,0.471 l 0.939,0.938 -0.424,1.695 -0.75,0 c -0.184,0 -0.334,0.15 -0.334,0.334 0,0.184 0.15,0.334 0.334,0.334 l 0.77,0 0.582,1.861 -0.77,0.771 c -0.13,0.129 -0.13,0.342 0,0.471 0.129,0.13 0.342,0.13 0.471,0 l 0.642,-0.641 1.806,1.203 1.166,0.327 0,-5.166 0,-1.639 -2.171,-1.222 -1.085,0.966 z" />
+        <use
+           height="100%"
+           width="100%"
+           transform="matrix(-1,0,0,1,926.71775,0)"
+           id="use6516"
+           xlink:href="#sdfgdsfgsdfg"
+           y="0"
+           x="0" />
+      </g>
+    </g>
+    <g
+       id="src/plugins/analyzerbase/images/analyzer_overlay_small">
+      <rect
+         id="rect4959-4-5"
+         height="16"
+         width="16"
+         y="568"
+         x="473"
+         style="display:inline;fill:#ffffff;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:connector-curvature="0"
+         id="rect4603-5"
+         d="m 474,570 0,10 10,0 0,-1 -9,0 0,-9 z m 2,0 0,2 8,0 0,-2 z m 0,3 0,2 6,0 0,-2 z m 0,3 0,2 4,0 0,-2 z"
+         style="fill:#000000;fill-opacity:1;stroke:none" />
+    </g>
+    <g
+       transform="translate(169,368)"
+       style="display:inline"
+       id="src/plugins/coreplugin/images/zoom">
+      <rect
+         id="rect4723-6"
+         height="16"
+         width="16"
+         y="200"
+         x="400"
+         style="fill:#ffffff;fill-opacity:1" />
+      <g
+         id="magnifying_lense"
+         style="fill:#000000;fill-opacity:1">
+        <path
+           id="path4719-8"
+           d="m 401.45736,213.21148 c -0.156,0.155 -0.156,0.41 0,0.565 l 0.84663,0.84863 c 0.156,0.154 0.41,0.154 0.566,0 L 407.231,210.24 c 0.156,-0.154 0.156,-0.41 0.001,-0.565 l -0.84763,-0.84763 c -0.156,-0.156 -0.41,-0.156 -0.566,0 z"
+           inkscape:connector-curvature="0"
+           style="fill-opacity:1"
+           sodipodi:nodetypes="cccccsscc" />
+        <circle
+           style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.173913;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="path5669"
+           cx="409.5"
+           cy="206.5"
+           r="3.9130435" />
+      </g>
+    </g>
+    <g
+       transform="translate(29,268)"
+       id="src/plugins/coreplugin/images/plus">
+      <rect
+         id="rect5187-0"
+         height="16"
+         width="16"
+         y="300"
+         x="300"
+         style="fill:#ffffff;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#000000;fill-opacity:1"
+         d="m 432,570 0,5 -5,0 0,2 5,0 0,5 2,0 0,-5 5,0 0,-2 -5,0 0,-5 -2,0 z"
+         transform="translate(-125,-268)"
+         id="rect5183-1" />
+    </g>
+    <g
+       style="display:inline"
+       transform="translate(45,268)"
+       id="src/plugins/coreplugin/images/minus">
+      <rect
+         id="rect5187-0-8"
+         height="16"
+         width="16"
+         y="300"
+         x="300"
+         style="fill:#ffffff;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#000000;fill-opacity:1"
+         d="m 427,575 0,2 12,0 0,-2 z"
+         transform="translate(-125,-268)"
+         id="rect5183-1-5" />
+    </g>
+    <g
+       transform="translate(-219,368)"
+       style="display:inline"
+       id="src/plugins/coreplugin/images/clean_pane_small">
+      <rect
+         id="rect4672-0"
+         height="16"
+         width="16"
+         y="200"
+         x="500"
+         style="fill:#ffffff;fill-opacity:1;stroke:none" />
+      <polygon
+         style="fill:#000000;fill-opacity:1;stroke:none"
+         points="515,315 515,308 510,308 510,310 514,310 514,314 510,314 509,314 508,314 508,315 "
+         id="polygon5319-7"
+         transform="translate(0,-100)" />
+      <path
+         id="path5323-9"
+         d="m 506,207 0,0 c -0.552,0 -1,-0.448 -1,-1 l 0,-4 c 0,-0.552 0.448,-1 1,-1 l 0,0 c 0.552,0 1,0.448 1,1 l 0,4 c 0,0.552 -0.448,1 -1,1 z"
+         inkscape:connector-curvature="0"
+         style="fill:#000000;fill-opacity:1;stroke:none" />
+      <path
+         id="path5325-5"
+         d="m 503,207 0.171,-0.342 c 0.508,-1.016 1.547,-1.658 2.683,-1.658 l 0.292,0 c 1.136,0 2.175,0.642 2.683,1.658 L 509,207 l -6,0 z"
+         inkscape:connector-curvature="0"
+         style="fill:#000000;fill-opacity:1;stroke:none" />
+      <polygon
+         id="polygon5327-8"
+         points="508,313 501,313 503,308 509,308 "
+         style="fill:#000000;fill-opacity:1;stroke:none"
+         transform="translate(0,-100)" />
+    </g>
+    <g
+       id="src/plugins/coreplugin/images/sidebaricon"
+       clip-path="none"
+       transform="translate(383,0)">
+      <rect
+         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         id="rect3216"
+         width="16"
+         height="16"
+         x="218"
+         y="568" />
+      <path
+         style="fill:#000000;fill-opacity:1;stroke:none"
+         d="m 220,582 11,0 0,-11 -11,0 z m 5,-1 0,-9 5,0 0,9 z"
+         id="use3223"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccccccc" />
+    </g>
+    <g
+       id="g6019" />
+    <g
+       transform="translate(-83,318)"
+       id="src/plugins/qmldesigner/components/navigator/arrowup"
+       style="fill:none;stroke:none">
+      <rect
+         id="rect6596-2"
+         height="16"
+         width="16"
+         y="250"
+         x="700"
+         style="fill:#ffffff;fill-opacity:1;stroke:none" />
+      <g
+         id="g7250"
+         style="fill:#000000;fill-opacity:1;stroke:none">
+        <polygon
+           style="fill:#000000;fill-opacity:1;stroke:none"
+           points="702.146,257.146 707.5,251.793 712.854,257.146 712.146,257.854 707.5,253.207 702.854,257.854 "
+           id="polygon6590-1" />
+        <rect
+           style="fill:#000000;fill-opacity:1;stroke:none"
+           x="707"
+           y="253"
+           width="1"
+           height="11"
+           id="rect6594-4" />
+      </g>
+    </g>
+    <use
+       x="0"
+       y="0"
+       xlink:href="#src/plugins/qmldesigner/components/navigator/arrowup"
+       id="src/plugins/qmldesigner/components/navigator/arrowdown"
+       transform="matrix(1,0,0,-1,16,1152)"
+       width="100%"
+       height="100%" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#src/plugins/qmldesigner/components/navigator/arrowup"
+       id="src/plugins/qmldesigner/components/navigator/arrowleft"
+       transform="matrix(0,1,1,0,81,-49)"
+       width="100%"
+       height="100%" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#src/plugins/qmldesigner/components/navigator/arrowleft"
+       id="src/plugins/qmldesigner/components/navigator/arrowright"
+       transform="matrix(-1,0,0,1,1330,0)"
+       width="100%"
+       height="100%" />
+    <g
+       transform="translate(281,268)"
+       style="display:inline"
+       id="src/plugins/qmldesigner/components/navigator/eye_open">
+      <rect
+         id="rect6782-9"
+         height="16"
+         width="16"
+         y="300"
+         x="400"
+         style="fill:#ffffff;fill-opacity:1;stroke:none" />
+      <path
+         id="path6778-0"
+         d="m 408,305 c 1.932,0 4.282,1.794 5.583,3.001 -1.298,1.207 -3.645,2.999 -5.583,2.999 -1.932,0 -4.282,-1.794 -5.583,-3.001 C 403.715,306.792 406.062,305 408,305 m 0,-1 c -3.314,0 -7,4 -7,4 0,0 3.686,4 7,4 3.314,0 7,-4 7,-4 0,0 -3.686,-4 -7,-4 l 0,0 z"
+         inkscape:connector-curvature="0"
+         style="fill:#000000;fill-opacity:1" />
+      <circle
+         id="circle6780-4"
+         r="2.5"
+         cy="307.5"
+         cx="408"
+         style="fill:#000000;fill-opacity:1" />
+    </g>
+    <g
+       transform="translate(247,268)"
+       id="src/plugins/qmldesigner/components/navigator/eye_closed">
+      <rect
+         id="rect6790-1"
+         height="16"
+         width="16"
+         y="300"
+         x="450"
+         style="fill:#ffffff;fill-opacity:1" />
+      <path
+         style="fill:#000000;fill-opacity:1"
+         inkscape:connector-curvature="0"
+         d="m 465,308 c 0,0 -3.686,4 -7,4 -3.314,0 -7,-4 -7,-4 0,0 3.686,-4 7,-4 3.314,0 7,4 7,4 z"
+         id="path6788-2" />
+    </g>
+    <g
+       transform="translate(362,268)"
+       style="display:inline"
+       id="src/plugins/qmldesigner/components/navigator/export_checked">
+      <rect
+         id="rect6774-6"
+         height="16"
+         width="16"
+         y="300"
+         x="350"
+         style="fill:#ffffff;fill-opacity:1" />
+      <path
+         style="fill:#000000;fill-opacity:1"
+         d="m 619,570 0,3 1,0 0,-2 10,0 0,11 -10,0 0,-2 -1,0 0,3 12,0 0,-13 -12,0 z m -2,4 0,1 5,0 0,-1 -5,0 z m 0,2 0,1 5,0 0,-1 -5,0 z m 0,2 0,1 5,0 0,-1 -5,0 z"
+         transform="translate(-266,-268)"
+         id="polygon6766-5"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       id="src/plugins/qmldesigner/components/navigator/export_unchecked"
+       transform="translate(378,268)">
+      <rect
+         style="fill:#ffffff;fill-opacity:1"
+         x="350"
+         y="300"
+         width="16"
+         height="16"
+         id="rect7336" />
+      <path
+         style="opacity:0.8;fill:#000000;fill-opacity:1"
+         d="m 353,302 0,3 1,0 0,-2 10,0 0,11 -10,0 0,-2 -1,0 0,3 12,0 0,-13 z"
+         id="path7346"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path7338"
+         style="opacity:0.5;fill:#000000;fill-opacity:1"
+         d="m 353,310 0,1 3,0 0,-1 z m 0,-2 0,1 3,0 0,-1 z m 0,-2 0,1 3,0 0,-1 z"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       transform="translate(694,268)"
+       style="display:inline"
+       id="src/plugins/qmldesigner/components/formeditor/no_snapping">
+      <rect
+         id="rect6654-0"
+         height="16"
+         width="16"
+         y="300"
+         x="50"
+         style="fill:#ffffff;fill-opacity:1" />
+      <path
+         id="polygon6648-1"
+         style="opacity:0.8;fill:#000000;fill-opacity:1"
+         d="m 56,315 0,-5 -2.5,2.5 z m 3,-8 5,0 -2.5,-2.5 z m -8,-5 1,0 0,13 -1,0 z m 0,0 13,0 0,1 -13,0 z"
+         inkscape:connector-curvature="0" />
+      <rect
+         id="rect6650-3"
+         height="0.50099999"
+         width="7.9990001"
+         transform="matrix(-0.7071,0.7071,-0.7071,-0.7071,324.7387,489.4781)"
+         y="311.74399"
+         x="56.995998"
+         style="fill:#000000;fill-opacity:1" />
+      <rect
+         id="rect6652-4"
+         height="0.5"
+         width="8"
+         transform="matrix(-0.707,-0.7072,0.7072,-0.707,-116.5111,575.7229)"
+         y="311.745"
+         x="56.994999"
+         style="fill:#000000;fill-opacity:1" />
+    </g>
+    <g
+       transform="translate(660,268)"
+       style="display:inline"
+       id="src/plugins/qmldesigner/components/formeditor/snapping_and_anchoring">
+      <rect
+         id="rect6676-2"
+         height="16"
+         width="16"
+         y="300"
+         x="100"
+         style="fill:#ffffff;fill-opacity:1" />
+      <path
+         id="polygon6674-3"
+         style="fill:#000000;fill-opacity:1"
+         d="m 106,310 -2.5,2.5 2.5,2.5 z m 8,-3 -2.5,-2.5 -2.5,2.5 z m -13,-5 13,0 0,1 -13,0 z m 0,0 1,0 0,13 -1,0 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path7627"
+         style="display:inline;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+         d="m 109.5,315 0,-4.5 c 0,0 0,-1 1.5,-1 1.5,0 1.5,1 1.5,1 l 0,4.5 m -3,-2.5 3,0"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccscccc" />
+    </g>
+    <g
+       transform="translate(695.36962,268.17679)"
+       style="display:inline"
+       id="src/plugins/qmldesigner/components/formeditor/snapping">
+      <rect
+         id="rect6690-2"
+         height="16"
+         width="16"
+         y="299.82321"
+         x="80.630379"
+         style="fill:#ffffff;fill-opacity:1" />
+      <path
+         id="polygon6686-2"
+         transform="translate(-69.369828,-0.1767767)"
+         style="fill:#000000;fill-opacity:1"
+         d="m 156,315 0,-5 -2.5,2.5 z m 3,-8 5,0 -2.5,-2.5 z m -7.99979,-5.00001 1,0 0,13 -1,0 z m 0,0 13,0 0,1 -13,0 z"
+         inkscape:connector-curvature="0" />
+      <rect
+         id="rect6688-8"
+         height="6"
+         width="6"
+         y="308.82321"
+         x="88.630379"
+         style="opacity:0.7;fill:#000000;fill-opacity:1" />
+    </g>
+    <g
+       transform="translate(592,268)"
+       style="display:inline"
+       id="src/plugins/qmldesigner/components/formeditor/boundingrect">
+      <rect
+         id="rect6754-2"
+         height="16"
+         width="16"
+         y="300"
+         x="200"
+         style="fill:#ffffff;fill-opacity:1" />
+      <path
+         id="path6752-4"
+         style="fill:#000000;fill-opacity:1"
+         d="m 211,306 0,5 -7,0 0,-5 7,0 m 1,-1 -9,0 0,7 9,0 0,-7 0,0 z m -11,8 1,0 0,1 -1,0 z m 2,0 1,0 0,1 -1,0 z m 10,-10 1,0 0,1 -1,0 z m -12,2 1,0 0,1 -1,0 z m 0,6 1,0 0,1 -1,0 z m 0,-2 1,0 0,1 -1,0 z m 0,-2 1,0 0,1 -1,0 z m 4,6 1,0 0,1 -1,0 z m 2,0 1,0 0,1 -1,0 z m 2,0 1,0 0,1 -1,0 z m 2,0 1,0 0,1 -1,0 z m 2,0 1,0 0,1 -1,0 z m 0,-2 1,0 0,1 -1,0 z m 0,-2 1,0 0,1 -1,0 z m 0,-2 1,0 0,1 -1,0 z m 0,-2 1,0 0,1 -1,0 z m -2,-2 1,0 0,1 -1,0 z m -2,0 1,0 0,1 -1,0 z m -2,0 1,0 0,1 -1,0 z m -2,0 1,0 0,1 -1,0 z m -2,0 1,0 0,1 -1,0 z m -2,0 1,0 0,1 -1,0 z"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       transform="translate(558,268)"
+       style="display:inline"
+       id="src/plugins/qmldesigner/components/formeditor/reset">
+      <rect
+         id="rect6700-2"
+         height="16"
+         width="16"
+         y="300"
+         x="250"
+         style="fill:#ffffff;fill-opacity:1" />
+      <g
+         id="g6694-7"
+         style="fill:#000000;fill-opacity:1">
+        <polygon
+           id="polygon6696-3"
+           points="261,304.5 258,302 258,307 "
+           style="fill:#000000;fill-opacity:1" />
+        <path
+           id="path6698-5"
+           d="m 258,313 c -2.206,0 -4,-1.795 -4,-4 0,-2.205 1.794,-4 4,-4 l 0,-1 c -2.762,0 -5,2.238 -5,5 0,2.762 2.238,5 5,5 2.762,0 5,-2.238 5,-5 l -1,0 c 0,2.205 -1.794,4 -4,4 z"
+           inkscape:connector-curvature="0"
+           style="fill:#000000;fill-opacity:1" />
+      </g>
+    </g>
+    <g
+       id="src/plugins/debugger/images/debugger_stepover_small"
+       transform="translate(16,0)">
+      <rect
+         id="rect4959-4-5-4"
+         height="16"
+         width="16"
+         y="568"
+         x="473"
+         style="display:inline;fill:#ffffff;fill-opacity:1;stroke:none" />
+      <path
+         id="debugger_function"
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.20000005;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 483,578 5,0 0,1 -5,0 z m 0,-2 5,0 0,1 -5,0 z m 0,-2 5,0 0,1 -5,0 z m -2,7 7,0 0,2 -7,0 z m 0,-11 7,0 0,2 -7,0 z"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccccccccccccccccccsccc" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 480,570.5 c -5.5,0 -5.5,3 -5.5,4.5 0,0.5 0.5,4 5,7.5"
+         id="path4741"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="csc" />
+      <path
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 480,583 0,-4 -4,4 z"
+         id="path4743"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccc" />
+    </g>
+    <g
+       style="display:inline"
+       id="src/plugins/debugger/images/debugger_stepinto_small"
+       transform="translate(32,0)">
+      <rect
+         id="rect4959-4-5-4-2"
+         height="16"
+         width="16"
+         y="568"
+         x="473"
+         style="display:inline;fill:#ffffff;fill-opacity:1;stroke:none" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#debugger_function"
+         id="use4745"
+         width="100%"
+         height="100%" />
+      <g
+         id="debugger_step_arrow"
+         transform="translate(-32,0)">
+        <path
+           sodipodi:nodetypes="cc"
+           inkscape:connector-curvature="0"
+           id="path4755"
+           d="m 506.5,570 c 0,6.5 0.40625,6.5 5.40625,6.5625"
+           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           sodipodi:nodetypes="cccc"
+           inkscape:connector-curvature="0"
+           id="path4757"
+           d="m 510,579.5 3,-3 -3,-3 z"
+           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      </g>
+    </g>
+    <g
+       style="display:inline"
+       id="src/plugins/debugger/images/debugger_stepout_small"
+       transform="translate(48,0)">
+      <rect
+         id="rect4959-4-5-4-4"
+         height="16"
+         width="16"
+         y="568"
+         x="473"
+         style="display:inline;fill:#ffffff;fill-opacity:1;stroke:none" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#debugger_function"
+         id="use4749"
+         width="100%"
+         height="100%" />
+      <g
+         transform="matrix(0,1,-1,0,1053.7441,68.755917)"
+         id="use4766">
+        <path
+           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 505.74408,571.7441 c 1e-5,4 1,4.5 7,4.5"
+           id="path4772"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc" />
+        <path
+           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 511.24408,579.2441 3,-3 -3,-3 z"
+           id="path4774"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccc" />
+      </g>
+    </g>
+    <g
+       style="display:inline"
+       id="src/plugins/debugger/images/debugger_restart_small"
+       transform="translate(64,0)">
+      <rect
+         id="rect4959-4-5-4-4-7-0"
+         height="16"
+         width="16"
+         y="568"
+         x="473"
+         style="display:inline;fill:#ffffff;fill-opacity:1;stroke:none" />
+      <rect
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect4663-0"
+         width="2"
+         height="6"
+         x="480"
+         y="569" />
+      <path
+         style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path4665-4"
+         sodipodi:type="arc"
+         sodipodi:cx="480.9993"
+         sodipodi:cy="576.5"
+         sodipodi:rx="5.4992981"
+         sodipodi:ry="5"
+         sodipodi:start="5.2359878"
+         sodipodi:end="4.1887902"
+         d="m 483.74895,572.16987 a 5.4992981,5 0 0 1 2.56226,5.62423 5.4992981,5 0 0 1 -5.31191,3.7059 5.4992981,5 0 0 1 -5.31192,-3.7059 5.4992981,5 0 0 1 2.56227,-5.62423"
+         sodipodi:open="true" />
+      <path
+         sodipodi:open="true"
+         d="m 480.9993,581.5 a 5.4992981,5 0 0 1 -5.13232,-3.20409 5.4992981,5 0 0 1 1.44544,-5.50579"
+         sodipodi:end="3.9776054"
+         sodipodi:start="1.5707963"
+         sodipodi:ry="5"
+         sodipodi:rx="5.4992981"
+         sodipodi:cy="576.5"
+         sodipodi:cx="480.9993"
+         sodipodi:type="arc"
+         id="path4711"
+         style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 481,583.35937 3.5,-2.72679 -3.5,-0.86696"
+         id="path4713"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccc" />
+    </g>
+    <g
+       id="src/plugins/debugger/images/debugger_singleinstructionmode"
+       style="display:inline">
+      <rect
+         style="display:inline;fill:#ffffff;fill-opacity:1;stroke:none"
+         x="553"
+         y="568"
+         width="16"
+         height="16"
+         id="rect4749" />
+      <rect
+         style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect4772"
+         width="12"
+         height="12"
+         x="554.5"
+         y="570.5" />
+      <path
+         id="rect4774-5-6"
+         style="display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 557,579 4,0 0,1 -4,0 z m 2,-3 6,0 0,1 -6,0 z m -2,-3 6,0 0,1 -6,0 z"
+         inkscape:connector-curvature="0" />
     </g>
   </g>
   <g
@@ -1963,7 +2533,7 @@
          x="48"
          y="552" />
       <path
-         d="m 61.2929,560 a 5.2929,5.2929 0 1 1 -10.5858,0 5.2929,5.2929 0 1 1 10.5858,0 z"
+         d="M 61.2929,560 A 5.2929001,5.2929001 0 0 1 56,565.2929 5.2929001,5.2929001 0 0 1 50.7071,560 5.2929001,5.2929001 0 0 1 56,554.7071 5.2929001,5.2929001 0 0 1 61.2929,560 Z"
          sodipodi:ry="5.2929"
          sodipodi:rx="5.2929"
          sodipodi:cy="560"
@@ -2022,52 +2592,35 @@
     <g
        id="src/plugins/coreplugin/images/compile_error_taskbar"
        transform="translate(-76,-48)">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4020"
-         d="m 77,589 4,-4 6,0 4,4 0,6 -4,4 -6,0 -4,-4 z"
-         style="fill:#8a0101;fill-opacity:1;stroke:none" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path4022"
-         d="m 81.5,586.5 5,0 3,3 0,5 -3,3 -5,0 -3,-3 0,-5 3,-3"
-         style="fill:url(#radialGradient4553);fill-opacity:1;stroke:#e36565;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <rect
          y="584"
          x="76"
          height="16"
          width="16"
          id="rect4024"
-         style="fill:none;stroke:none" />
+         style="fill:#ffffff" />
+      <path
+         id="path5306-6"
+         d="M 87.501011,586 80.498989,586 77,592 l 3.498989,6 7.002022,0 L 91,592 Z"
+         inkscape:connector-curvature="0"
+         style="display:inline;fill:#000000"
+         sodipodi:nodetypes="ccccccc" />
     </g>
     <g
        id="src/plugins/coreplugin/images/warning"
        transform="translate(-437,-48)">
       <rect
-         style="fill:none;stroke:none"
+         style="fill:#ffffff;stroke:none"
          id="use3942"
          width="16"
          height="16"
          x="453"
          y="584" />
       <path
-         sodipodi:nodetypes="cccc"
+         id="path5300-7"
+         d="m 461.5,586 -1,0 -5.5,11 0,1 12,0 0,-1 -5.5,-11 z m -0.5,11 c -0.553,0 -1,-0.447 -1,-1 0,-0.553 0.447,-1 1,-1 0.553,0 1,0.447 1,1 0,0.553 -0.447,1 -1,1 z m 0.7,-3 -1.4,0 -0.3,-5 2,0 -0.3,5 z"
          inkscape:connector-curvature="0"
-         id="path3945"
-         d="m 454,598.5 7,-13 7,13 z"
-         style="fill:#fcd171;fill-opacity:1;stroke:#493703;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:url(#linearGradient3875);fill-opacity:1;stroke:none"
-         d="m 456.5,597 9,0 -4.5,-8.82322 z"
-         id="path3974"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccc" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#493703;fill-opacity:1;stroke:none"
-         d="m 460,590 0.5,5 1,0 0.5,-5 z m 0,6 0,1 2,0 0,-1 z"
-         id="path3959"
-         sodipodi:nodetypes="cccccccccc" />
+         style="display:inline;fill:#000000" />
     </g>
     <g
        id="src/plugins/coreplugin/images/error"
@@ -2081,10 +2634,10 @@
          y="0"
          x="0" />
       <path
-         inkscape:connector-curvature="0"
-         style="fill:#eea1a1;fill-opacity:1;stroke:none"
-         d="m 477,588 0.5,5 1,0 0.5,-5 -2,0 z m 0,6 0,2 2,0 0,-2 -2,0 z"
-         id="path3890" />
+         style="display:inline;fill:#ffffff"
+         d="m 477,588 0.29981,5 1.40038,0 0.29981,-5 -2,0 z m 1,6 c -0.55334,0 -1,0.447 -1,1 0,0.553 0.44666,1 1,1 0.55234,0 1,-0.447 1,-1 0,-0.553 -0.44666,-1 -1,-1 z"
+         id="path6028"
+         inkscape:connector-curvature="0" />
     </g>
     <g
        id="src/plugins/coreplugin/images/info"
@@ -2095,32 +2648,12 @@
          height="16"
          width="16"
          id="rect4024-7"
-         style="fill:none;stroke:none" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#01218a;fill-opacity:1;stroke:none"
-         id="path3203"
-         sodipodi:cx="56"
-         sodipodi:cy="544"
-         sodipodi:rx="7"
-         sodipodi:ry="7"
-         d="m 63,544 a 7,7 0 0 1 -7,7 7,7 0 0 1 -7,-7 7,7 0 0 1 7,-7 7,7 0 0 1 7,7 z"
-         transform="translate(438,48)" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#radialGradient3994);fill-opacity:1;stroke:#6583e3;stroke-opacity:1"
-         id="path3986"
-         sodipodi:cx="56"
-         sodipodi:cy="544"
-         sodipodi:rx="5.5"
-         sodipodi:ry="5.5"
-         d="M 61.5,544 A 5.5,5.5 0 0 1 56,549.5 5.5,5.5 0 0 1 50.5,544 5.5,5.5 0 0 1 56,538.5 5.5,5.5 0 0 1 61.5,544 Z"
-         transform="translate(438,48)" />
+         style="fill:#ffffff;stroke:none" />
       <path
+         id="path5294-7"
+         d="m 494,586 c -3.314,0 -6,2.686 -6,6 0,3.314 2.686,6 6,6 3.314,0 6,-2.686 6,-6 0,-3.314 -2.686,-6 -6,-6 z m 1,10 -2,0 0,-5 2,0 0,5 z m 0,-6 -2,0 0,-2 2,0 0,2 z"
          inkscape:connector-curvature="0"
-         style="fill:#a1acee;fill-opacity:1;stroke:none"
-         d="m 493,588 0,2 2,0 0,-2 -2,0 z m 0,3 0,5 2,0 0,-5 -2,0 z"
-         id="path3892-2" />
+         style="display:inline;fill:#000000" />
     </g>
     <g
        id="src/plugins/coreplugin/images/warning_big"
@@ -2269,72 +2802,77 @@
     </g>
     <g
        id="src/plugins/coreplugin/images/editclear"
-       style="opacity:0.6"
-       transform="translate(-139,-80)">
-      <path
-         d="m 186,592 c 0,3.86599 -3.13401,7 -7,7 -3.86599,0 -7,-3.13401 -7,-7 0,-3.86599 3.13401,-7 7,-7 3.86599,0 7,3.13401 7,7 z"
-         sodipodi:ry="7"
-         sodipodi:rx="7"
-         sodipodi:cy="592"
-         sodipodi:cx="179"
+       transform="translate(-139,-80)"
+       style="">
+      <rect
+         style="opacity:0.60100002;fill:#ffffff;fill-opacity:1;"
+         id="rect3817-2-9-1-9-6"
+         width="16"
+         height="16"
+         x="171"
+         y="584" />
+      <circle
          id="path4284"
-         style="fill:#505050;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
+         style="fill:#000000;fill-opacity:1;stroke:none;"
+         cx="179"
+         cy="592"
+         r="7" />
       <g
          id="g4438"
-         style="filter:url(#soft_shadow)">
+         style="">
         <rect
            y="586.24261"
            x="173.47487"
            height="10.952218"
            width="10.898602"
            id="rect3817-2-9-1-9-6-5"
-           style="opacity:0.60100002;fill:#ffffff;fill-opacity:0" />
+           style="opacity:0.60100002;fill:#ffffff;fill-opacity:0;" />
         <path
-           style="fill:none;stroke:#ffffff;stroke-width:1.7;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           style="fill:none;stroke:#ffffff;stroke-width:1.70000005;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;"
            d="m 176,589 6,6"
            id="path4478"
            inkscape:connector-curvature="0" />
         <path
-           style="fill:none;stroke:#ffffff;stroke-width:1.7;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           style="fill:none;stroke:#ffffff;stroke-width:1.70000005;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;"
            d="m 176,595 6,-6"
            id="path4480"
            inkscape:connector-curvature="0" />
       </g>
-      <rect
-         style="opacity:0.60100002;fill:#ffffff;fill-opacity:0"
-         id="rect3817-2-9-1-9-6"
-         width="16"
-         height="16"
-         x="171"
-         y="584" />
     </g>
     <g
        style="display:inline"
-       id="src/plugins/coreplugin/images/sidebaricon"
-       clip-path="url(#clipPath3237)"
-       transform="translate(-170,-64)">
-      <use
-         height="600"
-         width="800"
-         transform="matrix(0,-1,1,0,-351,785)"
-         id="use3223"
-         xlink:href="#rect3233"
-         y="0"
-         x="0" />
+       id="src/plugins/coreplugin/images/magnifier"
+       transform="translate(37,-80)">
       <rect
-         style="fill:none;stroke:none"
-         id="rect3216"
-         width="16"
-         height="16"
-         x="218"
-         y="568" />
+         style="opacity:0.60100002;fill:#ffffff;fill-opacity:1"
+         id="rect3817-2-9-1-9-6-0"
+         width="17"
+         height="11"
+         x="171"
+         y="589" />
+      <g
+         transform="translate(-231.13585,386.05488)"
+         id="magnifying_lense-1"
+         style="display:inline;fill:#000000;fill-opacity:1">
+        <path
+           id="path4719-8-0"
+           d="m 402.25285,212.41599 c -0.156,0.155 -0.156,0.41 0,0.565 l 0.84663,0.84863 c 0.156,0.154 0.41,0.154 0.566,0 L 407.231,210.24 c 0.156,-0.154 0.156,-0.41 0.001,-0.565 l -0.84763,-0.84763 c -0.156,-0.156 -0.41,-0.156 -0.566,0 z"
+           inkscape:connector-curvature="0"
+           style="fill-opacity:1"
+           sodipodi:nodetypes="cccccsscc" />
+        <circle
+           style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.17697227;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="path5669-9"
+           cx="409"
+           cy="206.94511"
+           r="3.4115138" />
+      </g>
       <path
-         id="rect3241-1"
-         style="fill:none;stroke:#292929;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         d="m 225.5,572.5 4,0 0,7 -4,0 z m -6,-2 12,0 0,11 -12,0 z"
+         sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccc" />
+         id="path4784-5"
+         d="m 186,597 -2.5,2.5 -2.5,-2.5 z"
+         style="display:inline;fill:#000000;fill-opacity:1;stroke:none" />
     </g>
     <g
        id="src/plugins/coreplugin/images/panel_button"
author	Alessandro Portale <alessandro.portale@theqtcompany.com>	2015-10-19 12:55:13 +0200
committer	Alessandro Portale <alessandro.portale@theqtcompany.com>	2015-10-23 16:04:52 +0000
commit	b8bdc6f669d0949292be217e84fe046ea8450e1c (patch)
tree	adf7521912f2c28b3b571049938f81ce0146207e /src
parent	e6d038364fe44d96b93fa2f5e40334e7ecad13c2 (diff)
download	qt-creator-b8bdc6f669d0949292be217e84fe046ea8450e1c.tar.gz