diff --git a/app/core/gimppalette.c b/app/core/gimppalette.c
index bfe7271ca6..57dea793f4 100644
--- a/app/core/gimppalette.c
+++ b/app/core/gimppalette.c
@@ -94,7 +94,7 @@ gimp_palette_class_init (GimpPaletteClass *klass)
 
   gimp_object_class->get_memsize    = gimp_palette_get_memsize;
 
-  viewable_class->default_icon_name = "gtk-select-color";
+  viewable_class->default_icon_name = GIMP_STOCK_COLOR_PALETTE;
   viewable_class->get_preview_size  = gimp_palette_get_preview_size;
   viewable_class->get_popup_size    = gimp_palette_get_popup_size;
   viewable_class->get_new_preview   = gimp_palette_get_new_preview;
diff --git a/icons/Color/16/gimp-color-palette.png b/icons/Color/16/gimp-color-palette.png
new file mode 100644
index 0000000000..2010495fac
Binary files /dev/null and b/icons/Color/16/gimp-color-palette.png differ
diff --git a/icons/Color/24/gimp-color-palette.png b/icons/Color/24/gimp-color-palette.png
new file mode 100644
index 0000000000..03c7f87b53
Binary files /dev/null and b/icons/Color/24/gimp-color-palette.png differ
diff --git a/icons/Color/24/gimp-color-palette.svg b/icons/Color/24/gimp-color-palette.svg
new file mode 100644
index 0000000000..9587497d73
--- /dev/null
+++ b/icons/Color/24/gimp-color-palette.svg
@@ -0,0 +1,224 @@
+<?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: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"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   id="svg30571"
+   version="1.1"
+   inkscape:version="0.92pre1 unknown"
+   sodipodi:docname="gimp-color-palette-24.svg">
+  <defs
+     id="defs30573">
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3201"
+       id="radialGradient3297"
+       cx="28.6576"
+       cy="33.986694"
+       fx="28.6576"
+       fy="33.986694"
+       r="18.572308"
+       gradientTransform="matrix(1.9578819,0,0,1.9776232,-44.272539,980.78953)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3201">
+      <stop
+         style="stop-color:#e7ce79;stop-opacity:1"
+         offset="0"
+         id="stop3203" />
+      <stop
+         style="stop-color:#c17d11;stop-opacity:1"
+         offset="1"
+         id="stop3205" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3299"
+       id="linearGradient3238"
+       gradientUnits="userSpaceOnUse"
+       x1="15.299923"
+       y1="9.1440983"
+       x2="51.568203"
+       y2="83.076073"
+       gradientTransform="matrix(0.32399235,0,0,0.35716019,2.336485,1035.1719)" />
+    <linearGradient
+       id="linearGradient3299"
+       inkscape:collect="always">
+      <stop
+         id="stop3301"
+         offset="0"
+         style="stop-color:white;stop-opacity:1;" />
+      <stop
+         id="stop3303"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0.52091253" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3299"
+       id="linearGradient3236"
+       gradientUnits="userSpaceOnUse"
+       x1="21.424923"
+       y1="14.769098"
+       x2="16.6399"
+       y2="5.5"
+       gradientTransform="matrix(0.32399235,0,0,0.32399235,-69.093826,1002.7822)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="13.515376"
+     inkscape:cx="-13.494038"
+     inkscape:cy="7.6391696"
+     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="811"
+     inkscape:window-height="428"
+     inkscape:window-x="0"
+     inkscape:window-y="358"
+     inkscape:window-maximized="0"
+     inkscape:snap-global="false"
+     showguides="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid50" />
+  </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,-1028.3622)">
+    <g
+       id="g95"
+       transform="matrix(1.5,0,0,1.5,0,-526.18124)">
+      <g
+         id="g4142">
+        <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" />
+        <g
+           id="g4112"
+           transform="matrix(1,0,0,1.1023723,69.984109,-69.486814)">
+          <g
+             style="opacity:0.30268196"
+             transform="matrix(0.40000001,0,0,0.36005784,-76.78411,999.30505)"
+             id="g3828" />
+          <path
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="csssssssc"
+             id="path3086"
+             d="m -62.775975,1005.2122 c 0.508984,0 0.979337,0.1347 1.336468,0.3847 0.357132,0.25 0.607486,0.634 0.607486,1.0732 0,0.4393 -0.250354,0.8233 -0.607486,1.0733 -0.357131,0.25 -0.827484,0.3847 -1.336468,0.3847 -0.508984,0 -0.979337,-0.1347 -1.336468,-0.3847 -0.357132,-0.25 -0.607486,-0.634 -0.607486,-1.0733 0,-0.4392 0.250354,-0.8232 0.607486,-1.0732 0.357131,-0.25 0.827484,-0.3847 1.336468,-0.3847 z"
+             style="opacity:0.7356322;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3236);stroke-width:0.32399234;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" />
+          <g
+             style="opacity:0.13026817"
+             transform="matrix(0.32399235,0,0,0.32399235,-69.042979,1002.9121)"
+             id="g3292" />
+        </g>
+        <rect
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.5;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;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="rect4140"
+           width="16"
+           height="16"
+           x="0"
+           y="1036.3622" />
+      </g>
+      <g
+         id="g4010"
+         transform="matrix(1.2447189,0,0,1.1215307,-5.0725418,-126.21668)">
+        <path
+           style="opacity:1;fill:url(#radialGradient3297);fill-opacity:1;fill-rule:evenodd;stroke:#c17d11;stroke-width:0.34017223;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 9.4536954,1036.7703 c -1.900788,0.028 -4.447296,0.7445 -4.404271,3.0471 0.0459,2.4561 2.752324,1.487 2.855183,2.5782 0.166241,1.7637 -3.296211,7.1293 1.964204,8.1811 3.5118376,0.7024 7.2390576,-1.7087 6.8645866,-6.5738 -0.336769,-4.3755 -3.620646,-7.1213 -6.9050856,-7.2326 -0.119994,0 -0.247897,0 -0.374617,0 z m -0.820105,1.4287 c 0.894219,0 1.6199616,0.56 1.6199616,1.2501 0,0.6899 -0.7257426,1.2499 -1.6199616,1.2499 -0.894219,0 -1.619962,-0.56 -1.619962,-1.2499 0,-0.6901 0.725743,-1.2501 1.619962,-1.2501 z"
+           id="path2193"
+           inkscape:connector-curvature="0" />
+        <path
+           style="opacity:0.67049806;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3238);stroke-width:0.34017226;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+           d="m 9.4744424,1037.1363 c -0.915046,0.013 -1.983862,0.2027 -2.78431,0.6362 -0.800447,0.4334 -1.314734,1.0383 -1.295969,2.0424 0.0101,0.5408 0.155408,0.8317 0.354367,1.038 0.198958,0.2065 0.484586,0.3301 0.80998,0.4242 0.325395,0.094 0.677648,0.1497 0.992227,0.2679 0.15729,0.058 0.311383,0.1357 0.44549,0.2679 0.134106,0.1322 0.232392,0.3381 0.253119,0.558 0.05537,0.5875 -0.155169,1.2513 -0.374617,2.0202 -0.219447,0.7689 -0.468522,1.6121 -0.556861,2.4108 -0.08834,0.7988 -0.01335,1.5286 0.344241,2.1095 0.357595,0.5808 1.027285,1.0649 2.288196,1.317 1.6713306,0.3342 3.3853516,-0.074 4.6270156,-1.1273 1.241664,-1.0533 2.031962,-2.7287 1.852831,-5.056 -0.322615,-4.1915 -3.465043,-6.8028 -6.5912186,-6.9088 -0.109183,0 -0.237167,0 -0.364491,0 z"
+           id="path3230"
+           sodipodi:nodetypes="cssssssssssssssc"
+           inkscape:connector-curvature="0" />
+        <ellipse
+           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:#73d216;fill-opacity:1;fill-rule:nonzero;stroke:#4e9a06;stroke-width:0.45703787;stroke-linecap:round;stroke-linejoin:miter;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="path4013"
+           cx="13.715981"
+           cy="1046.7054"
+           rx="1.3782696"
+           ry="1.5547582" />
+        <ellipse
+           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:#ef2929;fill-opacity:1;fill-rule:nonzero;stroke:#a40000;stroke-width:0.45703787;stroke-linecap:round;stroke-linejoin:miter;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="path4013-3"
+           cx="9.4312124"
+           cy="1047.2998"
+           rx="1.3782696"
+           ry="1.5547582" />
+        <ellipse
+           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:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#204a87;stroke-width:0.45703787;stroke-linecap:round;stroke-linejoin:miter;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="path4013-1"
+           cx="13.715981"
+           cy="1041.95"
+           rx="1.3782696"
+           ry="1.5547582" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/icons/Color/scalable/gimp-color-palette.svg b/icons/Color/scalable/gimp-color-palette.svg
new file mode 100644
index 0000000000..86b4f9abf6
--- /dev/null
+++ b/icons/Color/scalable/gimp-color-palette.svg
@@ -0,0 +1,223 @@
+<?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: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"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg30571"
+   version="1.1"
+   inkscape:version="0.92pre1 unknown"
+   sodipodi:docname="gimp-color-palette.svg">
+  <defs
+     id="defs30573">
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3201"
+       id="radialGradient3297"
+       cx="28.6576"
+       cy="33.986694"
+       fx="28.6576"
+       fy="33.986694"
+       r="18.572308"
+       gradientTransform="matrix(1.9578819,0,0,1.9776232,-44.272539,980.78953)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3201">
+      <stop
+         style="stop-color:#e7ce79;stop-opacity:1"
+         offset="0"
+         id="stop3203" />
+      <stop
+         style="stop-color:#c17d11;stop-opacity:1"
+         offset="1"
+         id="stop3205" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3299"
+       id="linearGradient3238"
+       gradientUnits="userSpaceOnUse"
+       x1="15.299923"
+       y1="9.1440983"
+       x2="51.568203"
+       y2="83.076073"
+       gradientTransform="matrix(0.32399235,0,0,0.35716019,2.336485,1035.1719)" />
+    <linearGradient
+       id="linearGradient3299"
+       inkscape:collect="always">
+      <stop
+         id="stop3301"
+         offset="0"
+         style="stop-color:white;stop-opacity:1;" />
+      <stop
+         id="stop3303"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0.52091253" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3299"
+       id="linearGradient3236"
+       gradientUnits="userSpaceOnUse"
+       x1="21.424923"
+       y1="14.769098"
+       x2="16.6399"
+       y2="5.5"
+       gradientTransform="matrix(0.32399235,0,0,0.32399235,-69.093826,1002.7822)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="13.515376"
+     inkscape:cx="8"
+     inkscape:cy="8.1201033"
+     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="811"
+     inkscape:window-height="428"
+     inkscape:window-x="0"
+     inkscape:window-y="358"
+     inkscape:window-maximized="0"
+     inkscape:snap-global="false"
+     showguides="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid50" />
+  </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)">
+    <g
+       id="g95">
+      <g
+         id="g4142">
+        <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" />
+        <g
+           id="g4112"
+           transform="matrix(1,0,0,1.1023723,69.984109,-69.486814)">
+          <g
+             style="opacity:0.30268196"
+             transform="matrix(0.40000001,0,0,0.36005784,-76.78411,999.30505)"
+             id="g3828" />
+          <path
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="csssssssc"
+             id="path3086"
+             d="m -62.775975,1005.2122 c 0.508984,0 0.979337,0.1347 1.336468,0.3847 0.357132,0.25 0.607486,0.634 0.607486,1.0732 0,0.4393 -0.250354,0.8233 -0.607486,1.0733 -0.357131,0.25 -0.827484,0.3847 -1.336468,0.3847 -0.508984,0 -0.979337,-0.1347 -1.336468,-0.3847 -0.357132,-0.25 -0.607486,-0.634 -0.607486,-1.0733 0,-0.4392 0.250354,-0.8232 0.607486,-1.0732 0.357131,-0.25 0.827484,-0.3847 1.336468,-0.3847 z"
+             style="opacity:0.7356322;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3236);stroke-width:0.32399234;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" />
+          <g
+             style="opacity:0.13026817"
+             transform="matrix(0.32399235,0,0,0.32399235,-69.042979,1002.9121)"
+             id="g3292" />
+        </g>
+        <rect
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.5;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;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="rect4140"
+           width="16"
+           height="16"
+           x="0"
+           y="1036.3622" />
+      </g>
+      <g
+         id="g4010"
+         transform="matrix(1.2447189,0,0,1.1215307,-5.0725418,-126.21668)">
+        <path
+           style="opacity:1;fill:url(#radialGradient3297);fill-opacity:1;fill-rule:evenodd;stroke:#c17d11;stroke-width:0.34017223;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 9.4536954,1036.7703 c -1.900788,0.028 -4.447296,0.7445 -4.404271,3.0471 0.0459,2.4561 2.752324,1.487 2.855183,2.5782 0.166241,1.7637 -3.296211,7.1293 1.964204,8.1811 3.5118376,0.7024 7.2390576,-1.7087 6.8645866,-6.5738 -0.336769,-4.3755 -3.620646,-7.1213 -6.9050856,-7.2326 -0.119994,0 -0.247897,0 -0.374617,0 z m -0.820105,1.4287 c 0.894219,0 1.6199616,0.56 1.6199616,1.2501 0,0.6899 -0.7257426,1.2499 -1.6199616,1.2499 -0.894219,0 -1.619962,-0.56 -1.619962,-1.2499 0,-0.6901 0.725743,-1.2501 1.619962,-1.2501 z"
+           id="path2193"
+           inkscape:connector-curvature="0" />
+        <path
+           style="opacity:0.67049806;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3238);stroke-width:0.34017226;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+           d="m 9.4744424,1037.1363 c -0.915046,0.013 -1.983862,0.2027 -2.78431,0.6362 -0.800447,0.4334 -1.314734,1.0383 -1.295969,2.0424 0.0101,0.5408 0.155408,0.8317 0.354367,1.038 0.198958,0.2065 0.484586,0.3301 0.80998,0.4242 0.325395,0.094 0.677648,0.1497 0.992227,0.2679 0.15729,0.058 0.311383,0.1357 0.44549,0.2679 0.134106,0.1322 0.232392,0.3381 0.253119,0.558 0.05537,0.5875 -0.155169,1.2513 -0.374617,2.0202 -0.219447,0.7689 -0.468522,1.6121 -0.556861,2.4108 -0.08834,0.7988 -0.01335,1.5286 0.344241,2.1095 0.357595,0.5808 1.027285,1.0649 2.288196,1.317 1.6713306,0.3342 3.3853516,-0.074 4.6270156,-1.1273 1.241664,-1.0533 2.031962,-2.7287 1.852831,-5.056 -0.322615,-4.1915 -3.465043,-6.8028 -6.5912186,-6.9088 -0.109183,0 -0.237167,0 -0.364491,0 z"
+           id="path3230"
+           sodipodi:nodetypes="cssssssssssssssc"
+           inkscape:connector-curvature="0" />
+        <ellipse
+           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:#73d216;fill-opacity:1;fill-rule:nonzero;stroke:#4e9a06;stroke-width:0.45703787;stroke-linecap:round;stroke-linejoin:miter;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="path4013"
+           cx="13.715981"
+           cy="1046.4082"
+           rx="1.3782696"
+           ry="1.5547582" />
+        <ellipse
+           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:#ef2929;fill-opacity:1;fill-rule:nonzero;stroke:#a40000;stroke-width:0.45703787;stroke-linecap:round;stroke-linejoin:miter;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="path4013-3"
+           cx="9.6990108"
+           cy="1047.2998"
+           rx="1.3782696"
+           ry="1.5547582" />
+        <ellipse
+           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:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#204a87;stroke-width:0.45703787;stroke-linecap:round;stroke-linejoin:miter;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="path4013-1"
+           cx="13.715981"
+           cy="1041.95"
+           rx="1.3782696"
+           ry="1.5547582" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/icons/Prototype/Color/16/gimp-color-palette.png b/icons/Prototype/Color/16/gimp-color-palette.png
deleted file mode 100644
index a334863b5e..0000000000
Binary files a/icons/Prototype/Color/16/gimp-color-palette.png and /dev/null differ
diff --git a/icons/Prototype/Symbolic/16/gimp-color-palette.png b/icons/Prototype/Symbolic/16/gimp-color-palette.png
deleted file mode 100644
index e93a8edfd0..0000000000
Binary files a/icons/Prototype/Symbolic/16/gimp-color-palette.png and /dev/null differ
diff --git a/icons/Symbolic/16/gimp-color-palette.png b/icons/Symbolic/16/gimp-color-palette.png
new file mode 100644
index 0000000000..336976105e
Binary files /dev/null and b/icons/Symbolic/16/gimp-color-palette.png differ
diff --git a/icons/Symbolic/24/gimp-color-palette.png b/icons/Symbolic/24/gimp-color-palette.png
new file mode 100644
index 0000000000..3d310044b8
Binary files /dev/null and b/icons/Symbolic/24/gimp-color-palette.png differ
diff --git a/icons/Symbolic/24/gimp-color-palette.svg b/icons/Symbolic/24/gimp-color-palette.svg
new file mode 100644
index 0000000000..c6090e764a
--- /dev/null
+++ b/icons/Symbolic/24/gimp-color-palette.svg
@@ -0,0 +1,114 @@
+<?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="24"
+   height="24"
+   viewBox="0 0 24 24"
+   id="svg30571"
+   version="1.1"
+   inkscape:version="0.92pre1 unknown"
+   sodipodi:docname="gimp-color-palette-24.svg">
+  <defs
+     id="defs30573" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.3472814"
+     inkscape:cx="11.320301"
+     inkscape:cy="16.060596"
+     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="grid24" />
+  </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,-1028.3622)">
+    <g
+       id="g946"
+       transform="matrix(1.4999314,0,0,1.4999314,-1.9996329e-7,-526.10888)">
+      <g
+         transform="scale(0.99995371,1)"
+         id="g4017">
+        <g
+           id="g4007"
+           transform="translate(-2.3419761,0.78065922)">
+          <g
+             transform="translate(2.3419765,-0.78065884)"
+             id="g4142">
+            <path
+               inkscape:connector-curvature="0"
+               id="rect28186-4"
+               d="m 0,1036.3622 h 16 v 16 H 0 Z"
+               style="fill:none;stroke:none" />
+          </g>
+          <g
+             id="g4010"
+             transform="matrix(1.0501565,0,0,1.0501565,-0.29003914,-52.708266)">
+            <path
+               style="opacity:1;fill:#bebebe;fill-opacity:1;fill-rule:evenodd;stroke:#bebebe;stroke-width:0.60283387;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+               d="M 10.037109 0.30273438 C 6.4836236 0.34998919 1.7203465 1.5555435 1.8007812 5.4238281 C 1.8865907 9.5496518 6.9502851 7.9208894 7.1425781 9.7539062 C 7.453362 12.716787 0.98216052 21.729083 10.816406 23.496094 C 17.381721 24.676049 24.350458 20.623903 23.650391 12.451172 C 23.020808 5.1008332 16.880434 0.48970612 10.740234 0.30273438 L 10.037109 0.30273438 z M 8.5078125 2.7050781 C 10.179538 2.7050781 11.533203 3.6453677 11.533203 4.8046875 C 11.533203 5.9636923 10.179538 6.9023436 8.5078125 6.9023438 C 6.8360871 6.9023438 5.4746094 5.9636923 5.4746094 4.8046875 C 5.4746094 3.6453677 6.8360871 2.7050781 8.5078125 2.7050781 z M 18.5 7 A 2.5 2.5 0 0 1 21 9.5 A 2.5 2.5 0 0 1 18.5 12 A 2.5 2.5 0 0 1 16 9.5 A 2.5 2.5 0 0 1 18.5 7 z M 17.5 14 C 18.880712 14 20 15.119288 20 16.5 C 20 17.880712 18.880712 19 17.5 19 C 16.119288 19 15 17.880712 15 16.5 C 15 15.119288 16.119288 14 17.5 14 z M 10.539062 15.941406 C 11.919776 15.941406 13.039062 17.060694 13.039062 18.441406 C 13.039062 19.822118 11.919776 20.941406 10.539062 20.941406 C 9.1583513 20.941406 8.0390625 19.822118 8.0390625 18.441406 C 8.0390625 17.060694 9.1583513 15.941406 10.539062 15.941406 z "
+               transform="matrix(0.63488444,0,0,0.63485505,2.5063077,1036.3113)"
+               id="path2193" />
+          </g>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/icons/Symbolic/scalable/gimp-color-palette.svg b/icons/Symbolic/scalable/gimp-color-palette.svg
new file mode 100644
index 0000000000..7c73653ad3
--- /dev/null
+++ b/icons/Symbolic/scalable/gimp-color-palette.svg
@@ -0,0 +1,113 @@
+<?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-palette.svg">
+  <defs
+     id="defs30573" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="41.5625"
+     inkscape:cx="6.1593983"
+     inkscape:cy="7.4766665"
+     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="grid24" />
+  </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 />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <g
+       id="g946">
+      <g
+         transform="scale(0.99995371,1)"
+         id="g4017">
+        <g
+           id="g4007"
+           transform="translate(-2.3419761,0.78065922)">
+          <g
+             transform="translate(2.3419765,-0.78065884)"
+             id="g4142">
+            <path
+               inkscape:connector-curvature="0"
+               id="rect28186-4"
+               d="m 0,1036.3622 h 16 v 16 H 0 Z"
+               style="fill:none;stroke:none" />
+          </g>
+          <g
+             id="g4010"
+             transform="matrix(1.0501565,0,0,1.0501565,-0.29003914,-52.708266)">
+            <path
+               id="path2193"
+               transform="matrix(0.9522831,0,0,0.95223902,2.5063076,1036.312)"
+               d="M 6.6914062 0.20117188 C 4.3223068 0.23267653 1.1475463 1.03626 1.2011719 3.6152344 C 1.2583807 6.3659093 4.6335176 5.279886 4.7617188 6.5019531 C 4.9689175 8.4772975 0.65447349 14.486001 7.2109375 15.664062 C 11.588014 16.450735 16.234311 13.749518 15.767578 8.3007812 C 15.347837 3.4003314 11.25381 0.32582541 7.1601562 0.20117188 L 6.6914062 0.20117188 z M 5.671875 1.8027344 C 6.7864096 1.8027344 7.6894528 2.4302098 7.6894531 3.203125 C 7.6894531 3.9758302 6.7864096 4.6015625 5.671875 4.6015625 C 4.5573404 4.6015625 3.6503906 3.9758302 3.6503906 3.203125 C 3.6503906 2.4302098 4.5573404 1.8027344 5.671875 1.8027344 z M 12.476562 4.9882812 C 13.299758 4.9882812 13.976538 5.6650816 13.976562 6.4882812 C 13.976611 7.3115813 13.299812 7.9882812 12.476562 7.9882812 C 11.653318 7.9882812 10.976519 7.3115813 10.976562 6.4882812 C 10.976591 5.6650816 11.653373 4.9882812 12.476562 4.9882812 z M 11.5 9 A 1.5 1.5 0 0 1 13 10.5 A 1.5 1.5 0 0 1 11.5 12 A 1.5 1.5 0 0 1 10 10.5 A 1.5 1.5 0 0 1 11.5 9 z M 6.5136719 11.042969 C 7.3420878 11.042931 8.0136719 11.714515 8.0136719 12.542969 C 8.0136719 13.371423 7.3420878 14.043007 6.5136719 14.042969 C 5.685256 14.043007 5.0136719 13.371423 5.0136719 12.542969 C 5.0136719 11.714515 5.685256 11.042931 6.5136719 11.042969 z "
+               style="opacity:1;fill:#bebebe;fill-opacity:1;fill-rule:evenodd;stroke:#bebebe;stroke-width:0.40190762;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+          </g>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/icons/icon-list.mk b/icons/icon-list.mk
index af7a751db8..b644e80079 100644
--- a/icons/icon-list.mk
+++ b/icons/icon-list.mk
@@ -20,6 +20,7 @@ scalable_images = \
 	scalable/gimp-color-picker-white.svg		\
 	scalable/gimp-color-pick-from-screen.svg	\
 	scalable/gimp-color-cmyk.svg			\
