Icons: Move "next/prev", "[un]locked" and "zoom" from Core to Utils

They are needed in the timeline view.
The change in qtcreator-project.qdocconf makes sure
that qdoc still finds the referenced icons.

Change-Id: I812fba8e57d06d93efc00c295467c83c08cd1784
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>

30 files changed, 73 insertions, 71 deletions

diff --git a/doc/config/qtcreator-project.qdocconf b/doc/config/qtcreator-project.qdocconf
index 401563e7abd..50986a4c4bf 100644
--- a/doc/config/qtcreator-project.qdocconf
+++ b/doc/config/qtcreator-project.qdocconf
@@ -7,6 +7,7 @@ sourcedirs = $SRCDIR/src
 imagedirs = $SRCDIR/images \
             $SRCDIR/templates/images \
             $SRCDIR/../src/libs/qmleditorwidgets/images \
+            $SRCDIR/../src/libs/utils/images \
             $SRCDIR/../src/plugins/android/images \
             $SRCDIR/../src/plugins/autotest/images \
             $SRCDIR/../src/plugins/classview/images \
diff --git a/src/plugins/coreplugin/images/locked.png b/src/libs/utils/images/locked.png
index 7ce4f1f3599..7ce4f1f3599 100644
--- a/src/plugins/coreplugin/images/locked.png
+++ b/src/libs/utils/images/locked.png
diff --git a/src/plugins/coreplugin/images/locked@2x.png b/src/libs/utils/images/locked@2x.png
index d40ae60040f..d40ae60040f 100644
--- a/src/plugins/coreplugin/images/locked@2x.png
+++ b/src/libs/utils/images/locked@2x.png
diff --git a/src/plugins/coreplugin/images/next.png b/src/libs/utils/images/next.png
index 5ab267510e6..5ab267510e6 100644
--- a/src/plugins/coreplugin/images/next.png
+++ b/src/libs/utils/images/next.png
diff --git a/src/plugins/coreplugin/images/next@2x.png b/src/libs/utils/images/next@2x.png
index 47af6478750..47af6478750 100644
--- a/src/plugins/coreplugin/images/next@2x.png
+++ b/src/libs/utils/images/next@2x.png
diff --git a/src/plugins/coreplugin/images/prev.png b/src/libs/utils/images/prev.png
index c9bd18a7de6..c9bd18a7de6 100644
--- a/src/plugins/coreplugin/images/prev.png
+++ b/src/libs/utils/images/prev.png
diff --git a/src/plugins/coreplugin/images/prev@2x.png b/src/libs/utils/images/prev@2x.png
index 6c5114bc84b..6c5114bc84b 100644
--- a/src/plugins/coreplugin/images/prev@2x.png
+++ b/src/libs/utils/images/prev@2x.png
diff --git a/src/plugins/coreplugin/images/unlocked.png b/src/libs/utils/images/unlocked.png
index a281db1a8c9..a281db1a8c9 100644
--- a/src/plugins/coreplugin/images/unlocked.png
+++ b/src/libs/utils/images/unlocked.png
diff --git a/src/plugins/coreplugin/images/unlocked@2x.png b/src/libs/utils/images/unlocked@2x.png
index 4867e1568eb..4867e1568eb 100644
--- a/src/plugins/coreplugin/images/unlocked@2x.png
+++ b/src/libs/utils/images/unlocked@2x.png
diff --git a/src/plugins/coreplugin/images/zoom.png b/src/libs/utils/images/zoom.png
index a3e9dd0b6be..a3e9dd0b6be 100644
--- a/src/plugins/coreplugin/images/zoom.png
+++ b/src/libs/utils/images/zoom.png
diff --git a/src/plugins/coreplugin/images/zoom@2x.png b/src/libs/utils/images/zoom@2x.png
index 96976de58bd..96976de58bd 100644
--- a/src/plugins/coreplugin/images/zoom@2x.png
+++ b/src/libs/utils/images/zoom@2x.png
diff --git a/src/libs/utils/utils.qrc b/src/libs/utils/utils.qrc
index 4bbc0be8b3a..035389c93b1 100644
--- a/src/libs/utils/utils.qrc
+++ b/src/libs/utils/utils.qrc
@@ -14,6 +14,16 @@
         <file>images/progressindicator_small.png</file>
         <file>images/progressindicator_small@2x.png</file>
         <file>images/triangle_vert.png</file>
+        <file>images/next.png</file>
+        <file>images/next@2x.png</file>
+        <file>images/prev.png</file>
+        <file>images/prev@2x.png</file>
+        <file>images/zoom.png</file>
+        <file>images/zoom@2x.png</file>
         <file>tooltip/images/f1.png</file>
