Centralize error/warning/info icons

There are multiple copies of these pngs in different plugins.
Let's have one version in core, also as @2x variant.

Change-Id: Iedff1a6190a72c1947dd202ae1ee46f59f9fb13c
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>

57 files changed, 86 insertions, 88 deletions

diff --git a/src/plugins/android/androiddeployqtwidget.ui b/src/plugins/android/androiddeployqtwidget.ui
index c7636369a2..fc744a6955 100644
--- a/src/plugins/android/androiddeployqtwidget.ui
+++ b/src/plugins/android/androiddeployqtwidget.ui
@@ -69,7 +69,7 @@
            <string/>
           </property>
           <property name="pixmap">
-           <pixmap resource="../projectexplorer/projectexplorer.qrc">:/projectexplorer/images/compile_warning.png</pixmap>
+           <pixmap resource="../coreplugin/core.qrc">:/core/images/warning.png</pixmap>
           </property>
          </widget>
         </item>
@@ -220,7 +220,7 @@
         <string/>
        </property>
        <property name="pixmap">
-        <pixmap resource="../projectexplorer/projectexplorer.qrc">:/projectexplorer/images/compile_warning.png</pixmap>
+        <pixmap resource="../coreplugin/core.qrc">:/core/images/warning.png</pixmap>
        </property>
        <property name="alignment">
         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
diff --git a/src/plugins/android/androidmanifesteditorwidget.cpp b/src/plugins/android/androidmanifesteditorwidget.cpp
index 42a0bf8911..338954849a 100644
--- a/src/plugins/android/androidmanifesteditorwidget.cpp
+++ b/src/plugins/android/androidmanifesteditorwidget.cpp
@@ -33,6 +33,7 @@
 #include "androidmanifestdocument.h"
 #include "androidmanager.h"
 
+#include <coreplugin/coreconstants.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/infobar.h>
 #include <coreplugin/editormanager/ieditor.h>
@@ -165,7 +166,7 @@ void AndroidManifestEditorWidget::initializePage()
         m_packageNameWarning->setVisible(false);
 
         m_packageNameWarningIcon = new QLabel;
-        m_packageNameWarningIcon->setPixmap(QPixmap(QLatin1String(ProjectExplorer::Constants::ICON_WARNING)));
+        m_packageNameWarningIcon->setPixmap(QPixmap(QLatin1String(Core::Constants::ICON_WARNING)));
         m_packageNameWarningIcon->setVisible(false);
         m_packageNameWarningIcon->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
 
diff --git a/src/plugins/android/androidpackagecreationwidget.ui b/src/plugins/android/androidpackagecreationwidget.ui
index 13b96df747..102e74cfb4 100644
--- a/src/plugins/android/androidpackagecreationwidget.ui
+++ b/src/plugins/android/androidpackagecreationwidget.ui
@@ -232,7 +232,7 @@
            <string/>
           </property>
           <property name="pixmap">
-           <pixmap resource="../projectexplorer/projectexplorer.qrc">:/projectexplorer/images/compile_warning.png</pixmap>
+           <pixmap resource="../coreplugin/core.qrc">:/core/images/warning.png</pixmap>
           </property>
          </widget>
         </item>
diff --git a/src/plugins/android/androidpotentialkit.cpp b/src/plugins/android/androidpotentialkit.cpp
index 5ef87071a2..247872b3e4 100644
--- a/src/plugins/android/androidpotentialkit.cpp
+++ b/src/plugins/android/androidpotentialkit.cpp
@@ -32,8 +32,8 @@
 #include "androidconfigurations.h"
 
 #include <utils/detailswidget.h>
+#include <coreplugin/coreconstants.h>
 #include <coreplugin/icore.h>
-#include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/kitmanager.h>
 #include <projectexplorer/kit.h>
 #include <projectexplorer/kitinformation.h>
