diff --git a/src/tools/icons/export.py b/src/tools/icons/export.py
index d7bb9a1bcc2..e28b7e6e4e9 100644
--- a/src/tools/icons/export.py
+++ b/src/tools/icons/export.py
@@ -68,6 +68,12 @@ for svgElement in svgTreeRoot.iter():
     except:
         pass
 
+for id in svgIDs:
+    pngFile = qtcSourceRoot + id + ".png"
+    pngAt2XFile = qtcSourceRoot + id + "@2x.png"
+    if not (os.path.isfile(pngFile) or os.path.isfile(pngAt2XFile)):
+        sys.stderr.write(id + " has not yet been exported as .png.\n")
+
 # The shell mode of Inkscape is used to execute several export commands
 # with one launch of Inkscape.
 inkscapeShellCommands = ""
diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg
index 4dffd7a6b39..1307b159a82 100644
--- a/src/tools/icons/qtcreatoricons.svg
+++ b/src/tools/icons/qtcreatoricons.svg
@@ -1300,7 +1300,7 @@
          sodipodi:nodetypes="cc" />
     </g>
     <g
-       id="share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/down-arrow">
+       id="share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/down-arrow">
       <rect
          style="fill:#ffffff"
          id="rect5094"
@@ -1318,8 +1318,8 @@
     <use
        x="0"
        y="0"
-       xlink:href="#share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/down-arrow"
-       id="share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/up-arrow"
+       xlink:href="#share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/down-arrow"
+       id="share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/up-arrow"
        transform="matrix(1,0,0,-1,8,1174)"
        width="100%"
        height="100%" />
@@ -2528,52 +2528,6 @@
          width="100%"
          height="100%" />
     </g>
-    <g
-       id="share/qtcreator/templates/wizards/projects/qtquickapplication/canvas3d/icon"
-       transform="translate(-159,-83)">
-      <use
-         style="display:inline"
-         x="0"
-         y="0"
-         xlink:href="#transparentBackgroundRect_60_60"
-         id="use5906-0-4-3-5-6-36"
-         width="100%"
-         height="100%"
-         transform="translate(399,143)" />
-      <use
-         style="display:inline"
-         x="0"
-         y="0"
-         xlink:href="#wizardicons_laptop_and_mobile"
-         id="use5639"
-         width="100%"
-         height="100%"
-         transform="translate(376,0.9999997)" />
-      <g
-         id="g7204"
-         transform="translate(20,8)">
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           id="path5743"
-           d="m 387,310 7,4 v 8 l -7,-4.50001 z"
-           style="fill:#53586b" />
-        <path
-           sodipodi:nodetypes="ccccccc"
-           inkscape:connector-curvature="0"
-           id="path5747"
-           d="m 394,306 7,4 2.6e-4,7.49999 L 394,322 v -8 l -7,-4 z"
-           style="fill:#cecfd5" />
-      </g>
-      <use
-         x="0"
-         y="0"
-         xlink:href="#g7204"
-         id="use7208"
-         transform="translate(20.99974,1.00001)"
-         width="100%"
-         height="100%" />
-    </g>
     <g
        id="share/qtcreator/templates/wizards/global/consoleapplication"
        transform="translate(-185,-78)">
@@ -2770,7 +2724,7 @@
          x="0" />
       <g
          transform="matrix(0.875,0,0,0.875,828.5,72.25)"
-         id="src/plugins/welcome/images/userguide-6" />
+         id="g2818" />
       <path
          id="path7726"
          style="fill:#000000"
@@ -3045,31 +2999,6 @@
          id="path6672"
          inkscape:connector-curvature="0" />
     </g>
-    <g
-       id="src/plugins/qbsprojectmanager/images/settingscategory_qbs"
-       transform="translate(-229,-84)">
-      <use
-         style="display:inline"
-         transform="translate(1144,148)"
-         height="100%"
-         width="100%"
-         id="use3820-1-8-0-1-6-0-1-4-4-5-9-2-0-5-9"
-         xlink:href="#backgroundRect_24"
-         y="0"
-         x="0" />
-      <rect
-         y="564"
-         x="1124"
-         height="16"
-         width="16"
-         id="rect6710"
-         style="fill:#000000" />
-      <path
-         d="m 1139,570.5 h -1.5 c 0,0 -1,0 -1,1 0,1 2,1 2,2 0,1 -1,1 -1,1 h -1.5 m -4.5,-4 h 1.5 c 1,0 1.5,1 1.5,2 0,1 -0.5,2 -1.5,2 h -1.5 m 0,-6.5 v 7 m -3.5,-0.5 c 0.2067,0.72504 1,1 2,1 m -0.5,-4 a 2,3 0 0 1 -2,3 2,3 0 0 1 -2,-3 2,3 0 0 1 2,-3 2,3 0 0 1 2,3 z"
-         style="fill:none;stroke:#ffffff"
-         id="path6706"
-         inkscape:connector-curvature="0" />
-    </g>
     <g
        id="src/plugins/autotest/images/settingscategory_autotest"
        transform="translate(-220,-84)">
