diff --git a/src/plugins/analyzerbase/images/mode_analyze_mask.png b/src/plugins/analyzerbase/images/mode_analyze_mask.png
index a898c27eb6e..b90619a3a15 100644
Binary files a/src/plugins/analyzerbase/images/mode_analyze_mask.png and b/src/plugins/analyzerbase/images/mode_analyze_mask.png differ
diff --git a/src/plugins/analyzerbase/images/mode_analyze_mask@2x.png b/src/plugins/analyzerbase/images/mode_analyze_mask@2x.png
index 160b6513a10..a0618846da1 100644
Binary files a/src/plugins/analyzerbase/images/mode_analyze_mask@2x.png and b/src/plugins/analyzerbase/images/mode_analyze_mask@2x.png differ
diff --git a/src/plugins/coreplugin/images/mode_design_mask.png b/src/plugins/coreplugin/images/mode_design_mask.png
index a2955133508..3225507f81a 100644
Binary files a/src/plugins/coreplugin/images/mode_design_mask.png and b/src/plugins/coreplugin/images/mode_design_mask.png differ
diff --git a/src/plugins/coreplugin/images/mode_design_mask@2x.png b/src/plugins/coreplugin/images/mode_design_mask@2x.png
index 99d95b7a4d0..f4eced6284d 100644
Binary files a/src/plugins/coreplugin/images/mode_design_mask@2x.png and b/src/plugins/coreplugin/images/mode_design_mask@2x.png differ
diff --git a/src/plugins/coreplugin/images/mode_edit_mask.png b/src/plugins/coreplugin/images/mode_edit_mask.png
index 954f3abe790..8e2a971f15f 100644
Binary files a/src/plugins/coreplugin/images/mode_edit_mask.png and b/src/plugins/coreplugin/images/mode_edit_mask.png differ
diff --git a/src/plugins/coreplugin/images/mode_edit_mask@2x.png b/src/plugins/coreplugin/images/mode_edit_mask@2x.png
index b70cbcb71b4..d683f154e0e 100644
Binary files a/src/plugins/coreplugin/images/mode_edit_mask@2x.png and b/src/plugins/coreplugin/images/mode_edit_mask@2x.png differ
diff --git a/src/plugins/debugger/images/mode_debug_mask.png b/src/plugins/debugger/images/mode_debug_mask.png
index ea9b364994f..6e9ced21643 100644
Binary files a/src/plugins/debugger/images/mode_debug_mask.png and b/src/plugins/debugger/images/mode_debug_mask.png differ
diff --git a/src/plugins/debugger/images/mode_debug_mask@2x.png b/src/plugins/debugger/images/mode_debug_mask@2x.png
index 63e2fe5f99c..b37967938fa 100644
Binary files a/src/plugins/debugger/images/mode_debug_mask@2x.png and b/src/plugins/debugger/images/mode_debug_mask@2x.png differ
diff --git a/src/plugins/help/images/mode_help_mask.png b/src/plugins/help/images/mode_help_mask.png
index 9924e734167..43eb4d120b2 100644
Binary files a/src/plugins/help/images/mode_help_mask.png and b/src/plugins/help/images/mode_help_mask.png differ
diff --git a/src/plugins/help/images/mode_help_mask@2x.png b/src/plugins/help/images/mode_help_mask@2x.png
index 213bfc65aad..611769bd968 100644
Binary files a/src/plugins/help/images/mode_help_mask@2x.png and b/src/plugins/help/images/mode_help_mask@2x.png differ
diff --git a/src/plugins/projectexplorer/images/mode_project_mask.png b/src/plugins/projectexplorer/images/mode_project_mask.png
index f3098ca6f89..beffa6722b8 100644
Binary files a/src/plugins/projectexplorer/images/mode_project_mask.png and b/src/plugins/projectexplorer/images/mode_project_mask.png differ
diff --git a/src/plugins/projectexplorer/images/mode_project_mask@2x.png b/src/plugins/projectexplorer/images/mode_project_mask@2x.png
index 88e203caea5..bd195752ac7 100644
Binary files a/src/plugins/projectexplorer/images/mode_project_mask@2x.png and b/src/plugins/projectexplorer/images/mode_project_mask@2x.png differ
diff --git a/src/plugins/welcome/images/mode_welcome_mask.png b/src/plugins/welcome/images/mode_welcome_mask.png
index d0183d3e79f..86912bb0695 100644
Binary files a/src/plugins/welcome/images/mode_welcome_mask.png and b/src/plugins/welcome/images/mode_welcome_mask.png differ
diff --git a/src/plugins/welcome/images/mode_welcome_mask@2x.png b/src/plugins/welcome/images/mode_welcome_mask@2x.png
index b9189b3efb4..daee953529c 100644
Binary files a/src/plugins/welcome/images/mode_welcome_mask@2x.png and b/src/plugins/welcome/images/mode_welcome_mask@2x.png differ
diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg
index a7001a2d38f..42f921947bd 100644
--- a/src/tools/icons/qtcreatoricons.svg
+++ b/src/tools/icons/qtcreatoricons.svg
@@ -3517,10 +3517,9 @@
          height="32"
          id="rect5694-0" />
       <path