+	scalable/gimp-color-palette.svg			\
 	scalable/gimp-color-triangle.svg		\
 	scalable/gimp-color-water.svg			\
 	scalable/gimp-controller-keyboard.svg		\
@@ -256,19 +257,20 @@ vector24_images = \
 	24/gimp-channels.svg				\
 	24/gimp-char-picker.svg				\
 	24/gimp-colormap.svg				\
+	24/gimp-color-palette.svg			\
 	24/gimp-controller.svg				\
 	24/gimp-controller-keyboard.svg			\
 	24/gimp-controller-linux-input.svg		\
 	24/gimp-controller-midi.svg			\
 	24/gimp-controller-wheel.svg			\
 	24/gimp-cursor.svg				\
-	24/gimp-device-status.svg				\
-	24/gimp-display-filter.svg				\
+	24/gimp-device-status.svg			\
+	24/gimp-display-filter.svg			\
 	24/gimp-display-filter-colorblind.svg		\
-	24/gimp-display-filter-contrast.svg			\
-	24/gimp-display-filter-gamma.svg			\
+	24/gimp-display-filter-contrast.svg		\
+	24/gimp-display-filter-gamma.svg		\
 	24/gimp-display-filter-lcms.svg			\
-	24/gimp-display-filter-proof.svg			\
+	24/gimp-display-filter-proof.svg		\
 	24/gimp-dynamics.svg				\
 	24/gimp-error.svg				\
 	24/gimp-floating-selection.svg			\
