diff --git a/icons/Symbolic/16/gimp-tool-warp.png b/icons/Symbolic/16/gimp-tool-warp.png
new file mode 100644
index 0000000000..f0823f2fde
Binary files /dev/null and b/icons/Symbolic/16/gimp-tool-warp.png differ
diff --git a/icons/Symbolic/16/gimp-tool-warp.svg b/icons/Symbolic/16/gimp-tool-warp.svg
new file mode 100644
index 0000000000..a8133654cc
--- /dev/null
+++ b/icons/Symbolic/16/gimp-tool-warp.svg
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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: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="svg30001"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="gimp-tool-warp.svg"
+   inkscape:export-filename="/home/alex/soft/graphics/gimp/gimp-2015-12-21/icons/Symbolic/16/gimp-tool-warp.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs30003">
+    <linearGradient
+       id="linearGradient19282"
+       osb:paint="solid"
+       gradientTransform="matrix(1.2509561,0,0,1.0722478,649.98056,1839.3669)">
+      <stop
+         style="stop-color:#666666;stop-opacity:1;"
+         offset="0"
+         id="stop19284" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="6.4547496"
+     inkscape:cy="11.16702"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     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"
+     inkscape:snap-page="true"
+     showborder="false"
+     inkscape:window-width="960"
+     inkscape:window-height="1136"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata30006">
+    <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:creator>
+          <cc:Agent>
+            <dc:title>Barbara Muraus</dc:title>
+          </cc:Agent>
+        </dc:creator>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <g
+       transform="matrix(1.0625125,0,0,1.0625125,-337.81666,-82.848296)"
+       id="tool-tweak-16px">
+      <rect
+         y="1053.3621"
+         x="317"
+         height="16"
+         width="16"
+         id="rect19598"
+         style="color:#000000;fill:none" />
+      <path
+         sodipodi:nodetypes="ccccccccscc"
+         style="color:#000000;fill:url(#linearGradient19282);stroke-width:0.89168727"
+         d="m 327.38013,1054.488 c -0.78177,-0.032 -1.50243,0.086 -1.95599,0.3667 -3.91317,2.3901 -1.68815,8.2242 -7.43561,7.1412 l -0.0472,6.4249 15.01147,0 0.0472,-6.4249 c -3.91339,0.8653 -5.55703,0 -6.32487,-1.6942 -0.68077,-1.5022 -0.13789,-2.8371 0.7733,-2.998 1.80117,-0.3195 1.61395,0.8653 2.68384,1.1624 1.01703,0.282 1.32669,-0.6638 0.61408,-2.1424 -0.59821,-1.2406 -2.06322,-1.7767 -3.36622,-1.8357 z"
+         id="path19600"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/icons/Symbolic/22/gimp-tool-warp.png b/icons/Symbolic/22/gimp-tool-warp.png
new file mode 100644
index 0000000000..5f3cd7e7b0
Binary files /dev/null and b/icons/Symbolic/22/gimp-tool-warp.png differ
diff --git a/icons/Symbolic/22/gimp-tool-warp.svg b/icons/Symbolic/22/gimp-tool-warp.svg
new file mode 100644
index 0000000000..3440386a88
--- /dev/null
+++ b/icons/Symbolic/22/gimp-tool-warp.svg
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="22"
+   height="22"
+   viewBox="0 0 22 22"
+   id="svg30571"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="gimp-tool-warp.svg"
+   inkscape:export-filename="/home/alex/soft/graphics/gimp/gimp-2015-12-21/icons/Symbolic/22/gimp-tool-warp.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs30573">
+    <linearGradient
+       id="linearGradient19282"
+       osb:paint="solid"
+       gradientTransform="matrix(1.2178615,0,0,1.043881,642.66072,1818.5586)">
+      <stop
+         style="stop-color:#666666;stop-opacity:1;"
+         offset="0"
+         id="stop19284" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="11.529377"
+     inkscape:cy="-0.55430683"
+     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="960"
+     inkscape:window-height="1136"
+     inkscape:window-x="960"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0" />
+  <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:title></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Barbara Muraus</dc:title>
+          </cc:Agent>
+        </dc:creator>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1030.3622)">
+    <g
+       transform="translate(-285.969,-24.0628)"
+       id="tool-tweak">
+      <rect
+         style="color:#000000;fill:none"
+         id="rect4400"
+         width="24"
+         height="24"
+         x="285"
+         y="1053.3621" />
+      <path
+         sodipodi:nodetypes="ccccccccccc"
+         inkscape:connector-curvature="0"
+         id="rect4412"
+         d="m 299.77318,1055.491 c -1.14326,-0.052 -2.19727,0.1357 -2.86065,0.5512 -5.72298,3.5909 -2.49196,12.5881 -10.8976,10.9618 l -0.0459,9.421 21.95407,0 0.0459,-9.421 c -5.72318,1.2986 -8.10396,-0.2307 -9.22697,-2.7778 -0.99544,-2.2579 -0.20147,-4.2642 1.13094,-4.5054 2.63424,-0.4791 2.36053,1.2996 3.9252,1.7464 1.48733,0.4249 1.94016,-0.9969 0.89805,-3.2183 -0.87487,-1.8643 -3.01744,-2.6692 -4.92294,-2.7579 z"
+         style="color:#000000;fill:url(#linearGradient19282);stroke-width:0.89168727" />
+    </g>
+  </g>
+</svg>
diff --git a/icons/Symbolic/icon-list.mk b/icons/Symbolic/icon-list.mk
index 8648475280..8d0b2a07c9 100644
--- a/icons/Symbolic/icon-list.mk
+++ b/icons/Symbolic/icon-list.mk
@@ -166,6 +166,7 @@ icons16_DATA = \
 	16/gimp-tool-smudge.png				\
 	16/gimp-tool-text.png				\
 	16/gimp-tool-threshold.png			\
+	16/gimp-tool-warp.png				\
 	16/gimp-tool-zoom.png				\
 	16/gimp-tools.png				\
 	16/gimp-transparency.png			\
@@ -275,6 +276,7 @@ icons22_DATA = \
 	22/gimp-tool-smudge.png			\
 	22/gimp-tool-text.png			\
 	22/gimp-tool-threshold.png		\
+	22/gimp-tool-warp.png			\
 	22/gimp-tool-zoom.png			\
 	22/gimp-wilber.png