-         id="rect5692-9"
-         style="fill:#000000"
-         d="m 62,62 4,0 0,4 -4,0 z m -6,0 4,0 0,4 -4,0 z m -6,0 4,0 0,4 -4,0 z m 12,-6 4,0 0,4 -4,0 z m -6,0 4,0 0,4 -4,0 z m -6,0 4,0 0,4 -4,0 z m 12,-6 4,0 0,4 -4,0 z m -6,0 4,0 0,4 -4,0 z m -6,0 4,0 0,4 -4,0 z"
-         inkscape:connector-curvature="0" />
+         inkscape:connector-curvature="0"
+         d="m 62,62 5,0 0,5 -5,0 z m -7,0 5,0 0,5 -5,0 z m -7,0 5,0 0,5 -5,0 z m 14,-7 5,0 0,5 -5,0 z m -7,0 5,0 0,5 -5,0 z m -7,0 5,0 0,5 -5,0 z m 14,-7 5,0 0,5 -5,0 z m -7,0 5,0 0,5 -5,0 z m -7,0 5,0 0,5 -5,0 z"
+         id="rect5371-8" />
     </g>
     <g
        transform="translate(-36,308)"
@@ -3533,15 +3532,11 @@
          width="48"
          height="32"
          id="rect5706-3-8" />
-      <g
-         style="fill:#000000"
-         id="g5697-7">
-        <path
-           style="fill:#000000"
-           inkscape:connector-curvature="0"
-           d="m 100,50 0,16 16,0 0,-16 -16,0 z m 3,6 8,0 0,1 -8,0 0,-1 z m 8,5 -8,0 0,-1 8,0 0,1 z m 2,-2 -10,0 0,-1 10,0 0,1 z m 0,-4 -10,0 0,-1 10,0 0,1 z"
-           id="path5699-3" />
-      </g>
+      <path
+         id="path5381-3"
+         d="m 98,48 0,19 19,0 0,-19 z m 4,9 9,0 0,1 -9,0 z m 9,5 -9,0 0,-1 9,0 z m 2,-2 -11,0 0,-1 11,0 z m 0,-4 -11,0 0,-1 11,0 z m 0,-2 -11,0 0,-1 11,0 z"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccccccccccccccccccccccccccc" />
     </g>
     <g
        transform="translate(-38,308)"
@@ -3554,18 +3549,14 @@
          width="48"
          height="32"
          id="rect5706-2" />
-      <rect
-         style="fill:#000000"
-         x="161.58099"
-         y="50.402"
-         transform="matrix(-0.707,0.7072,-0.7072,-0.707,315.6181,-25.4514)"
-         width="3"
-         height="4.5"
-         id="rect5702-4" />
-      <polygon
-         style="fill:#000000"
-         points="159.511,53.04 150.884,61.667 150,65.732 154.065,64.85 162.692,56.222 "
-         id="polygon5704-0" />
+      <g
+         transform="translate(-5,-4)"
+         id="g5387-8">
+        <path
+           id="polygon5391-6"
+           d="m 167.909,59.778 -3.535,-3.536 -10.96,10.96 -1.414,4.95 4.949,-1.414 z m -2.4715,-4.589696 3.18214,-3.180343 3.5338,3.535793 -3.18215,3.180343 z"
+           inkscape:connector-curvature="0" />
+      </g>
     </g>
     <g
        transform="translate(-40,308)"
@@ -3579,24 +3570,12 @@
          height="32"
          id="rect5706-4-6" />
       <g
