diff --git a/icons/Color/16/gimp-color-cmyk.png b/icons/Color/16/gimp-color-cmyk.png
new file mode 100644
index 0000000000..6733fa35c9
Binary files /dev/null and b/icons/Color/16/gimp-color-cmyk.png differ
diff --git a/icons/Color/16/gimp-color-water.png b/icons/Color/16/gimp-color-water.png
new file mode 100644
index 0000000000..b172df4076
Binary files /dev/null and b/icons/Color/16/gimp-color-water.png differ
diff --git a/icons/Color/scalable/gimp-color-cmyk.svg b/icons/Color/scalable/gimp-color-cmyk.svg
new file mode 100644
index 0000000000..343e3f54c5
--- /dev/null
+++ b/icons/Color/scalable/gimp-color-cmyk.svg
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg30571"
+   version="1.1"
+   inkscape:version="0.92pre1 unknown"
+   sodipodi:docname="gimp-color-cmyk.svg">
+  <defs
+     id="defs30573" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="21.73877"
+     inkscape:cx="26.561238"
+     inkscape:cy="13.875709"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:snap-page="true"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-text-baseline="true"
+     showborder="false"
+     inkscape:window-width="809"
+     inkscape:window-height="428"
+     inkscape:window-x="90"
+     inkscape:window-y="117"
+     inkscape:window-maximized="0"
+     inkscape:snap-global="false"
+     showguides="false" />
+  <metadata
+     id="metadata30576">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>
+          image/svg+xml
+        </dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Klaus Staedtler       </dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <g
+       id="g3951">
+      <g
+         id="g3950">
+        <rect
+           style="fill:none;stroke:none"
+           id="rect28186-4"
+           width="16"
+           height="16"
+           x="0"
+           y="1036.3622"
+           rx="0" />
+        <rect
+           style="opacity:0.3;fill:none;stroke:none"
+           id="rect6884"
+           width="16"
+           height="16"
+           x="0"
+           y="1036.3622" />
+        <path
+           style="opacity:0;fill:#000000;fill-opacity:1;stroke:none"
+           d="m 0,1036.3622 v 16 h 16 v -16 z m 1.1428571,1.1429 H 14.857143 v 13.7142 H 1.1428571 Z"
+           id="rect6886"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           style="opacity:1;fill:#ffff00;fill-opacity:1;stroke:none;stroke-width:0.214;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 1,1044.3622 v 7 h 7 v -7 z m 0.921875,0.7832 h 0.7949219 l 1.5175781,2.2481 1.5039062,-2.2481 h 0.7949219 l -1.9335937,2.8633 v 2.6035 H 3.8554688 v -2.6035 z"
+           id="rect3938" />
+        <rect
+           style="opacity:0.75;fill:#00ffff;fill-opacity:1;stroke:none;stroke-width:0.214;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="rect3938-6"
+           width="7"
+           height="7"
+           x="1"
+           y="1037.3622" />
+        <rect
+           style="opacity:0.50800003;fill:#ff00ff;fill-opacity:1;stroke:none;stroke-width:0.214;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="rect3938-6-3"
+           width="7"
+           height="7"
+           x="8"
+           y="1037.3622" />
+        <rect
+           style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.214;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="rect3938-6-3-5"
+           width="7"
+           height="7"
+           x="8"
+           y="1044.3622" />
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-weight:normal;font-size:7.5px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           x="1.5"
+           y="1043.4247"
+           id="text3999"
+           sodipodi:linespacing="125%"><tspan
+             sodipodi:role="line"
+             id="tspan4001"
+             x="1.5"
+             y="1043.4247">C</tspan></text>
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-weight:normal;font-size:7.5px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           x="8.1875"
+           y="1043.7997"
+           id="text4003"
+           sodipodi:linespacing="125%"><tspan
+             sodipodi:role="line"
+             id="tspan4005"
+             x="8.1875"
+             y="1043.7997">M</tspan></text>
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-weight:normal;font-size:7.5px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           x="8.1875"
+           y="1050.4872"
+           id="text4007"
+           sodipodi:linespacing="125%"><tspan
+             sodipodi:role="line"
+             id="tspan4009"
+             x="8.1875"
+             y="1050.4872">K</tspan></text>
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-weight:normal;font-size:7.85690022px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           x="1.8122203"
+           y="1052.7969"
+           id="text3962"
+           sodipodi:linespacing="125%"
+           transform="scale(1.0019472,0.99805657)"><tspan
+             sodipodi:role="line"
+             id="tspan3964"
+             x="1.8122203"
+             y="1052.7969">Y</tspan></text>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/icons/Color/scalable/gimp-color-water.svg b/icons/Color/scalable/gimp-color-water.svg
new file mode 100644
index 0000000000..669ede63eb
--- /dev/null
+++ b/icons/Color/scalable/gimp-color-water.svg
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg11300"
+   sodipodi:version="0.32"
+   inkscape:version="0.92pre1 unknown"
+   sodipodi:docname="gimp-color-water.svg"
+   version="1.0"
+   viewBox="0 0 16 16">
+  <sodipodi:namedview
+     inkscape:cy="13.816391"
+     inkscape:cx="17.477291"
+     inkscape:zoom="19.486724"
+     inkscape:window-height="1016"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="0.17254902"
+     bordercolor="#666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:showpageshadow="false"
+     showborder="true"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:current-layer="layer1"
+     width="16px"
+     height="16px"
+     showgrid="true"
+     inkscape:window-maximized="1"
+     inkscape:document-units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4261" />
+  </sodipodi:namedview>
+  <defs
+     id="defs3" />
+  <sodipodi:namedview
+     stroke="#ef2929"
+     fill="#eeeeec"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="0.25490196"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="-14.198652"
+     inkscape:cy="-5.1663457"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:showpageshadow="false"
+     inkscape:window-width="872"
+     inkscape:window-height="659"
+     inkscape:window-x="403"
+     inkscape:window-y="296"
+     width="32px"
+     height="32px"
+     id="namedview73" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>http://jimmac.musichall.cz</dc:source>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
+        <dc:title />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Attribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g4294">
+      <path
+         inkscape:connector-curvature="0"
+         id="path4015"
+         d="M 7.2137584,15.261679 C 6.744803,15.201805 5.9555085,15.027427 5.5723969,14.899055 4.463395,14.527455 3.6936426,14.040168 2.7837316,13.133709 1.5570134,11.911645 0.95823789,10.702714 0.69416856,8.9148709 0.43723162,7.1753176 0.97723968,5.1117223 2.0660262,3.6724307 2.8909383,2.581961 3.90982,1.7710026 5.0570044,1.2918218 7.1153369,0.43205305 9.3884047,0.53213795 11.380948,1.5702695 c 1.209757,0.6302936 2.415997,1.8640284 3.03,3.0990654 0.327259,0.6582653 0.468335,1.0699675 0.638905,1.8645206 0.115388,0.5374996 0.132121,0.7235288 0.131922,1.4665984 -2.34e-4,0.9557532 -0.08274,1.4657122 -0.382654,2.3658881 -0.365247,1.096259 -0.85656,1.874147 -1.748414,2.768236 -1.22223,1.225294 -2.418225,1.821826 -4.183773,2.086761 -0.4424291,0.06639 -1.2876083,0.08701 -1.6531756,0.04034 z M 8.6967542,12.404824 C 10.403593,12.095214 11.803755,10.802623 12.2561,9.1189319 12.402295,8.5747754 12.414694,7.470649 12.280129,6.979235 12.066474,6.1990019 11.699288,5.5299 11.180337,4.9751505 10.744754,4.509519 10.351944,4.2217259 9.7969569,3.961615 7.2478718,2.7669094 4.2447417,4.211609 3.5574096,6.9632401 3.4410988,7.4288747 3.4404651,8.58818 3.5562893,9.0138008 c 0.416181,1.5293472 1.4232633,2.6630812 2.8244393,3.1796432 0.7368589,0.271653 1.5663758,0.347361 2.3160256,0.21138 z"
+         style="fill:#fce94f;stroke-width:0.03890092" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4017"
+         d="M 7.2137584,15.261679 C 5.9333995,15.098208 4.8261939,14.702642 3.8700103,14.067073 3.2160775,13.632408 2.2445038,12.648717 1.8029818,11.974264 0.80139898,10.444282 0.40744567,8.4132816 0.76664067,6.6314739 1.0777096,5.0883965 1.7746803,3.8228159 2.9188964,2.723342 3.9715165,1.7118824 5.0193968,1.1748877 6.5816618,0.84632832 7.2800562,0.69944902 8.4983583,0.68701155 9.1343595,0.82026798 9.647998,0.92788657 10.591417,1.240953 11.073788,1.463853 c 0.941517,0.4350669 2.074322,1.4040314 2.752673,2.3545454 0.507745,0.7114594 1.1471,2.1546052 1.013672,2.2880515 -0.06186,0.061869 -2.388258,0.6876149 -2.485631,0.6685751 C 12.313372,6.7669825 12.242477,6.650986 12.196959,6.5172549 11.703684,5.0680429 10.389061,3.9157212 8.890998,3.6194416 8.4819393,3.5385401 8.2553084,3.5226904 7.7486093,3.5395473 7.1778681,3.558535 7.0636528,3.5783003 6.5719373,3.7431753 4.9255817,4.2952069 3.802509,5.5761065 3.5132383,7.2317176 3.4204563,7.7627472 3.4443795,8.5880268 3.5656864,9.04102 c 0.7070737,2.640408 3.3861895,4.073907 5.8911633,3.15215 0.6457033,-0.2376 1.1784533,-0.58609 1.7857073,-1.168096 0.340606,-0.326444 0.810941,-1.1137303 0.957181,-1.6022079 0.03864,-0.1290665 0.09094,-0.2072845 0.139268,-0.208298 0.04257,-8.909e-4 0.632127,0.1459954 1.310137,0.3264182 l 1.232743,0.32804 -0.02311,0.1720347 c -0.03808,0.283553 -0.411548,1.18043 -0.672125,1.614108 -0.347366,0.57812 -0.720756,1.049777 -1.28178,1.619111 -1.053726,1.069336 -2.34814,1.693491 -4.037941,1.947059 -0.4424291,0.06639 -1.2876083,0.08701 -1.6531756,0.04034 z"
+         style="fill:#8ae234;stroke-width:0.03890092" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4019"
+         d="M 7.2137584,15.264796 C 5.2321213,14.969435 4.0608634,14.405995 2.7837316,13.133709 2.314136,12.665895 2.0558866,12.360592 1.8029818,11.974264 1.0071567,10.75859 0.57496643,9.1790394 0.64250235,7.7329918 0.73220444,5.8123201 1.4929395,4.1058469 2.8449823,2.7924103 3.8965568,1.7708626 4.9704982,1.2013702 6.4692132,0.87054425 6.9860636,0.75645483 7.1808668,0.73802153 7.8944778,0.73567915 c 0.9475302,-0.003112 1.3089657,0.0560289 2.2342352,0.36557425 1.239132,0.4145464 1.985346,0.8713596 2.846849,1.7427679 0.652978,0.6604867 1.046466,1.1914626 1.389113,1.8744819 0.293043,0.5841396 0.54468,1.3187142 0.475458,1.3879467 -0.06186,0.061869 -2.388258,0.6876149 -2.485631,0.6685751 C 12.313372,6.7669825 12.242477,6.650986 12.196959,6.5172549 11.703684,5.0680429 10.389061,3.9157212 8.890998,3.6194416 8.2885637,3.5002951 7.3111304,3.5119658 6.831867,3.6440279 5.2003546,4.093595 3.9602099,5.3506899 3.5574096,6.9632401 3.4410988,7.4288747 3.4404651,8.58818 3.5562893,9.0138008 3.9725002,10.543259 4.980499,11.677927 6.3807286,12.19317 c 0.7660906,0.281899 1.5234644,0.346904 2.368236,0.203264 0.7827634,-0.133095 1.4838564,-0.465777 2.1321334,-1.011738 l 0.215119,-0.181168 0.959636,0.958867 c 0.527799,0.527376 0.949545,0.985162 0.937214,1.017302 -0.03215,0.0838 -0.48037,0.462937 -0.924505,0.782016 -0.734119,0.527413 -1.923227,1.027625 -2.8855793,1.213854 -0.3970177,0.07683 -1.6664952,0.134351 -1.9692239,0.08923 z"
+         style="fill:#edd400;stroke-width:0.03890092" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4021"
+         d="M 7.2137584,15.264796 C 5.2321213,14.969435 4.0608634,14.405995 2.7837316,13.133709 2.314136,12.665895 2.0558866,12.360592 1.8029818,11.974264 1.0071567,10.75859 0.57496643,9.1790394 0.64250235,7.7329918 0.73220444,5.8123201 1.4929395,4.1058469 2.8449823,2.7924103 3.8965568,1.7708626 4.9704982,1.2013702 6.4692132,0.87054425 6.9860636,0.75645483 7.1808668,0.73802153 7.8944778,0.73567915 9.033697,0.73194052 9.267276,0.78223001 10.684592,1.3364064 c 0.532885,0.2083602 1.07764,0.5105862 1.524107,0.8455627 0.289951,0.2175454 0.685602,0.5716026 0.743556,0.665387 0.0378,0.061163 -1.754304,1.894923 -1.851872,1.894923 -0.02903,0 -0.105827,-0.056762 -0.17066,-0.1261379 C 10.601948,4.2653951 9.5686137,3.7053649 9.156253,3.654984 9.0506123,3.6420769 8.8131591,3.6050714 8.6285787,3.5727492 8.2061515,3.4987771 7.2199875,3.5381479 6.831867,3.6444796 5.2034906,4.0905986 3.9602061,5.3507046 3.5574096,6.9632401 3.4410988,7.4288747 3.4404651,8.58818 3.5562893,9.0138008 3.9725002,10.543259 4.980499,11.677927 6.3807286,12.19317 c 0.7660906,0.281899 1.5234644,0.346904 2.368236,0.203264 0.7827634,-0.133095 1.4838564,-0.465777 2.1321334,-1.011738 l 0.215119,-0.181168 0.959636,0.958867 c 0.527799,0.527376 0.949545,0.985162 0.937214,1.017302 -0.03215,0.0838 -0.48037,0.462937 -0.924505,0.782016 -0.734119,0.527413 -1.923227,1.027625 -2.8855793,1.213854 -0.3970177,0.07683 -1.6664952,0.134351 -1.9692239,0.08923 z"
+         style="fill:#fcaf3e;stroke-width:0.03890092" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4023"
+         d="M 7.2137584,15.264796 C 5.2321213,14.969435 4.0608634,14.405995 2.7837316,13.133709 1.5570134,11.911645 0.95823789,10.702714 0.69416856,8.9148709 0.49457658,7.5635628 0.7838193,5.950585 1.4628139,4.6284752 2.1495252,3.2913409 3.4673104,2.0325782 4.8312406,1.4109185 5.8730855,0.93606021 7.4491461,0.64116174 8.3928616,0.74449898 8.8806091,0.79790737 9.6969367,0.96070018 9.7517105,1.0154819 9.7866112,1.0503873 9.1474507,3.4738749 9.0821817,3.5541155 9.0524012,3.5907273 8.9357699,3.5877166 8.6860291,3.5438886 7.9152047,3.4086138 7.188762,3.4769281 6.4601048,3.7532132 5.7802882,4.0109793 5.2847844,4.3192147 4.8269886,4.7691175 4.1947629,5.3904423 3.7645657,6.1339212 3.5574096,6.9632401 3.4410988,7.4288747 3.4404651,8.58818 3.5562893,9.0138008 3.9725002,10.543259 4.980499,11.677927 6.3807286,12.19317 c 0.7660906,0.281899 1.5234644,0.346904 2.368236,0.203264 0.7827634,-0.133095 1.4838564,-0.465777 2.1321334,-1.011738 l 0.215119,-0.181168 0.959636,0.958867 c 0.527799,0.527376 0.949545,0.985162 0.937214,1.017302 -0.03215,0.0838 -0.48037,0.462937 -0.924505,0.782016 -0.734119,0.527413 -1.923227,1.027625 -2.8855793,1.213854 -0.3970177,0.07683 -1.6664952,0.134351 -1.9692239,0.08923 z"
+         style="fill:#729fcf;stroke-width:0.03890092" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4025"
+         d="m 9.4538502,13.726278 c -0.185305,-0.701925 -0.3440873,-1.29811 -0.3528495,-1.324857 -0.00876,-0.02675 0.1537905,-0.108506 0.361229,-0.18169 0.4482405,-0.158138 0.8684843,-0.399314 1.3127223,-0.753365 L 11.1,11.207308 l 0.957744,0.956977 c 0.526759,0.526337 0.947654,0.983272 0.935323,1.015412 -0.0755,0.196769 -1.150266,0.977844 -1.782981,1.295761 -0.411262,0.206643 -1.2515632,0.528247 -1.3778678,0.527343 -0.022798,-1.55e-4 -0.1930637,-0.574598 -0.378368,-1.276523 z M 5.4515175,14.811176 C 4.496898,14.474455 3.7832583,14.030557 2.8863281,13.215578 1.7454015,12.178897 1.0893421,10.985196 0.76190364,9.3501845 0.61647281,8.6239982 0.60693068,7.4758917 0.74037968,6.7604023 1.0296068,5.2097048 1.7665229,3.8195547 2.8360723,2.8069987 3.9687613,1.7346671 4.9311601,1.2248321 6.4048883,0.91640262 7.2841016,0.73239647 7.8418706,0.68416536 8.3928616,0.74449898 8.8806091,0.79790737 9.6969367,0.96070018 9.7517105,1.0154819 9.7866112,1.0503873 9.1474507,3.4738749 9.0821817,3.5541155 9.0524012,3.5907273 8.9357699,3.5877166 8.6860291,3.5438886 7.9152047,3.4086138 7.188762,3.4769281 6.4601048,3.7532132 5.7802882,4.0109793 5.2847844,4.3192147 4.8269886,4.7691175 4.1947629,5.3904423 3.7645657,6.1339212 3.5574096,6.9632401 3.4410988,7.4288747 3.4404651,8.58818 3.5562893,9.0138008 3.7529822,9.7365919 4.2205334,10.623824 4.583563,10.963171 c 0.069366,0.06484 0.1261209,0.145961 0.1261209,0.180265 0,0.06856 0.5300202,0.508681 0.8752106,0.726762 0.1203415,0.07603 0.4157251,0.218481 0.656408,0.31656 0.4325509,0.176268 0.4375404,0.180222 0.432009,0.342384 -0.00308,0.09023 -0.1431214,0.672842 -0.3112085,1.294692 -0.3515379,1.300535 -0.2708147,1.213007 -0.9105855,0.987342 z"
+         style="fill:#f57900;stroke-width:0.03890092" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4027"
+         d="m 9.4538502,13.726278 c -0.185305,-0.701925 -0.3440873,-1.29811 -0.3528495,-1.324857 -0.00876,-0.02675 0.1537905,-0.108506 0.361229,-0.18169 0.4482405,-0.158138 0.8684843,-0.399314 1.3127223,-0.753365 L 11.1,11.207308 l 0.957744,0.956977 c 0.526759,0.526337 0.947654,0.983272 0.935323,1.015412 -0.0755,0.196769 -1.150266,0.977844 -1.782981,1.295761 -0.411262,0.206643 -1.2515632,0.528247 -1.3778678,0.527343 -0.022798,-1.55e-4 -0.1930637,-0.574598 -0.378368,-1.276523 z M 5.4515175,14.811176 C 4.496898,14.474455 3.7832583,14.030557 2.8863281,13.215578 1.7454015,12.178897 1.0893421,10.985196 0.76190364,9.3501845 0.61647281,8.6239982 0.60693068,7.4758917 0.74037968,6.7604023 0.94203832,5.6792045 1.4220781,4.535421 2.0032242,3.7514411 2.3256635,3.3164629 2.7528487,2.8457296 2.8251477,2.8457296 c 0.025449,0 0.1918474,-0.1334899 0.3697738,-0.2966437 C 3.5843906,2.191953 4.152687,1.8094841 4.6998178,1.5362771 5.2200998,1.276477 5.9700028,1.0231128 6.0327954,1.0859141 6.0823499,1.1354749 6.7019725,3.3979352 6.7027587,3.5321836 6.703031,3.5847396 6.6025607,3.6467325 6.3993263,3.7193445 5.6475433,3.9879418 5.1205436,4.3572259 4.6155564,4.9692834 3.9715274,5.7498635 3.6606786,6.3878597 3.5132383,7.2317176 3.4204563,7.7627472 3.4443795,8.5880268 3.5656864,9.04102 c 0.1854019,0.6923429 0.6590044,1.58669 1.0178766,1.922151 0.069366,0.06484 0.1261205,0.145961 0.1261205,0.180265 0,0.06856 0.5300202,0.508681 0.8752107,0.726762 0.1203414,0.07603 0.415725,0.218481 0.6564079,0.31656 0.4325509,0.176268 0.4375408,0.180222 0.4320094,0.342384 -0.00308,0.09023 -0.1431218,0.672842 -0.3112089,1.294692 -0.3515375,1.300535 -0.2708143,1.213007 -0.9105851,0.987342 z"
+         style="fill:#3465a4;stroke-width:0.03890092" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4029"
+         d="m 9.4538502,13.726278 c -0.185305,-0.701925 -0.3440873,-1.29811 -0.3528495,-1.324857 -0.00876,-0.02675 0.1537905,-0.108506 0.361229,-0.18169 0.4482405,-0.158138 0.8684843,-0.399314 1.3127223,-0.753365 L 11.1,11.207308 l 0.957744,0.956977 c 0.526759,0.526337 0.947654,0.983272 0.935323,1.015412 -0.0755,0.196769 -1.150266,0.977844 -1.782981,1.295761 -0.411262,0.206643 -1.2515632,0.528247 -1.3778678,0.527343 -0.022798,-1.55e-4 -0.1930637,-0.574598 -0.378368,-1.276523 z M 2.4320323,12.790865 C 1.2686957,11.547085 0.558162,9.5388532 0.64250235,7.7329918 0.72455082,5.9761972 1.4151955,4.2880401 2.5374905,3.1010343 2.6702533,2.9606169 2.7996989,2.8457296 2.8251477,2.8457296 c 0.025449,0 0.1918474,-0.1334899 0.3697738,-0.2966437 C 3.5843906,2.191953 4.152687,1.8094841 4.6998178,1.5362771 5.2200998,1.276477 5.9700028,1.0231128 6.0327954,1.0859141 6.0823499,1.1354749 6.7019725,3.3979352 6.7027587,3.5321836 6.703031,3.5847396 6.6025607,3.6467325 6.3993263,3.7193445 5.6475433,3.9879418 5.1205436,4.3572259 4.6155564,4.9692834 3.9715274,5.7498635 3.6606786,6.3878597 3.5132383,7.2317176 3.4204563,7.7627472 3.4443795,8.5880268 3.5656864,9.04102 c 0.1858492,0.6940135 0.5599197,1.412601 0.9739398,1.870935 0.1193667,0.132142 0.1685963,0.226039 0.1497116,0.285547 -0.034232,0.10787 -1.8360697,1.909047 -1.9097473,1.909047 -0.028761,0 -0.1851623,-0.142057 -0.3475582,-0.315684 z"
+         style="fill:#73d216;stroke-width:0.03890092" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4031"
+         d="M 2.4320323,12.790865 C 1.2686957,11.547085 0.558162,9.5388532 0.64250235,7.7329918 0.72455082,5.9761972 1.4151955,4.2880401 2.5374905,3.1010343 2.6702533,2.9606169 2.7996989,2.8457296 2.8251477,2.8457296 c 0.025449,0 0.1918474,-0.1334899 0.3697738,-0.2966437 C 3.5843906,2.191953 4.152687,1.8094841 4.6998178,1.5362771 5.2200998,1.276477 5.9700028,1.0231128 6.0327954,1.0859141 6.0823499,1.1354749 6.7019725,3.3979352 6.7027587,3.5321836 6.703031,3.5847396 6.6025607,3.6467325 6.3993263,3.7193445 5.6475433,3.9879418 5.1205436,4.3572259 4.6155564,4.9692834 3.9715274,5.7498635 3.6606786,6.3878597 3.5132383,7.2317176 3.4204563,7.7627472 3.4443795,8.5880268 3.5656864,9.04102 c 0.1858492,0.6940135 0.5599197,1.412601 0.9739398,1.870935 0.1193667,0.132142 0.1685963,0.226039 0.1497116,0.285547 -0.034232,0.10787 -1.8360697,1.909047 -1.9097473,1.909047 -0.028761,0 -0.1851623,-0.142057 -0.3475582,-0.315684 z"
+         style="fill:#ad7fa8;stroke-width:0.03890092" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4033"
+         d="M 2.4430821,12.711573 C 1.8237994,11.98738 1.3713116,11.195705 1.0890356,10.342526 1.0034485,10.083839 0.97175386,9.9201534 1.0014924,9.8904109 c 0.049446,-0.049453 2.3168,-0.6735513 2.4485464,-0.6739727 0.052066,-1.556e-4 0.1288403,0.1313564 0.2340465,0.4009458 0.1858698,0.476287 0.503215,1.001495 0.8140676,1.347286 L 4.723077,11.214874 3.8290139,12.115682 C 3.3372794,12.611128 2.8995924,13.035956 2.856376,13.059744 2.7944897,13.09381 2.7067103,13.019862 2.4430821,12.711573 Z M 2.2542315,6.4833349 C 1.5589253,6.2966008 0.96930444,6.1239487 0.94396301,6.0996631 0.84555744,6.0053577 1.3368567,4.7722625 1.7074629,4.1833813 2.0417062,3.6522798 2.715625,2.8457296 2.8251477,2.8457296 c 0.025449,0 0.1918474,-0.1334899 0.3697738,-0.2966437 C 3.5843906,2.191953 4.152687,1.8094841 4.6998178,1.5362771 5.2200998,1.276477 5.9700028,1.0231128 6.0327954,1.0859141 6.0823499,1.1354749 6.7019725,3.3979352 6.7027587,3.5321836 6.703031,3.5847396 6.6025607,3.6467325 6.3993263,3.7193445 5.6486052,3.9875625 5.1202456,4.3574585 4.6185154,4.9660607 4.1705608,5.5094336 3.9661011,5.8396413 3.7580137,6.355795 3.6714208,6.5705863 3.5820886,6.7635438 3.5594981,6.7845883 3.5369075,6.8056332 2.9495377,6.6700686 2.2542315,6.4833349 Z"
+         style="fill:#ef2929;stroke-width:0.03890092" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4035"
+         d="M 2.4430821,12.711573 C 1.8237994,11.98738 1.3713116,11.195705 1.0890356,10.342526 1.0034485,10.083839 0.97175386,9.9201534 1.0014924,9.8904109 c 0.049446,-0.049453 2.3168,-0.6735513 2.4485464,-0.6739727 0.052066,-1.556e-4 0.1288403,0.1313564 0.2340465,0.4009458 0.1858698,0.476287 0.503215,1.001495 0.8140676,1.347286 L 4.723077,11.214874 3.8290139,12.115682 C 3.3372794,12.611128 2.8995924,13.035956 2.856376,13.059744 2.7944897,13.09381 2.7067103,13.019862 2.4430821,12.711573 Z M 2.2542315,6.4833349 C 1.5589253,6.2966008 0.96930444,6.1239487 0.94396301,6.0996631 0.84555744,6.0053577 1.3368567,4.7722625 1.7074629,4.1833813 1.9316619,3.8271366 2.2660363,3.3923008 2.5415974,3.0986359 L 2.7834134,2.8409328 3.767559,3.8243347 4.7517049,4.8077371 4.4997357,5.111725 C 4.1698369,5.5097312 3.9513968,5.876115 3.7580137,6.355795 3.6714208,6.5705863 3.5820886,6.7635438 3.5594981,6.7845883 3.5369075,6.8056332 2.9495377,6.6700686 2.2542315,6.4833349 Z"
+         style="fill:#cc0000;stroke-width:0.03890092" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4037"
+         d="M 2.4430821,12.711573 C 1.8237994,11.98738 1.3713116,11.195705 1.0890356,10.342526 1.0034485,10.083839 0.97175386,9.9201534 1.0014924,9.8904109 c 0.049446,-0.049453 2.3168,-0.6735513 2.4485464,-0.6739727 0.052066,-1.556e-4 0.1288403,0.1313564 0.2340465,0.4009458 0.1858698,0.476287 0.503215,1.001495 0.8140676,1.347286 L 4.723077,11.214874 3.8290139,12.115682 C 3.3372794,12.611128 2.8995924,13.035956 2.856376,13.059744 2.7944897,13.09381 2.7067103,13.019862 2.4430821,12.711573 Z"
+         style="fill:#75507b;stroke-width:0.03890092" />
+      <path
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.45587003;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="path4039"
+         sodipodi:type="arc"
+         sodipodi:cx="7.8767509"
+         sodipodi:cy="8.1844206"
+         sodipodi:rx="4.6970806"
+         sodipodi:ry="4.8680339"
+         sodipodi:start="6.2730799"
+         sodipodi:end="6.2702229"
+         d="M 12.573592,8.135228 A 4.6970806,4.8680339 0 0 1 7.9275708,13.05217 4.6970806,4.8680339 0 0 1 3.1799828,8.2405668 4.6970806,4.8680339 0 0 1 7.8192218,3.3167518 4.6970806,4.8680339 0 0 1 12.573437,8.1213209"
+         sodipodi:open="true" />
+      <path
+         id="path4041"
+         d="M 7.9024136,0.00107134 A 7.9995306,7.9994643 0 0 0 5.3344182e-4,8.0923264 7.9995306,7.9994643 0 0 0 8.0859965,16 7.9995306,7.9994643 0 0 0 15.999595,7.9204629 V 7.897027 A 7.9995306,7.9994643 0 0 0 7.9024136,0.00107134 Z m 0.011718,0.96868513 A 7.0310278,7.0309695 0 0 1 15.030901,7.9087449 v 0.021483 A 7.0310278,7.0309695 0 0 1 8.0762315,15.031315 7.0310278,7.0309695 0 0 1 0.96922659,8.0825614 7.0310278,7.0309695 0 0 1 7.9141316,0.96975647 Z"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#b4b4b4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.49996859;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="caaac"
+         inkscape:connector-curvature="0"
+         id="path4263"
+         d="m 4,6.25 c 0,0 1.2576558,-1.0669371 2,-1 0.8299661,0.074838 1.1666667,1.5 2,1.5 0.8333333,0 1.1700339,-1.425162 2,-1.5 0.742344,-0.066937 2,1 2,1"
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#3465a4;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="caaac"
+         inkscape:connector-curvature="0"
+         id="path4263-7"
+         d="m 4,10.25 c 0,0 1.2576558,-1.0669371 2,-1 0.8299661,0.074838 1.1666667,1.5 2,1.5 0.8333333,0 1.1700339,-1.425162 2,-1.5 0.742344,-0.066937 2,1 2,1"
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#3465a4;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="caaac"
+         inkscape:connector-curvature="0"
+         id="path4263-0"
+         d="m 4,8.25 c 0,0 1.2576558,-1.0669371 2,-1 0.8299661,0.074838 1.1666667,1.5 2,1.5 0.8333333,0 1.1700339,-1.425162 2,-1.5 0.742344,-0.066937 2,1 2,1"
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#3465a4;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>
diff --git a/icons/Prototype/Color/16/gimp-cmyk.png b/icons/Prototype/Color/16/gimp-cmyk.png
deleted file mode 100644
index 16eb5d87d9..0000000000
Binary files a/icons/Prototype/Color/16/gimp-cmyk.png and /dev/null differ
diff --git a/icons/Prototype/Color/16/gimp-water-color.png b/icons/Prototype/Color/16/gimp-water-color.png
deleted file mode 100644
index 40b198c1d0..0000000000
Binary files a/icons/Prototype/Color/16/gimp-water-color.png and /dev/null differ
diff --git a/icons/Prototype/Symbolic/16/gimp-cmyk.png b/icons/Prototype/Symbolic/16/gimp-cmyk.png
deleted file mode 100644
index 8444d54003..0000000000
Binary files a/icons/Prototype/Symbolic/16/gimp-cmyk.png and /dev/null differ
diff --git a/icons/Prototype/Symbolic/16/gimp-water-color.png b/icons/Prototype/Symbolic/16/gimp-water-color.png
deleted file mode 100644
index 793b6f16a7..0000000000
Binary files a/icons/Prototype/Symbolic/16/gimp-water-color.png and /dev/null differ
diff --git a/icons/Symbolic/16/gimp-color-cmyk.png b/icons/Symbolic/16/gimp-color-cmyk.png
new file mode 100644
index 0000000000..ec586bdff1
Binary files /dev/null and b/icons/Symbolic/16/gimp-color-cmyk.png differ
diff --git a/icons/Symbolic/16/gimp-color-water.png b/icons/Symbolic/16/gimp-color-water.png
new file mode 100644
index 0000000000..7d974e56b9
Binary files /dev/null and b/icons/Symbolic/16/gimp-color-water.png differ
diff --git a/icons/Symbolic/24/gimp-histogram.svg b/icons/Symbolic/24/gimp-histogram.svg
index 2a132ec7fc..76ffbc7d35 100644
--- a/icons/Symbolic/24/gimp-histogram.svg
+++ b/icons/Symbolic/24/gimp-histogram.svg
@@ -30,8 +30,8 @@
      id="namedview1511"
      showgrid="true"
      inkscape:zoom="14.749984"
