Doc: Copy icons from sources to \doc\qtcreator\images\icons

- Fix the paths to them in .qdoc files
- Remove paths to source folders from .qdocconf files

This is the second step towards making the icons visible in both
dark and light online doc modes.

Task-number: QTCREATORBUG-26644
Change-Id: I6995ea716df78cf0f285175515d1466ee20e317b
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>

77 files changed, 102 insertions, 119 deletions

diff --git a/doc/qtcreator/config/qtcreator-project.qdocconf b/doc/qtcreator/config/qtcreator-project.qdocconf
index b190e87ea1..468e4e6f98 100644
--- a/doc/qtcreator/config/qtcreator-project.qdocconf
+++ b/doc/qtcreator/config/qtcreator-project.qdocconf
@@ -15,21 +15,7 @@ ignorewords += \
 headerdirs =
 sourcedirs = ../src
 
-imagedirs = ../images \
-            ../../../src/libs/qmleditorwidgets/images \
-            ../../../src/libs/utils/images \
-            ../../../src/plugins/android/images \
-            ../../../src/plugins/autotest/images \
-            ../../../src/plugins/classview/images \
-            ../../../src/plugins/coreplugin/images \
-            ../../../src/plugins/debugger/images \
-            ../../../src/plugins/diffeditor/images \
-            ../../../src/plugins/help/images \
-            ../../../src/plugins/projectexplorer/images \
-            ../../../src/plugins/scxmleditor/common/images \
-            ../../../src/plugins/texteditor/images \
-            ../../../src/plugins/valgrind/images \
-            ../../../src/plugins/welcome/images
+imagedirs = ../images
 
 exampledirs = ../examples
 examples.fileextensions += *.qml *.svg