-         style="fill:#000000"
-         id="g5709-8"
-         transform="translate(0.5,0)">
+         transform="translate(-4.5,-5)"
+         id="g5397-4">
         <path
-           style="fill:#000000"
-           inkscape:connector-curvature="0"
-           d="m 208,50 c -1.016,0 -2.634,0.93 -3.106,2.18 l 3.106,1.746 3.105,-1.747 C 210.635,50.93 209.016,50 208,50 Z"
-           id="path5711-2" />
-        <path
-           style="fill:#000000"
-           inkscape:connector-curvature="0"
-           d="m 215.5,58.011 -1.125,0 -0.636,-2.543 1.407,-1.407 c 0.194,-0.194 0.194,-0.513 0,-0.707 -0.195,-0.194 -0.514,-0.194 -0.708,0 l -1.054,1.054 -1.629,-1.447 -3.256,1.832 0,2.458 0,7.749 1.75,-0.489 2.707,-1.806 0.963,0.963 c 0.193,0.193 0.512,0.193 0.707,0 0.193,-0.195 0.193,-0.514 0,-0.707 l -1.156,-1.156 0.873,-2.794 1.156,0 c 0.275,0 0.5,-0.226 0.5,-0.5 0,-0.274 -0.224,-0.5 -0.499,-0.5 z"
-           id="path5713-0" />
-        <path
-           style="fill:#000000"
-           inkscape:connector-curvature="0"
-           d="m 202.615,54.408 -1.055,-1.055 c -0.194,-0.194 -0.513,-0.194 -0.707,0 l 0,0 c -0.194,0.194 -0.194,0.513 0,0.707 l 1.407,1.407 -0.636,2.543 -1.124,0 c -0.275,0 -0.5,0.226 -0.5,0.5 0,0.274 0.225,0.5 0.5,0.5 l 1.156,0 0.873,2.794 -1.156,1.156 c -0.194,0.193 -0.194,0.512 0,0.707 0.194,0.193 0.513,0.193 0.707,0 l 0.962,-0.963 2.708,1.806 1.75,0.49 0,-7.75 0,-2.458 -3.256,-1.832 -1.629,1.448 z"
-           id="path5715-4" />
+           d="M 167.5 356 C 166.225 356 164.19123 357.17695 163.61523 358.75195 L 167.5 360.9375 L 171.38477 358.75195 C 170.80877 357.17595 168.775 356 167.5 356 z M 162.82422 359.68359 L 160.83789 361.44922 L 159.44141 360.05469 C 159.24741 359.86069 158.92837 359.86069 158.73438 360.05469 C 158.54038 360.24869 158.54038 360.56772 158.73438 360.76172 L 160.42188 362.44922 L 159.53516 366 L 158 366 C 157.725 366 157.5 366.225 157.5 366.5 C 157.5 366.775 157.725 367 158 367 L 159.48828 367 L 160.67969 370.8125 L 159.05273 372.43945 C 158.85873 372.63345 158.85873 372.95248 159.05273 373.14648 C 159.24673 373.34048 159.56577 373.34048 159.75977 373.14648 L 161.13477 371.77148 L 164.6875 374.13867 L 167 374.72461 L 167 362 L 162.82422 359.68359 z M 172.17578 359.68359 L 168 362 L 168 374.72461 L 170.3125 374.13867 L 173.86328 371.77148 L 175.23828 373.14648 C 175.43228 373.34048 175.75131 373.34048 175.94531 373.14648 C 176.13931 372.95248 176.13931 372.63345 175.94531 372.43945 L 174.32031 370.81445 L 175.51172 367 L 177 367 C 177.275 367 177.5 366.775 177.5 366.5 C 177.5 366.225 177.275 366 177 366 L 175.46484 366 L 174.57812 362.44922 L 176.26562 360.76172 C 176.45963 360.56772 176.45962 360.24869 176.26562 360.05469 C 176.07163 359.86069 175.75259 359.86069 175.55859 360.05469 L 174.16211 361.44922 L 172.17578 359.68359 z "
+           transform="translate(44.5,-303)"
+           id="path5403-3" />
       </g>
     </g>
     <g
@@ -3611,10 +3590,9 @@
          height="32"
          id="rect5722-4" />
       <path
