diff --git a/icons/Color/24/gimp-color-space-non-linear.png b/icons/Color/24/gimp-color-space-non-linear.png
new file mode 100644
index 0000000000..2e47cd9214
Binary files /dev/null and b/icons/Color/24/gimp-color-space-non-linear.png differ
diff --git a/icons/Color/24/gimp-color-space-non-linear.svg b/icons/Color/24/gimp-color-space-non-linear.svg
new file mode 100644
index 0000000000..77fceb9bb2
--- /dev/null
+++ b/icons/Color/24/gimp-color-space-non-linear.svg
@@ -0,0 +1,110 @@
+<?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="24"
+   height="24"
+   viewBox="0 0 6.3499999 6.3500002"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="gimp-color-space-perceptual.svg"
+   inkscape:export-filename="/home/alex/soft/graphics/gimp/gimp-2018-01-05/icons/Color/24/gimp-color-space-perceptual.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="8.626758"
+     inkscape:cy="1.2759042"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:document-rotation="0"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1136"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-text-baseline="true"
+     inkscape:snap-page="true"
+     inkscape:snap-global="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:showpageshadow="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid812" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5">
+    <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 />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-290.64998)">
+    <rect
+       style="color:#000000;overflow:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.26458335;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;paint-order:normal"
+       id="rect2481"
+       width="5.8208337"
+       height="5.8208461"
+       x="0.26458335"
+       y="290.91455" />
+    <path
+       style="fill:#bebebe;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.26458335px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 0.26458334,292.50206 H 2.6458334 v 4.23334 H 2.3812501 v -3.96876 H 0.26458334 Z"
+       id="path2687"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc" />
+    <g
+       id="gimp-color-space-perceptual-24">
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path819"
+         d="m 0.26458335,296.73538 c 0.65211582,-2.52051 2.58942775,-5.71277 5.82083345,-5.82082"
+         style="fill:none;fill-rule:evenodd;stroke:#dc0000;stroke-width:0.26458335;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         id="rect814"
+         transform="matrix(0.26458334,0,0,0.26458334,0,292.76665)"
+         d="M 0,-8.0000124 V 15.999987 H 24 V -8.0000124 Z m 1,1 H 23 V 14.999987 l -22,-1.3e-5 z"
+         style="color:#000000;overflow:visible;opacity:1;fill:#2d2d2d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;paint-order:normal"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccccccc" />
+    </g>
+  </g>
+</svg>
diff --git a/icons/Color/scalable/gimp-color-space-non-linear.svg b/icons/Color/scalable/gimp-color-space-non-linear.svg
new file mode 100644
index 0000000000..f61d4e0ee0
--- /dev/null
+++ b/icons/Color/scalable/gimp-color-space-non-linear.svg
@@ -0,0 +1,107 @@
+<?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"
+   viewBox="0 0 4.2333333 4.2333335"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="gimp-color-space-perceptual.svg"
+   inkscape:export-filename="/home/alex/soft/graphics/gimp/gimp-2018-01-05/icons/Color/16/gimp-color-space-perceptual.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="7.8856033"
+     inkscape:cy="10.412292"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:document-rotation="0"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1136"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-text-baseline="true"
+     inkscape:snap-page="true"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid812" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5">
+    <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 />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-292.76665)">
+    <rect
+       style="color:#000000;overflow:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.26458335;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;paint-order:normal"
+       id="rect2483"
+       width="3.7041667"
+       height="3.7041807"
+       x="0.26458335"
+       y="293.03122" />
+    <path
+       style="fill:#bebebe;fill-rule:evenodd;stroke:none;stroke-width:0.26458335px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="M 0.26458334,294.08957 H 1.8520834 v 2.64583 H 1.5875 v -2.38125 H 0.26458334 Z"
+       id="path1375"
+       inkscape:connector-curvature="0" />
+    <g
+       id="gimp-color-space-perceptual"
+       style="fill:#2d2d2d">
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path819"
+         d="m 0.26458334,296.7354 c 0.33769803,-1.99099 2.01315326,-3.44589 3.70416676,-3.70417"
+         style="fill:none;fill-rule:evenodd;stroke:#dc0000;stroke-width:0.26458335px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         id="rect814"
+         transform="matrix(0.26458334,0,0,0.26458334,0,292.76665)"
+         d="m 0,0 v 16 l 16,0 V 0 Z M 0.99999999,0.99999999 15,1 V 15 L 0.99999999,15 Z"
+         style="color:#000000;overflow:visible;opacity:1;fill:#2d2d2d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;paint-order:normal"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccccccc" />
+    </g>
+  </g>
+</svg>
diff --git a/icons/Symbolic/24/gimp-color-space-non-linear-symbolic.svg b/icons/Symbolic/24/gimp-color-space-non-linear-symbolic.svg
new file mode 100644
index 0000000000..e0158270c2
--- /dev/null
+++ b/icons/Symbolic/24/gimp-color-space-non-linear-symbolic.svg
@@ -0,0 +1,96 @@
+<?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="24"
+   height="24"
+   viewBox="0 0 6.3499999 6.3500002"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="gimp-color-space-perceptual.svg"
+   inkscape:export-filename="/home/alex/soft/graphics/gimp/gimp-2018-01-05/icons/Symbolic/24/gimp-color-space-perceptual.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8284271"
+     inkscape:cx="66.611098"
+     inkscape:cy="36.360787"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:document-rotation="0"
+     showgrid="true"
+     units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1136"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-text-baseline="true"
+     inkscape:snap-page="true"
+     inkscape:snap-global="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid812" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5">
+    <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>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-290.64998)">
+    <g
+       id="gimp-color-space-perceptual-24">
+      <path
+         id="rect814"
+         transform="matrix(0.26458334,0,0,0.26458334,0,292.76665)"
+         d="M 0.99999998,-7.0000124 1,15 23,14.999987 V -7.0000124 Z M 2,-6.0000124 H 22 V 13.999987 H 2 Z"
+         style="color:#000000;overflow:visible;opacity:1;fill:#bebebe;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;paint-order:normal"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccccccc" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path819"
+         d="M 0.52916668,296.47082 C 1.1812825,293.95031 2.5894277,291.2872 5.8208334,291.17915"
+         style="fill:none;fill-rule:evenodd;stroke:#bebebe;stroke-width:0.26458335;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>
diff --git a/icons/Symbolic/scalable/gimp-color-space-non-linear-symbolic.svg b/icons/Symbolic/scalable/gimp-color-space-non-linear-symbolic.svg
new file mode 100644
index 0000000000..4499101a9e
--- /dev/null
+++ b/icons/Symbolic/scalable/gimp-color-space-non-linear-symbolic.svg
@@ -0,0 +1,90 @@
+<?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"
+   viewBox="0 0 4.2333333 4.2333335"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="gimp-color-space-perceptual.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="15.263674"
+     inkscape:cy="6.9396371"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:document-rotation="0"
+     showgrid="true"
+     units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1136"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-text-baseline="true"
+     inkscape:snap-page="true"
+     inkscape:snap-global="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid812" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5">
+    <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>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-292.76665)">
+    <g
+       id="gimp-color-space-perceptual">
+      <path
+         id="rect814"
+         transform="matrix(0.26458334,0,0,0.26458334,0,292.76665)"
+         d="M 1,1 V 15 H 15 V 1 Z M 2,2 H 14 V 14 H 2 Z"
+         style="color:#000000;overflow:visible;opacity:1;fill:#bebebe;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;paint-order:normal"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path819"
+         d="m 0.52916668,296.47082 c 0.33769803,-1.99099 1.48398662,-2.91672 3.17500012,-3.175"
+         style="fill:none;fill-rule:evenodd;stroke:#bebebe;stroke-width:0.26458335px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>
diff --git a/icons/icon-list.mk b/icons/icon-list.mk
index 096ee523a5..4e70cc5a70 100644
--- a/icons/icon-list.mk
+++ b/icons/icon-list.mk
@@ -86,6 +86,7 @@ color_scalable_images = \
 	scalable/gimp-color-pick-from-screen.svg		\
 	scalable/gimp-color-cmyk.svg				\
 	scalable/gimp-color-space-linear.svg			\