@@ -92,7 +92,7 @@ AndroidPotentialKitWidget::AndroidPotentialKitWidget(QWidget *parent)
     : Utils::DetailsWidget(parent)
 {
     setSummaryText(QLatin1String("<b>Android has not been configured. Create Android kits.</b>"));
-    setIcon(QIcon(QLatin1String(ProjectExplorer::Constants::ICON_WARNING)));
+    setIcon(QIcon(QLatin1String(Core::Constants::ICON_WARNING)));
     //detailsWidget->setState(Utils::DetailsWidget::NoSummary);
     QWidget *mainWidget = new QWidget(this);
     setWidget(mainWidget);
diff --git a/src/plugins/android/androidsettingswidget.ui b/src/plugins/android/androidsettingswidget.ui
index 6dd67b2231..5b40861e16 100644
--- a/src/plugins/android/androidsettingswidget.ui
+++ b/src/plugins/android/androidsettingswidget.ui
@@ -58,7 +58,7 @@
         <string/>
        </property>
        <property name="pixmap">
-        <pixmap>:/projectexplorer/images/compile_warning.png</pixmap>
+        <pixmap>:/core/images/warning.png</pixmap>
        </property>
       </widget>
      </item>
@@ -124,7 +124,7 @@
         <string/>
        </property>
        <property name="pixmap">
-        <pixmap resource="../projectexplorer/projectexplorer.qrc">:/projectexplorer/images/compile_warning.png</pixmap>
+        <pixmap resource="../coreplugin/core.qrc">:/core/images/error.png</pixmap>
        </property>
       </widget>
      </item>
@@ -193,7 +193,7 @@
         <string/>
        </property>
        <property name="pixmap">
-        <pixmap resource="../projectexplorer/projectexplorer.qrc">:/projectexplorer/images/compile_error.png</pixmap>
+        <pixmap resource="../coreplugin/core.qrc">:/core/images/error.png</pixmap>
        </property>
       </widget>
      </item>
@@ -245,7 +245,7 @@
         <string/>
        </property>
        <property name="pixmap">
-        <pixmap resource="../projectexplorer/projectexplorer.qrc">:/projectexplorer/images/compile_warning.png</pixmap>
+        <pixmap resource="../coreplugin/core.qrc">:/core/images/warning.png</pixmap>
        </property>
       </widget>
      </item>
diff --git a/src/plugins/android/avddialog.cpp b/src/plugins/android/avddialog.cpp
index a72b943b6e..8aa54debe3 100644
--- a/src/plugins/android/avddialog.cpp
+++ b/src/plugins/android/avddialog.cpp
@@ -29,7 +29,7 @@
 
 #include "avddialog.h"
 #include "androidconfigurations.h"
-#include <projectexplorer/projectexplorerconstants.h>
+#include <coreplugin/coreconstants.h>
 
 #include <QMessageBox>
 
@@ -53,7 +53,7 @@ AvdDialog::AvdDialog(int minApiLevel, const QString &targetArch, const AndroidCo
     QRegExp rx(QLatin1String("\\S+"));
     QRegExpValidator v(rx, 0);
     m_avdDialog.nameLineEdit->setValidator(&v);
-    m_avdDialog.warningIcon->setPixmap(QPixmap(QLatin1String(ProjectExplorer::Constants::ICON_WARNING)));
+    m_avdDialog.warningIcon->setPixmap(QPixmap(QLatin1String(Core::Constants::ICON_WARNING)));
 
     updateApiLevelComboBox();
 
diff --git a/src/plugins/android/createandroidmanifestwizard.cpp b/src/plugins/android/createandroidmanifestwizard.cpp
index 5703975831..fffe8e5e5b 100644
--- a/src/plugins/android/createandroidmanifestwizard.cpp
+++ b/src/plugins/android/createandroidmanifestwizard.cpp
@@ -32,7 +32,6 @@
 #include <projectexplorer/target.h>
 #include <qmakeprojectmanager/qmakeproject.h>
 #include <qmakeprojectmanager/qmakenodes.h>
-#include <projectexplorer/projectexplorerconstants.h>
 #include <proparser/prowriter.h>
 #include <QComboBox>
 #include <QFormLayout>
@@ -40,6 +39,7 @@
 #include <QMessageBox>
 #include <QVBoxLayout>
 #include <qtsupport/qtkitinformation.h>
+#include <coreplugin/coreconstants.h>
 #include <coreplugin/editormanager/editormanager.h>
 
 using namespace Android;
@@ -111,7 +111,7 @@ ChooseDirectoryPage::ChooseDirectoryPage(CreateAndroidManifestWizard *wizard)
     m_sourceDirectoryWarning->setWordWrap(true);
     m_warningIcon = new QLabel(this);
     m_warningIcon->setVisible(false);
-    m_warningIcon->setPixmap(QPixmap(QLatin1String(ProjectExplorer::Constants::ICON_ERROR)));
+    m_warningIcon->setPixmap(QPixmap(QLatin1String(Core::Constants::ICON_ERROR)));
     m_warningIcon->setWordWrap(true);
     m_warningIcon->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
 
diff --git a/src/plugins/baremetal/baremetalrunconfigurationwidget.cpp b/src/plugins/baremetal/baremetalrunconfigurationwidget.cpp
index 1e244aeacf..5f62a4a673 100644
--- a/src/plugins/baremetal/baremetalrunconfigurationwidget.cpp
+++ b/src/plugins/baremetal/baremetalrunconfigurationwidget.cpp
@@ -29,6 +29,8 @@
 
 #include "baremetalrunconfigurationwidget.h"
 #include "baremetalrunconfiguration.h"
+
+#include <coreplugin/coreconstants.h>
 #include <utils/detailswidget.h>
 
 #include <QLineEdit>
@@ -86,7 +88,7 @@ void BareMetalRunConfigurationWidget::addDisabledLabel(QVBoxLayout *topLayout)
 {
     QHBoxLayout * const hl = new QHBoxLayout;
     hl->addStretch();
-    d->disabledIcon.setPixmap(QPixmap(QLatin1String(ProjectExplorer::Constants::ICON_WARNING)));
+    d->disabledIcon.setPixmap(QPixmap(QLatin1String(Core::Constants::ICON_WARNING)));
     hl->addWidget(&d->disabledIcon);
     d->disabledReason.setVisible(false);
     hl->addWidget(&d->disabledReason);
diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc
index ca54e34c30..bb606f02a3 100644
--- a/src/plugins/coreplugin/core.qrc
+++ b/src/plugins/coreplugin/core.qrc
@@ -91,5 +91,11 @@
         <file>images/pause.png</file>
         <file>images/reload_gray.png</file>
         <file>images/reload_gray@2x.png</file>
+        <file>images/error.png</file>
+        <file>images/error@2x.png</file>
+        <file>images/warning.png</file>
+        <file>images/warning@2x.png</file>
+        <file>images/info.png</file>
+        <file>images/info@2x.png</file>
     </qresource>
 </RCC>
diff --git a/src/plugins/coreplugin/coreconstants.h b/src/plugins/coreplugin/coreconstants.h
index 8066161e0f..f517fb618d 100644
--- a/src/plugins/coreplugin/coreconstants.h
+++ b/src/plugins/coreplugin/coreconstants.h
@@ -213,6 +213,9 @@ 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 WIZARD_CATEGORY_QT[] = "R.Qt";
 const char WIZARD_TR_CATEGORY_QT[] = QT_TRANSLATE_NOOP("Core", "Qt");
diff --git a/src/plugins/coreplugin/images/error.png b/src/plugins/coreplugin/images/error.png
new file mode 100644
index 0000000000..8f9f3bb161
--- /dev/null
+++ 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
new file mode 100644
index 0000000000..464072347b
--- /dev/null
+++ b/src/plugins/coreplugin/images/error@2x.png
diff --git a/src/plugins/coreplugin/images/info.png b/src/plugins/coreplugin/images/info.png
new file mode 100644
index 0000000000..4fcbe4068e
--- /dev/null
+++ 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
new file mode 100644
index 0000000000..816f4d75a6
--- /dev/null
+++ b/src/plugins/coreplugin/images/info@2x.png
diff --git a/src/plugins/coreplugin/images/warning.png b/src/plugins/coreplugin/images/warning.png
new file mode 100644
index 0000000000..74e67dbae8
--- /dev/null
+++ 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
new file mode 100644
index 0000000000..b362e6c555
--- /dev/null
+++ b/src/plugins/coreplugin/images/warning@2x.png
diff --git a/src/plugins/git/gitsubmitpanel.ui b/src/plugins/git/gitsubmitpanel.ui
index 3d80ddacc4..7bc4bb6963 100644
--- a/src/plugins/git/gitsubmitpanel.ui
+++ b/src/plugins/git/gitsubmitpanel.ui
@@ -89,7 +89,7 @@
          <string/>
         </property>
         <property name="pixmap">
-         <pixmap resource="../projectexplorer/projectexplorer.qrc">:/projectexplorer/images/compile_error.png</pixmap>
+         <pixmap resource="../coreplugin/core.qrc">:/core/images/error.png</pixmap>
         </property>
        </widget>
       </item>
@@ -138,7 +138,7 @@
          <string/>
         </property>
         <property name="pixmap">
-         <pixmap resource="../projectexplorer/projectexplorer.qrc">:/projectexplorer/images/compile_error.png</pixmap>
+         <pixmap resource="../coreplugin/core.qrc">:/core/images/error.png</pixmap>
         </property>
        </widget>
       </item>
diff --git a/src/plugins/projectexplorer/buildprogress.cpp b/src/plugins/projectexplorer/buildprogress.cpp
index 65623f1f27..0300d1ffc8 100644
--- a/src/plugins/projectexplorer/buildprogress.cpp
+++ b/src/plugins/projectexplorer/buildprogress.cpp
@@ -30,6 +30,7 @@
 #include "buildprogress.h"
 #include "projectexplorerconstants.h"
 
+#include <coreplugin/coreconstants.h>
 #include <utils/stylehelper.h>
 
 #include <QVBoxLayout>
@@ -85,8 +86,8 @@ BuildProgress::BuildProgress(TaskWindow *taskWindow, Qt::Orientation orientation
 
     m_errorIcon->setAlignment(Qt::AlignRight);
     m_warningIcon->setAlignment(Qt::AlignRight);
-    m_errorIcon->setPixmap(QPixmap(QLatin1String(ProjectExplorer::Constants::ICON_ERROR)));
-    m_warningIcon->setPixmap(QPixmap(QLatin1String(ProjectExplorer::Constants::ICON_WARNING)));
+    m_errorIcon->setPixmap(QPixmap(QLatin1String(Core::Constants::ICON_ERROR)));
+    m_warningIcon->setPixmap(QPixmap(QLatin1String(Core::Constants::ICON_WARNING)));
 
     m_contentWidget->hide();
 
diff --git a/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.cpp b/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.cpp
index 475e4f152d..d346ab2cbc 100644
--- a/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.cpp
+++ b/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.cpp
@@ -31,6 +31,7 @@
 #include "ui_desktopdeviceconfigurationwidget.h"
 #include <projectexplorer/projectexplorerconstants.h>
 
+#include <coreplugin/coreconstants.h>
 #include <utils/portlist.h>
 #include <utils/qtcassert.h>
 
@@ -73,7 +74,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(ProjectExplorer::Constants::ICON_WARNING)));
+                QPixmap(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/images/compile_error.png b/src/plugins/projectexplorer/images/compile_error.png
deleted file mode 100644
index 71496e0437..0000000000
--- a/src/plugins/projectexplorer/images/compile_error.png
+++ /dev/null
diff --git a/src/plugins/projectexplorer/images/compile_warning.png b/src/plugins/projectexplorer/images/compile_warning.png
deleted file mode 100644
index 645cc5fd58..0000000000
--- a/src/plugins/projectexplorer/images/compile_warning.png
+++ /dev/null
diff --git a/src/plugins/projectexplorer/kitmodel.cpp b/src/plugins/projectexplorer/kitmodel.cpp
index be87d31d3a..e0920fb8ac 100644
--- a/src/plugins/projectexplorer/kitmodel.cpp
+++ b/src/plugins/projectexplorer/kitmodel.cpp
@@ -32,8 +32,8 @@
 #include "kit.h"
 #include "kitmanagerconfigwidget.h"
 #include "kitmanager.h"
-#include "projectexplorerconstants.h"
 
+#include <coreplugin/coreconstants.h>
 #include <utils/qtcassert.h>
 
 #include <QApplication>
@@ -156,8 +156,8 @@ int KitModel::columnCount(const QModelIndex &parent) const
 
 QVariant KitModel::data(const QModelIndex &index, int role) const
 {
-    static QIcon warningIcon(QString::fromLatin1(ProjectExplorer::Constants::ICON_WARNING));
-    static QIcon errorIcon(QString::fromLatin1(ProjectExplorer::Constants::ICON_ERROR));
+    static QIcon warningIcon(QString::fromLatin1(Core::Constants::ICON_WARNING));
+    static QIcon errorIcon(QString::fromLatin1(Core::Constants::ICON_ERROR));
 
     if (!index.isValid() || index.column() != 0)
         return QVariant();
diff --git a/src/plugins/projectexplorer/projectexplorer.qbs b/src/plugins/projectexplorer/projectexplorer.qbs
index bce65aadff..2837bb3f58 100644
--- a/src/plugins/projectexplorer/projectexplorer.qbs
+++ b/src/plugins/projectexplorer/projectexplorer.qbs
@@ -227,8 +227,6 @@ QtcPlugin {
             "clean.png",
             "clean_small.png",
             "closetab.png",
-            "compile_error.png",
-            "compile_warning.png",
             "debugger_start.png",
             "debugger_start_small.png",
             "findallprojects.png",
diff --git a/src/plugins/projectexplorer/projectexplorer.qrc b/src/plugins/projectexplorer/projectexplorer.qrc
index bbf1b90b31..faa38fd3ab 100644
--- a/src/plugins/projectexplorer/projectexplorer.qrc
+++ b/src/plugins/projectexplorer/projectexplorer.qrc
@@ -25,8 +25,6 @@
         <file>images/leftselection.png</file>
         <file>images/rightselection.png</file>
         <file>images/midselection.png</file>
-        <file>images/compile_error.png</file>
-        <file>images/compile_warning.png</file>
         <file>images/BuildSettings.png</file>
         <file>images/CodeStyleSettings.png</file>
         <file>images/RunSettings.png</file>
diff --git a/src/plugins/projectexplorer/projectexplorerconstants.h b/src/plugins/projectexplorer/projectexplorerconstants.h
index 9f7c14d29a..180e7a5741 100644
--- a/src/plugins/projectexplorer/projectexplorerconstants.h
+++ b/src/plugins/projectexplorer/projectexplorerconstants.h
@@ -162,8 +162,6 @@ const char ICON_DEBUG_SMALL[]     = ":/projectexplorer/images/debugger_start_sma
 const char ICON_STOP[]            = ":/projectexplorer/images/stop.png";
 const char ICON_STOP_SMALL[]      = ":/projectexplorer/images/stop_small.png";
 const char ICON_WINDOW[]          = ":/projectexplorer/images/window.png";
-const char ICON_WARNING[]         = ":/projectexplorer/images/compile_warning.png";
-const char ICON_ERROR[]           = ":/projectexplorer/images/compile_error.png";
 
 // Mime types
 const char C_SOURCE_MIMETYPE[]    = "text/x-csrc";
diff --git a/src/plugins/projectexplorer/task.cpp b/src/plugins/projectexplorer/task.cpp
index f794969066..ac7a8d4838 100644
--- a/src/plugins/projectexplorer/task.cpp
+++ b/src/plugins/projectexplorer/task.cpp
@@ -29,7 +29,7 @@
 
 #include "task.h"
 
-#include <projectexplorer/projectexplorerconstants.h>
+#include <coreplugin/coreconstants.h>
 #include <utils/qtcassert.h>
 
 namespace ProjectExplorer
@@ -39,9 +39,9 @@ static QString taskTypeIcon(Task::TaskType t)
 {
     switch (t) {
     case Task::Warning:
-        return QLatin1String(ProjectExplorer::Constants::ICON_WARNING);
+        return QLatin1String(Core::Constants::ICON_WARNING);
     case Task::Error:
-        return QLatin1String(ProjectExplorer::Constants::ICON_ERROR);
+        return QLatin1String(Core::Constants::ICON_ERROR);
     case Task::Unknown:
         break;
     }
diff --git a/src/plugins/projectexplorer/taskhub.cpp b/src/plugins/projectexplorer/taskhub.cpp
index 3b671b3d46..d02cce80db 100644
--- a/src/plugins/projectexplorer/taskhub.cpp
+++ b/src/plugins/projectexplorer/taskhub.cpp
@@ -29,8 +29,8 @@
 
 #include "taskhub.h"
 
+#include <coreplugin/coreconstants.h>
 #include <coreplugin/ioutputpane.h>
-#include <projectexplorer/projectexplorerconstants.h>
 #include <utils/qtcassert.h>
 
 using namespace ProjectExplorer;
@@ -85,8 +85,8 @@ void TaskMark::clicked()
 }
 
 TaskHub::TaskHub()
-    : m_errorIcon(QLatin1String(ProjectExplorer::Constants::ICON_ERROR)),
-      m_warningIcon(QLatin1String(ProjectExplorer::Constants::ICON_WARNING))
+    : m_errorIcon(QLatin1String(Core::Constants::ICON_ERROR)),
+      m_warningIcon(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 d5d1833790..0bc1c088bb 100644
--- a/src/plugins/projectexplorer/taskwindow.cpp
+++ b/src/plugins/projectexplorer/taskwindow.cpp
@@ -262,7 +262,7 @@ TaskWindow::TaskWindow() : d(new TaskWindowPrivate)
     d->m_listview->setContextMenuPolicy(Qt::ActionsContextMenu);
 
     d->m_filterWarningsButton = createFilterButton(
-                QIcon(QLatin1String(Constants::ICON_WARNING)),
+                QIcon(QLatin1String(Core::Constants::ICON_WARNING)),
                 tr("Show Warnings"), this, SLOT(setShowWarnings(bool)));
 
     d->m_categoriesButton = new QToolButton;
diff --git a/src/plugins/qbsprojectmanager/qbsbuildstepconfigwidget.ui b/src/plugins/qbsprojectmanager/qbsbuildstepconfigwidget.ui
index 3be95b229e..c0d88a9a7e 100644
--- a/src/plugins/qbsprojectmanager/qbsbuildstepconfigwidget.ui
+++ b/src/plugins/qbsprojectmanager/qbsbuildstepconfigwidget.ui
@@ -108,7 +108,7 @@
         <string/>
        </property>
        <property name="pixmap">
-        <pixmap>:/projectexplorer/images/compile_warning.png</pixmap>
+        <pixmap>:/coreplugin/images/warning.png</pixmap>
        </property>
       </widget>
      </item>
diff --git a/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp b/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
index 6fda531af9..fb28e7a554 100644
--- a/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
+++ b/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
@@ -340,7 +340,7 @@ QbsRunConfigurationWidget::QbsRunConfigurationWidget(QbsRunConfiguration *rc, QW
     QHBoxLayout *hl = new QHBoxLayout();
     hl->addStretch();
     m_disabledIcon = new QLabel(this);
-    m_disabledIcon->setPixmap(QPixmap(QLatin1String(Constants::ICON_WARNING)));
+    m_disabledIcon->setPixmap(QPixmap(QLatin1String(Core::Constants::ICON_WARNING)));
     hl->addWidget(m_disabledIcon);
     m_disabledReason = new QLabel(this);
     m_disabledReason->setVisible(false);
diff --git a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp
index 4aa5bd2af8..188b9add4e 100644
--- a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp
+++ b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp
@@ -190,7 +190,7 @@ DesktopQmakeRunConfigurationWidget::DesktopQmakeRunConfigurationWidget(DesktopQm
     QHBoxLayout *hl = new QHBoxLayout();
     hl->addStretch();
     m_disabledIcon = new QLabel(this);
-    m_disabledIcon->setPixmap(QPixmap(QLatin1String(ProjectExplorer::Constants::ICON_WARNING)));
+    m_disabledIcon->setPixmap(QPixmap(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.ui b/src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.ui
index c2383e587b..33b53f8925 100644
--- a/src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.ui
+++ b/src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.ui
@@ -60,7 +60,7 @@
      <item>
       <widget class="QLabel" name="warningLabel">
        <property name="pixmap">
-        <pixmap resource="../projectexplorer/projectexplorer.qrc">:/projectexplorer/images/compile_warning.png</pixmap>
+        <pixmap resource="../coreplugin/core.qrc">:/core/images/warning.png</pixmap>
        </property>
       </widget>
      </item>
diff --git a/src/plugins/qmakeprojectmanager/qmakestep.ui b/src/plugins/qmakeprojectmanager/qmakestep.ui
index 0b6315c878..0aeed59dfb 100644
--- a/src/plugins/qmakeprojectmanager/qmakestep.ui
+++ b/src/plugins/qmakeprojectmanager/qmakestep.ui
@@ -126,7 +126,7 @@
       <item>
        <widget class="QLabel" name="qmlDebuggingWarningIcon">
         <property name="pixmap">
-         <pixmap resource="../projectexplorer/projectexplorer.qrc">:/projectexplorer/images/compile_warning.png</pixmap>
+         <pixmap resource="../coreplugin/core.qrc">:/core/images/warning.png</pixmap>
         </property>
        </widget>
       </item>
diff --git a/src/plugins/qmljstools/images/error.png b/src/plugins/qmljstools/images/error.png
deleted file mode 100644
index 39768b9f39..0000000000
--- a/src/plugins/qmljstools/images/error.png
+++ /dev/null
diff --git a/src/plugins/qmljstools/images/log.png b/src/plugins/qmljstools/images/log.png
deleted file mode 100644
index e4766f228b..0000000000
--- a/src/plugins/qmljstools/images/log.png
+++ /dev/null
diff --git a/src/plugins/qmljstools/images/warning.png b/src/plugins/qmljstools/images/warning.png
deleted file mode 100644
index 3200efc4fd..0000000000
--- a/src/plugins/qmljstools/images/warning.png
+++ /dev/null
diff --git a/src/plugins/qmljstools/qmlconsoleitemdelegate.cpp b/src/plugins/qmljstools/qmlconsoleitemdelegate.cpp
index 095b3d0ae9..114692c1c5 100644
--- a/src/plugins/qmljstools/qmlconsoleitemdelegate.cpp
+++ b/src/plugins/qmljstools/qmlconsoleitemdelegate.cpp
@@ -30,6 +30,8 @@
 #include "qmlconsoleitemdelegate.h"
 #include "qmlconsoleedit.h"
 
+#include <coreplugin/coreconstants.h>
+
 #include <QPainter>
 #include <QTreeView>
 #include <QScrollBar>
@@ -68,9 +70,9 @@ namespace Internal {
 
 QmlConsoleItemDelegate::QmlConsoleItemDelegate(QObject *parent) :
     QStyledItemDelegate(parent),
-    m_logIcon(QLatin1String(":/qmljstools/images/log.png")),
-    m_warningIcon(QLatin1String(":/qmljstools/images/warning.png")),
-    m_errorIcon(QLatin1String(":/qmljstools/images/error.png")),
+    m_logIcon(QLatin1String(Core::Constants::ICON_INFO)),
+    m_warningIcon(QLatin1String(Core::Constants::ICON_WARNING)),
+    m_errorIcon(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 6f5c0f26d2..9c01ebc345 100644
--- a/src/plugins/qmljstools/qmlconsolepane.cpp
+++ b/src/plugins/qmljstools/qmlconsolepane.cpp
@@ -32,6 +32,7 @@
 #include "qmlconsoleproxymodel.h"
 #include "qmlconsoleitemdelegate.h"
 
+#include <coreplugin/coreconstants.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/findplaceholder.h>
 #include <utils/savedaction.h>
@@ -108,7 +109,7 @@ QmlConsolePane::QmlConsolePane(QObject *parent)
     m_showDebugButtonAction->setSettingsKey(QLatin1String(CONSOLE), QLatin1String(SHOW_LOG));
     m_showDebugButtonAction->setToolTip(tr("Show debug, log, and info messages."));
     m_showDebugButtonAction->setCheckable(true);
-    m_showDebugButtonAction->setIcon(QIcon(QLatin1String(":/qmljstools/images/log.png")));
+    m_showDebugButtonAction->setIcon(QIcon(QLatin1String(Core::Constants::ICON_INFO)));
     connect(m_showDebugButtonAction, SIGNAL(toggled(bool)), m_proxyModel, SLOT(setShowLogs(bool)));
     m_showDebugButton->setDefaultAction(m_showDebugButtonAction);
 
@@ -120,7 +121,7 @@ QmlConsolePane::QmlConsolePane(QObject *parent)
     m_showWarningButtonAction->setSettingsKey(QLatin1String(CONSOLE), QLatin1String(SHOW_WARNING));
     m_showWarningButtonAction->setToolTip(tr("Show debug, log, and info messages."));
     m_showWarningButtonAction->setCheckable(true);
-    m_showWarningButtonAction->setIcon(QIcon(QLatin1String(":/qmljstools/images/warning.png")));
+    m_showWarningButtonAction->setIcon(QIcon(QLatin1String(Core::Constants::ICON_WARNING)));
     connect(m_showWarningButtonAction, SIGNAL(toggled(bool)), m_proxyModel,
             SLOT(setShowWarnings(bool)));
     m_showWarningButton->setDefaultAction(m_showWarningButtonAction);
@@ -133,7 +134,7 @@ QmlConsolePane::QmlConsolePane(QObject *parent)
     m_showErrorButtonAction->setSettingsKey(QLatin1String(CONSOLE), QLatin1String(SHOW_ERROR));
     m_showErrorButtonAction->setToolTip(tr("Show debug, log, and info messages."));
     m_showErrorButtonAction->setCheckable(true);
-    m_showErrorButtonAction->setIcon(QIcon(QLatin1String(":/qmljstools/images/error.png")));
+    m_showErrorButtonAction->setIcon(QIcon(QLatin1String(Core::Constants::ICON_ERROR)));
     connect(m_showErrorButtonAction, SIGNAL(toggled(bool)), m_proxyModel,
             SLOT(setShowErrors(bool)));
     m_showErrorButton->setDefaultAction(m_showErrorButtonAction);
diff --git a/src/plugins/qmljstools/qmljstools.qrc b/src/plugins/qmljstools/qmljstools.qrc
index 124a396169..45c345ece6 100644
--- a/src/plugins/qmljstools/qmljstools.qrc
+++ b/src/plugins/qmljstools/qmljstools.qrc
@@ -3,10 +3,7 @@
         <file>images/category_qml.png</file>
         <file>images/prompt.png</file>
         <file>images/collapse.png</file>
-        <file>images/warning.png</file>
-        <file>images/log.png</file>
         <file>images/expand.png</file>
-        <file>images/error.png</file>
         <file>QmlJSTools.mimetypes.xml</file>
     </qresource>
 </RCC>
diff --git a/src/plugins/qnx/bardescriptoreditorentrypointwidget.ui b/src/plugins/qnx/bardescriptoreditorentrypointwidget.ui
index 5811dd917b..f83b6bc72b 100644
--- a/src/plugins/qnx/bardescriptoreditorentrypointwidget.ui
+++ b/src/plugins/qnx/bardescriptoreditorentrypointwidget.ui
@@ -94,7 +94,7 @@
       <string/>
      </property>
      <property name="pixmap">
-      <pixmap resource="../projectexplorer/projectexplorer.qrc">:/projectexplorer/images/compile_warning.png</pixmap>
+      <pixmap resource="../coreplugin/core.qrc">:/core/images/warning.png</pixmap>
      </property>
     </widget>
    </item>
@@ -184,7 +184,7 @@
       <string/>
      </property>
      <property name="pixmap">
-      <pixmap resource="../projectexplorer/projectexplorer.qrc">:/projectexplorer/images/compile_warning.png</pixmap>
+      <pixmap resource="../coreplugin/core.qrc">:/core/images/warning.png</pixmap>
      </property>
     </widget>
    </item>
diff --git a/src/plugins/qnx/blackberrycreatepackagestepconfigwidget.ui b/src/plugins/qnx/blackberrycreatepackagestepconfigwidget.ui
index a277b2e856..41ebb3f1ef 100644
--- a/src/plugins/qnx/blackberrycreatepackagestepconfigwidget.ui
+++ b/src/plugins/qnx/blackberrycreatepackagestepconfigwidget.ui
@@ -188,7 +188,7 @@
          <string/>
         </property>
         <property name="pixmap">
-         <pixmap resource="../projectexplorer/projectexplorer.qrc">:/projectexplorer/images/compile_warning.png</pixmap>
+         <pixmap resource="../coreplugin/core.qrc">:/core/images/warning.png</pixmap>
         </property>
        </widget>
       </item>
diff --git a/src/plugins/qnx/blackberryndksettingswidget.cpp b/src/plugins/qnx/blackberryndksettingswidget.cpp
index 2a516963c3..ce5551469c 100644
--- a/src/plugins/qnx/blackberryndksettingswidget.cpp
+++ b/src/plugins/qnx/blackberryndksettingswidget.cpp
@@ -40,8 +40,8 @@
 
 #include <utils/pathchooser.h>
 
+#include <coreplugin/coreconstants.h>
 #include <coreplugin/icore.h>
-#include <projectexplorer/projectexplorerconstants.h>
 
 #include <QMessageBox>
 #include <QFileDialog>
@@ -52,7 +52,7 @@
 namespace Qnx {
 namespace Internal {
 
-static QIcon invalidConfigIcon(QString::fromLatin1(ProjectExplorer::Constants::ICON_ERROR));
+static QIcon invalidConfigIcon(QString::fromLatin1(Core::Constants::ICON_ERROR));
 
 BlackBerryNDKSettingsWidget::BlackBerryNDKSettingsWidget(QWidget *parent) :
     QWidget(parent),
diff --git a/src/plugins/qnx/blackberrypotentialkit.cpp b/src/plugins/qnx/blackberrypotentialkit.cpp
index a3db558601..dc1a91e647 100644
--- a/src/plugins/qnx/blackberrypotentialkit.cpp
+++ b/src/plugins/qnx/blackberrypotentialkit.cpp
@@ -34,8 +34,8 @@
 #include "blackberryapilevelconfiguration.h"
 #include "qnxconstants.h"
 
+#include <coreplugin/coreconstants.h>
 #include <coreplugin/icore.h>
-#include <projectexplorer/projectexplorerconstants.h>
 
 #include <QGridLayout>
 #include <QLabel>
@@ -87,7 +87,7 @@ BlackBerryPotentialKitWidget::BlackBerryPotentialKitWidget(QWidget *parent)
     : Utils::DetailsWidget(parent)
 {
     setSummaryText(tr("<b>BlackBerry has not been configured. Create BlackBerry kits.</b>"));
-    setIcon(QIcon(QLatin1String(ProjectExplorer::Constants::ICON_WARNING)));
+    setIcon(QIcon(QLatin1String(Core::Constants::ICON_WARNING)));
     QWidget *mainWidget = new QWidget(this);
     setWidget(mainWidget);
 
diff --git a/src/plugins/qnx/blackberrysetupwidget.cpp b/src/plugins/qnx/blackberrysetupwidget.cpp
index 911715510c..17284c9618 100644
--- a/src/plugins/qnx/blackberrysetupwidget.cpp
+++ b/src/plugins/qnx/blackberrysetupwidget.cpp
@@ -38,6 +38,7 @@
 #include "blackberrycertificate.h"
 #include "qnxconstants.h"
 
+#include <coreplugin/coreconstants.h>
 #include <projectexplorer/devicesupport/devicemanager.h>
 
 #include <QFileInfo>
@@ -94,13 +95,13 @@ void SetupItem::set(Status status, const QString &message, const QString &fixTex
         icon = Qnx::Constants::QNX_OK_ICON;
         break;
     case Info:
-        icon = Qnx::Constants::QNX_INFO_ICON;
+        icon = Core::Constants::ICON_INFO;
         break;
     case Warning:
-        icon = Qnx::Constants::QNX_WARNING_ICON;
+        icon = Core::Constants::ICON_WARNING;
         break;
     case Error:
-        icon = Qnx::Constants::QNX_ERROR_ICON;
+        icon = Core::Constants::ICON_ERROR;
         break;
     }
     m_icon->setPixmap(QPixmap(QLatin1String(icon)));
diff --git a/src/plugins/qnx/images/error.png b/src/plugins/qnx/images/error.png
deleted file mode 100644
index 0d49c16f43..0000000000
--- a/src/plugins/qnx/images/error.png
+++ /dev/null
diff --git a/src/plugins/qnx/images/info.png b/src/plugins/qnx/images/info.png
deleted file mode 100644
index 8d81e904ac..0000000000
--- a/src/plugins/qnx/images/info.png
+++ /dev/null
diff --git a/src/plugins/qnx/images/warning.png b/src/plugins/qnx/images/warning.png
deleted file mode 100644
index 934e4af507..0000000000
--- a/src/plugins/qnx/images/warning.png
+++ /dev/null
diff --git a/src/plugins/qnx/qnx.qrc b/src/plugins/qnx/qnx.qrc
index 0d50275c90..16047a4125 100644
--- a/src/plugins/qnx/qnx.qrc
+++ b/src/plugins/qnx/qnx.qrc
@@ -3,9 +3,6 @@
         <file>images/target-small.png</file>
         <file>images/target.png</file>
         <file>images/ok.png</file>
-        <file>images/info.png</file>
-        <file>images/warning.png</file>
-        <file>images/error.png</file>
         <file>images/qnx-target.png</file>
     </qresource>
     <qresource prefix="/"/>
diff --git a/src/plugins/qnx/qnxconstants.h b/src/plugins/qnx/qnxconstants.h
index eafc8b7842..768b6d069c 100644
--- a/src/plugins/qnx/qnxconstants.h
+++ b/src/plugins/qnx/qnxconstants.h
@@ -126,9 +126,6 @@ const char QNX_DEBUGGING_GROUP[] = "Debugger.Group.Qnx";
 const char QNX_BLACKBERRY_DEFAULT_DEPLOY_QT_BASEPATH[] = "/accounts/devuser/";
 
 const char QNX_OK_ICON[] = ":/qnx/images/ok.png";
-const char QNX_INFO_ICON[] = ":/qnx/images/info.png";
-const char QNX_WARNING_ICON[] = ":/qnx/images/warning.png";
-const char QNX_ERROR_ICON[] = ":/qnx/images/error.png";
 
 const char QNX_BLACKBERRY_SETUP_URL[] = "http://qt-project.org/wiki/Qt-Creator-with-BlackBerry-10";
 const char QNX_LEGACY_KEYS_URL[] = "https://developer.blackberry.com/native/documentation/core"
diff --git a/src/plugins/qtsupport/qtoptionspage.cpp b/src/plugins/qtsupport/qtoptionspage.cpp
index 7397f56f87..171ac83ab7 100644
--- a/src/plugins/qtsupport/qtoptionspage.cpp
+++ b/src/plugins/qtsupport/qtoptionspage.cpp
@@ -39,6 +39,7 @@
 #include "qmldumptool.h"
 
 #include <coreplugin/progressmanager/progressmanager.h>
+#include <coreplugin/coreconstants.h>
 #include <projectexplorer/toolchainmanager.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <utils/hostosinfo.h>
@@ -107,8 +108,8 @@ QtOptionsPageWidget::QtOptionsPageWidget(QWidget *parent)
     , m_versionUi(new Internal::Ui::QtVersionInfo())
     , m_debuggingHelperUi(new Internal::Ui::DebuggingHelper())
     , m_infoBrowser(new QTextBrowser)
-    , m_invalidVersionIcon(QLatin1String(ProjectExplorer::Constants::ICON_ERROR))
-    , m_warningVersionIcon(QLatin1String(ProjectExplorer::Constants::ICON_WARNING))
+    , m_invalidVersionIcon(QLatin1String(Core::Constants::ICON_ERROR))
+    , m_warningVersionIcon(QLatin1String(Core::Constants::ICON_WARNING))
     , m_configurationWidget(0)
     , m_autoItem(0)
     , m_manualItem(0)
diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp
index dd4f8c41e8..e97a4d3a78 100644
--- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp
+++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp
@@ -30,7 +30,7 @@
 #include "genericlinuxdeviceconfigurationwidget.h"
 #include "ui_genericlinuxdeviceconfigurationwidget.h"
 
-#include <projectexplorer/projectexplorerconstants.h>
+#include <coreplugin/coreconstants.h>
 #include <utils/portlist.h>
 #include <utils/fancylineedit.h>
 #include <ssh/sshconnection.h>
@@ -180,7 +180,7 @@ void GenericLinuxDeviceConfigurationWidget::initGui()
         m_ui->machineTypeValueLabel->setText(tr("Physical Device"));
     else
         m_ui->machineTypeValueLabel->setText(tr("Emulator"));
-    m_ui->portsWarningLabel->setPixmap(QPixmap(QLatin1String(ProjectExplorer::Constants::ICON_ERROR)));
+    m_ui->portsWarningLabel->setPixmap(QPixmap(QLatin1String(Core::Constants::ICON_ERROR)));
     m_ui->portsWarningLabel->setToolTip(QLatin1String("<font color=\"red\">")
         + tr("You will need at least one port.") + QLatin1String("</font>"));
     m_ui->keyFileLineEdit->setExpectedKind(PathChooser::File);
diff --git a/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.cpp b/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.cpp
index 17b8f95703..9ffc257b7a 100644
--- a/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.cpp
+++ b/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.cpp
@@ -30,6 +30,7 @@
 
 #include "remotelinuxrunconfiguration.h"
 
+#include <coreplugin/coreconstants.h>
 #include <utils/detailswidget.h>
 
 #include <QCoreApplication>
@@ -105,7 +106,7 @@ void RemoteLinuxRunConfigurationWidget::addDisabledLabel(QVBoxLayout *topLayout)
 {
     QHBoxLayout * const hl = new QHBoxLayout;
     hl->addStretch();
-    d->disabledIcon.setPixmap(QPixmap(QLatin1String(ProjectExplorer::Constants::ICON_WARNING)));
+    d->disabledIcon.setPixmap(QPixmap(QLatin1String(Core::Constants::ICON_WARNING)));
     hl->addWidget(&d->disabledIcon);
     d->disabledReason.setVisible(false);
     hl->addWidget(&d->disabledReason);
diff --git a/src/plugins/todo/constants.h b/src/plugins/todo/constants.h
index fbbe260f94..c3c488f0e8 100644
--- a/src/plugins/todo/constants.h
+++ b/src/plugins/todo/constants.h
@@ -43,12 +43,6 @@ const char COLOR_FIXME_BG[] = "#ffcccc";
 const char COLOR_BUG_BG[] = "#ffcccc";
 const char COLOR_NOTE_BG[] = "#e0ebff";
 
-// Todo item icons
-
-// http://en.wikipedia.org/wiki/File:Information_icon_with_gradient_background.svg,
-// public domain, tuned a bit
-const char ICON_INFO[] = ":/todoplugin/images/info.png";
-
 // Dummy, needs to be changed
 const char ICON_TODO[] = ":/todoplugin/images/todo.png";
 
diff --git a/src/plugins/todo/images/info.png b/src/plugins/todo/images/info.png
deleted file mode 100755
index 5c800c3ce6..0000000000
--- a/src/plugins/todo/images/info.png
+++ /dev/null
diff --git a/src/plugins/todo/keyworddialog.cpp b/src/plugins/todo/keyworddialog.cpp
index f738f7bb47..03b3332a38 100644
--- a/src/plugins/todo/keyworddialog.cpp
+++ b/src/plugins/todo/keyworddialog.cpp
@@ -34,7 +34,7 @@
 #include "constants.h"
 #include "lineparser.h"
 
-#include <projectexplorer/projectexplorerconstants.h>
+#include <coreplugin/coreconstants.h>
 
 #include <QColorDialog>
 
@@ -87,19 +87,19 @@ void KeywordDialog::setupListWidget(const QString &selectedIcon)
 {
     ui->listWidget->setViewMode(QListWidget::IconMode);
     ui->listWidget->setDragEnabled(false);
-    const QString infoIconName = QLatin1String(Constants::ICON_INFO);
+    const QString infoIconName = QLatin1String(Core::Constants::ICON_INFO);
     QListWidgetItem *item = new QListWidgetItem(QIcon(infoIconName),
                                                 QLatin1String("information"));
     item->setData(Qt::UserRole, infoIconName);
     ui->listWidget->addItem(item);
 
-    const QString warningIconName = QLatin1String(ProjectExplorer::Constants::ICON_WARNING);
+    const QString warningIconName = QLatin1String(Core::Constants::ICON_WARNING);
     item = new QListWidgetItem(QIcon(warningIconName),
                                QLatin1String("warning"));
     item->setData(Qt::UserRole, warningIconName);
     ui->listWidget->addItem(item);
 
-    const QString errorIconName = QLatin1String(ProjectExplorer::Constants::ICON_ERROR);
+    const QString errorIconName = QLatin1String(Core::Constants::ICON_ERROR);
     item = new QListWidgetItem(QIcon(errorIconName),
                                QLatin1String("error"));
     item->setData(Qt::UserRole, errorIconName);
diff --git a/src/plugins/todo/settings.cpp b/src/plugins/todo/settings.cpp
index e3a2b1ca5e..16e855ee79 100644
--- a/src/plugins/todo/settings.cpp
+++ b/src/plugins/todo/settings.cpp
@@ -31,7 +31,7 @@
 #include "settings.h"
 #include "constants.h"
 
-#include <projectexplorer/projectexplorerconstants.h>
+#include <coreplugin/coreconstants.h>
 
 #include <QSettings>
 
@@ -100,27 +100,27 @@ void Settings::setDefault()
     Keyword keyword;
 
     keyword.name = QLatin1String("TODO");
-    keyword.iconResource = QLatin1String(ProjectExplorer::Constants::ICON_WARNING);
+    keyword.iconResource = QLatin1String(Core::Constants::ICON_WARNING);
     keyword.color = QColor(QLatin1String(Constants::COLOR_TODO_BG));
     keywords.append(keyword);
 
     keyword.name = QLatin1String("NOTE");
-    keyword.iconResource = QLatin1String(Constants::ICON_INFO);
+    keyword.iconResource = QLatin1String(Core::Constants::ICON_INFO);
     keyword.color = QColor(QLatin1String(Constants::COLOR_NOTE_BG));
     keywords.append(keyword);
 
     keyword.name = QLatin1String("FIXME");
-    keyword.iconResource = QLatin1String(ProjectExplorer::Constants::ICON_ERROR);
+    keyword.iconResource = QLatin1String(Core::Constants::ICON_ERROR);
     keyword.color = QColor(QLatin1String(Constants::COLOR_FIXME_BG));
     keywords.append(keyword);
 
     keyword.name = QLatin1String("BUG");
-    keyword.iconResource = QLatin1String(ProjectExplorer::Constants::ICON_ERROR);
+    keyword.iconResource = QLatin1String(Core::Constants::ICON_ERROR);
     keyword.color = QColor(QLatin1String(Constants::COLOR_BUG_BG));
     keywords.append(keyword);
 
     keyword.name = QLatin1String("WARNING");
-    keyword.iconResource = QLatin1String(ProjectExplorer::Constants::ICON_WARNING);
+    keyword.iconResource = QLatin1String(Core::Constants::ICON_WARNING);
     keyword.color = QColor(QLatin1String(Constants::COLOR_WARNING_BG));
     keywords.append(keyword);
 }
diff --git a/src/plugins/todo/todoplugin.qrc b/src/plugins/todo/todoplugin.qrc
index a7d1a2c239..ac97a96943 100644
--- a/src/plugins/todo/todoplugin.qrc
+++ b/src/plugins/todo/todoplugin.qrc
@@ -1,6 +1,5 @@
 <RCC>
     <qresource prefix="/todoplugin">
         <file>images/todo.png</file>
-        <file>images/info.png</file>
     </qresource>
 </RCC>