-         style="fill:#000000"
-         inkscape:connector-curvature="0"
-         d="m 264.652,57.667 c 1.247,-1.246 1.592,-3.038 1.069,-4.604 l -2.483,2.483 c -0.389,0.389 -1.025,0.389 -1.414,0 l -1.414,-1.415 c -0.389,-0.389 -0.389,-1.025 0,-1.414 l 2.482,-2.483 c -1.565,-0.521 -3.357,-0.177 -4.604,1.069 -1.318,1.318 -1.646,3.251 -0.988,4.876 l -6.79,6.791 c -0.681,0.681 -0.681,1.794 0,2.475 0.681,0.681 1.794,0.681 2.475,0 l 6.79,-6.791 c 1.627,0.66 3.559,0.331 4.877,-0.987 z"
-         id="path5720-8" />
+         id="path5439-0"
+         d="m 265.554,57.885 c 1.51,-1.511 1.955,-3.68 1.34,-5.583 l -2.754,2.754 c -0.584,0.583 -1.538,0.583 -2.121,0 l -1.414,-1.415 c -0.584,-0.583 -0.584,-1.538 0,-2.121 l 2.754,-2.754 c -1.903,-0.614 -4.073,-0.17 -5.583,1.34 -1.647,1.647 -2.025,4.081 -1.145,6.095 l -8.048,8.047 c -0.777,0.778 -0.777,2.051 0,2.829 0.777,0.777 2.051,0.777 2.828,0 l 8.048,-8.048 c 2.015,0.882 4.447,0.503 6.095,-1.144 z"
+         inkscape:connector-curvature="0" />
     </g>
     <g
        transform="translate(-44,308)"
@@ -3627,41 +3605,10 @@
          width="48"
          height="32"
          id="rect5706-6-2" />
-      <rect
-         style="fill:#000000"
-         x="300"
-         y="50"
-         width="1"
-         height="16"
-         id="rect5725-8" />
-      <rect
-         style="fill:#000000"
-         x="300"
-         y="65"
-         width="16"
-         height="1"
-         id="rect5727-6" />
-      <rect
-         style="fill:#000000"
-         x="303"
-         y="50"
-         width="13"
-         height="3"
-         id="rect5729-7" />
-      <rect
-         style="fill:#000000"
-         x="303"
-         y="55"
-         width="9"
-         height="3"
-         id="rect5731-4" />
-      <rect
-         style="fill:#000000"
-         x="303"
-         y="60"
-         width="5"
-         height="3"
-         id="rect5733-9" />
+      <path
+         id="rect5451-0"
+         style=""
+         d="m 301,61 7,0 0,4 -7,0 z m 0,-6 12,0 0,4 -12,0 z m 0,-6 16,0 0,4 -16,0 z m -3,18 19,0 0,1 -19,0 z m 0,-18 1,0 0,19 -1,0 z" />
     </g>
     <g
        transform="translate(-46,308)"
@@ -3675,13 +3622,9 @@
          height="32"
          id="rect5706-9-7" />
       <path