diff --git a/doc/qtcreator/images/icons/arrowdown.png b/doc/qtcreator/images/icons/arrowdown.png
new file mode 100644
index 0000000000..fff77a48e6
--- /dev/null
+++ b/doc/qtcreator/images/icons/arrowdown.png
diff --git a/doc/qtcreator/images/icons/arrowup.png b/doc/qtcreator/images/icons/arrowup.png
new file mode 100644
index 0000000000..c1058ce1ee
--- /dev/null
+++ b/doc/qtcreator/images/icons/arrowup.png
diff --git a/doc/qtcreator/images/icons/bookmark.png b/doc/qtcreator/images/icons/bookmark.png
new file mode 100644
index 0000000000..4e2a562ac0
--- /dev/null
+++ b/doc/qtcreator/images/icons/bookmark.png
diff --git a/doc/qtcreator/images/icons/buildstepdisable.png b/doc/qtcreator/images/icons/buildstepdisable.png
new file mode 100644
index 0000000000..2c715aa254
--- /dev/null
+++ b/doc/qtcreator/images/icons/buildstepdisable.png
diff --git a/doc/qtcreator/images/icons/clean_pane_small.png b/doc/qtcreator/images/icons/clean_pane_small.png
new file mode 100644
index 0000000000..c75262d64a
--- /dev/null
+++ b/doc/qtcreator/images/icons/clean_pane_small.png
diff --git a/doc/qtcreator/images/icons/debugger_singleinstructionmode.png b/doc/qtcreator/images/icons/debugger_singleinstructionmode.png
new file mode 100644
index 0000000000..41529e91fd
--- /dev/null
+++ b/doc/qtcreator/images/icons/debugger_singleinstructionmode.png
diff --git a/doc/qtcreator/images/icons/debugger_stepinto_small.png b/doc/qtcreator/images/icons/debugger_stepinto_small.png
new file mode 100644
index 0000000000..8e24fba5a2
--- /dev/null
+++ b/doc/qtcreator/images/icons/debugger_stepinto_small.png
diff --git a/doc/qtcreator/images/icons/debugger_stepout_small.png b/doc/qtcreator/images/icons/debugger_stepout_small.png
new file mode 100644
index 0000000000..615c022419
--- /dev/null
+++ b/doc/qtcreator/images/icons/debugger_stepout_small.png
diff --git a/doc/qtcreator/images/icons/debugger_stepover_small.png b/doc/qtcreator/images/icons/debugger_stepover_small.png
new file mode 100644
index 0000000000..e7dc6fb20b
--- /dev/null
+++ b/doc/qtcreator/images/icons/debugger_stepover_small.png
diff --git a/doc/qtcreator/images/icons/desktopdevicesmall.png b/doc/qtcreator/images/icons/desktopdevicesmall.png
new file mode 100644
index 0000000000..adc2b78bce
--- /dev/null
+++ b/doc/qtcreator/images/icons/desktopdevicesmall.png
diff --git a/doc/qtcreator/images/icons/filtericon.png b/doc/qtcreator/images/icons/filtericon.png
new file mode 100644
index 0000000000..1afcb471b0
--- /dev/null
+++ b/doc/qtcreator/images/icons/filtericon.png
diff --git a/doc/qtcreator/images/icons/fittoview.png b/doc/qtcreator/images/icons/fittoview.png
new file mode 100644
index 0000000000..6b9d1329f7
--- /dev/null
+++ b/doc/qtcreator/images/icons/fittoview.png
diff --git a/doc/qtcreator/images/icons/icon-export-canvas.png b/doc/qtcreator/images/icons/icon-export-canvas.png
new file mode 100644
index 0000000000..cd6f0cea56
--- /dev/null
+++ b/doc/qtcreator/images/icons/icon-export-canvas.png
diff --git a/doc/qtcreator/images/icons/kcachegrind.png b/doc/qtcreator/images/icons/kcachegrind.png
new file mode 100644
index 0000000000..67792f2224
--- /dev/null
+++ b/doc/qtcreator/images/icons/kcachegrind.png
diff --git a/doc/qtcreator/images/icons/leafsort.png b/doc/qtcreator/images/icons/leafsort.png
new file mode 100644
index 0000000000..c9f744bde7
--- /dev/null
+++ b/doc/qtcreator/images/icons/leafsort.png
diff --git a/doc/qtcreator/images/icons/leftsidebaricon.png b/doc/qtcreator/images/icons/leftsidebaricon.png
new file mode 100644
index 0000000000..413bed7c49
--- /dev/null
+++ b/doc/qtcreator/images/icons/leftsidebaricon.png
diff --git a/doc/qtcreator/images/icons/linkicon.png b/doc/qtcreator/images/icons/linkicon.png
new file mode 100644
index 0000000000..b205b3eaf1
--- /dev/null
+++ b/doc/qtcreator/images/icons/linkicon.png
diff --git a/doc/qtcreator/images/icons/magnifier.png b/doc/qtcreator/images/icons/magnifier.png
new file mode 100644
index 0000000000..692a32d9a3
--- /dev/null
+++ b/doc/qtcreator/images/icons/magnifier.png
diff --git a/doc/qtcreator/images/icons/minus.png b/doc/qtcreator/images/icons/minus.png
new file mode 100644
index 0000000000..0a16b38681
--- /dev/null
+++ b/doc/qtcreator/images/icons/minus.png
diff --git a/doc/qtcreator/images/icons/namespace.png b/doc/qtcreator/images/icons/namespace.png
new file mode 100644
index 0000000000..b36b2a4acf
--- /dev/null
+++ b/doc/qtcreator/images/icons/namespace.png
diff --git a/doc/qtcreator/images/icons/navigator.png b/doc/qtcreator/images/icons/navigator.png
new file mode 100644
index 0000000000..d4629fd896
--- /dev/null
+++ b/doc/qtcreator/images/icons/navigator.png
diff --git a/doc/qtcreator/images/icons/next.png b/doc/qtcreator/images/icons/next.png
new file mode 100644
index 0000000000..5ab267510e
--- /dev/null
+++ b/doc/qtcreator/images/icons/next.png
diff --git a/doc/qtcreator/images/icons/online.png b/doc/qtcreator/images/icons/online.png
new file mode 100644
index 0000000000..2e053b8792
--- /dev/null
+++ b/doc/qtcreator/images/icons/online.png
diff --git a/doc/qtcreator/images/icons/open.png b/doc/qtcreator/images/icons/open.png
new file mode 100644
index 0000000000..938f1a3332
--- /dev/null
+++ b/doc/qtcreator/images/icons/open.png
diff --git a/doc/qtcreator/images/icons/pan.png b/doc/qtcreator/images/icons/pan.png
new file mode 100644
index 0000000000..753b3bf02b
--- /dev/null
+++ b/doc/qtcreator/images/icons/pan.png
diff --git a/doc/qtcreator/images/icons/pin.png b/doc/qtcreator/images/icons/pin.png
index ac65f66815..dc96231ca4 100644
--- a/doc/qtcreator/images/icons/pin.png
+++ b/doc/qtcreator/images/icons/pin.png
diff --git a/doc/qtcreator/images/icons/plus.png b/doc/qtcreator/images/icons/plus.png
new file mode 100644
index 0000000000..795229ec6c
--- /dev/null
+++ b/doc/qtcreator/images/icons/plus.png
diff --git a/doc/qtcreator/images/icons/prev.png b/doc/qtcreator/images/icons/prev.png
new file mode 100644
index 0000000000..c9bd18a7de
--- /dev/null
+++ b/doc/qtcreator/images/icons/prev.png
diff --git a/doc/qtcreator/images/icons/recordfill.png b/doc/qtcreator/images/icons/recordfill.png
new file mode 100644
index 0000000000..57dc3054c8
--- /dev/null
+++ b/doc/qtcreator/images/icons/recordfill.png
diff --git a/doc/qtcreator/images/icons/redo.png b/doc/qtcreator/images/icons/redo.png
new file mode 100644
index 0000000000..082e8d1f74
--- /dev/null
+++ b/doc/qtcreator/images/icons/redo.png
diff --git a/doc/qtcreator/images/icons/reload_gray.png b/doc/qtcreator/images/icons/reload_gray.png
new file mode 100644
index 0000000000..3b5644c2af
--- /dev/null
+++ b/doc/qtcreator/images/icons/reload_gray.png
diff --git a/doc/qtcreator/images/icons/reset.png b/doc/qtcreator/images/icons/reset.png
new file mode 100644
index 0000000000..fc20531780
--- /dev/null
+++ b/doc/qtcreator/images/icons/reset.png
diff --git a/doc/qtcreator/images/icons/rightsidebaricon.png b/doc/qtcreator/images/icons/rightsidebaricon.png
new file mode 100644
index 0000000000..95df5c3b9b
--- /dev/null
+++ b/doc/qtcreator/images/icons/rightsidebaricon.png
diff --git a/doc/qtcreator/images/icons/run_small.png b/doc/qtcreator/images/icons/run_small.png
new file mode 100644
index 0000000000..d1a9c205a5
--- /dev/null
+++ b/doc/qtcreator/images/icons/run_small.png
diff --git a/doc/qtcreator/images/icons/settings.png b/doc/qtcreator/images/icons/settings.png
new file mode 100644
index 0000000000..2621923499
--- /dev/null
+++ b/doc/qtcreator/images/icons/settings.png
diff --git a/doc/qtcreator/images/icons/sidebysidediff.png b/doc/qtcreator/images/icons/sidebysidediff.png
new file mode 100644
index 0000000000..21dfa6a0a5
--- /dev/null
+++ b/doc/qtcreator/images/icons/sidebysidediff.png
diff --git a/doc/qtcreator/images/icons/snapshot.png b/doc/qtcreator/images/icons/snapshot.png
new file mode 100644
index 0000000000..c8a731d41e
--- /dev/null
+++ b/doc/qtcreator/images/icons/snapshot.png
diff --git a/doc/qtcreator/images/icons/sort_alphabetically.png b/doc/qtcreator/images/icons/sort_alphabetically.png
new file mode 100644
index 0000000000..c15eb56d50
--- /dev/null
+++ b/doc/qtcreator/images/icons/sort_alphabetically.png
diff --git a/doc/qtcreator/images/icons/splitbutton_closetop.png b/doc/qtcreator/images/icons/splitbutton_closetop.png
new file mode 100644
index 0000000000..4f58e4eae9
--- /dev/null
+++ b/doc/qtcreator/images/icons/splitbutton_closetop.png
diff --git a/doc/qtcreator/images/icons/splitbutton_horizontal.png b/doc/qtcreator/images/icons/splitbutton_horizontal.png
new file mode 100644
index 0000000000..2a8f953b8b
--- /dev/null
+++ b/doc/qtcreator/images/icons/splitbutton_horizontal.png
diff --git a/doc/qtcreator/images/icons/stop_small.png b/doc/qtcreator/images/icons/stop_small.png
new file mode 100644
index 0000000000..50571390da
--- /dev/null
+++ b/doc/qtcreator/images/icons/stop_small.png
diff --git a/doc/qtcreator/images/icons/text.png b/doc/qtcreator/images/icons/text.png
new file mode 100644
index 0000000000..7d4c35c70e
--- /dev/null
+++ b/doc/qtcreator/images/icons/text.png
diff --git a/doc/qtcreator/images/icons/unifieddiff.png b/doc/qtcreator/images/icons/unifieddiff.png
new file mode 100644
index 0000000000..ff989cd5d2
--- /dev/null
+++ b/doc/qtcreator/images/icons/unifieddiff.png
diff --git a/doc/qtcreator/images/icons/visual.png b/doc/qtcreator/images/icons/visual.png
new file mode 100644
index 0000000000..62fd49061f
--- /dev/null
+++ b/doc/qtcreator/images/icons/visual.png
diff --git a/doc/qtcreator/images/icons/zoom.png b/doc/qtcreator/images/icons/zoom.png
new file mode 100644
index 0000000000..a3e9dd0b6b
--- /dev/null
+++ b/doc/qtcreator/images/icons/zoom.png
diff --git a/doc/qtcreator/src/analyze/cpu-usage-analyzer.qdoc b/doc/qtcreator/src/analyze/cpu-usage-analyzer.qdoc
index 5b08c23057..c9d9fe89b4 100644
--- a/doc/qtcreator/src/analyze/cpu-usage-analyzer.qdoc
+++ b/doc/qtcreator/src/analyze/cpu-usage-analyzer.qdoc
@@ -79,7 +79,7 @@
     \endlist
 
     \note If data collection does not start automatically, select the