-     inkscape:cx="-15.76276"
-     inkscape:cy="10.101706"
+     inkscape:cx="13.540961"
+     inkscape:cy="10.542384"
      inkscape:window-x="0"
      inkscape:window-y="27"
      inkscape:window-maximized="0"
@@ -71,16 +71,7 @@
          style="stop-color:#bebebe;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       gradientTransform="translate(541.61297,283.03649)"
-       gradientUnits="userSpaceOnUse"
-       y2="602"
-       x2="176.0002"
-       y1="602"
-       x1="162.0002"
-       id="linearGradient7532"
-       xlink:href="#linearGradient19282-4" />
-    <linearGradient
-       gradientTransform="translate(541.61297,283.03649)"
+       gradientTransform="matrix(1.1666666,0,0,1.3391314,603.71507,173.83113)"
        gradientUnits="userSpaceOnUse"
        y2="603"
        x2="175.0002"
@@ -102,15 +93,9 @@
        id="g3970-0"
        transform="matrix(1.5714286,0,0,1.5714286,-253.57175,-934.00002)">
       <path
-         sodipodi:nodetypes="cccccccccc"
-         style="fill:url(#linearGradient7532);fill-opacity:1;stroke:none"
-         d="m 162.0002,595 v 14 h 14 v -14 z m 0.63637,0.63637 h 12.72727 v 11.45454 h -12.72727 z"
-         id="rect5444-3-2"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccccccccccccccccccccc"
-         style="fill:url(#linearGradient7536);fill-opacity:1;stroke:none"
-         d="m 163.0002,608 0.625,-1.0625 0.375,-0.9375 h 1 v 0 l 1,-8.45454 h 1 l 1,4.45454 h 1 l 1,2 1,2 v 0 l 1,-2 v -2 0 0 0 l 1,2 1,2 v 0 l 1,1 v 1 z"
+         sodipodi:nodetypes="ccccccccccccccccccccc"
+         style="fill:url(#linearGradient7536);fill-opacity:1;stroke:none;stroke-width:1.249928"
+         d="m 162.0002,609 0.72917,-1.42282 0.4375,-1.25544 h 1.16666 v 0 L 165.5002,595 h 1.16667 l 1.16666,5.96521 h 1.16667 l 1.16667,2.67826 1.16666,2.67827 v 0 l 1.16667,-2.67827 v -2.9162 c 0.33092,-0.25957 0.65075,0.0168 0.95455,0 l 0.21212,2.9162 1.16666,2.67827 v 0 l 1.16667,1.33912 V 609 Z"
          id="path5449-8-0"
          inkscape:connector-curvature="0" />
     </g>