+        <file>images/locked.png</file>
+        <file>images/locked@2x.png</file>
+        <file>images/unlocked.png</file>
+        <file>images/unlocked@2x.png</file>
     </qresource>
 </RCC>
diff --git a/src/libs/utils/utilsicons.h b/src/libs/utils/utilsicons.h
index bf481e9b4f6..601907c2b0b 100644
--- a/src/libs/utils/utilsicons.h
+++ b/src/libs/utils/utilsicons.h
@@ -32,6 +32,24 @@ namespace Icons {
 
 const Utils::Icon EDIT_CLEAR({
         {QLatin1String(":/core/images/editclear.png"), Utils::Theme::PanelTextColorMid}}, Utils::Icon::Tint);
+const Utils::Icon LOCKED_TOOLBAR({
+        {QLatin1String(":/utils/images/locked.png"), Utils::Theme::IconsBaseColor}});
+const Utils::Icon LOCKED({
+        {QLatin1String(":/utils/images/locked.png"), Utils::Theme::PanelTextColorDark}}, Icon::Tint);
+const Utils::Icon UNLOCKED_TOOLBAR({
+        {QLatin1String(":/utils/images/unlocked.png"), Utils::Theme::IconsBaseColor}});
+const Utils::Icon NEXT({
+        {QLatin1String(":/utils/images/next.png"), Utils::Theme::IconsWarningColor}}, Utils::Icon::MenuTintedStyle);
+const Utils::Icon NEXT_TOOLBAR({
+        {QLatin1String(":/utils/images/next.png"), Utils::Theme::IconsNavigationArrowsColor}});
+const Utils::Icon PREV({
+        {QLatin1String(":/utils/images/prev.png"), Utils::Theme::IconsWarningColor}}, Utils::Icon::MenuTintedStyle);
+const Utils::Icon PREV_TOOLBAR({
+        {QLatin1String(":/utils/images/prev.png"), Utils::Theme::IconsNavigationArrowsColor}});
+const Utils::Icon ZOOM({
+        {QLatin1String(":/utils/images/zoom.png"), Utils::Theme::PanelTextColorMid}}, Utils::Icon::Tint);
+const Utils::Icon ZOOM_TOOLBAR({
+        {QLatin1String(":/utils/images/zoom.png"), Utils::Theme::IconsBaseColor}});
 
 } // namespace Icons
 } // namespace Utils
diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzertool.cpp b/src/plugins/clangstaticanalyzer/clangstaticanalyzertool.cpp
index 89df4c56bfb..745651461a9 100644
--- a/src/plugins/clangstaticanalyzer/clangstaticanalyzertool.cpp
+++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzertool.cpp
@@ -33,7 +33,6 @@
 
 #include <debugger/analyzer/analyzermanager.h>
 #include <coreplugin/coreconstants.h>
-#include <coreplugin/coreicons.h>
 #include <coreplugin/icore.h>
 #include <cpptools/cppmodelmanager.h>
 #include <projectexplorer/buildconfiguration.h>
@@ -44,6 +43,7 @@
 
 #include <utils/checkablemessagebox.h>
 #include <utils/fancymainwindow.h>
+#include <utils/utilsicons.h>
 
 #include <QAction>
 #include <QDockWidget>
@@ -123,7 +123,7 @@ ClangStaticAnalyzerTool::ClangStaticAnalyzerTool(QObject *parent)
     // Go to previous diagnostic
     auto action = new QAction(this);
     action->setDisabled(true);
-    action->setIcon(Core::Icons::PREV_TOOLBAR.icon());
+    action->setIcon(Utils::Icons::PREV_TOOLBAR.icon());
     action->setToolTip(tr("Go to previous bug."));
     connect(action, &QAction::triggered, m_diagnosticView, &DetailedErrorView::goBack);
     m_goBack = action;
@@ -131,7 +131,7 @@ ClangStaticAnalyzerTool::ClangStaticAnalyzerTool(QObject *parent)
     // Go to next diagnostic
     action = new QAction(this);
     action->setDisabled(true);
-    action->setIcon(Core::Icons::NEXT_TOOLBAR.icon());
+    action->setIcon(Utils::Icons::NEXT_TOOLBAR.icon());
     action->setToolTip(tr("Go to next bug."));
     connect(action, &QAction::triggered, m_diagnosticView, &DetailedErrorView::goNext);
     m_goNext = action;
diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc
index be8904f44d1..a2c3b8ee4b4 100644
--- a/src/plugins/coreplugin/core.qrc
+++ b/src/plugins/coreplugin/core.qrc
@@ -23,14 +23,10 @@
         <file>images/close@2x.png</file>
         <file>images/linkicon.png</file>
         <file>images/linkicon@2x.png</file>