+	scalable/gimp-color-space-non-linear.svg		\
 	scalable/gimp-color-space-perceptual.svg		\
 	scalable/gimp-color-triangle.svg			\
 	scalable/gimp-color-water.svg				\
@@ -348,6 +349,7 @@ color_vector24_images = \
 	24/gimp-char-picker.svg					\
 	24/gimp-colormap.svg					\
 	24/gimp-color-space-linear.svg				\
+	24/gimp-color-space-non-linear.svg			\
 	24/gimp-color-space-perceptual.svg			\
 	24/gimp-controller.svg					\
 	24/gimp-controller-keyboard.svg				\
@@ -582,6 +584,7 @@ symbolic_scalable_images = \
 	scalable/gimp-color-pick-from-screen-symbolic.svg		\
 	scalable/gimp-color-cmyk-symbolic.svg				\
 	scalable/gimp-color-space-linear-symbolic.svg			\
+	scalable/gimp-color-space-non-linear-symbolic.svg		\
 	scalable/gimp-color-space-perceptual-symbolic.svg		\
 	scalable/gimp-color-triangle-symbolic.svg			\
 	scalable/gimp-color-water-symbolic.svg				\
@@ -844,6 +847,7 @@ symbolic_vector24_images = \
 	24/gimp-char-picker-symbolic.svg					\
 	24/gimp-colormap-symbolic.svg					\
 	24/gimp-color-space-linear-symbolic.svg				\