diff --git a/icons/Symbolic/24/gimp-prefs-folders-palettes.svg b/icons/Symbolic/24/gimp-prefs-folders-palettes.svg
new file mode 100644
index 0000000000..0cb8bb8395
--- /dev/null
+++ b/icons/Symbolic/24/gimp-prefs-folders-palettes.svg
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 23.999999 24"
+   id="svg7384"
+   height="24"
+   width="24"
+   version="1.1"
+   inkscape:version="0.92pre1 unknown"
+   sodipodi:docname="gimp-prefs-folders-palettes.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview1510"
+     showgrid="true"
+     inkscape:zoom="14.75"
+     inkscape:cx="13.197532"
+     inkscape:cy="13.843956"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg7384">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4250" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata90">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <dc:contributor>
+          <cc:Agent>
+            <dc:title>Barbara Muraus, Jakub Steiner, Klaus Staedtler</dc:title>
+          </cc:Agent>
+        </dc:contributor>
+        <dc:description>Images originally created as the &quot;Art Libre&quot; icon set. Extended and adopted for GIMP</dc:description>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs7386">
+    <linearGradient
+       osb:paint="solid"
+       id="linearGradient8074">
+      <stop
+         id="stop8072"
+         offset="0"
+         style="stop-color:#be00be;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       osb:paint="solid"
+       id="linearGradient7561">
+      <stop
+         id="stop7558"
+         offset="0"
+         style="stop-color:#a5a5a5;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       osb:paint="solid"
+       id="linearGradient7548">
+      <stop
+         id="stop7546"
+         offset="0"
+         style="stop-color:#ebebeb;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       osb:paint="solid"
+       id="linearGradient7542">
+      <stop
+         id="stop7538"
+         offset="0"
+         style="stop-color:#c9c9c9;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0,-735328.32,170712.69,0,2464326300,577972450)"
+       osb:paint="solid"
+       id="linearGradient19282">
+      <stop
+         id="stop19284"
+         offset="0"
+         style="stop-color:#b4b4b4;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.34682586,0,0,0.30620888,-39.35207,741.03851)"
+       osb:paint="solid"
+       id="linearGradient19282-4">
+      <stop
+         id="stop19284-0"
+         offset="0"
+         style="stop-color:#bebebe;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(768.15947,421.87401)"
+       gradientUnits="userSpaceOnUse"
+       y2="28"
+       x2="131"
+       y1="28"
+       x1="115"
+       id="linearGradient8376"
+       xlink:href="#linearGradient19282-4" />
+    <linearGradient
+       gradientTransform="matrix(1.3333333,0,0,1.3333333,981.21262,553.16533)"
+       gradientUnits="userSpaceOnUse"
+       y2="28"
+       x2="129"
+       y1="28"
+       x1="127"
+       id="linearGradient7450"
+       xlink:href="#linearGradient19282-4" />
+    <linearGradient
+       gradientTransform="matrix(1.3333333,0,0,1.3333333,983.8793,553.16532)"
+       gradientUnits="userSpaceOnUse"
+       y2="28"
+       x2="122"
+       y1="28"
+       x1="120"
+       id="linearGradient7452"
+       xlink:href="#linearGradient19282-4" />
+  </defs>
+  <g
+     transform="matrix(1.5,0,0,1.5,-232.25829,-395.81101)"
+     style="display:inline"
+     id="preferences">
+    <g
+       transform="translate(39.838857,243.87401)"
+       id="gimp-prefs-folders-palettes">
+      <g
+         id="g759"
+         transform="translate(100,60)">
+        <path
+           style="display:inline;fill:url(#linearGradient8376);fill-opacity:1;stroke:none"
+           d="M 115.53125,20 C 115.24212,20 115,20.24212 115,20.53125 v 14.9375 C 115,35.76725 115.23264,36 115.53125,36 h 14.9375 C 130.76735,36 131,35.76735 131,35.46875 v -9.63542 c 0,-0.2891 -0.24223,-0.492061 -0.53125,-0.5 H 118.33334 V 33.5 c 0,0.277 -0.38967,0.5 -0.66667,0.5 C 117.38967,34 117,33.777 117,33.5 v -9 c 0,-0.277 0.223,-0.5 0.5,-0.5 H 120.46875 129 V 22.59375 C 129,22.26655 128.73334,22 128.40625,22 H 121 V 20.53125 C 121,20.2421 120.75788,20 120.46875,20 Z M 121,26 c 1.10457,0 2,0.895431 2,2 0,1.104569 -0.89543,2 -2,2 -1.10457,0 -2,-0.895431 -2,-2 0,-1.104569 0.89543,-2 2,-2 z m 6.66667,0 c 1.10457,0 2,0.895431 2,2 0,1.104569 -0.89543,2 -2,2 -1.10457,0 -2,-0.895431 -2,-2 0,-1.104569 0.89543,-2 2,-2 z m -3.33333,4 c 1.10457,0 2,0.895431 2,2 0,1.104569 -0.89543,2 -2,2 -1.10457,0 -2,-0.895431 -2,-2 0,-1.104569 0.89543,-2 2,-2 z"
+           transform="translate(-100,-60)"
+           id="path7651"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="sssssssscsssssccsscssssssssssssssssss" />
+        <rect
+           style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+           id="rect7653"
+           width="16"
+           height="16"
+           x="15"
+           y="-40" />
+      </g>
+      <circle
+         r="1.3333334"
+         cy="27.999996"
+         cx="121"
+         style="fill:url(#linearGradient7452);fill-opacity:1;stroke:none;stroke-width:1.33333337"
+         id="path7664" />
+      <circle
+         r="1.3333334"
+         cy="27.999996"
+         cx="127.66667"
+         style="opacity:0.3;fill:url(#linearGradient7450);fill-opacity:1;stroke:none;stroke-width:1.33333337"
+         id="path7666" />
+    </g>
+  </g>
+</svg>
diff --git a/icons/Symbolic/24/gimp-prefs-folders-patterns.svg b/icons/Symbolic/24/gimp-prefs-folders-patterns.svg
new file mode 100644
index 0000000000..27f3cc7a8e
--- /dev/null
+++ b/icons/Symbolic/24/gimp-prefs-folders-patterns.svg
@@ -0,0 +1,337 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 23.999999 24"
+   id="svg7384"
+   height="24"
+   width="24"
+   version="1.1"
+   inkscape:version="0.92pre1 unknown"
+   sodipodi:docname="gimp-prefs-folders-patterns.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview1519"
+     showgrid="true"
+     inkscape:zoom="14.75"
+     inkscape:cx="27.464608"
+     inkscape:cy="6.3389831"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg7384">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4268" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata90">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <dc:contributor>
+          <cc:Agent>
+            <dc:title>Barbara Muraus, Jakub Steiner, Klaus Staedtler</dc:title>
+          </cc:Agent>
+        </dc:contributor>
+        <dc:description>Images originally created as the &quot;Art Libre&quot; icon set. Extended and adopted for GIMP</dc:description>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs7386">
+    <linearGradient
+       osb:paint="solid"
+       id="linearGradient8074">
+      <stop
+         id="stop8072"
+         offset="0"
+         style="stop-color:#be00be;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       osb:paint="solid"
+       id="linearGradient7561">
+      <stop
+         id="stop7558"
+         offset="0"
+         style="stop-color:#a5a5a5;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       osb:paint="solid"
+       id="linearGradient7548">
+      <stop
+         id="stop7546"
+         offset="0"
+         style="stop-color:#ebebeb;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       osb:paint="solid"
+       id="linearGradient7542">
+      <stop
+         id="stop7538"
+         offset="0"
+         style="stop-color:#c9c9c9;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0,-735328.32,170712.69,0,2464326300,577972450)"
+       osb:paint="solid"
+       id="linearGradient19282">
+      <stop
+         id="stop19284"
+         offset="0"
+         style="stop-color:#b4b4b4;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.34682586,0,0,0.30620888,-59.28957,801.06976)"
+       osb:paint="solid"
+       id="linearGradient19282-4">
+      <stop
+         id="stop19284-0"
+         offset="0"
+         style="stop-color:#bebebe;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(789.82382,421.87401)"
+       gradientUnits="userSpaceOnUse"
+       y2="-32.03125"
+       x2="111.0625"
+       y1="-32.03125"
+       x1="95.0625"
+       id="linearGradient8370"
+       xlink:href="#linearGradient19282-4" />
+    <linearGradient
+       gradientTransform="translate(789.82382,421.87401)"
+       gradientUnits="userSpaceOnUse"
+       y2="-31.5"
+       x2="107"
+       y1="-31.5"
+       x1="106"
+       id="linearGradient7422"
+       xlink:href="#linearGradient19282-4" />
+    <linearGradient
+       gradientTransform="translate(789.82382,421.87401)"
+       gradientUnits="userSpaceOnUse"
+       y2="-31.5"
+       x2="110"
+       y1="-31.5"
+       x1="109"
+       id="linearGradient7424"
+       xlink:href="#linearGradient19282-4" />
+    <linearGradient
+       gradientTransform="translate(789.82382,421.87401)"
+       gradientUnits="userSpaceOnUse"
+       y2="-30.5"
+       x2="109"
+       y1="-30.5"
+       x1="108"
+       id="linearGradient7426"
+       xlink:href="#linearGradient19282-4" />
+    <linearGradient
+       gradientTransform="translate(789.82382,421.87401)"
+       gradientUnits="userSpaceOnUse"
+       y2="-29.5"
+       x2="108"
+       y1="-29.5"
+       x1="107"
+       id="linearGradient7428"
+       xlink:href="#linearGradient19282-4" />
+    <linearGradient
+       gradientTransform="translate(789.82382,421.87401)"
+       gradientUnits="userSpaceOnUse"
+       y2="-28.5"
+       x2="107"
+       y1="-28.5"
+       x1="106"
+       id="linearGradient7430"
+       xlink:href="#linearGradient19282-4" />
+    <linearGradient
+       gradientTransform="translate(789.82382,421.87401)"
+       gradientUnits="userSpaceOnUse"
+       y2="-29.5"
+       x2="106"
+       y1="-29.5"
+       x1="105"
+       id="linearGradient7432"
+       xlink:href="#linearGradient19282-4" />
+    <linearGradient
+       gradientTransform="translate(789.82382,421.87401)"
+       gradientUnits="userSpaceOnUse"
+       y2="-30.5"
+       x2="105"
+       y1="-30.5"
+       x1="104"
+       id="linearGradient7434"
+       xlink:href="#linearGradient19282-4" />
+    <linearGradient
+       gradientTransform="translate(789.82382,421.87401)"
+       gradientUnits="userSpaceOnUse"
+       y2="-31.5"
+       x2="104"
+       y1="-31.5"
+       x1="103"
+       id="linearGradient7436"
+       xlink:href="#linearGradient19282-4" />
+    <linearGradient
+       gradientTransform="translate(789.82382,421.87401)"
+       gradientUnits="userSpaceOnUse"
+       y2="-30.5"
+       x2="103"
+       y1="-30.5"
+       x1="102"
+       id="linearGradient7438"
+       xlink:href="#linearGradient19282-4" />
+    <linearGradient
+       gradientTransform="translate(789.82382,421.87401)"
+       gradientUnits="userSpaceOnUse"
+       y2="-29.5"
+       x2="102"
+       y1="-29.5"
+       x1="101"
+       id="linearGradient7440"
+       xlink:href="#linearGradient19282-4" />
+    <linearGradient
+       gradientTransform="translate(789.82382,421.87401)"
+       gradientUnits="userSpaceOnUse"
+       y2="-28.5"
+       x2="101"
+       y1="-28.5"
+       x1="100"
+       id="linearGradient7442"
+       xlink:href="#linearGradient19282-4" />
+    <linearGradient
+       gradientTransform="translate(789.82382,421.87401)"
+       gradientUnits="userSpaceOnUse"
+       y2="-31.5"
+       x2="101"
+       y1="-31.5"
+       x1="100"
+       id="linearGradient7444"
+       xlink:href="#linearGradient19282-4" />
+  </defs>
+  <g
+     transform="matrix(1.5,0,0,1.5,-264.75481,-395.81101)"
+     style="display:inline"
+     id="preferences">
+    <g
+       transform="translate(81.440707,303.90526)"
+       id="gimp-prefs-folders-patterns">
+      <rect
+         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+         id="rect28947"
+         width="16"
+         height="16"
+         x="95.0625"
+         y="-40.03125" />
+      <path
+         id="path28949"
+         d="m 95.59375,-40.03125 c -0.28913,0 -0.53125,0.24212 -0.53125,0.53125 v 14.9375 c 0,0.2985 0.23264,0.53125 0.53125,0.53125 h 14.9375 c 0.2986,0 0.53125,-0.23265 0.53125,-0.53125 v -9.63542 c 0,-0.2891 -0.24223,-0.492061 -0.53125,-0.5 H 98.395833 v 8.16667 c 0,0.277 -0.389667,0.5 -0.666667,0.5 -0.277,0 -0.666666,-0.223 -0.666666,-0.5 v -9 c 0,-0.277 0.223,-0.5 0.5,-0.5 h 2.96875 8.53125 v -1.40625 c 0,-0.3272 -0.26666,-0.59375 -0.59375,-0.59375 H 101.0625 V -39.5 c 0,-0.28915 -0.24212,-0.53125 -0.53125,-0.53125 z m 3.46875,7.33333 h 11.33333 v 5.333335 l -11.33333,-3e-6 z"
+         style="display:inline;fill:url(#linearGradient8370);fill-opacity:1;stroke:none"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="sssssssscsssssccsscsssccccc" />
+      <rect
+         style="fill:url(#linearGradient7430);fill-opacity:1;stroke:none"
+         id="rect28998"
+         width="1"
+         height="1"
+         x="106"
+         y="-29" />
+      <rect
+         style="fill:url(#linearGradient7434);fill-opacity:1;stroke:none"
+         id="rect29000"
+         width="1"
+         height="1"
+         x="104"
+         y="-31" />
+      <rect
+         style="fill:url(#linearGradient7428);fill-opacity:1;stroke:none"
+         id="rect29002"
+         width="1"
+         height="1"
+         x="107"
+         y="-30" />
+      <rect
+         style="fill:url(#linearGradient7432);fill-opacity:1;stroke:none"
+         id="rect29004"
+         width="1"
+         height="1"
+         x="105"
+         y="-30" />
+      <rect
+         style="fill:url(#linearGradient7422);fill-opacity:1;stroke:none"
+         id="rect29006"
+         width="1"
+         height="1"
+         x="106"
+         y="-32" />
+      <rect
+         style="fill:url(#linearGradient7426);fill-opacity:1;stroke:none"
+         id="rect29008"
+         width="1"
+         height="1"
+         x="108"
+         y="-31" />
+      <rect
+         style="fill:url(#linearGradient7436);fill-opacity:1;stroke:none"
+         id="rect29010"
+         width="1"
+         height="1"
+         x="103"
+         y="-32" />
+      <rect
+         style="fill:url(#linearGradient7444);fill-opacity:1;stroke:none"
+         id="rect29012"
+         width="1"
+         height="1"
+         x="100"
+         y="-32" />
+      <rect
+         style="fill:url(#linearGradient7442);fill-opacity:1;stroke:none"
+         id="rect29014"
+         width="1"
+         height="1"
+         x="100"
+         y="-29" />
+      <rect
+         style="fill:url(#linearGradient7438);fill-opacity:1;stroke:none"
+         id="rect29016"
+         width="1"
+         height="1"
+         x="102"
+         y="-31" />
+      <rect
+         style="fill:url(#linearGradient7440);fill-opacity:1;stroke:none"
+         id="rect29018"
+         width="1"
+         height="1"
+         x="101"
+         y="-30" />
+      <rect
+         style="fill:url(#linearGradient7424);fill-opacity:1;stroke:none"
+         id="rect29020"
+         width="1"
+         height="1"
+         x="109"
+         y="-32" />
+    </g>
+  </g>
+</svg>
diff --git a/icons/Symbolic/24/gimp-prefs-folders-plug-ins.svg b/icons/Symbolic/24/gimp-prefs-folders-plug-ins.svg
new file mode 100644
index 0000000000..e7692c0043
--- /dev/null
+++ b/icons/Symbolic/24/gimp-prefs-folders-plug-ins.svg
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 23.999999 24"
+   id="svg7384"
+   height="24"
+   width="24"
+   version="1.1"
+   inkscape:version="0.92pre1 unknown"
+   sodipodi:docname="gimp-prefs-folders-plug-ins.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="501"
+     inkscape:window-height="405"
+     id="namedview1508"
+     showgrid="true"
+     inkscape:zoom="14.75"
+     inkscape:cx="5.9955149"
+     inkscape:cy="6.3389831"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg7384">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4245" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata90">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <dc:contributor>
+          <cc:Agent>
+            <dc:title>Barbara Muraus, Jakub Steiner, Klaus Staedtler</dc:title>
+          </cc:Agent>
+        </dc:contributor>
+        <dc:description>Images originally created as the &quot;Art Libre&quot; icon set. Extended and adopted for GIMP</dc:description>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs7386">
+    <linearGradient
+       osb:paint="solid"
+       id="linearGradient8074">
+      <stop
+         id="stop8072"
+         offset="0"
+         style="stop-color:#be00be;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       osb:paint="solid"
+       id="linearGradient7561">
+      <stop
+         id="stop7558"
+         offset="0"
+         style="stop-color:#a5a5a5;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       osb:paint="solid"
+       id="linearGradient7548">
+      <stop
+         id="stop7546"
+         offset="0"
+         style="stop-color:#ebebeb;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       osb:paint="solid"
+       id="linearGradient7542">
+      <stop
+         id="stop7538"
+         offset="0"
+         style="stop-color:#c9c9c9;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0,-735328.32,170712.69,0,2464326300,577972450)"
+       osb:paint="solid"
+       id="linearGradient19282">
+      <stop
+         id="stop19284"
+         offset="0"
+         style="stop-color:#b4b4b4;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.34682586,0,0,0.30620888,-19.35207,801.03851)"
+       osb:paint="solid"
+       id="linearGradient19282-4">
+      <stop
+         id="stop19284-0"
+         offset="0"
+         style="stop-color:#bebebe;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(811.48816,421.87401)"
+       gradientUnits="userSpaceOnUse"
+       y2="-32"
+       x2="151"
+       y1="-32"
+       x1="135"
+       id="linearGradient8364"
+       xlink:href="#linearGradient19282-4" />
+  </defs>
+  <g
+     transform="matrix(1.5,0,0,1.5,-297.25132,-395.81101)"
+     style="display:inline"
+     id="preferences">
+    <g
+       transform="translate(63.167547,303.87401)"
+       id="gimp-prefs-folders-plug-ins">
+      <g
+         id="g612"
+         transform="translate(120)">
+        <path
+           style="display:inline;fill:url(#linearGradient8364);fill-opacity:1;stroke:none"
+           d="M 135.53125,-40 C 135.24212,-40 135,-39.75788 135,-39.46875 v 14.9375 c 0,0.2985 0.23264,0.53125 0.53125,0.53125 h 14.9375 C 150.76735,-24 151,-24.23265 151,-24.53125 v -9.63542 c 0,-0.2891 -0.24223,-0.492061 -0.53125,-0.5 H 138.33333 V -26.5 c 0,0.277 -0.38966,0.5 -0.66666,0.5 C 137.38967,-26 137,-26.223 137,-26.5 v -9 c 0,-0.277 0.223,-0.5 0.5,-0.5 H 140.46875 149 v -1.40625 C 149,-37.73345 148.73334,-38 148.40625,-38 H 141 v -1.46875 C 141,-39.7579 140.75788,-40 140.46875,-40 Z m 9.13542,6 c 0.5,0 0.83333,0.166667 0.83333,0.5 v 1.5 h 2.16667 v 2 l -1.16667,-3e-6 c -0.66609,-0.02775 -0.66667,1.999998 0,2 l 1.16667,3e-6 v 2 l -6,-3e-6 v -2 L 140.5625,-28 c -0.66667,2e-6 -0.66667,-2 0,-2 l 1.10417,-3e-6 v -2 l 2,3e-6 v -1.5 c 0,-0.333333 0.5,-0.5 1,-0.5 z"
+           transform="translate(-120)"
+           id="path29116"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="sssssssscsssssccsscsssssccccsccccsscccss" />
+        <rect
+           style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+           id="rect29118"
+           width="16"
+           height="16"
+           x="15"
+           y="-40" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/icons/Symbolic/24/gimp-prefs-folders-scripts.svg b/icons/Symbolic/24/gimp-prefs-folders-scripts.svg
new file mode 100644
index 0000000000..5b69f489d2
--- /dev/null
+++ b/icons/Symbolic/24/gimp-prefs-folders-scripts.svg
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 23.999999 24"
+   id="svg7384"
+   height="24"
+   width="24"
+   version="1.1"
+   inkscape:version="0.92pre1 unknown"
+   sodipodi:docname="gimp-prefs-folders-scripts.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="501"
+     inkscape:window-height="405"
+     id="namedview1508"
+     showgrid="true"
+     inkscape:zoom="14.75"
+     inkscape:cx="15.915233"
+     inkscape:cy="8.9189558"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg7384">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4245" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata90">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <dc:contributor>
+          <cc:Agent>
+            <dc:title>Barbara Muraus, Jakub Steiner, Klaus Staedtler</dc:title>
+          </cc:Agent>
+        </dc:contributor>
+        <dc:description>Images originally created as the &quot;Art Libre&quot; icon set. Extended and adopted for GIMP</dc:description>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs7386">
+    <linearGradient
+       osb:paint="solid"
+       id="linearGradient8074">
+      <stop
+         id="stop8072"
+         offset="0"
+         style="stop-color:#be00be;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       osb:paint="solid"
+       id="linearGradient7561">
+      <stop
+         id="stop7558"
+         offset="0"
+         style="stop-color:#a5a5a5;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       osb:paint="solid"
+       id="linearGradient7548">
+      <stop
+         id="stop7546"
+         offset="0"
+         style="stop-color:#ebebeb;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       osb:paint="solid"
+       id="linearGradient7542">
+      <stop
+         id="stop7538"
+         offset="0"
+         style="stop-color:#c9c9c9;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0,-735328.32,170712.69,0,2464326300,577972450)"
+       osb:paint="solid"
+       id="linearGradient19282">
+      <stop
+         id="stop19284"
+         offset="0"
+         style="stop-color:#b4b4b4;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.34682586,0,0,0.30620888,-39.35207,801.03851)"
+       osb:paint="solid"
+       id="linearGradient19282-4">
+      <stop
+         id="stop19284-0"
+         offset="0"
+         style="stop-color:#bebebe;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(833.15251,421.87401)"
+       gradientUnits="userSpaceOnUse"
+       y2="-32"
+       x2="131"
+       y1="-32"
+       x1="115"
+       id="linearGradient8358"
+       xlink:href="#linearGradient19282-4" />
+  </defs>
+  <g
+     transform="matrix(1.5,0,0,1.5,-329.74785,-395.81101)"
+     style="display:inline"
+     id="preferences">
+    <g
+       transform="translate(104.8319,303.87401)"
+       id="gimp-prefs-folders-scripts">
+      <g
+         id="g607"
+         transform="translate(100)">
+        <path
+           style="display:inline;fill:url(#linearGradient8358);fill-opacity:1;stroke:none"
+           d="M 115.53125,-40 C 115.24212,-40 115,-39.75788 115,-39.46875 v 14.9375 c 0,0.2985 0.23264,0.53125 0.53125,0.53125 h 14.9375 C 130.76735,-24 131,-24.23265 131,-24.53125 v -9.63542 c 0,-0.2891 -0.24223,-0.492061 -0.53125,-0.5 H 118.33333 V -26.5 c 0,0.277 -0.38966,0.5 -0.66666,0.5 C 117.38967,-26 117,-26.223 117,-26.5 v -9 c 0,-0.277 0.223,-0.5 0.5,-0.5 H 120.46875 129 v -1.40625 C 129,-37.73345 128.73334,-38 128.40625,-38 H 121 v -1.46875 C 121,-39.7579 120.75788,-40 120.46875,-40 Z m 4.80208,6 5.33334,4 -5.33334,3.999997 v -1.333334 L 124,-30 120.33333,-32.66667 Z M 125,-27.333337 h 4.66667 V -26 H 125 Z"
+           transform="translate(-100)"
+           id="path29078"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="sssssssscsssssccsscssscccccccccccc" />
+        <rect
+           style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+           id="rect29080"
+           width="16"
+           height="16"
+           x="15"
+           y="-40" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/icons/Symbolic/24/gimp-prefs-folders-themes.svg b/icons/Symbolic/24/gimp-prefs-folders-themes.svg
new file mode 100644
index 0000000000..b7bc943754
--- /dev/null
+++ b/icons/Symbolic/24/gimp-prefs-folders-themes.svg
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 23.999999 24"
+   id="svg7384"
+   height="24"
+   width="24"
+   version="1.1"
+   inkscape:version="0.92pre1 unknown"
+   sodipodi:docname="gimp-prefs-folders-themes.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview1507"
+     showgrid="true"
+     inkscape:zoom="14.75"
+     inkscape:cx="24.344523"
+     inkscape:cy="13.331826"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg7384">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4244" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata90">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <dc:contributor>
+          <cc:Agent>
+            <dc:title>Barbara Muraus, Jakub Steiner, Klaus Staedtler</dc:title>
+          </cc:Agent>
+        </dc:contributor>
+        <dc:description>Images originally created as the &quot;Art Libre&quot; icon set. Extended and adopted for GIMP</dc:description>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs7386">
+    <linearGradient
+       osb:paint="solid"
+       id="linearGradient8074">
+      <stop
+         id="stop8072"
+         offset="0"
+         style="stop-color:#be00be;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       osb:paint="solid"
+       id="linearGradient7561">
+      <stop
+         id="stop7558"
+         offset="0"
+         style="stop-color:#a5a5a5;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       osb:paint="solid"
+       id="linearGradient7548">
+      <stop
+         id="stop7546"
+         offset="0"
+         style="stop-color:#ebebeb;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       osb:paint="solid"
+       id="linearGradient7542">
+      <stop
+         id="stop7538"
+         offset="0"
+         style="stop-color:#c9c9c9;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0,-735328.32,170712.69,0,2464326300,577972450)"
+       osb:paint="solid"
+       id="linearGradient19282">
+      <stop
+         id="stop19284"
+         offset="0"
+         style="stop-color:#b4b4b4;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.34682586,0,0,0.30620888,-139.35207,801.03851)"
+       osb:paint="solid"
+       id="linearGradient19282-4">
+      <stop
+         id="stop19284-0"
+         offset="0"
+         style="stop-color:#bebebe;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(1175.3732,580.07676)"
+       gradientUnits="userSpaceOnUse"
+       y2="11"
+       x2="22"
+       y1="11"
+       x1="0"
+       id="linearGradient8352"
+       xlink:href="#linearGradient19282-4" />
+  </defs>
+  <g
+     transform="matrix(1.5,0,0,1.5,-362.24436,-395.81101)"
+     style="display:inline"
+     id="preferences">
+    <g
+       transform="translate(226.49624,303.87401)"
+       id="gimp-prefs-folders-themes">
+      <path
+         style="display:inline;opacity:0.95;fill:url(#linearGradient8352);fill-opacity:1;stroke:none"
+         d="M 0.73046875,0 C 0.332915,0 0,0.332915 0,0.73046875 V 21.269531 C 0,21.679969 0.31988,22 0.73046875,22 H 21.269531 C 21.680106,22 22,21.680106 22,21.269531 V 8.0208287 c 0,-0.3975128 -0.333065,-0.6765843 -0.730469,-0.6875 H 4.5833333 V 18.5625 c 0,0.380875 -0.5357916,0.6875 -0.9166666,0.6875 C 3.2857917,19.25 2.75,18.943375 2.75,18.5625 V 6.1875 C 2.75,5.806625 3.056625,5.5 3.4375,5.5 H 7.5195312 19.25 V 3.5664062 C 19.25,3.1165062 18.883342,2.75 18.433594,2.75 H 8.25 V 0.73046875 C 8.25,0.3328875 7.9170852,0 7.5195312,0 Z M 9.1679688,8.4023438 h 3.6640622 c 0.435295,0 0.7938,0.21035 0.792969,0.4648437 l -0.02148,3.7949215 2.509765,-2.455078 c 0.04418,-0.04331 0.0999,-0.07057 0.164063,-0.08203 0.192498,-0.03442 0.462154,0.07306 0.683594,0.300781 l 2.488281,2.570313 c 0.295216,0.303686 0.396042,0.674817 0.21875,0.847656 l -2.513672,2.433594 h 3.853515 c 0.254494,0 0.464844,0.330339 0.464844,0.765625 v 3.664062 c 0,0.435295 -0.21035,0.7938 -0.464844,0.792969 L 16.085938,21.472656 13.84375,21.5 H 10.753906 C 10.232865,21.5 9.7809302,21.043559 9.5058594,20.361328 8.8408043,20.086147 8.4023438,19.639237 8.4023438,19.121094 V 8.8671875 c 0,-0.2544937 0.3303385,-0.4648437 0.765625,-0.4648437 z M 9.25,9.25 V 11 h 3.5 V 9.25 Z m 7.191406,1.804688 -1.230468,1.203124 2.378906,2.433594 1.203125,-1.175781 z M 9.25,11.875 v 1.75 h 3.5 v -1.75 z m 5.359375,0.984375 -1.011719,0.957031 0.0059,0.44336 2.154296,2.236328 1.230469,-1.203125 -2.378906,-2.433594 z M 9.25,14.5 v 1.75 h 3.5 V 14.5 Z m 4.361328,0.347656 0.01367,1.183594 v 1.914062 l 0.328125,0.328126 1.203125,-1.175782 -1.53125,-1.585937 z m 2.666016,2.277344 -0.02734,0.02734 v 3.472656 h 1.75 v -3.5 h -1.720703 -0.002 z m 2.597656,0 v 3.5 h 1.75 v -3.5 z m -2.652344,0.05469 -1.53125,1.558593 -1.066406,1.039063 v 0.847656 h 1.75 V 18.05469 Z M 11,18 c -0.483254,0 -0.875,0.391746 -0.875,0.875 0,0.483254 0.391746,0.875 0.875,0.875 0.483254,0 0.875,-0.391746 0.875,-0.875 C 11.875,18.391746 11.483254,18 11,18 Z m -0.650391,2.601562 c 0.204998,0.138914 0.411273,0.250285 0.615235,0.333985 -0.203569,-0.08395 -0.41093,-0.196069 -0.615235,-0.333985 z m 0.638672,0.341797 c 0.199218,0.07973 0.393573,0.135311 0.578125,0.158203 -0.184625,-0.02377 -0.378949,-0.07808 -0.578125,-0.158203 z m 1.322266,0.05469 c -0.03508,0.0179 -0.07367,0.02928 -0.111328,0.04297 0.03755,-0.01385 0.07633,-0.02497 0.111328,-0.04297 z m -0.269531,0.08984 c -0.0426,0.0084 -0.08603,0.01549 -0.13086,0.01953 0.04493,-0.0043 0.08818,-0.01079 0.13086,-0.01953 z m -0.458985,0.01563 c 0.05665,0.0066 0.109642,0.0069 0.164063,0.0078 -0.0542,-0.0012 -0.107648,-0.001 -0.164063,-0.0078 z"
+         transform="matrix(0.72727273,0,0,0.72727273,15,-40)"
+         id="path15574-5"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="sssssssscsssssccsscsssssccccccccssscccscsssccccccccccccccccccccccccccccccccccccccccccccccccccccccsssssccccccccccccccc" />
+      <rect
+         y="-40"
+         x="15"
+         height="16"
+         width="16"
+         id="rect15576-1"
+         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
+    </g>
+  </g>
+</svg>
diff --git a/icons/Symbolic/48/gimp-prefs-folders-palettes.png b/icons/Symbolic/48/gimp-prefs-folders-palettes.png
index 7f5d89f38e..0877527064 100644
Binary files a/icons/Symbolic/48/gimp-prefs-folders-palettes.png and b/icons/Symbolic/48/gimp-prefs-folders-palettes.png differ
diff --git a/icons/Symbolic/48/gimp-prefs-folders-patterns.png b/icons/Symbolic/48/gimp-prefs-folders-patterns.png
index 800b4f5522..218455e416 100644
Binary files a/icons/Symbolic/48/gimp-prefs-folders-patterns.png and b/icons/Symbolic/48/gimp-prefs-folders-patterns.png differ
diff --git a/icons/Symbolic/48/gimp-prefs-folders-plug-ins.png b/icons/Symbolic/48/gimp-prefs-folders-plug-ins.png
index 0e8650e962..779039c03b 100644
Binary files a/icons/Symbolic/48/gimp-prefs-folders-plug-ins.png and b/icons/Symbolic/48/gimp-prefs-folders-plug-ins.png differ
diff --git a/icons/Symbolic/48/gimp-prefs-folders-scripts.png b/icons/Symbolic/48/gimp-prefs-folders-scripts.png
index 5ea7739468..7e255123f2 100644
Binary files a/icons/Symbolic/48/gimp-prefs-folders-scripts.png and b/icons/Symbolic/48/gimp-prefs-folders-scripts.png differ
diff --git a/icons/Symbolic/48/gimp-prefs-folders-themes.png b/icons/Symbolic/48/gimp-prefs-folders-themes.png
index 4d91da0e7a..594eb057a2 100644
Binary files a/icons/Symbolic/48/gimp-prefs-folders-themes.png and b/icons/Symbolic/48/gimp-prefs-folders-themes.png differ
diff --git a/icons/Symbolic/scalable/gimp-color-cmyk.svg b/icons/Symbolic/scalable/gimp-color-cmyk.svg
new file mode 100644
index 0000000000..4d37bd0001
--- /dev/null
+++ b/icons/Symbolic/scalable/gimp-color-cmyk.svg
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg30571"
+   version="1.1"
+   inkscape:version="0.92pre1 unknown"
+   sodipodi:docname="gimp-cmyk.svg">
+  <defs
+     id="defs30573" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="7.2301683"
+     inkscape:cy="5.611921"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-page="true"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-text-baseline="true"
+     showborder="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="false"
+     showguides="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4242" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata30576">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>
+          image/svg+xml
+        </dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Klaus Staedtler       </dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <rect
+       style="fill:none;stroke:none"
+       id="rect28186-4"
+       width="16"
+       height="16"
+       x="0"
+       y="1036.3622"
+       rx="0" />
+    <rect
+       style="opacity:0.3;fill:none;stroke:none"
+       id="rect6884"
+       width="16"
+       height="16"
+       x="0"
+       y="1036.3622" />
+    <path
+       style="fill:#bebebe;fill-opacity:1;stroke:none"
+       d="m 0,1036.3622 v 16 h 16 v -16 z m 1,1 h 14 v 14 H 1 Z"
+       id="rect6886"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccc" />
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:1;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:0.214;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 1,1044.3622 v 7 h 7 v -7 z m 0.921875,0.7832 h 0.7949219 l 1.5175781,2.2481 1.5039062,-2.2481 h 0.7949219 l -1.9335937,2.8633 v 2.6035 H 3.8554688 v -2.6035 z"
+       id="rect3938" />
+    <rect
+       style="opacity:0.75;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:0.214;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3938-6"
+       width="7"
+       height="7"
+       x="1"
+       y="1037.3622" />
+    <rect
+       style="opacity:0.50800003;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:0.214;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3938-6-3"
+       width="7"
+       height="7"
+       x="8"
+       y="1037.3622" />
+    <rect
+       style="opacity:0.25;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:0.214;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3938-6-3-5"
+       width="7"
+       height="7"
+       x="8"
+       y="1044.3622" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:7.5px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="1.5"
+       y="1043.4247"
+       id="text3999"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan4001"
+         x="1.5"
+         y="1043.4247">C</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:7.5px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="8.1875"
+       y="1043.7997"
+       id="text4003"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan4005"
+         x="8.1875"
+         y="1043.7997">M</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:7.5px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="8.1875"
+       y="1050.4872"
+       id="text4007"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan4009"
+         x="8.1875"
+         y="1050.4872">K</tspan></text>
+  </g>
+</svg>
diff --git a/icons/Symbolic/scalable/gimp-color-water.svg b/icons/Symbolic/scalable/gimp-color-water.svg
new file mode 100644
index 0000000000..7165537ab6
--- /dev/null
+++ b/icons/Symbolic/scalable/gimp-color-water.svg
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg11300"
+   sodipodi:version="0.32"
+   inkscape:version="0.92pre1 unknown"
+   sodipodi:docname="gimp-color-water.svg"
+   version="1.0"
+   viewBox="0 0 16 16">
+  <sodipodi:namedview
+     inkscape:cy="9.0182525"
+     inkscape:cx="18.004561"
+     inkscape:zoom="38.973448"
+     inkscape:window-height="1016"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="0.17254902"
+     bordercolor="#666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:showpageshadow="false"
+     showborder="true"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:current-layer="layer1"
+     width="16px"
+     height="16px"
+     showgrid="true"
+     inkscape:window-maximized="1"
+     inkscape:document-units="px"
+     inkscape:snap-global="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4261" />
+  </sodipodi:namedview>
+  <defs
+     id="defs3" />
+  <sodipodi:namedview
+     stroke="#ef2929"
+     fill="#eeeeec"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="0.25490196"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="-14.198652"
+     inkscape:cy="-5.1663457"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:showpageshadow="false"
+     inkscape:window-width="872"
+     inkscape:window-height="659"
+     inkscape:window-x="403"
+     inkscape:window-y="296"
+     width="32px"
+     height="32px"
+     id="namedview73" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>http://jimmac.musichall.cz</dc:source>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
+        <dc:title />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Attribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g3439">
+      <g
+         id="g4294">
+        <path
+           style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#bebebe;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 4,6.25 c 0,0 1.2576558,-1.0669371 2,-1 0.8299661,0.074838 1.1666667,1.5 2,1.5 0.8333333,0 1.1700339,-1.425162 2,-1.5 0.742344,-0.066937 2,1 2,1"
+           id="path4263"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="caaac" />
+        <path
+           style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#bebebe;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 4,10.25 c 0,0 1.2576558,-1.0669371 2,-1 0.8299661,0.074838 1.1666667,1.5 2,1.5 0.8333333,0 1.1700339,-1.425162 2,-1.5 0.742344,-0.066937 2,1 2,1"
+           id="path4263-7"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="caaac" />
+        <path
+           style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#bebebe;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 4,8.25 c 0,0 1.2576558,-1.0669371 2,-1 0.8299661,0.074838 1.1666667,1.5 2,1.5 0.8333333,0 1.1700339,-1.425162 2,-1.5 0.742344,-0.066937 2,1 2,1"
+           id="path4263-0"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="caaac" />
+      </g>
+      <path
+         id="path4299"
+         d="M 8 0 A 8 8 0 0 0 0 8 A 8 8 0 0 0 8 16 A 8 8 0 0 0 16 8 A 8 8 0 0 0 8 0 z M 8 1 A 7 7 0 0 1 15 8 A 7 7 0 0 1 8 15 A 7 7 0 0 1 1 8 A 7 7 0 0 1 8 1 z "
+         style="opacity:1;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:0.57572687;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path4299-3"
+         d="M 8,1 A 7,7 0 0 0 1,8 7,7 0 0 0 8,15 7,7 0 0 0 15,8 7,7 0 0 0 8,1 Z M 8,2 A 6,6 0 0 1 14,8 6,6 0 0 1 8,14 6,6 0 0 1 2,8 6,6 0 0 1 2.0292969,7.4003906 6,6 0 0 1 8,2 Z"
+         style="opacity:0.66000001;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:0.50376099;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path4299-3-6"
+         d="M 8,2 A 6,6 0 0 0 2,8 6,6 0 0 0 8,14 6,6 0 0 0 14,8 6,6 0 0 0 8,2 Z M 8,2.8571429 A 5.1428571,5.1428571 0 0 1 13.142857,8 5.1428571,5.1428571 0 0 1 8,13.142857 5.1428571,5.1428571 0 0 1 2.8571429,8 5.1428571,5.1428571 0 0 1 2.8822545,7.4860491 5.1428571,5.1428571 0 0 1 8,2.8571429 Z"
+         style="opacity:0.33;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:0.43179515;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/icons/Symbolic/scalable/gimp-histogram.svg b/icons/Symbolic/scalable/gimp-histogram.svg
index b098f64063..c0fb2ef833 100644
--- a/icons/Symbolic/scalable/gimp-histogram.svg
+++ b/icons/Symbolic/scalable/gimp-histogram.svg
@@ -9,9 +9,9 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="0 0 16.000001 16.000017"
+   viewBox="0 0 16.000001 16"
    id="svg7384"