-        <file>images/locked.png</file>
-        <file>images/locked@2x.png</file>
         <file>images/magnifier.png</file>
         <file>images/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>
@@ -43,8 +39,6 @@
         <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/redo.png</file>
         <file>images/replace.png</file>
         <file>images/reset.png</file>
@@ -54,8 +48,6 @@
         <file>images/splitbutton_horizontal@2x.png</file>
         <file>images/undo.png</file>
         <file>images/unknownfile.png</file>
-        <file>images/unlocked.png</file>
-        <file>images/unlocked@2x.png</file>
         <file>images/extension.png</file>
         <file>images/extension@2x.png</file>
         <file>images/category_core.png</file>
@@ -98,8 +90,6 @@
         <file>images/dark_fileicon.png</file>
         <file>images/dark_foldericon.png</file>
         <file>images/Desktop.png</file>
-        <file>images/zoom.png</file>
-        <file>images/zoom@2x.png</file>
         <file>images/interrupt_small.png</file>
         <file>images/interrupt_small@2x.png</file>
         <file>images/run_small.png</file>
diff --git a/src/plugins/coreplugin/coreicons.cpp b/src/plugins/coreplugin/coreicons.cpp
index 0638c3d023e..56fea1b9930 100644
--- a/src/plugins/coreplugin/coreicons.cpp
+++ b/src/plugins/coreplugin/coreicons.cpp
@@ -56,12 +56,6 @@ const Icon RESET_TOOLBAR({
         {QLatin1String(":/core/images/reset.png"), Theme::IconsBaseColor}});
 const Icon DARK_CLOSE(
         QLatin1String(":/core/images/darkclose.png"));