-    \inlineimage recordfill.png
+    \inlineimage icons/recordfill.png
     (\uicontrol {Collect profile data}) button.
 
     When you start analyzing an application, the application is launched, and
diff --git a/doc/qtcreator/src/analyze/creator-clang-static-analyzer.qdoc b/doc/qtcreator/src/analyze/creator-clang-static-analyzer.qdoc
index d61eced1aa..c4d61e1c01 100644
--- a/doc/qtcreator/src/analyze/creator-clang-static-analyzer.qdoc
+++ b/doc/qtcreator/src/analyze/creator-clang-static-analyzer.qdoc
@@ -60,7 +60,7 @@
     need to set them up separately.
 
     In addition to running the tools to collect diagnostics, you can select
-    \inlineimage open.png
+    \inlineimage icons/open.png
     to load diagnostics from \l{https://yaml.org/}{YAML} files that you exported
     using the \c {-export fixes} option.
 
@@ -69,7 +69,7 @@
     To run the Clang tools to analyze the currently open file:
 
     \list
-        \li Select the \inlineimage debugger_singleinstructionmode.png
+        \li Select the \inlineimage icons/debugger_singleinstructionmode.png
             (\uicontrol {Analyze File}) button on the editor toolbar.
         \li Select \uicontrol Tools > \uicontrol {C++} >
             \uicontrol {Analyze Current File}.
@@ -116,7 +116,7 @@
     particular project by selecting \uicontrol {Disable This Check} or
     \uicontrol {Disable These Checks} in the context menu.
 
-    Select the \inlineimage settings.png
+    Select the \inlineimage icons/settings.png
     button to customize Clang diagnostics for the current project.
 
     \image qtcreator-clang-tools-options-customized.png "Clang Tools customized settings"
diff --git a/doc/qtcreator/src/analyze/creator-ctf-visualizer.qdoc b/doc/qtcreator/src/analyze/creator-ctf-visualizer.qdoc
index 87f63f95e4..68e1296e42 100644
--- a/doc/qtcreator/src/analyze/creator-ctf-visualizer.qdoc
+++ b/doc/qtcreator/src/analyze/creator-ctf-visualizer.qdoc
@@ -96,7 +96,7 @@
     To reset the default zoom level, right-click the timeline to open the
     context menu, and select \uicontrol {Reset Zoom}.
 
-    Select the \inlineimage filtericon.png
+    Select the \inlineimage icons/filtericon.png
     (\uicontrol {Restrict to Threads}) button (10) to select the threads to
     show.
 
diff --git a/doc/qtcreator/src/analyze/creator-valgrind.qdoc b/doc/qtcreator/src/analyze/creator-valgrind.qdoc
index b33f391205..6baf3d5d79 100644
--- a/doc/qtcreator/src/analyze/creator-valgrind.qdoc
+++ b/doc/qtcreator/src/analyze/creator-valgrind.qdoc
@@ -64,7 +64,7 @@
 
         \li Use the application to analyze it.
 
-        \li Select the \inlineimage stop_small.png "Stop button"
+        \li Select the \inlineimage icons/stop_small.png "Stop button"
             button to view the results of the analysis in the
             \uicontrol {Analysis} view.
 
@@ -76,7 +76,7 @@
     Click a line to view where a memory leak
     occurred and a stack trace that shows what caused it.
 
-    As an alternative to collecting data, you can select \inlineimage open.png
+    As an alternative to collecting data, you can select \inlineimage icons/open.png
     to load an external log file in XML format into the \uicontrol Memcheck
     view.
 
@@ -84,11 +84,11 @@
 
     Move the mouse on a row to view more information about the function.
 
-    To move between rows, select \inlineimage prev.png
-    or \inlineimage next.png
+    To move between rows, select \inlineimage icons/prev.png
+    or \inlineimage icons/next.png
     .
 
-    To filter the results, select \inlineimage filtericon.png
+    To filter the results, select \inlineimage icons/filtericon.png
     , and then select the types of issues to display in the view. You
     can view and hide definite and possible memory leaks, uninitialized
     values, invalid calls to \c free(), and external errors.
@@ -223,7 +223,7 @@
 
         \li Use the application to analyze it.
 
-        \li Select the \inlineimage stop_small.png "Stop button"
+        \li Select the \inlineimage icons/stop_small.png "Stop button"
             button to view the results of the analysis in the
             \uicontrol Functions view.
 
@@ -233,13 +233,13 @@
     to speed up program execution during profiling by pausing event
     logging. No events are counted while logging is paused.
 
-    Select \inlineimage reload_gray.png
+    Select \inlineimage icons/reload_gray.png
     to reset all event counters.
 
-    Select \inlineimage clean_pane_small.png
+    Select \inlineimage icons/clean_pane_small.png
     to discard all collected data.
 
-    Select \inlineimage kcachegrind.png
+    Select \inlineimage icons/kcachegrind.png
     to view the data in KCachegrind. \QC launches KCachegrind
     and loads the data into it for visualization.
 
@@ -251,10 +251,11 @@
 
     Select \uicontrol Views to show and hide views and view
     titles. The \uicontrol Visualization view is hidden by
-    default. Select \inlineimage redo.png
+    default. Select \inlineimage icons/redo.png
     to refresh the data displayed in it when it is shown.
 
-    As an alternative to collecting data, you can select \inlineimage open.png
+    As an alternative to collecting data, you can select
+    \inlineimage icons/open.png
     to load an external log file into the \uicontrol Callgrind views.
 
     \image qtcreator-valgrind-callgrind.png "Callgrind views"
@@ -268,13 +269,13 @@
     the \uicontrol Callers view and about the called functions in the
     \uicontrol Callees view.
 
-    Select \inlineimage prev.png
-    or \inlineimage next.png
+    Select \inlineimage icons/prev.png
+    or \inlineimage icons/next.png
     To move between functions in the \uicontrol Callee view.
 
     To set the cost format, select \uicontrol $. You can view absolute
     or relative costs, as well as relative costs to parent. Select
-    \inlineimage filtericon.png
+    \inlineimage icons/filtericon.png
     to view only profiling info that originated from the project.
 
     To properly handle recursive or circular function calls, enable cycle
diff --git a/doc/qtcreator/src/android/androiddev.qdoc b/doc/qtcreator/src/android/androiddev.qdoc
index d66a1468b5..cda10b5a28 100644
--- a/doc/qtcreator/src/android/androiddev.qdoc
+++ b/doc/qtcreator/src/android/androiddev.qdoc
@@ -91,7 +91,7 @@
             By default, \QC tries to find a supported \l{AdoptOpenJDK} or
             \l{OpenJDK} installation. If none is found, you must set the path
             manually. If you don't have a supported JDK installed, select
-            \inlineimage online.png
+            \inlineimage icons/online.png
             to open the JDK download web page in the default browser.
 
             \note We recommended using a 64-bit JDK, because the 32-bit one
@@ -182,7 +182,7 @@
     be modified from the SDK Manager tab. For more information, see
     \l{Managing Android SDK Packages}.
 
-    To manually download NDKs, select \inlineimage online.png
+    To manually download NDKs, select \inlineimage icons/online.png
     .
 
     To add custom NDK paths manually to the global list of NDKs, select
diff --git a/doc/qtcreator/src/cmake/creator-projects-cmake-building.qdoc b/doc/qtcreator/src/cmake/creator-projects-cmake-building.qdoc
index 16dd3cee47..31e4780e60 100644
--- a/doc/qtcreator/src/cmake/creator-projects-cmake-building.qdoc
+++ b/doc/qtcreator/src/cmake/creator-projects-cmake-building.qdoc
@@ -126,11 +126,12 @@
 
     \image qtcreator-build-cmake-output.png "CMake output in Projects mode"
 
-    To clear the search results, select the \inlineimage clean_pane_small.png
+    To clear the search results, select the \inlineimage icons/clean_pane_small.png
     (\uicontrol Clear) button.
 
     You can enter a string in the \uicontrol Filter field to filter output.
-    To specify filtering options, select the \inlineimage magnifier.png "Filtering options menu"
+    To specify filtering options, select the
+    \inlineimage icons/magnifier.png "Filtering options menu"
     button. You can filter output by using regular expressions or
     case-sensitivity. Select \uicontrol {Show Non-matching Lines} to
     hide the lines that match the filter.
@@ -138,8 +139,8 @@
     Press \key {Ctrl+F} to \l{Finding and Replacing}{search} for a string from
     the output.
 
-    To increase or decrease the output text size, select \inlineimage plus.png
-    (\uicontrol {Zoom In}) or \inlineimage minus.png
+    To increase or decrease the output text size, select \inlineimage icons/plus.png
+    (\uicontrol {Zoom In}) or \inlineimage icons/minus.png
     (\uicontrol {Zoom Out}), or press \key Ctrl++ or \key Ctrl+-.
 
     \section1 CMake Build Steps
diff --git a/doc/qtcreator/src/debugger/creator-only/creator-debugger-example.qdoc b/doc/qtcreator/src/debugger/creator-only/creator-debugger-example.qdoc
index 3eaa76533d..1ef64237a4 100644
--- a/doc/qtcreator/src/debugger/creator-only/creator-debugger-example.qdoc
+++ b/doc/qtcreator/src/debugger/creator-only/creator-debugger-example.qdoc
@@ -108,9 +108,9 @@
     work correctly due to a logic error. To locate this logic error, step
     through the code using the following buttons:
     \inlineimage icons/qtcreator-debug-button-stop.png
-    (\uicontrol {Stop Debugger}), \inlineimage debugger_stepover_small.png
-    (\uicontrol {Step Over}), \inlineimage debugger_stepinto_small.png
-    (\uicontrol {Step Into}), and \inlineimage debugger_stepout_small.png
+    (\uicontrol {Stop Debugger}), \inlineimage icons/debugger_stepover_small.png
+    (\uicontrol {Step Over}), \inlineimage icons/debugger_stepinto_small.png
+    (\uicontrol {Step Into}), and \inlineimage icons/debugger_stepout_small.png
     (\uicontrol {Step Out}).
 
 */
diff --git a/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc b/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc
index ce52c8697d..28265fb931 100644
--- a/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc
+++ b/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc
@@ -786,7 +786,8 @@
 
     To access the \uicontrol Disassembler view, check
     \uicontrol Debug > \uicontrol {Operate by Instruction} while the debugger is
-    running. Alternatively, click the \inlineimage debugger_singleinstructionmode.png
+    running. Alternatively, click the
+    \inlineimage icons/debugger_singleinstructionmode.png
     (\uicontrol {Operate by Instruction}) tool button on the debugger tool bar.
 
     By default, GDB shows AT&T style disassembly. To switch to the Intel style,
diff --git a/doc/qtcreator/src/debugger/qtquick-debugger-example.qdoc b/doc/qtcreator/src/debugger/qtquick-debugger-example.qdoc
index 6a938999c5..dd63e607b1 100644
--- a/doc/qtcreator/src/debugger/qtquick-debugger-example.qdoc
+++ b/doc/qtcreator/src/debugger/qtquick-debugger-example.qdoc
@@ -79,7 +79,7 @@
 
             \image qtquick-example-setting-breakpoint2.png
 
-        \li Click the \inlineimage debugger_stepinto_small.png
+        \li Click the \inlineimage icons/debugger_stepinto_small.png
             (\uicontrol {Step Into}) button on the toolbar or press \key F11 to step
             into the code in the stack. The samegame.js file opens in the code
             editor at the function that starts a new game.
diff --git a/doc/qtcreator/src/editors/creator-code-refactoring.qdoc b/doc/qtcreator/src/editors/creator-code-refactoring.qdoc
index 137bae8690..371aaeee16 100644
--- a/doc/qtcreator/src/editors/creator-code-refactoring.qdoc
+++ b/doc/qtcreator/src/editors/creator-code-refactoring.qdoc
@@ -103,8 +103,8 @@
     \list
         \li To go directly to an instance, double-click the instance in the
             \uicontrol {Search Results} pane.
-        \li To move between instances, click the \inlineimage next.png
-            (\uicontrol {Next Item}) button and \inlineimage prev.png
+        \li To move between instances, click the \inlineimage icons/next.png
+            (\uicontrol {Next Item}) button and \inlineimage icons/prev.png
             (\uicontrol {Previous Item}) button in the
             \uicontrol {Search Results} pane.
         \li To expand and collapse the list of all instances, click the
@@ -112,10 +112,10 @@
             (\uicontrol {Expand All}) button.
         \li To filter the search results for the usage of symbols according to
             access type, such as read, write, or declaration, click the
-            \inlineimage filtericon.png
+            \inlineimage icons/filtericon.png
             (\uicontrol {Filter Tree}) button and select the access type.
         \li To clear the search results, click the
-            \inlineimage clean_pane_small.png
+            \inlineimage icons/clean_pane_small.png
             (\uicontrol Clear) button.
         \li To start a new search, click the
             \inlineimage icons/qtcreator-new-search-icon.png
diff --git a/doc/qtcreator/src/editors/creator-coding-edit-mode.qdoc b/doc/qtcreator/src/editors/creator-coding-edit-mode.qdoc
index c2c6c1f2ea..1d1ef00d61 100644
--- a/doc/qtcreator/src/editors/creator-coding-edit-mode.qdoc
+++ b/doc/qtcreator/src/editors/creator-coding-edit-mode.qdoc
@@ -62,8 +62,8 @@
     to navigate between open files and symbols in use.
 
     To browse backward or forward through your
-    location history, click \inlineimage prev.png
-    (\uicontrol {Go Back}) and \inlineimage next.png
+    location history, click \inlineimage icons/prev.png
+    (\uicontrol {Go Back}) and \inlineimage icons/next.png
     (\uicontrol {Go Forward}).
 
     To return to the last location where you made a change, select
@@ -151,7 +151,7 @@
 
         \li To split the editor view into a top and bottom view, select
             \uicontrol Window > \uicontrol Split, press \key {Ctrl+E, 2}, or
-            select the \inlineimage splitbutton_horizontal.png
+            select the \inlineimage icons/splitbutton_horizontal.png
             (\uicontrol Split) button and then select \uicontrol Split.
 
             Split command creates views below the currently active editor view.
@@ -179,7 +179,7 @@
 
     To remove a split view, place the cursor within the view you want to
     remove and select \uicontrol Window > \uicontrol {Remove Current Split},
-    press \key {Ctrl+E, 0}, or select the \inlineimage splitbutton_closetop.png
+    press \key {Ctrl+E, 0}, or select the \inlineimage icons/splitbutton_closetop.png
     (\uicontrol {Remove Split}) button. To remove all but the currently selected
     split view, select \uicontrol Window > \uicontrol {Remove All Splits} or
     press \key {Ctrl+E, 1}.
diff --git a/doc/qtcreator/src/editors/creator-diff-editor.qdoc b/doc/qtcreator/src/editors/creator-diff-editor.qdoc
index 6614729293..a0a65b50eb 100644
--- a/doc/qtcreator/src/editors/creator-diff-editor.qdoc
+++ b/doc/qtcreator/src/editors/creator-diff-editor.qdoc
@@ -94,11 +94,11 @@
     removed text and then select \uicontrol {Apply Chunk}.
 
     To view the differences in a unified view where changed rows are placed
-    below each other, select \inlineimage unifieddiff.png
+    below each other, select \inlineimage icons/unifieddiff.png
     (\uicontrol {Switch to Unified Diff Editor}).
 
     To switch back to the side-by-side view, select
-    \inlineimage sidebysidediff.png
+    \inlineimage icons/sidebysidediff.png
     (\uicontrol {Switch to Side by Side Diff Editor}).
 
     To only show text changes, select \uicontrol {Ignore Whitespace}.
@@ -108,10 +108,10 @@
 
     By default, the horizontal scroll bars in the left and right pane are
     synchronized. To use them independently of each other, select the
-    \inlineimage linkicon.png
+    \inlineimage icons/linkicon.png
     (\uicontrol {Synchronize Horizontal Scroll Bars}) button.
 
-    If the files change outside \QC, select \inlineimage reload_gray.png
+    If the files change outside \QC, select \inlineimage icons/reload_gray.png
     (\uicontrol {Reload Editor}) to compare them again and to show the results.
 
     \if defined(qtcreator)
diff --git a/doc/qtcreator/src/editors/creator-locator.qdoc b/doc/qtcreator/src/editors/creator-locator.qdoc
index cae350b2d5..d649442309 100644
--- a/doc/qtcreator/src/editors/creator-locator.qdoc
+++ b/doc/qtcreator/src/editors/creator-locator.qdoc
@@ -244,7 +244,7 @@
 
     \list 1
 
-        \li In the locator, click \inlineimage magnifier.png
+        \li In the locator, click \inlineimage icons/magnifier.png
             (\uicontrol Options) and select \uicontrol Configure to open the
             \uicontrol Locator options.
 
diff --git a/doc/qtcreator/src/editors/creator-only/creator-modeling.qdoc b/doc/qtcreator/src/editors/creator-only/creator-modeling.qdoc
index 10e40c2849..9736e101be 100644
--- a/doc/qtcreator/src/editors/creator-only/creator-modeling.qdoc
+++ b/doc/qtcreator/src/editors/creator-only/creator-modeling.qdoc
@@ -125,7 +125,7 @@
     By default, when you select an element in a diagram, it is highlighted also
     in the \uicontrol Structure view. To change this behavior so that selecting
     an element in the \uicontrol Structure makes it highlighted also in the
-    diagram, click and hold the \inlineimage linkicon.png
+    diagram, click and hold the \inlineimage icons/linkicon.png
     button, and then select \uicontrol {Synchronize Diagram with Structure}.
     To keep the selections in the diagram and the \uicontrol Structure view
     synchronized, select \uicontrol {Keep Synchronized}.
diff --git a/doc/qtcreator/src/editors/creator-only/creator-scxml.qdoc b/doc/qtcreator/src/editors/creator-only/creator-scxml.qdoc
index a8eee8965c..2f6b67fd2a 100644
--- a/doc/qtcreator/src/editors/creator-only/creator-scxml.qdoc
+++ b/doc/qtcreator/src/editors/creator-only/creator-scxml.qdoc
@@ -69,34 +69,34 @@
     \uicontrol {Zoom In} or \uicontrol {Zoom Out} or press \key Ctrl and use the
     mouse wheel. To make
     the whole state chart visible in the state editor at a time, select
-    \inlineimage fittoview.png
+    \inlineimage icons/fittoview.png
     (\uicontrol {Fit to View}).
 
     To view a particular part of a large state chart in the state editor, select
-    \inlineimage navigator.png
+    \inlineimage icons/navigator.png
     (\uicontrol {Navigator}) and move the navigator frame on the part you want
     to view.
 
     To use the magnifier to zoom into a part of the state chart, select
-    \inlineimage zoom.png
+    \inlineimage icons/zoom.png
     (\uicontrol {Magnifier Tool}). To move the magnifier tool faster, press down
     the \key Alt key.
 
-    To pan the state chart, select \inlineimage pan.png
+    To pan the state chart, select \inlineimage icons/pan.png
     (\uicontrol Panning). To increase the pace of panning, press down the
     \key Shift key.
 
     To view statistics about the numbers of states and transitions in the state
-    chart, select \inlineimage statistics.png
+    chart, select \inlineimage icons/statistics.png
     (\uicontrol {View Statistics}).
 
     To search from the state chart, use the \uicontrol Search pane. The search
     checks the whole SCXML tree for attributes that match the search criteria.
 
     To save the currently visible part of the state chart as an image, select
-    \inlineimage snapshot.png
+    \inlineimage icons/snapshot.png
     (\uicontrol {Save Screenshot}). To save the whole state chart as an image,
-    select \inlineimage icon-export-canvas.png
+    select \inlineimage icons/icon-export-canvas.png
     (\uicontrol {Export Canvas to Image}).
 
     \section1 Creating State Charts
@@ -208,7 +208,7 @@
     select \uicontrol {Zoom to State}.
 
     To ensure that the state ids are unique within a compound state machine,
-    select \inlineimage namespace.png
+    select \inlineimage icons/namespace.png
     (\uicontrol {Toggle Full Namespace}). The name of the parent state is
     added to the names of the child states, separated by two colons (::).
     For example:
diff --git a/doc/qtcreator/src/editors/creator-search.qdoc b/doc/qtcreator/src/editors/creator-search.qdoc
index 4017dd1bcd..4f9cf51465 100644
--- a/doc/qtcreator/src/editors/creator-search.qdoc
+++ b/doc/qtcreator/src/editors/creator-search.qdoc
@@ -41,9 +41,9 @@
 
             If the text is found, all occurrences are highlighted as you type.
 
-        \li To go to the next occurrence, click \inlineimage next.png
+        \li To go to the next occurrence, click \inlineimage icons/next.png
             (\uicontrol {Find Next}), or press \key F3. To go to the previous
-            occurrence click \inlineimage prev.png
+            occurrence click \inlineimage icons/prev.png
             (\uicontrol {Find Previous}), or press \key {Shift+F3}.
 
     \endlist
@@ -207,7 +207,7 @@
     The search results are stored in the search history from which you can
     select earlier searches.
 
-    To clear the search results, select the \inlineimage clean_pane_small.png
+    To clear the search results, select the \inlineimage icons/clean_pane_small.png
     (\uicontrol Clear) button.
 
     To expand and collapse the search results, select the
diff --git a/doc/qtcreator/src/howto/creator-help.qdoc b/doc/qtcreator/src/howto/creator-help.qdoc
index de866a3207..712f9abed3 100644
--- a/doc/qtcreator/src/howto/creator-help.qdoc
+++ b/doc/qtcreator/src/howto/creator-help.qdoc
@@ -140,7 +140,7 @@
 
     \list 1
 
-        \li Click the \inlineimage bookmark.png
+        \li Click the \inlineimage icons/bookmark.png
             (\uicontrol {Add Bookmark}) button on the toolbar.
 
         \li In the \uicontrol {Add Bookmark} dialog, click \uicontrol OK to save the
@@ -188,7 +188,7 @@
 
     If you cannot find words that you know are there, indexing might not have
     been completed for some reason. To regenerate the index, click
-    \inlineimage reload_gray.png
+    \inlineimage icons/reload_gray.png
     (\uicontrol {Regenerate Index}).
 
     Punctuation is not included in indexed terms. To find terms that contain
@@ -225,7 +225,7 @@
     in the \uicontrol {On context help} field. To detach the help window, select
     \uicontrol {Always Show in External Window}.
 
-    To change this setting in a help view, select the \inlineimage linkicon.png
+    To change this setting in a help view, select the \inlineimage icons/linkicon.png
     toolbar button.
 
     \section1 Selecting the Start Page
@@ -266,7 +266,7 @@
 
             \image qtcreator-help-filter-attributes.png "Filters tab in Help options"
 
-        \li Select \inlineimage plus.png
+        \li Select \inlineimage icons/plus.png
             to add a new filter in the \uicontrol {Add Filter} dialog.
 
         \li In the \uicontrol {Filter name} field, enter a name for the filter,
@@ -291,6 +291,6 @@
 
     To rename the selected filter, select \uicontrol Rename.
 
-    To remove the selected filter select \inlineimage minus.png
+    To remove the selected filter select \inlineimage icons/minus.png
     .
 */
diff --git a/doc/qtcreator/src/howto/creator-only/creator-autotest.qdoc b/doc/qtcreator/src/howto/creator-only/creator-autotest.qdoc
index f0cdaa4072..2d5cc29ce5 100644
--- a/doc/qtcreator/src/howto/creator-only/creator-autotest.qdoc
+++ b/doc/qtcreator/src/howto/creator-only/creator-autotest.qdoc
@@ -325,7 +325,7 @@
         \li In the \uicontrol {Test Results} output pane, select:
 
             \list
-                \li \inlineimage run_small.png
+                \li \inlineimage icons/run_small.png
                     (\uicontrol {Run All Tests}) to run all tests.
                  \li \inlineimage icons/qtcreator-run-selected-tests.png
                     (\uicontrol {Run Selected Tests}) to run the selected tests.
@@ -376,14 +376,14 @@
     To refresh the view, select \uicontrol {Rescan Tests} in the context menu.
 
     To show or hide init and cleanup or data functions in the \uicontrol Tests
-    view, select \inlineimage filtericon.png
+    view, select \inlineimage icons/filtericon.png
     (\uicontrol {Filter Test Tree}), and then select \uicontrol {Show Init and
     Cleanup Functions} or \uicontrol {Show Data Functions}. Double-click a
     function in the list to open its source code in the code editor.
 
     The test cases are listed in alphabetic, case insensitive order. To list
     them in the order in which they are defined in the source code,
-    select \inlineimage leafsort.png
+    select \inlineimage icons/leafsort.png
     (\uicontrol {Sort Naturally}).
 
     \section2 Running and Debugging Tests from Code Editor
@@ -592,7 +592,7 @@
     To view the results of Qt tests as plain text, select \uicontrol Tools >
     \uicontrol Options > \uicontrol {Testing} > \uicontrol {Qt Test}, and
     then deselect the \uicontrol {Use XML output} check box. Then select the
-    \inlineimage text.png
+    \inlineimage icons/text.png
     (\uicontrol {Switch Between Visual and Text Display}) button in the
     \uicontrol {Test Results} output pane to switch to the text display.
 
@@ -668,7 +668,7 @@
     \endtable
 
     To view only messages of a particular type, select
-    \inlineimage filtericon.png
+    \inlineimage icons/filtericon.png
     (\uicontrol {Filter Test Results}), and then select the types of messages to
     show. To show all messages, select \uicontrol {Check All Filters}. To
     deselect all message types, select \uicontrol {Uncheck All Filters}.
diff --git a/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc b/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc
index 229abbddb5..438299a367 100644
--- a/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc
+++ b/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc
@@ -160,11 +160,11 @@
 
     You can toggle the left and right sidebar in some \QC modes.
 
-    To toggle the left sidebar, click \inlineimage leftsidebaricon.png
+    To toggle the left sidebar, click \inlineimage icons/leftsidebaricon.png
     (\uicontrol {Hide Left Sidebar/Show Left Sidebar}) or press \key Alt+0
     (\key Cmd+0 on \macos).
 
-    To toggle the right sidebar, click \inlineimage rightsidebaricon.png
+    To toggle the right sidebar, click \inlineimage icons/rightsidebaricon.png
     (\uicontrol {Hide Right Sidebar/Show Right Sidebar}) or press
     \key Alt+Shift+0 (\key Cmd+Shift+0 on \macos).
 
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-build-run-tutorial.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-build-run-tutorial.qdoc
index 4b58e67f9d..7d44a42884 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-build-run-tutorial.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-build-run-tutorial.qdoc
@@ -82,7 +82,7 @@
             automatically detected the installed kit. If no kits are available,
             see \l{Adding Kits}.
 
-        \li Click \inlineimage run_small.png
+        \li Click \inlineimage icons/run_small.png
             (\uicontrol Run) to build and run the application.
 
         \li To see the compilation progress, press \key{Alt+4} to open the
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build.qdoc
index eb4faea02c..81f3ebce5b 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build.qdoc
@@ -145,7 +145,7 @@
     \uicontrol {Add Build Step} > \uicontrol {Custom Process Step}.
 
     By default, custom steps are enabled. To disable a custom step, select
-    the \inlineimage buildstepdisable.png
+    the \inlineimage icons/buildstepdisable.png
     (\uicontrol Disable) button.
 
     \image qtcreator-build-steps-custom.png "Custom Process Step"
@@ -184,8 +184,8 @@
 
         \li To remove a clean step, click \uicontrol{Remove Item}.
 
-        \li To change the order of steps, click \inlineimage arrowup.png
-            (\uicontrol {Move Up}) and \inlineimage arrowdown.png
+        \li To change the order of steps, click \inlineimage icons/arrowup.png
+            (\uicontrol {Move Up}) and \inlineimage icons/arrowdown.png
             (\uicontrol {Move Down}).
     \endlist
 */
diff --git a/doc/qtcreator/src/qtquick/qtquick-live-preview-desktop.qdoc b/doc/qtcreator/src/qtquick/qtquick-live-preview-desktop.qdoc
index 5031c56938..cf00106444 100644
--- a/doc/qtcreator/src/qtquick/qtquick-live-preview-desktop.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-live-preview-desktop.qdoc
@@ -40,7 +40,7 @@
 
     \list
         \li Select \uicontrol Build > \uicontrol {QML Preview}.
-        \li Select the \inlineimage live_preview.png
+        \li Select the \inlineimage icons/live_preview.png
             (\uicontrol {Show Live Preview}) button.
         \li Press \key {Alt+P}.
     \endlist
diff --git a/doc/qtcreator/src/qtquick/qtquick-profiler.qdoc b/doc/qtcreator/src/qtquick/qtquick-profiler.qdoc
index f148a59cb6..86c3197cc0 100644
--- a/doc/qtcreator/src/qtquick/qtquick-profiler.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-profiler.qdoc
@@ -107,7 +107,7 @@
             QML Profiler.
 
             \note If data collection does not start automatically, select the
-            \inlineimage recordfill.png
+            \inlineimage icons/recordfill.png
             (\uicontrol {Enable Profiling}) button.
 
     \endlist
diff --git a/doc/qtcreator/src/user-interface/creator-file-system-view.qdoc b/doc/qtcreator/src/user-interface/creator-file-system-view.qdoc
index 87a62b4617..60db096f2c 100644
--- a/doc/qtcreator/src/user-interface/creator-file-system-view.qdoc
+++ b/doc/qtcreator/src/user-interface/creator-file-system-view.qdoc
@@ -60,7 +60,7 @@
     \endlist
 
     To stop the synchronization between the editor and the
-    \uicontrol {File System} view, delesect the \inlineimage linkicon.png
+    \uicontrol {File System} view, delesect the \inlineimage icons/linkicon.png
     (\uicontrol {Synchronize Root Directory with Editor}) button.
 
     The path to the active file is displayed as bread crumbs. You can move to
@@ -106,7 +106,7 @@
     \endif
 
 
-    To manage view contents, select \inlineimage filtericon.png
+    To manage view contents, select \inlineimage icons/filtericon.png
     (\uicontrol Options):
 
     \list
@@ -119,6 +119,6 @@
     \endlist
 
     To stop the synchronization with the file currently opened in the
-    editor, deselect \inlineimage linkicon.png
+    editor, deselect \inlineimage icons/linkicon.png
     (\uicontrol {Synchronize with Editor}).
 */
diff --git a/doc/qtcreator/src/user-interface/creator-projects-view.qdoc b/doc/qtcreator/src/user-interface/creator-projects-view.qdoc
index 558296a0bb..87021c3aa8 100644
--- a/doc/qtcreator/src/user-interface/creator-projects-view.qdoc
+++ b/doc/qtcreator/src/user-interface/creator-projects-view.qdoc
@@ -124,7 +124,7 @@
     \endif
 
 
-    To filter view contents, select \inlineimage filtericon.png
+    To filter view contents, select \inlineimage icons/filtericon.png
     (\uicontrol {Filter Tree}):
 
     \list
@@ -142,7 +142,7 @@
     \endlist
 
     To stop synchronizing the position in the project tree with the file
-    currently opened in the editor, deselect \inlineimage linkicon.png
+    currently opened in the editor, deselect \inlineimage icons/linkicon.png
     (\uicontrol {Synchronize with Editor}).
 
     \if defined(qtcreator)
diff --git a/doc/qtcreator/src/user-interface/creator-sidebars.qdoc b/doc/qtcreator/src/user-interface/creator-sidebars.qdoc
index 8c8162035e..0a83cdedd7 100644
--- a/doc/qtcreator/src/user-interface/creator-sidebars.qdoc
+++ b/doc/qtcreator/src/user-interface/creator-sidebars.qdoc
@@ -47,15 +47,15 @@
     You can change the view of the sidebars in the following ways:
 
     \list
-        \li To toggle the left sidebar, click \inlineimage leftsidebaricon.png
+        \li To toggle the left sidebar, click \inlineimage icons/leftsidebaricon.png
             (\uicontrol {Hide Left Sidebar/Show Left Sidebar}) or press
             \key Alt+0 (\key Cmd+0 on \macos). To toggle the right
-            sidebar, click \inlineimage rightsidebaricon.png
+            sidebar, click \inlineimage icons/rightsidebaricon.png
             (\uicontrol {Hide Right Sidebar/Show Right Sidebar}) or press
             \key Alt+Shift+0 (\key Cmd+Shift+0 on \macos).
-        \li To split a sidebar, click \inlineimage splitbutton_horizontal.png
+        \li To split a sidebar, click \inlineimage icons/splitbutton_horizontal.png
             (\uicontrol {Split}). Select new content to view in the split view.
-        \li To close a sidebar view, click \inlineimage splitbutton_closetop.png
+        \li To close a sidebar view, click \inlineimage icons/splitbutton_closetop.png
             (\uicontrol {Close}).
     \endlist
 */
diff --git a/doc/qtcreator/src/user-interface/creator-ui.qdoc b/doc/qtcreator/src/user-interface/creator-ui.qdoc
index 2d154021cf..8c013c13d3 100644
--- a/doc/qtcreator/src/user-interface/creator-ui.qdoc
+++ b/doc/qtcreator/src/user-interface/creator-ui.qdoc
@@ -400,12 +400,12 @@
             The menu items also display the keyboard shortcuts that you can use.
     \endlist
 
-    To maximize an open output pane, select the \inlineimage arrowup.png
+    To maximize an open output pane, select the \inlineimage icons/arrowup.png
     (\uicontrol {Maximize Output Pane}) button or press \key {Alt+Shift+9}.
 
 
-    To increase or decrease the output text size, select \inlineimage plus.png
-    (\uicontrol {Zoom In}) or \inlineimage minus.png
+    To increase or decrease the output text size, select \inlineimage icons/plus.png
+    (\uicontrol {Zoom In}) or \inlineimage icons/minus.png
     (\uicontrol {Zoom Out}), or press \key Ctrl++ or \key Ctrl+-. Zooming is
     not supported in all output panes.
 
@@ -440,7 +440,7 @@
 
     Besides searching from the output, you can enter a string in the
     \uicontrol Filter field to filter it. To specify filtering options,
-    select the \inlineimage magnifier.png "Filtering options menu"
+    select the \inlineimage icons/magnifier.png "Filtering options menu"
     button. You can filter output by using regular expressions or
     case-sensitivity. Select \uicontrol {Show Non-matching Lines} to
     hide the lines that match the filter.
@@ -503,7 +503,7 @@
 
     The pane filters out irrelevant output from the build tools and presents the
     issues in an organized way. To further filter the output by type, select
-    \inlineimage filtericon.png
+    \inlineimage icons/filtericon.png
     (\uicontrol {Filter Tree}) and then select a filter.
 
     \image qtcreator-issues.png "Issues output pane"
@@ -566,7 +566,7 @@
 
     To specify settings for displaying application output, select
     \uicontrol Tools > \uicontrol Options > \uicontrol {Build & Run} >
-    \uicontrol {Application Output}, or click the \inlineimage settings.png
+    \uicontrol {Application Output}, or click the \inlineimage icons/settings.png
     (\uicontrol {Open Settings Page}) button. You can select whether to open
     the \uicontrol{Application Output} pane on output when running or debugging
     applications, to clear old output on a new run,
@@ -592,7 +592,7 @@
     In the \uicontrol {Limit output to} field, you can specify the maximum
     amount of build output lines to display in the pane.
 
-    You can also reach the options page by clicking \inlineimage settings.png
+    You can also reach the options page by clicking \inlineimage icons/settings.png
     (\uicontrol {Open Settings Page}).
 
     To copy the output from the pane to the clipboard, select
diff --git a/doc/qtcreator/src/user-interface/creator-views.qdoc b/doc/qtcreator/src/user-interface/creator-views.qdoc
index 5cd014829f..955b77f845 100644
--- a/doc/qtcreator/src/user-interface/creator-views.qdoc
+++ b/doc/qtcreator/src/user-interface/creator-views.qdoc
@@ -97,13 +97,13 @@
 
     \list
         \li To see a complete list of all bindings, select
-            \inlineimage filtericon.png
+            \inlineimage icons/filtericon.png
             (\uicontrol {Filter Tree}) > \uicontrol {Show All Bindings}.
         \li To sort types or symbols alphabetically, select
-            \inlineimage sort_alphabetically.png
+            \inlineimage icons/sort_alphabetically.png
             (\uicontrol {Sort Alphabetically}).
         \li To stop the synchronization with the type or symbol selected in the
-            editor, deselect \inlineimage linkicon.png
+            editor, deselect \inlineimage icons/linkicon.png
             (\uicontrol {Synchronize with Editor}).
     \endlist
 
@@ -146,6 +146,6 @@
     \image qtcreator-include-hierarchy-view.png "Include Hierarchy view"
 
     To keep the view synchronized with the file currently opened in the editor,
-    select \inlineimage linkicon.png
+    select \inlineimage icons/linkicon.png
     (\uicontrol {Synchronize with Editor}).
 */
diff --git a/doc/qtcreator/src/vcs/creator-vcs-git.qdoc b/doc/qtcreator/src/vcs/creator-vcs-git.qdoc
index 18b9bcc689..c27ca66fa2 100644
--- a/doc/qtcreator/src/vcs/creator-vcs-git.qdoc
+++ b/doc/qtcreator/src/vcs/creator-vcs-git.qdoc
@@ -118,7 +118,7 @@
 
     To show log also for previous names of the file, select \uicontrol Follow.
 
-    Select \inlineimage reload_gray.png
+    Select \inlineimage icons/reload_gray.png
     (\uicontrol Reload) to rescan the files.
 
     To display a description of the change including the diff in the
@@ -141,7 +141,7 @@
     The other actions in the context-menu enable you to apply actions to the
     commit, such as cherry-pick, checkout, or revert it.
 
-    To rescan the files, click \inlineimage reload_gray.png
+    To rescan the files, click \inlineimage icons/reload_gray.png
     (\uicontrol Reload).
 
     \section2 Staging Changes
@@ -288,7 +288,7 @@
     \image qtcreator-vcs-gitbranch.png "Git Branches sidebar view"
 
     Old entries and tags are filtered out of the list of branches
-    by default. To include them, select \inlineimage filtericon.png
+    by default. To include them, select \inlineimage icons/filtericon.png
     (\uicontrol {Filter Tree}), and then select
     \uicontrol {Include Old Entries} and \uicontrol {Include Tags}.
 
@@ -302,7 +302,7 @@
     For local and remote branches, the changes log can be shown by double
     clicking on the branch name.
 
-    To refresh the list of branches, click \inlineimage reload_gray.png
+    To refresh the list of branches, click \inlineimage icons/reload_gray.png
     (\uicontrol Refresh).
 
     The following operations are supported in the context-menu for a branch:
diff --git a/doc/qtcreator/src/widgets/qtdesigner-app-tutorial.qdoc b/doc/qtcreator/src/widgets/qtdesigner-app-tutorial.qdoc
index 2dab21729e..1ad81db806 100644
--- a/doc/qtcreator/src/widgets/qtdesigner-app-tutorial.qdoc
+++ b/doc/qtcreator/src/widgets/qtdesigner-app-tutorial.qdoc
@@ -339,7 +339,7 @@
     \section1 Compiling and Running Your Program
 
     Now that you have all the necessary files, select the
-    \inlineimage run_small.png
+    \inlineimage icons/run_small.png
     button to compile and run your program.
 
 */
diff --git a/doc/qtdesignstudio/config/qtdesignstudio.qdocconf b/doc/qtdesignstudio/config/qtdesignstudio.qdocconf
index 3e333d3b64..2b3cf9879c 100644
--- a/doc/qtdesignstudio/config/qtdesignstudio.qdocconf
+++ b/doc/qtdesignstudio/config/qtdesignstudio.qdocconf
@@ -23,11 +23,6 @@ imagedirs = ../images \
             ../../../share/qtcreator/qml/qmlpuppet/mockfiles/images \
             ../../../share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images \
             ../../../src/libs/qmleditorwidgets/images \
-            ../../../src/libs/utils/images \
-            ../../../src/plugins/debugger/images \
-            ../../../src/plugins/diffeditor/images \
-            ../../../src/plugins/help/images \
-            ../../../src/plugins/projectexplorer/images \
             ../../../src/plugins/qmldesigner/components/componentcore/images \
             ../../../src/plugins/qmldesigner/components/edit3d/images \
             ../../../src/plugins/qmldesigner/components/formeditor \
@@ -36,7 +31,6 @@ imagedirs = ../images \
             ../../../src/plugins/qmldesigner/componentsplugin/images \
             ../../../src/plugins/qmldesigner/qmlpreviewplugin/images \
             ../../../src/plugins/qmldesigner/qtquickplugin/images \
-            ../../../src/plugins/texteditor/images
 
 include(../../qtcreator/images/extraimages/qtdesignstudio-extraimages.qdocconf)