-   height="16.000017"
+   height="16"
    width="16.000002"
    version="1.1"
    inkscape:version="0.92pre1 unknown"
@@ -28,14 +28,18 @@
      inkscape:window-width="501"
      inkscape:window-height="405"
      id="namedview1511"
-     showgrid="false"
+     showgrid="true"
      inkscape:zoom="14.749984"
-     inkscape:cx="12.137133"
-     inkscape:cy="9.6610276"
+     inkscape:cx="-14.335283"
+     inkscape:cy="9.2203492"
      inkscape:window-x="0"
      inkscape:window-y="27"
      inkscape:window-maximized="0"
-     inkscape:current-layer="svg7384" />
+     inkscape:current-layer="svg7384">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4238" />
+  </sodipodi:namedview>
   <metadata
      id="metadata90">
     <rdf:RDF>
@@ -66,16 +70,7 @@
          style="stop-color:#bebebe;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       gradientTransform="translate(541.61297,283.03649)"
-       gradientUnits="userSpaceOnUse"
-       y2="602"
-       x2="176.0002"
-       y1="602"
-       x1="162.0002"
-       id="linearGradient7532"
-       xlink:href="#linearGradient19282-4" />
-    <linearGradient
-       gradientTransform="translate(541.61297,283.03649)"
+       gradientTransform="matrix(1.1666667,0,0,1.4,603.71512,154.05109)"
        gradientUnits="userSpaceOnUse"
        y2="603"
        x2="175.0002"