-const Icon LOCKED_TOOLBAR({
-        {QLatin1String(":/core/images/locked.png"), Theme::IconsBaseColor}});
-const Icon LOCKED({
-        {QLatin1String(":/core/images/locked.png"), Theme::PanelTextColorDark}}, Icon::Tint);
-const Icon UNLOCKED_TOOLBAR({
-        {QLatin1String(":/core/images/unlocked.png"), Theme::IconsBaseColor}});
 const Icon FIND_CASE_INSENSITIVELY(
         QLatin1String(":/find/images/casesensitively.png"));
 const Icon FIND_WHOLE_WORD(
@@ -81,14 +75,6 @@ const Icon MINUS({
         {QLatin1String(":/core/images/minus.png"), Theme::IconsBaseColor}});
 const Icon PLUS({
         {QLatin1String(":/core/images/plus.png"), Theme::IconsBaseColor}});
-const Icon NEXT({
-        {QLatin1String(":/core/images/next.png"), Theme::IconsWarningColor}}, Icon::MenuTintedStyle);
-const Icon NEXT_TOOLBAR({
-        {QLatin1String(":/core/images/next.png"), Theme::IconsNavigationArrowsColor}});
-const Icon PREV({
-        {QLatin1String(":/core/images/prev.png"), Theme::IconsWarningColor}}, Icon::MenuTintedStyle);
-const Icon PREV_TOOLBAR({
-        {QLatin1String(":/core/images/prev.png"), Theme::IconsNavigationArrowsColor}});
 const Icon MAGNIFIER({
         {QLatin1String(":/core/images/magnifier.png"), Theme::PanelTextColorMid}}, Icon::Tint);
 const Icon CLEAN({
@@ -146,10 +132,6 @@ const Icon INFO_TOOLBAR({
         {QLatin1String(":/core/images/info.png"), Theme::IconsInfoToolBarColor}});
 const Icon EXPAND({
         {QLatin1String(":/find/images/expand.png"), Theme::IconsBaseColor}});
-const Icon ZOOM({
-        {QLatin1String(":/core/images/zoom.png"), Theme::PanelTextColorMid}}, Icon::Tint);
-const Icon ZOOM_TOOLBAR({
-        {QLatin1String(":/core/images/zoom.png"), Theme::IconsBaseColor}});
 const Icon TOOLBAR_EXTENSION({
         {QLatin1String(":/core/images/extension.png"), Theme::IconsBaseColor}});
 const Utils::Icon RUN_SMALL({
diff --git a/src/plugins/coreplugin/coreicons.h b/src/plugins/coreplugin/coreicons.h
index bd28a5194a1..dbf956e123c 100644
--- a/src/plugins/coreplugin/coreicons.h
+++ b/src/plugins/coreplugin/coreicons.h
@@ -45,9 +45,6 @@ CORE_EXPORT extern const Utils::Icon DIR;
 CORE_EXPORT extern const Utils::Icon RESET;
 CORE_EXPORT extern const Utils::Icon RESET_TOOLBAR;
 CORE_EXPORT extern const Utils::Icon DARK_CLOSE;
-CORE_EXPORT extern const Utils::Icon LOCKED_TOOLBAR;
-CORE_EXPORT extern const Utils::Icon LOCKED;
-CORE_EXPORT extern const Utils::Icon UNLOCKED_TOOLBAR;
 CORE_EXPORT extern const Utils::Icon FIND_CASE_INSENSITIVELY;
 CORE_EXPORT extern const Utils::Icon FIND_WHOLE_WORD;
 CORE_EXPORT extern const Utils::Icon FIND_REGEXP;
@@ -58,10 +55,6 @@ CORE_EXPORT extern const Utils::Icon ARROW_UP;
 CORE_EXPORT extern const Utils::Icon ARROW_DOWN;
 CORE_EXPORT extern const Utils::Icon MINUS;
 CORE_EXPORT extern const Utils::Icon PLUS;
-CORE_EXPORT extern const Utils::Icon NEXT;
-CORE_EXPORT extern const Utils::Icon NEXT_TOOLBAR;
-CORE_EXPORT extern const Utils::Icon PREV;
-CORE_EXPORT extern const Utils::Icon PREV_TOOLBAR;
 CORE_EXPORT extern const Utils::Icon MAGNIFIER;
 CORE_EXPORT extern const Utils::Icon CLEAN;
 CORE_EXPORT extern const Utils::Icon CLEAN_TOOLBAR;
@@ -89,8 +82,6 @@ CORE_EXPORT extern const Utils::Icon ERROR_TASKBAR;
 CORE_EXPORT extern const Utils::Icon INFO;
 CORE_EXPORT extern const Utils::Icon INFO_TOOLBAR;
 CORE_EXPORT extern const Utils::Icon EXPAND;
-CORE_EXPORT extern const Utils::Icon ZOOM;
-CORE_EXPORT extern const Utils::Icon ZOOM_TOOLBAR;
 CORE_EXPORT extern const Utils::Icon TOOLBAR_EXTENSION;
 CORE_EXPORT extern const Utils::Icon RUN_SMALL;
 CORE_EXPORT extern const Utils::Icon RUN_SMALL_TOOLBAR;
diff --git a/src/plugins/coreplugin/editormanager/documentmodel.cpp b/src/plugins/coreplugin/editormanager/documentmodel.cpp
index 4dbe7746c84..f72da54e586 100644
--- a/src/plugins/coreplugin/editormanager/documentmodel.cpp
+++ b/src/plugins/coreplugin/editormanager/documentmodel.cpp
@@ -27,12 +27,12 @@
 #include "ieditor.h"
 #include <coreplugin/documentmanager.h>
 #include <coreplugin/idocument.h>
-#include <coreplugin/coreicons.h>
 
 #include <utils/algorithm.h>
 #include <utils/dropsupport.h>
 #include <utils/hostosinfo.h>
 #include <utils/qtcassert.h>
+#include <utils/utilsicons.h>
 
 #include <QAbstractItemModel>
 #include <QDir>
@@ -329,7 +329,7 @@ bool DocumentModelPrivate::disambiguateDisplayNames(DocumentModel::Entry *entry)
 
 QIcon DocumentModelPrivate::lockedIcon()
 {
-    const static QIcon icon = Icons::LOCKED.icon();
+    const static QIcon icon = Utils::Icons::LOCKED.icon();
     return icon;
 }
 
diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index 8ecb34cc802..8719936d2f3 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -68,6 +68,7 @@
 #include <utils/mimetypes/mimetype.h>
 #include <utils/qtcassert.h>
 #include <utils/overridecursor.h>
+#include <utils/utilsicons.h>
 
 #include <QClipboard>
 #include <QDateTime>
@@ -201,8 +202,8 @@ EditorManagerPrivate::EditorManagerPrivate(QObject *parent) :
     m_closeAllEditorsExceptVisibleAction(new QAction(EditorManager::tr("Close All Except Visible"), this)),
     m_gotoNextDocHistoryAction(new QAction(EditorManager::tr("Next Open Document in History"), this)),
     m_gotoPreviousDocHistoryAction(new QAction(EditorManager::tr("Previous Open Document in History"), this)),
-    m_goBackAction(new QAction(Icons::PREV.icon(), EditorManager::tr("Go Back"), this)),
-    m_goForwardAction(new QAction(Icons::NEXT.icon(), EditorManager::tr("Go Forward"), this)),
+    m_goBackAction(new QAction(Utils::Icons::PREV.icon(), EditorManager::tr("Go Back"), this)),
+    m_goForwardAction(new QAction(Utils::Icons::NEXT.icon(), EditorManager::tr("Go Forward"), this)),
     m_copyFilePathContextAction(new QAction(EditorManager::tr("Copy Full Path"), this)),
     m_copyLocationContextAction(new QAction(EditorManager::tr("Copy Path and Line Number"), this)),
     m_copyFileNameContextAction(new QAction(EditorManager::tr("Copy File Name"), this)),
diff --git a/src/plugins/coreplugin/editortoolbar.cpp b/src/plugins/coreplugin/editortoolbar.cpp
index ce4b8f991d7..c7425849770 100644
--- a/src/plugins/coreplugin/editortoolbar.cpp
+++ b/src/plugins/coreplugin/editortoolbar.cpp
@@ -38,6 +38,7 @@
 #include <utils/fileutils.h>
 #include <utils/hostosinfo.h>
 #include <utils/qtcassert.h>
+#include <utils/utilsicons.h>
 
 #include <QApplication>
 #include <QComboBox>
@@ -94,8 +95,8 @@ EditorToolBarPrivate::EditorToolBarPrivate(QWidget *parent, EditorToolBar *q) :
     m_lockButton(new QToolButton(q)),
     m_dragHandle(new QToolButton(q)),
     m_dragHandleMenu(0),
-    m_goBackAction(new QAction(Icons::PREV_TOOLBAR.icon(), EditorManager::tr("Go Back"), parent)),
-    m_goForwardAction(new QAction(Icons::NEXT_TOOLBAR.icon(), EditorManager::tr("Go Forward"), parent)),
+    m_goBackAction(new QAction(Utils::Icons::PREV_TOOLBAR.icon(), EditorManager::tr("Go Back"), parent)),
+    m_goForwardAction(new QAction(Utils::Icons::NEXT_TOOLBAR.icon(), EditorManager::tr("Go Forward"), parent)),
     m_backButton(new QToolButton(q)),
     m_forwardButton(new QToolButton(q)),
     m_splitButton(new QToolButton(q)),
@@ -413,12 +414,12 @@ void EditorToolBar::updateDocumentStatus(IDocument *document)
         d->m_lockButton->setEnabled(false);
         d->m_lockButton->setToolTip(QString());
     } else if (document->isFileReadOnly()) {
-        const static QIcon locked = Icons::LOCKED_TOOLBAR.icon();
+        const static QIcon locked = Utils::Icons::LOCKED_TOOLBAR.icon();
         d->m_lockButton->setIcon(locked);
         d->m_lockButton->setEnabled(true);
         d->m_lockButton->setToolTip(tr("Make Writable"));
     } else {
-        const static QIcon unlocked = Icons::UNLOCKED_TOOLBAR.icon();
+        const static QIcon unlocked = Utils::Icons::UNLOCKED_TOOLBAR.icon();
         d->m_lockButton->setIcon(unlocked);
         d->m_lockButton->setEnabled(false);
         d->m_lockButton->setToolTip(tr("File is writable"));
diff --git a/src/plugins/coreplugin/find/findtoolbar.cpp b/src/plugins/coreplugin/find/findtoolbar.cpp
index 6e4ee65a6d4..3159843f9f1 100644
--- a/src/plugins/coreplugin/find/findtoolbar.cpp
+++ b/src/plugins/coreplugin/find/findtoolbar.cpp
@@ -42,6 +42,7 @@
 #include <utils/qtcassert.h>
 #include <utils/stylehelper.h>
 #include <utils/theme/theme.h>
+#include <utils/utilsicons.h>
 
 #include <QDebug>
 #include <QSettings>
@@ -962,9 +963,9 @@ void FindToolBar::setLightColoredIcon(bool lightColored)
         m_ui.findPreviousButton->setArrowType(Qt::LeftArrow);
         m_ui.close->setIcon(Icons::CLOSE_FOREGROUND.icon());
     } else {
-        m_ui.findNextButton->setIcon(Icons::NEXT_TOOLBAR.icon());
+        m_ui.findNextButton->setIcon(Utils::Icons::NEXT_TOOLBAR.icon());
         m_ui.findNextButton->setArrowType(Qt::NoArrow);
-        m_ui.findPreviousButton->setIcon(Icons::PREV_TOOLBAR.icon());
+        m_ui.findPreviousButton->setIcon(Utils::Icons::PREV_TOOLBAR.icon());
         m_ui.findPreviousButton->setArrowType(Qt::NoArrow);
         m_ui.close->setIcon(Icons::CLOSE_TOOLBAR.icon());
     }
diff --git a/src/plugins/coreplugin/locator/locatorfiltersfilter.cpp b/src/plugins/coreplugin/locator/locatorfiltersfilter.cpp
index c09ba186e6f..ae61898aeac 100644
--- a/src/plugins/coreplugin/locator/locatorfiltersfilter.cpp
+++ b/src/plugins/coreplugin/locator/locatorfiltersfilter.cpp
@@ -27,8 +27,8 @@
 #include "locatorfiltersfilter.h"
 #include "locatorwidget.h"
 
-#include <coreplugin/coreicons.h>
 #include <utils/qtcassert.h>
+#include <utils/utilsicons.h>
 
 using namespace Core;
 using namespace Core::Internal;
@@ -39,7 +39,7 @@ LocatorFiltersFilter::LocatorFiltersFilter(Locator *plugin,
                                                LocatorWidget *locatorWidget):
     m_plugin(plugin),
     m_locatorWidget(locatorWidget),
-    m_icon(Icons::NEXT.icon())
+    m_icon(Utils::Icons::NEXT.icon())
 {
     setId("FiltersFilter");
     setDisplayName(tr("Available filters"));
diff --git a/src/plugins/coreplugin/locator/locatorwidget.cpp b/src/plugins/coreplugin/locator/locatorwidget.cpp
index 4bcb5b59955..f7af2296ae2 100644
--- a/src/plugins/coreplugin/locator/locatorwidget.cpp
+++ b/src/plugins/coreplugin/locator/locatorwidget.cpp
@@ -43,6 +43,7 @@
 #include <utils/qtcassert.h>
 #include <utils/runextensions.h>
 #include <utils/stylehelper.h>
+#include <utils/utilsicons.h>
 
 #include <QColor>
 #include <QFileInfo>
@@ -248,7 +249,7 @@ LocatorWidget::LocatorWidget(Locator *qop) :
     layout->setMargin(0);
     layout->addWidget(m_fileLineEdit);
 
-    setWindowIcon(Icons::ZOOM.icon());
+    setWindowIcon(Utils::Icons::ZOOM.icon());
     const QPixmap pixmap = Icons::MAGNIFIER.pixmap();
     m_fileLineEdit->setFiltering(true);
     m_fileLineEdit->setButtonPixmap(Utils::FancyLineEdit::Left, pixmap);
diff --git a/src/plugins/coreplugin/outputpanemanager.cpp b/src/plugins/coreplugin/outputpanemanager.cpp
index b7f372ed124..07e234fbf9d 100644
--- a/src/plugins/coreplugin/outputpanemanager.cpp
+++ b/src/plugins/coreplugin/outputpanemanager.cpp
@@ -47,6 +47,7 @@
 #include <utils/proxyaction.h>
 #include <utils/qtcassert.h>
 #include <utils/theme/theme.h>
+#include <utils/utilsicons.h>
 
 #include <QDebug>
 
@@ -146,12 +147,12 @@ OutputPaneManager::OutputPaneManager(QWidget *parent) :
     connect(m_clearAction, &QAction::triggered, this, &OutputPaneManager::clearPage);
 
     m_nextAction = new QAction(this);
-    m_nextAction->setIcon(Icons::NEXT.icon());
+    m_nextAction->setIcon(Utils::Icons::NEXT.icon());
     m_nextAction->setText(tr("Next Item"));
     connect(m_nextAction, &QAction::triggered, this, &OutputPaneManager::slotNext);
 
     m_prevAction = new QAction(this);
-    m_prevAction->setIcon(Icons::PREV.icon());
+    m_prevAction->setIcon(Utils::Icons::PREV.icon());
     m_prevAction->setText(tr("Previous Item"));
     connect(m_prevAction, &QAction::triggered, this, &OutputPaneManager::slotPrev);
 
@@ -234,12 +235,12 @@ void OutputPaneManager::init()
     cmd = ActionManager::registerAction(m_prevAction, "Coreplugin.OutputPane.previtem");
     cmd->setDefaultKeySequence(QKeySequence(tr("Shift+F6")));
     m_prevToolButton->setDefaultAction(
-                ProxyAction::proxyActionWithIcon(cmd->action(), Icons::PREV_TOOLBAR.icon()));
+                ProxyAction::proxyActionWithIcon(cmd->action(), Utils::Icons::PREV_TOOLBAR.icon()));
     mpanes->addAction(cmd, "Coreplugin.OutputPane.ActionsGroup");
 
     cmd = ActionManager::registerAction(m_nextAction, "Coreplugin.OutputPane.nextitem");
     m_nextToolButton->setDefaultAction(
-                ProxyAction::proxyActionWithIcon(cmd->action(), Icons::NEXT_TOOLBAR.icon()));
+                ProxyAction::proxyActionWithIcon(cmd->action(), Utils::Icons::NEXT_TOOLBAR.icon()));
     cmd->setDefaultKeySequence(QKeySequence(tr("F6")));
     mpanes->addAction(cmd, "Coreplugin.OutputPane.ActionsGroup");
 
diff --git a/src/plugins/help/helpwidget.cpp b/src/plugins/help/helpwidget.cpp
index ff39e9503c7..7e81ce4d913 100644
--- a/src/plugins/help/helpwidget.cpp
+++ b/src/plugins/help/helpwidget.cpp
@@ -49,6 +49,7 @@
 #include <texteditor/texteditorconstants.h>
 #include <utils/qtcassert.h>
 #include <utils/styledbar.h>
+#include <utils/utilsicons.h>
 
 #include <QCoreApplication>
 #include <QHBoxLayout>
@@ -164,7 +165,7 @@ HelpWidget::HelpWidget(const Core::Context &context, WidgetStyle style, QWidget
     connect(m_homeAction, &QAction::triggered, this, &HelpWidget::goHome);
     layout->addWidget(Core::Command::toolButtonWithAppendedShortcut(m_homeAction, cmd));
 
-    m_backAction = new QAction(Core::Icons::PREV_TOOLBAR.icon(), tr("Back"), toolBar);
+    m_backAction = new QAction(Utils::Icons::PREV_TOOLBAR.icon(), tr("Back"), toolBar);
     connect(m_backAction, &QAction::triggered, this, &HelpWidget::backward);
     m_backMenu = new QMenu(toolBar);
     connect(m_backMenu, &QMenu::aboutToShow, this, &HelpWidget::updateBackMenu);
@@ -175,7 +176,7 @@ HelpWidget::HelpWidget(const Core::Context &context, WidgetStyle style, QWidget
     button->setPopupMode(QToolButton::DelayedPopup);
     layout->addWidget(button);
 
-    m_forwardAction = new QAction(Core::Icons::NEXT_TOOLBAR.icon(), tr("Forward"), toolBar);
+    m_forwardAction = new QAction(Utils::Icons::NEXT_TOOLBAR.icon(), tr("Forward"), toolBar);
     connect(m_forwardAction, &QAction::triggered, this, &HelpWidget::forward);
     m_forwardMenu = new QMenu(toolBar);
     connect(m_forwardMenu, &QMenu::aboutToShow, this, &HelpWidget::updateForwardMenu);
diff --git a/src/plugins/imageviewer/imageviewer.cpp b/src/plugins/imageviewer/imageviewer.cpp
index f5e3cb503cb..cb735933a81 100644
--- a/src/plugins/imageviewer/imageviewer.cpp
+++ b/src/plugins/imageviewer/imageviewer.cpp
@@ -36,6 +36,7 @@
 #include <coreplugin/actionmanager/command.h>
 #include <utils/fileutils.h>
 #include <utils/qtcassert.h>
+#include <utils/utilsicons.h>
 
 #include <QMap>
 #include <QFileInfo>
@@ -108,7 +109,7 @@ void ImageViewer::ctor()
     d->ui_toolbar.toolButtonOutline->setIcon(Core::Icons::BOUNDING_RECT.icon());
     d->ui_toolbar.toolButtonZoomIn->setIcon(Core::Icons::PLUS.icon());
     d->ui_toolbar.toolButtonZoomOut->setIcon(Core::Icons::MINUS.icon());
-    d->ui_toolbar.toolButtonFitToScreen->setIcon(Core::Icons::ZOOM_TOOLBAR.icon());
+    d->ui_toolbar.toolButtonFitToScreen->setIcon(Utils::Icons::ZOOM_TOOLBAR.icon());
     d->ui_toolbar.toolButtonOriginalSize->setIcon(Core::Icons::EYE_OPEN_TOOLBAR.icon());
     // icons update - try to use system theme
     updateButtonIconByTheme(d->ui_toolbar.toolButtonZoomIn, QLatin1String("zoom-in"));
diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp
index e290961338d..8ba2e59b3cb 100644
--- a/src/plugins/qmlprofiler/qmlprofilertool.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp
@@ -45,6 +45,7 @@
 #include <utils/fancymainwindow.h>
 #include <utils/fileinprojectfinder.h>
 #include <utils/qtcassert.h>
+#include <utils/utilsicons.h>
 #include <projectexplorer/environmentaspect.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/project.h>
@@ -213,7 +214,7 @@ QmlProfilerTool::QmlProfilerTool(QObject *parent)
     });
 
     d->m_searchButton = new QToolButton;
-    d->m_searchButton->setIcon(Core::Icons::ZOOM_TOOLBAR.icon());
+    d->m_searchButton->setIcon(Utils::Icons::ZOOM_TOOLBAR.icon());
     d->m_searchButton->setToolTip(tr("Search timeline event notes."));
 
     connect(d->m_searchButton, &QToolButton::clicked, this, &QmlProfilerTool::showTimeLineSearch);
diff --git a/src/plugins/valgrind/callgrindtool.cpp b/src/plugins/valgrind/callgrindtool.cpp
index 39bedd859ed..28a3dd52e8e 100644
--- a/src/plugins/valgrind/callgrindtool.cpp
+++ b/src/plugins/valgrind/callgrindtool.cpp
@@ -82,6 +82,7 @@
 #include <utils/fancymainwindow.h>
 #include <utils/qtcassert.h>
 #include <utils/styledbar.h>
+#include <utils/utilsicons.h>
 
 #include <QAction>
 #include <QActionGroup>
@@ -396,14 +397,14 @@ CallgrindTool::CallgrindTool(QObject *parent)
     // go back
     m_goBack = action = new QAction(this);
     action->setDisabled(true);
-    action->setIcon(Core::Icons::PREV_TOOLBAR.icon());
+    action->setIcon(Utils::Icons::PREV_TOOLBAR.icon());
     action->setToolTip(tr("Go back one step in history. This will select the previously selected item."));
     connect(action, &QAction::triggered, &m_stackBrowser, &StackBrowser::goBack);
 
     // go forward
     m_goNext = action = new QAction(this);
     action->setDisabled(true);
-    action->setIcon(Core::Icons::NEXT_TOOLBAR.icon());
+    action->setIcon(Utils::Icons::NEXT_TOOLBAR.icon());
     action->setToolTip(tr("Go forward one step in history."));
     connect(action, &QAction::triggered, &m_stackBrowser, &StackBrowser::goNext);
 
diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp
index 9a69bf1cb6e..ded4867fcec 100644
--- a/src/plugins/valgrind/memchecktool.cpp
+++ b/src/plugins/valgrind/memchecktool.cpp
@@ -68,6 +68,7 @@
 #include <utils/qtcassert.h>
 #include <utils/styledbar.h>
 #include <utils/stylehelper.h>
+#include <utils/utilsicons.h>
 
 #include <QAction>
 #include <QCheckBox>
@@ -361,7 +362,7 @@ MemcheckTool::MemcheckTool(QObject *parent)
     // Go to previous leak.
     action = new QAction(this);
     action->setDisabled(true);
-    action->setIcon(Core::Icons::PREV_TOOLBAR.icon());
+    action->setIcon(Utils::Icons::PREV_TOOLBAR.icon());
     action->setToolTip(tr("Go to previous leak."));
     connect(action, &QAction::triggered, m_errorView, &MemcheckErrorView::goBack);
     m_goBack = action;
@@ -369,7 +370,7 @@ MemcheckTool::MemcheckTool(QObject *parent)
     // Go to next leak.
     action = new QAction(this);
     action->setDisabled(true);
-    action->setIcon(Core::Icons::NEXT_TOOLBAR.icon());
+    action->setIcon(Utils::Icons::NEXT_TOOLBAR.icon());
     action->setToolTip(tr("Go to next leak."));
     connect(action, &QAction::triggered, m_errorView, &MemcheckErrorView::goNext);
     m_goNext = action;
diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg
index 4215cc2cd89..60fd6b64483 100644
--- a/src/tools/icons/qtcreatoricons.svg
+++ b/src/tools/icons/qtcreatoricons.svg
@@ -2076,7 +2076,7 @@
          style="" />
     </g>
     <g
-       id="src/plugins/coreplugin/images/locked"
+       id="src/libs/utils/images/locked"
        transform="translate(0,16)">
       <rect
          id="rect5031-6"
@@ -2097,7 +2097,7 @@
          id="lockbody" />
     </g>
     <g
-       id="src/plugins/coreplugin/images/unlocked"
+       id="src/libs/utils/images/unlocked"
        transform="translate(-16,16)">
       <rect
          id="rect5041-1"
@@ -2227,7 +2227,7 @@
     <g
        transform="translate(-503,368)"
        style="display:inline;fill:none;stroke:none"
-       id="src/plugins/coreplugin/images/prev">
+       id="src/libs/utils/images/prev">
       <rect
          id="rect4827-5"
          height="16"
@@ -2245,8 +2245,8 @@
     <use
        x="0"
        y="0"
-       xlink:href="#src/plugins/coreplugin/images/prev"
-       id="src/plugins/coreplugin/images/next"
+       xlink:href="#src/libs/utils/images/prev"
+       id="src/libs/utils/images/next"
        transform="matrix(-1,0,0,1,526,0)"
        width="100%"
        height="100%" />
@@ -2435,7 +2435,7 @@
     <g
        transform="translate(185,368)"
        style="display:inline"
-       id="src/plugins/coreplugin/images/zoom">
+       id="src/libs/utils/images/zoom">
       <rect
          id="rect4723-6"
          height="16"