@@ -329,7 +331,7 @@ vector24_images = \
 	24/gimp-question.svg				\
 	24/gimp-resize.svg				\
 	24/gimp-sample-point.svg			\
-	24/gimp-scale.svg					\
+	24/gimp-scale.svg				\
 	24/gimp-selection.svg				\
 	24/gimp-symmetry.svg				\
 	24/gimp-template.svg				\
@@ -421,6 +423,7 @@ icons16_images = \
 	16/gimp-channels.png				\
 	16/gimp-color-pick-from-screen.png		\
 	16/gimp-color-cmyk.png				\
+	16/gimp-color-palette.png			\
 	16/gimp-color-triangle.png			\
 	16/gimp-color-water.png				\
 	16/gimp-colormap.png				\
@@ -670,6 +673,7 @@ icons24_images = \
 	24/gimp-channel.png			\
 	24/gimp-channels.png			\
 	24/gimp-colormap.png			\
+	24/gimp-color-palette.png		\
 	24/gimp-controller-keyboard.png		\
 	24/gimp-controller-linux-input.png	\
 	24/gimp-controller-midi.png		\
diff --git a/libgimpwidgets/gimpicons.c b/libgimpwidgets/gimpicons.c
index 774928e90e..13a5c9e434 100644
--- a/libgimpwidgets/gimpicons.c
+++ b/libgimpwidgets/gimpicons.c
@@ -120,6 +120,7 @@ static const GtkStockItem gimp_stock_items[] =
   { GIMP_STOCK_COLOR_TRIANGLE,           NULL,        0, 0, LIBGIMP_DOMAIN },
   { GIMP_STOCK_COLOR_CMYK,               NULL,        0, 0, LIBGIMP_DOMAIN },
   { GIMP_STOCK_COLOR_WATER,              NULL,        0, 0, LIBGIMP_DOMAIN },