@@ -85,7 +80,7 @@
        xlink:href="#linearGradient19282-4" />
   </defs>
   <g
-     transform="translate(-83.801823,-116.00525)"
+     transform="translate(-83.801823,-116.00527)"
      style="display:inline"
      id="stock">
     <g
@@ -107,15 +102,11 @@
            id="g3970-0"
            transform="translate(0,5)">
           <path
-             style="fill:url(#linearGradient7532);fill-opacity:1;stroke:none"
-             d="m 162.0002,595 0,14 14,0 0,-14 z m 1,1 12,0 0,11.25 -12,0 z"
-             id="rect5444-3-2"
-             inkscape:connector-curvature="0" />
-          <path
-             style="fill:url(#linearGradient7536);fill-opacity:1;stroke:none"
-             d="m 163.0002,608 0.625,-1.0625 0.375,-0.9375 1,0 0,0 1,-8 1,0 1,4 1,0 1,2 1,2 0,0 1,-2 0,-2 0,0 0,0 0,0 1,2 1,2 0,0 1,1 0,1 z"
+             style="fill:url(#linearGradient7536);fill-opacity:1;stroke:none;stroke-width:1.27801931"
+             d="m 162.0002,609 0.72917,-1.4875 0.4375,-1.3125 h 1.16666 v 0 L 165.5002,595 h 1.16667 l 1.16666,5.6 h 1.16667 l 1.16667,2.8 1.16666,2.8 v 0 l 1.16667,-2.8 v -2.8 0 0 l 0.5,-0.6 0.66667,3.4 1.16666,2.8 v 0 l 1.16667,1.4 v 1.4 z"
              id="path5449-8-0"