+	24/gimp-color-space-non-linear-symbolic.svg			\
 	24/gimp-color-space-perceptual-symbolic.svg			\
 	24/gimp-controller-symbolic.svg					\
 	24/gimp-controller-keyboard-symbolic.svg				\
@@ -1085,6 +1089,7 @@ icons16_images = \
 	16/gimp-color-water.png					\
 	16/gimp-colormap.png					\
 	16/gimp-color-space-linear.png				\
+	16/gimp-color-space-non-linear.png			\
 	16/gimp-color-space-perceptual.png			\
 	16/gimp-controller-keyboard.png				\
 	16/gimp-controller-linux-input.png			\
@@ -1365,6 +1370,7 @@ icons24_images = \
 	24/gimp-channels.png					\
 	24/gimp-colormap.png					\
 	24/gimp-color-space-linear.png				\
+	24/gimp-color-space-non-linear.png			\
 	24/gimp-color-space-perceptual.png			\
 	24/gimp-tool-color-temperature.png			\
 	24/gimp-controller-keyboard.png				\
diff --git a/libgimpwidgets/gimpicons.h b/libgimpwidgets/gimpicons.h
index 567972adff..7fc97479ff 100644
--- a/libgimpwidgets/gimpicons.h
+++ b/libgimpwidgets/gimpicons.h
@@ -132,6 +132,7 @@ G_BEGIN_DECLS
 #define GIMP_ICON_COLOR_SELECTOR_WATER      "gimp-color-water"
 
 #define GIMP_ICON_COLOR_SPACE_LINEAR        "gimp-color-space-linear"
+#define GIMP_ICON_COLOR_SPACE_NON_LINEAR    "gimp-color-space-non-linear"
 #define GIMP_ICON_COLOR_SPACE_PERCEPTUAL    "gimp-color-space-perceptual"
 
 #define GIMP_ICON_COLORS_DEFAULT            "gimp-default-colors"