+  { GIMP_STOCK_COLOR_PALETTE             NULL,        0, 0, LIBGIMP_DOMAIN },
   { GIMP_STOCK_COLOR_PICK_FROM_SCREEN,   NULL,        0, 0, LIBGIMP_DOMAIN },
 
   { GIMP_STOCK_CHAR_PICKER,              NULL,        0, 0, LIBGIMP_DOMAIN },
diff --git a/libgimpwidgets/gimpicons.h b/libgimpwidgets/gimpicons.h
index 5c6388af63..4b6f9297a4 100644
--- a/libgimpwidgets/gimpicons.h
+++ b/libgimpwidgets/gimpicons.h
@@ -95,6 +95,7 @@ G_BEGIN_DECLS
 #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_PALETTE            "gimp-color-palette"
 #define GIMP_STOCK_COLOR_PICK_FROM_SCREEN   "gimp-color-pick-from-screen"
 
 #define GIMP_STOCK_CHAR_PICKER              "gimp-char-picker"
@@ -294,7 +295,6 @@ G_BEGIN_DECLS
 #define GIMP_STOCK_FONT                     GTK_STOCK_SELECT_FONT
 #define GIMP_STOCK_GRADIENT                 GIMP_STOCK_TOOL_BLEND
 #define GIMP_STOCK_MYPAINT_BRUSH            GIMP_STOCK_TOOL_MYPAINT_BRUSH
-#define GIMP_STOCK_PALETTE                  GTK_STOCK_SELECT_COLOR
 #define GIMP_STOCK_PATTERN                  GIMP_STOCK_TOOL_BUCKET_FILL
 #define GIMP_STOCK_CONTROLLER_MOUSE         GIMP_STOCK_CURSOR
 #define GIMP_STOCK_CONVERT_PRECISION        GIMP_STOCK_CONVERT_RGB