-             inkscape:connector-curvature="0" />
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccccccccccccccccccccc" />
         </g>
       </g>
     </g>
diff --git a/icons/icon-list.mk b/icons/icon-list.mk
index a16691d186..d6843ad203 100644
--- a/icons/icon-list.mk
+++ b/icons/icon-list.mk
@@ -19,7 +19,9 @@ scalable_images = \
 	scalable/gimp-color-picker-gray.svg		\
 	scalable/gimp-color-picker-white.svg		\
 	scalable/gimp-color-pick-from-screen.svg	\
+	scalable/gimp-color-cmyk.svg			\
 	scalable/gimp-color-triangle.svg		\
+	scalable/gimp-color-palette.svg			\
 	scalable/gimp-controller-keyboard.svg		\
 	scalable/gimp-controller-linux-input.svg	\
 	scalable/gimp-controller-midi.svg		\
@@ -410,7 +412,9 @@ icons16_images = \
 	16/gimp-channel.png				\
 	16/gimp-channels.png				\
 	16/gimp-color-pick-from-screen.png		\
+	16/gimp-color-cmyk.png				\
 	16/gimp-color-triangle.png			\
+	16/gimp-color-water.png				\
 	16/gimp-colormap.png				\
 	16/gimp-controller-keyboard.png			\
 	16/gimp-controller-linux-input.png		\