@@ -4773,7 +4702,7 @@
     <g
        transform="translate(32,0)"
        style="display:inline"
-       id="src/libs/timeline/qml/ico_rangeselection">
+       id="src/libs/tracing/qml/ico_rangeselection">
       <rect
          id="rect6782-96-0-0-7"
          height="16"
@@ -4814,7 +4743,7 @@
     <g
        transform="translate(32,0)"
        style="display:inline"
-       id="src/libs/timeline/qml/ico_rangeselected">
+       id="src/libs/tracing/qml/ico_rangeselected">
       <use
          height="100%"
          width="100%"
@@ -4833,7 +4762,7 @@
     </g>
     <g
        style="display:inline"
-       id="src/libs/timeline/qml/ico_selectionmode"
+       id="src/libs/tracing/qml/ico_selectionmode"
        clip-path="url(#clipPath6127)"
        transform="translate(31,0)">
       <rect
@@ -4885,7 +4814,7 @@
          x="0" />
     </g>
     <g
-       id="src/libs/timeline/qml/ico_edit">
+       id="src/libs/tracing/qml/ico_edit">
       <rect
          style="fill:#ffffff"
          x="1144"
@@ -7466,38 +7395,6 @@
            ry="1.5" />
       </g>
     </g>
-    <g
-       id="src/libs/utils/images/panel_manage_button_hover"
-       style="opacity:0.83">
-      <use
-         height="600"
-         width="800"
-         transform="translate(8,0)"
-         id="use4140"
-         xlink:href="#panel_manage_button"
-         y="0"
-         x="0" />
-      <rect
-         ry="3"
-         y="500"
-         x="192"
-         height="20"
-         width="8"
-         id="rect4143"
-         style="fill:#ffffff;fill-opacity:0.12549020000000000;stroke:none" />
-    </g>
-    <g
-       id="src/libs/utils/images/panel_manage_button_pressed"
-       style="opacity:0.82999998">
-      <use
-         x="0"
-         y="0"
-         xlink:href="#panel_manage_button"
-         id="use3293"
-         transform="matrix(1,0,0,-1,16,1020)"
-         width="800"
-         height="600" />
-    </g>
     <g
        style="display:inline"
        transform="translate(-4)"
@@ -9004,7 +8901,7 @@
     </g>
     <g
        transform="translate(-247.75,309.5)"
-       id="src/boot2qtdevice">
+       id="../boot2qt/common/images/boot2qtdevice">
       <use
          transform="translate(458.75,6.5)"
          style="display:inline"
@@ -9095,7 +8992,7 @@
          inkscape:label="#rect5338" />
     </g>
     <g
-       id="src/boot2qtdevicesmall"
+       id="../boot2qt/common/images/boot2qtdevicesmall"
        transform="translate(-318,27)">
       <use
          x="0"
@@ -9174,7 +9071,7 @@
     </g>
     <g
        transform="translate(-211.75,309.5)"
-       id="src/boot2qtemulator">
+       id="../boot2qt/common/images/boot2qtemulator">
       <use
          transform="translate(458.75,6.5)"
          style="display:inline"
@@ -9230,7 +9127,7 @@
          sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccccccc" />
     </g>
     <g
-       id="src/boot2qtemulatorsmall"
+       id="../boot2qt/common/images/boot2qtemulatorsmall"
        transform="translate(-282,27)">
       <use
          x="0"
@@ -9264,7 +9161,7 @@
     </g>
     <g
        transform="translate(-175.75,309.5)"
-       id="src/boot2qtstartvm">
+       id="../boot2qt/common/images/boot2qtstartvm">
       <use
          transform="translate(458.75,6.5)"
          style="display:inline"
@@ -9311,7 +9208,7 @@
     </g>
     <g
        transform="translate(-139.75,310.5)"
-       id="src/vxworksqtdevice">
+       id="../vxworks/plugins/vxworks/images/vxworksqtdevice">
       <use
          transform="translate(458.75,5.5)"
          style="display:inline"
@@ -9329,7 +9226,7 @@
          sodipodi:nodetypes="cccccccccccccc" />
     </g>
     <g
-       id="src/vxworksdevicesmall"
+       id="../vxworks/plugins/vxworks/images/vxworksdevicesmall"
        transform="translate(-210,27)">
       <use
          x="0"