-         d="m 358,50 c -4.418,0 -8,3.582 -8,8 0,4.418 3.582,8 8,8 4.418,0 8,-3.582 8,-8 0,-4.418 -3.582,-8 -8,-8 z m 0.91,12.846 c -0.22,0.215 -0.483,0.322 -0.791,0.322 -0.15,0 -0.292,-0.028 -0.428,-0.084 -0.135,-0.056 -0.254,-0.13 -0.356,-0.224 -0.103,-0.093 -0.185,-0.205 -0.245,-0.336 -0.061,-0.13 -0.091,-0.271 -0.091,-0.42 0,-0.299 0.109,-0.555 0.329,-0.77 0.219,-0.214 0.482,-0.322 0.791,-0.322 0.299,0 0.56,0.103 0.783,0.308 0.225,0.206 0.336,0.458 0.336,0.756 0,0.298 -0.109,0.555 -0.328,0.77 z m 2.192,-6.384 c -0.084,0.233 -0.197,0.448 -0.337,0.644 -0.14,0.196 -0.301,0.383 -0.483,0.56 -0.182,0.177 -0.375,0.364 -0.58,0.56 -0.131,0.121 -0.243,0.229 -0.336,0.322 -0.094,0.094 -0.171,0.189 -0.231,0.287 -0.06,0.098 -0.104,0.21 -0.133,0.336 -0.029,0.126 -0.042,0.278 -0.042,0.455 l 0,0.532 -1.68,0 0,-0.77 c 0,-0.206 0.012,-0.38 0.035,-0.525 0.022,-0.145 0.064,-0.275 0.125,-0.392 0.061,-0.117 0.141,-0.229 0.238,-0.336 0.098,-0.107 0.217,-0.235 0.357,-0.385 l 1.078,-1.092 c 0.232,-0.233 0.35,-0.537 0.35,-0.91 0,-0.364 -0.119,-0.66 -0.357,-0.889 -0.238,-0.229 -0.539,-0.343 -0.902,-0.343 -0.393,0 -0.715,0.133 -0.967,0.399 -0.252,0.266 -0.396,0.59 -0.434,0.973 l -1.792,-0.14 c 0.056,-0.448 0.173,-0.847 0.35,-1.197 0.177,-0.35 0.408,-0.646 0.693,-0.889 0.284,-0.243 0.614,-0.427 0.987,-0.553 0.373,-0.126 0.783,-0.189 1.232,-0.189 0.42,0 0.809,0.061 1.168,0.182 0.359,0.122 0.672,0.296 0.938,0.525 0.267,0.229 0.474,0.514 0.623,0.854 0.149,0.341 0.224,0.73 0.224,1.169 10e-4,0.308 -0.04,0.579 -0.124,0.812 z"
-         id="mode_x5F_help-2"
-         inkscape:connector-curvature="0"
-         style="fill:#000000"
-         inkscape:export-filename="c:\Users\aportale\ownprojects\stuff\experiments\iconrecoloring\icon.png"
-         inkscape:export-xdpi="90"
-         inkscape:export-ydpi="90" />
+         id="path5457-0"
+         d="m 358,48 c -5.522,0 -10,4.478 -10,10 0,5.522 4.478,10 10,10 5.522,0 10,-4.478 10,-10 0,-5.522 -4.478,-10 -10,-10 z m 1.136,16.182 c -0.274,0.269 -0.604,0.402 -0.989,0.402 -0.187,0 -0.364,-0.035 -0.533,-0.105 -0.169,-0.07 -0.318,-0.163 -0.446,-0.28 -0.129,-0.117 -0.23,-0.257 -0.307,-0.42 -0.076,-0.163 -0.113,-0.338 -0.113,-0.525 0,-0.373 0.137,-0.694 0.411,-0.962 0.273,-0.268 0.603,-0.402 0.988,-0.402 0.374,0 0.7,0.128 0.98,0.385 0.28,0.257 0.42,0.572 0.42,0.945 0,0.372 -0.138,0.693 -0.411,0.962 z m 2.738,-7.98 c -0.104,0.292 -0.245,0.56 -0.42,0.805 -0.175,0.245 -0.376,0.479 -0.604,0.7 -0.228,0.222 -0.47,0.455 -0.727,0.7 -0.163,0.151 -0.303,0.286 -0.42,0.402 -0.116,0.117 -0.213,0.236 -0.288,0.359 -0.076,0.122 -0.132,0.262 -0.167,0.42 -0.034,0.157 -0.052,0.347 -0.052,0.569 l 0,0.665 -2.101,0 0,-0.962 c 0,-0.256 0.015,-0.475 0.044,-0.656 0.029,-0.181 0.081,-0.344 0.157,-0.49 0.076,-0.146 0.175,-0.286 0.298,-0.42 0.122,-0.134 0.271,-0.295 0.446,-0.481 l 1.348,-1.365 c 0.291,-0.292 0.438,-0.67 0.438,-1.137 0,-0.455 -0.149,-0.825 -0.446,-1.111 -0.298,-0.286 -0.674,-0.429 -1.129,-0.429 -0.49,0 -0.893,0.166 -1.208,0.499 -0.314,0.333 -0.495,0.738 -0.542,1.216 l -2.24,-0.175 c 0.07,-0.56 0.216,-1.059 0.438,-1.496 0.222,-0.438 0.511,-0.808 0.866,-1.111 0.355,-0.303 0.768,-0.534 1.234,-0.691 0.466,-0.158 0.979,-0.236 1.54,-0.236 0.524,0 1.012,0.076 1.461,0.228 0.449,0.152 0.84,0.371 1.172,0.656 0.333,0.286 0.593,0.642 0.779,1.067 0.186,0.426 0.28,0.913 0.28,1.461 10e-4,0.382 -0.052,0.721 -0.157,1.013 z"
+         inkscape:connector-curvature="0" />
     </g>
     <g
        transform="translate(-262,305)"