diff --git a/libgimpwidgets/gimpicons.h b/libgimpwidgets/gimpicons.h
index 09c7efc363..5c6388af63 100644
--- a/libgimpwidgets/gimpicons.h
+++ b/libgimpwidgets/gimpicons.h
@@ -93,6 +93,8 @@ G_BEGIN_DECLS
 #define GIMP_STOCK_COLOR_PICKER_GRAY        "gimp-color-picker-gray"
 #define GIMP_STOCK_COLOR_PICKER_WHITE       "gimp-color-picker-white"
 #define GIMP_STOCK_COLOR_TRIANGLE           "gimp-color-triangle"
+#define GIMP_STOCK_COLOR_CMYK               "gimp-color-cmyk"
+#define GIMP_STOCK_COLOR_WATER              "gimp-color-water"
 #define GIMP_STOCK_COLOR_PICK_FROM_SCREEN   "gimp-color-pick-from-screen"
 
 #define GIMP_STOCK_CHAR_PICKER              "gimp-char-picker"
diff --git a/modules/color-selector-cmyk.c b/modules/color-selector-cmyk.c
index b9e1107918..c2e8fda3ff 100644
--- a/modules/color-selector-cmyk.c
+++ b/modules/color-selector-cmyk.c
@@ -115,7 +115,7 @@ colorsel_cmyk_class_init (ColorselCmykClass *klass)
 
   selector_class->name       = _("CMYK");
   selector_class->help_id    = "gimp-colorselector-cmyk";
-  selector_class->icon_name  = "document-print";  /* FIXME */
+  selector_class->icon_name  = GIMP_STOCK_COLOR_CMYK;
   selector_class->set_color  = colorsel_cmyk_set_color;
   selector_class->set_config = colorsel_cmyk_set_config;
 }
diff --git a/modules/color-selector-water.c b/modules/color-selector-water.c
index f714374aa6..25ffde69f3 100644
--- a/modules/color-selector-water.c
+++ b/modules/color-selector-water.c
@@ -131,7 +131,7 @@ colorsel_water_class_init (ColorselWaterClass *klass)
 
   selector_class->name       = _("Watercolor");
   selector_class->help_id    = "gimp-colorselector-watercolor";
-  selector_class->icon_name  = GIMP_STOCK_TOOL_PAINTBRUSH;
+  selector_class->icon_name  = GIMP_STOCK_COLOR_WATER;
   selector_class->set_config = colorsel_water_set_config;
 }