Convert the zoom icons to templates.

Ping-Bug: 15511
Change-Id: I37ecd210e93387535b7e5b3c6f4b617844e75d01
Reviewed-on: https://code.wireshark.org/review/33613
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

34 files changed, 638 insertions, 319 deletions

diff --git a/image/stock_icons.qrc b/image/stock_icons.qrc
index 45d8f22d6b..71a3346db8 100644
--- a/image/stock_icons.qrc
+++ b/image/stock_icons.qrc
@@ -91,12 +91,12 @@
         <file>stock_icons/16x16/x-resize-columns@2x.png</file>
         <file>stock_icons/16x16/x-stay-last.png</file>
         <file>stock_icons/16x16/x-stay-last@2x.png</file>
-        <file>stock_icons/16x16/zoom-in.png</file>
-        <file>stock_icons/16x16/zoom-in@2x.png</file>
-        <file>stock_icons/16x16/zoom-original.png</file>
-        <file>stock_icons/16x16/zoom-original@2x.png</file>
-        <file>stock_icons/16x16/zoom-out.png</file>
-        <file>stock_icons/16x16/zoom-out@2x.png</file>
+        <file>stock_icons/16x16/zoom-in.template.png</file>
+        <file>stock_icons/16x16/zoom-in.template@2x.png</file>
+        <file>stock_icons/16x16/zoom-original.template.png</file>
+        <file>stock_icons/16x16/zoom-original.template@2x.png</file>
+        <file>stock_icons/16x16/zoom-out.template.png</file>
+        <file>stock_icons/16x16/zoom-out.template@2x.png</file>
         <file>stock_icons/24x14/x-filter-apply.png</file>
         <file>stock_icons/24x14/x-filter-apply@2x.png</file>
         <file>stock_icons/24x14/x-filter-apply.active.png</file>
@@ -133,12 +133,12 @@
         <file>stock_icons/24x24/x-resize-columns@2x.png</file>
         <file>stock_icons/24x24/x-stay-last.png</file>
         <file>stock_icons/24x24/x-stay-last@2x.png</file>
-        <file>stock_icons/24x24/zoom-in.png</file>
-        <file>stock_icons/24x24/zoom-in@2x.png</file>
-        <file>stock_icons/24x24/zoom-original.png</file>
-        <file>stock_icons/24x24/zoom-original@2x.png</file>
-        <file>stock_icons/24x24/zoom-out.png</file>
-        <file>stock_icons/24x24/zoom-out@2x.png</file>
+        <file>stock_icons/24x24/zoom-in.template.png</file>
+        <file>stock_icons/24x24/zoom-in.template@2x.png</file>
+        <file>stock_icons/24x24/zoom-original.template.png</file>
+        <file>stock_icons/24x24/zoom-original.template@2x.png</file>
+        <file>stock_icons/24x24/zoom-out.template.png</file>
+        <file>stock_icons/24x24/zoom-out.template@2x.png</file>
         <file>stock_icons/24x24/x-capture-file-close.png</file>
         <file>stock_icons/24x24/x-capture-file-close@2x.png</file>
         <file>stock_icons/24x24/x-capture-file-save.png</file>
diff --git a/image/stock_icons/16x16/zoom-in.png b/image/stock_icons/16x16/zoom-in.png
deleted file mode 100644
index 993841e66a..0000000000
--- a/image/stock_icons/16x16/zoom-in.png
+++ /dev/null
diff --git a/image/stock_icons/16x16/zoom-in.template.png b/image/stock_icons/16x16/zoom-in.template.png
new file mode 100644
index 0000000000..d490d0bf7b
--- /dev/null
+++ b/image/stock_icons/16x16/zoom-in.template.png
diff --git a/image/stock_icons/16x16/zoom-in.svg b/image/stock_icons/16x16/zoom-in.template.svg
index 9604c17452..607fbf666d 100644
--- a/image/stock_icons/16x16/zoom-in.svg
+++ b/image/stock_icons/16x16/zoom-in.template.svg
@@ -7,26 +7,43 @@
    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"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="zoom-in.svg"
+   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
+   sodipodi:docname="zoom-in.template.svg"
    inkscape:export-filename="zoom-in.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90">
   <defs
      id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient68947">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.12156863"
+         offset="0"
+         id="stop68943" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.24705882"
+         offset="1"
+         id="stop68945" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient68947"
+       id="radialGradient68949"
+       cx="7.4976749"
+       cy="6.9953456"
+       fx="7.4976749"
+       fy="6.9953456"
+       r="5.4744209"
+       gradientTransform="matrix(0.87021707,0.45217807,-0.50481451,0.78692796,4.1897748,-1.7802782)"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -35,16 +52,16 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="30.9375"
+     inkscape:zoom="31.4375"
      inkscape:cx="8"
-     inkscape:cy="8"
+     inkscape:cy="6.7276342"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:window-width="1239"
      inkscape:window-height="664"
-     inkscape:window-x="132"
-     inkscape:window-y="882"
+     inkscape:window-x="165"
+     inkscape:window-y="187"
      inkscape:window-maximized="0">
     <inkscape:grid
        type="xygrid"
@@ -71,36 +88,33 @@
      inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1036.3622)">
-    <g
-       id="g3759"
-       transform="matrix(0.41569296,-0.41571122,0.41569296,0.41571122,-430.24983,621.04542)">
-      <rect
-         ry="1.7009567"
-         rx="1.7010314"
-         y="1042.3622"
-         x="16.5"
-         height="9"
-         width="3"
-         id="rect2987"
-         style="fill:#2e3436;fill-opacity:1;stroke:#2e3436;stroke-width:1.70099401;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path3757"
-         d="m 18,1030.3622 c 0,13 0,13 0,13"
-         style="fill:none;stroke:#2e3436;stroke-width:3.40198803;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    </g>
+    <rect
+       style="fill:#2e3436;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect2987"
+       width="1.7636746"
+       height="5.2910237"
+       x="-733.6748"
+       y="747.69244"
+       rx="1.0000219"
+       ry="0.99997807"
+       transform="matrix(0.70709125,-0.70712231,0.70709125,0.70712231,0,0)" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 10.013215,1046.3622 C 14,1050.3492 14,1050.3492 14,1050.3492"
+       id="path3757"
+       inkscape:connector-curvature="0" />
     <path
        sodipodi:type="arc"
-       style="fill:#eeeeec;fill-opacity:1;stroke:#2e3436;stroke-width:0.94884175;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:url(#radialGradient68949);fill-opacity:1;stroke:#000000;stroke-width:0.94884175;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        id="path2985"
        sodipodi:cx="7"
        sodipodi:cy="6.5"
        sodipodi:rx="5"
        sodipodi:ry="4.5"
-       d="M 12,6.5 C 12,8.9852814 9.7614237,11 7,11 4.2385763,11 2,8.9852814 2,6.5 2,4.0147186 4.2385763,2 7,2 c 2.7614237,0 5,2.0147186 5,4.5 z"
+       d="M 12,6.5 A 5,4.5 0 0 1 7,11 5,4.5 0 0 1 2,6.5 5,4.5 0 0 1 7,2 5,4.5 0 0 1 12,6.5 Z"
        transform="matrix(0.86588083,-0.49991653,0.55546279,0.96208979,-3.171674,1040.108)" />
     <rect
-       style="fill:#2e3436;stroke:none"
+       style="fill:#000000;stroke:none;fill-opacity:1"
        id="rect3760"
        width="5"
        height="1"
@@ -112,7 +126,7 @@
        height="1"
        width="5"
        id="rect3762"
-       style="fill:#2e3436;stroke:none"
+       style="fill:#000000;stroke:none;fill-opacity:1"
        transform="matrix(0,1,-1,0,0,0)" />
   </g>
 </svg>
diff --git a/image/stock_icons/16x16/zoom-in.template@2x.png b/image/stock_icons/16x16/zoom-in.template@2x.png
new file mode 100644
index 0000000000..fe558b966d
--- /dev/null
+++ b/image/stock_icons/16x16/zoom-in.template@2x.png
diff --git a/image/stock_icons/16x16/zoom-in@2x.png b/image/stock_icons/16x16/zoom-in@2x.png
deleted file mode 100644
index 8a0a28db38..0000000000
--- a/image/stock_icons/16x16/zoom-in@2x.png
+++ /dev/null
diff --git a/image/stock_icons/16x16/zoom-original.png b/image/stock_icons/16x16/zoom-original.png
deleted file mode 100644
index 78c21c2d4e..0000000000
--- a/image/stock_icons/16x16/zoom-original.png
+++ /dev/null
diff --git a/image/stock_icons/16x16/zoom-original.svg b/image/stock_icons/16x16/zoom-original.svg
deleted file mode 100644
index ef8541e6a9..0000000000
--- a/image/stock_icons/16x16/zoom-original.svg
+++ /dev/null
@@ -1,117 +0,0 @@
-<?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="svg2"
-   version="1.1"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="zoom-original.svg"
-   inkscape:export-filename="zoom-original.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="31.6875"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1301"
-     inkscape:window-height="676"
-     inkscape:window-x="132"
-     inkscape:window-y="882"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2983"
-       empspacing="4"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <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,-1036.3622)">
-    <g
-       id="g3759"
-       transform="matrix(0.41569296,-0.41571122,0.41569296,0.41571122,-430.24983,621.04542)">
-      <rect
-         ry="1.7009567"
-         rx="1.7010314"
-         y="1042.3622"
-         x="16.5"
-         height="9"
-         width="3"
-         id="rect2987"
-         style="fill:#2e3436;fill-opacity:1;stroke:#2e3436;stroke-width:1.70099401;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path3757"
-         d="m 18,1030.3622 c 0,13 0,13 0,13"
-         style="fill:none;stroke:#2e3436;stroke-width:3.40198803;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    </g>
-    <path
-       sodipodi:type="arc"
-       style="fill:#eeeeec;fill-opacity:1;stroke:#2e3436;stroke-width:0.94884175;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="path2985"
-       sodipodi:cx="7"
-       sodipodi:cy="6.5"
-       sodipodi:rx="5"
-       sodipodi:ry="4.5"
-       d="M 12,6.5 C 12,8.9852814 9.7614237,11 7,11 4.2385763,11 2,8.9852814 2,6.5 2,4.0147186 4.2385763,2 7,2 c 2.7614237,0 5,2.0147186 5,4.5 z"
-       transform="matrix(0.86588083,-0.49991653,0.55546279,0.96208979,-3.171674,1040.108)" />
-    <rect
-       style="fill:#2e3436;stroke:none"
-       id="rect3760"
-       width="5"
-       height="1"
-       x="4"
-       y="1041.3622" />
-    <rect
-       y="1043.3622"
-       x="4"
-       height="1"
-       width="5"
-       id="rect3816"
-       style="fill:#2e3436;stroke:none" />
-  </g>
-</svg>
diff --git a/image/stock_icons/16x16/zoom-original.template.png b/image/stock_icons/16x16/zoom-original.template.png
new file mode 100644
index 0000000000..f65a0099ae
--- /dev/null
+++ b/image/stock_icons/16x16/zoom-original.template.png
diff --git a/image/stock_icons/16x16/zoom-original.template.svg b/image/stock_icons/16x16/zoom-original.template.svg
new file mode 100644
index 0000000000..745d8531af
--- /dev/null
+++ b/image/stock_icons/16x16/zoom-original.template.svg
@@ -0,0 +1,131 @@
+<?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: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"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
+   sodipodi:docname="zoom-original.template.svg"
+   inkscape:export-filename="zoom-in.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient68947">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.12156863"
+         offset="0"
+         id="stop68943" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.24705882"
+         offset="1"
+         id="stop68945" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient68947"
+       id="radialGradient68949"
+       cx="7.4976749"
+       cy="6.9953456"
+       fx="7.4976749"
+       fy="6.9953456"
+       r="5.4744209"
+       gradientTransform="matrix(0.87021707,0.45217807,-0.50481451,0.78692796,4.1897748,-1.7802782)"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="31.4375"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1239"
+     inkscape:window-height="664"
+     inkscape:window-x="146"
+     inkscape:window-y="85"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2983"
+       empspacing="4"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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,-1036.3622)">
+    <rect
+       style="fill:#2e3436;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect2987"
+       width="1.7636746"
+       height="5.2910237"
+       x="-733.6748"
+       y="747.69244"
+       rx="1.0000219"
+       ry="0.99997807"
+       transform="matrix(0.70709125,-0.70712231,0.70709125,0.70712231,0,0)" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 10.013215,1046.3622 C 14,1050.3492 14,1050.3492 14,1050.3492"
+       id="path3757"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:type="arc"
+       style="fill:url(#radialGradient68949);fill-opacity:1;stroke:#000000;stroke-width:0.94884175;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path2985"
+       sodipodi:cx="7"
+       sodipodi:cy="6.5"
+       sodipodi:rx="5"
+       sodipodi:ry="4.5"
+       d="M 12,6.5 A 5,4.5 0 0 1 7,11 5,4.5 0 0 1 2,6.5 5,4.5 0 0 1 7,2 5,4.5 0 0 1 12,6.5 Z"
+       transform="matrix(0.86588083,-0.49991653,0.55546279,0.96208979,-3.171674,1040.108)" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect3760"
+       width="5"
+       height="1"
+       x="4"
+       y="1043.3622" />
+    <rect
+       y="1041.3622"
+       x="4"
+       height="1"
+       width="5"
+       id="rect96799"
+       style="fill:#000000;fill-opacity:1;stroke:none" />
+  </g>
+</svg>
diff --git a/image/stock_icons/16x16/zoom-original.template@2x.png b/image/stock_icons/16x16/zoom-original.template@2x.png
new file mode 100644
index 0000000000..43b998a803
--- /dev/null
+++ b/image/stock_icons/16x16/zoom-original.template@2x.png
diff --git a/image/stock_icons/16x16/zoom-original@2x.png b/image/stock_icons/16x16/zoom-original@2x.png
deleted file mode 100644
index 212900e86c..0000000000
--- a/image/stock_icons/16x16/zoom-original@2x.png
+++ /dev/null
diff --git a/image/stock_icons/16x16/zoom-out.png b/image/stock_icons/16x16/zoom-out.png
deleted file mode 100644
index 7fa79bf4c9..0000000000
--- a/image/stock_icons/16x16/zoom-out.png
+++ /dev/null
diff --git a/image/stock_icons/16x16/zoom-out.svg b/image/stock_icons/16x16/zoom-out.svg
deleted file mode 100644
index d56b57f608..0000000000
--- a/image/stock_icons/16x16/zoom-out.svg
+++ /dev/null
@@ -1,110 +0,0 @@
-<?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="svg2"
-   version="1.1"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="zoom-out.svg"
-   inkscape:export-filename="zoom-out.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="30.8125"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1241"
-     inkscape:window-height="662"
-     inkscape:window-x="132"
-     inkscape:window-y="882"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2983"
-       empspacing="4"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <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,-1036.3622)">
-    <g
-       id="g3759"
-       transform="matrix(0.41569296,-0.41571122,0.41569296,0.41571122,-430.24983,621.04542)">
-      <rect
-         ry="1.7009567"
-         rx="1.7010314"
-         y="1042.3622"
-         x="16.5"
-         height="9"
-         width="3"
-         id="rect2987"
-         style="fill:#2e3436;fill-opacity:1;stroke:#2e3436;stroke-width:1.70099401;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path3757"
-         d="m 18,1030.3622 c 0,13 0,13 0,13"
-         style="fill:none;stroke:#2e3436;stroke-width:3.40198803;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    </g>
-    <path
-       sodipodi:type="arc"
-       style="fill:#eeeeec;fill-opacity:1;stroke:#2e3436;stroke-width:0.94884175;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="path2985"
-       sodipodi:cx="7"
-       sodipodi:cy="6.5"
-       sodipodi:rx="5"
-       sodipodi:ry="4.5"
-       d="M 12,6.5 C 12,8.9852814 9.7614237,11 7,11 4.2385763,11 2,8.9852814 2,6.5 2,4.0147186 4.2385763,2 7,2 c 2.7614237,0 5,2.0147186 5,4.5 z"
-       transform="matrix(0.86588083,-0.49991653,0.55546279,0.96208979,-3.171674,1040.108)" />
-    <rect
-       style="fill:#2e3436;stroke:none"
-       id="rect3760"
-       width="5"
-       height="1"
-       x="4"
-       y="1042.3622" />
-  </g>
-</svg>
diff --git a/image/stock_icons/16x16/zoom-out.template.png b/image/stock_icons/16x16/zoom-out.template.png
new file mode 100644
index 0000000000..4316e231b4
--- /dev/null
+++ b/image/stock_icons/16x16/zoom-out.template.png
diff --git a/image/stock_icons/16x16/zoom-out.template.svg b/image/stock_icons/16x16/zoom-out.template.svg
new file mode 100644
index 0000000000..db52864234
--- /dev/null
+++ b/image/stock_icons/16x16/zoom-out.template.svg
@@ -0,0 +1,124 @@
+<?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: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"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
+   sodipodi:docname="zoom-out.template.svg"
+   inkscape:export-filename="zoom-in.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient68947">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.12156863"
+         offset="0"
+         id="stop68943" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.24705882"
+         offset="1"
+         id="stop68945" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient68947"
+       id="radialGradient68949"
+       cx="7.4976749"
+       cy="6.9953456"
+       fx="7.4976749"
+       fy="6.9953456"
+       r="5.4744209"
+       gradientTransform="matrix(0.87021707,0.45217807,-0.50481451,0.78692796,4.1897748,-1.7802782)"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="64.22583"
+     inkscape:cx="4.9638384"
+     inkscape:cy="6.7276342"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1239"
+     inkscape:window-height="664"
+     inkscape:window-x="165"
+     inkscape:window-y="187"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2983"
+       empspacing="4"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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,-1036.3622)">
+    <rect
+       style="fill:#2e3436;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect2987"
+       width="1.7636746"
+       height="5.2910237"
+       x="-733.6748"
+       y="747.69244"
+       rx="1.0000219"
+       ry="0.99997807"
+       transform="matrix(0.70709125,-0.70712231,0.70709125,0.70712231,0,0)" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 10.013215,1046.3622 C 14,1050.3492 14,1050.3492 14,1050.3492"
+       id="path3757"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:type="arc"
+       style="fill:url(#radialGradient68949);fill-opacity:1;stroke:#000000;stroke-width:0.94884175;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path2985"
+       sodipodi:cx="7"
+       sodipodi:cy="6.5"
+       sodipodi:rx="5"
+       sodipodi:ry="4.5"
+       d="M 12,6.5 A 5,4.5 0 0 1 7,11 5,4.5 0 0 1 2,6.5 5,4.5 0 0 1 7,2 5,4.5 0 0 1 12,6.5 Z"
+       transform="matrix(0.86588083,-0.49991653,0.55546279,0.96208979,-3.171674,1040.108)" />
+    <rect
+       style="fill:#000000;stroke:none;fill-opacity:1"
+       id="rect3760"
+       width="5"
+       height="1"
+       x="4"
+       y="1042.3622" />
+  </g>
+</svg>
diff --git a/image/stock_icons/16x16/zoom-out.template@2x.png b/image/stock_icons/16x16/zoom-out.template@2x.png
new file mode 100644
index 0000000000..d1a79d39eb
--- /dev/null
+++ b/image/stock_icons/16x16/zoom-out.template@2x.png
diff --git a/image/stock_icons/16x16/zoom-out@2x.png b/image/stock_icons/16x16/zoom-out@2x.png
deleted file mode 100644
index b41eed9915..0000000000
--- a/image/stock_icons/16x16/zoom-out@2x.png
+++ /dev/null
diff --git a/image/stock_icons/24x24/zoom-in.png b/image/stock_icons/24x24/zoom-in.png
deleted file mode 100644
index 0025c34c00..0000000000
--- a/image/stock_icons/24x24/zoom-in.png
+++ /dev/null
diff --git a/image/stock_icons/24x24/zoom-in.template.png b/image/stock_icons/24x24/zoom-in.template.png
new file mode 100644
index 0000000000..f5ea80bc5e
--- /dev/null
+++ b/image/stock_icons/24x24/zoom-in.template.png
diff --git a/image/stock_icons/24x24/zoom-in.svg b/image/stock_icons/24x24/zoom-in.template.svg
index bae0b0748d..8fd1ecff7b 100644
--- a/image/stock_icons/24x24/zoom-in.svg
+++ b/image/stock_icons/24x24/zoom-in.template.svg
@@ -7,26 +7,43 @@
    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"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="zoom-in.svg"
+   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
+   sodipodi:docname="zoom-in.template.svg"
    inkscape:export-filename="zoom-in.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90">
   <defs
      id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient9558">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.12156863"
+         offset="0"
+         id="stop9554" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.24705882"
+         offset="1"
+         id="stop9556" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9558"
+       id="radialGradient9560"
+       cx="7.3559246"
+       cy="6.8546762"
+       fx="7.3559246"
+       fy="6.8546762"
+       r="5.338872"
+       gradientTransform="matrix(0.86913421,0.45161541,-0.50352622,0.78491975,4.1889809,-1.7632862)"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -35,16 +52,16 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="21.541667"
-     inkscape:cx="11.46994"
+     inkscape:zoom="21.875"
+     inkscape:cx="12"
      inkscape:cy="12"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:window-width="1147"
      inkscape:window-height="686"
-     inkscape:window-x="1837"
-     inkscape:window-y="214"
+     inkscape:window-x="67"
+     inkscape:window-y="40"
      inkscape:window-maximized="0">
     <inkscape:grid
        type="xygrid"
@@ -62,7 +79,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -71,37 +88,33 @@
      inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1028.3622)">
-    <g
-       id="g3043"
-       transform="matrix(0.70712074,-0.70710678,0.70712074,0.70710678,-735.46474,319.5415)">
-      <rect
-         transform="matrix(0.99999995,-3.1484358e-4,-3.6143743e-4,0.99999993,0,0)"
-         ry="0.99980539"
-         rx="1.0001751"
-         y="1042.9893"
-         x="17.949001"
-         height="7.9997311"
-         width="2.8565922"
-         id="rect2987"
-         style="fill:#2e3436;fill-opacity:1;stroke:#2e3436;stroke-width:0.99999022;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path3757"
-         d="M 19.004176,1030.9788 C 19,1043.3622 19,1043.3622 19,1043.3622"
-         style="fill:none;stroke:#2e3436;stroke-width:1.99998021;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    </g>
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect2987"
+       width="2.8566203"
+       height="7.9998097"
+       x="-728.15637"
+       y="748.66986"
+       rx="1.000185"
+       ry="0.99981523"
+       transform="matrix(0.7068911,-0.7073224,0.70685814,0.70735534,0,0)" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 14.241789,1042.3622 C 21,1049.1249 21,1049.1249 21,1049.1249"
+       id="path3757"
+       inkscape:connector-curvature="0" />
     <path
        sodipodi:type="arc"
-       style="fill:#eeeeec;fill-opacity:1;stroke:#2e3436;stroke-width:0.67774409;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:url(#radialGradient9560);fill-opacity:1;stroke:#000000;stroke-width:0.67774409;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        id="path2985"
        sodipodi:cx="7"
        sodipodi:cy="6.5"
        sodipodi:rx="5"
        sodipodi:ry="4.5"
-       d="m 12,6.5 a 5,4.5 0 1 1 -10,0 5,4.5 0 1 1 10,0 z"
+       d="M 12,6.5 A 5,4.5 0 0 1 7,11 5,4.5 0 0 1 2,6.5 5,4.5 0 0 1 7,2 5,4.5 0 0 1 12,6.5 Z"
        transform="matrix(1.2122332,-0.69988316,0.77764788,1.3469257,-4.0403435,1034.0064)" />
     <rect
-       style="fill:#2e3436;stroke:none"
+       style="fill:#000000;stroke:none;fill-opacity:1"
        id="rect3760"
        width="7"
        height="1"
@@ -115,7 +128,7 @@
        height="1"
        width="7.0000296"
        id="rect3762"
-       style="fill:#2e3436;stroke:none"
+       style="fill:#000000;stroke:none;fill-opacity:1"
        transform="matrix(0,1,-1,0,0,0)"
        rx="0.5"
        ry="0.5" />
diff --git a/image/stock_icons/24x24/zoom-in.template@2x.png b/image/stock_icons/24x24/zoom-in.template@2x.png
new file mode 100644
index 0000000000..02ffdd4d5a
--- /dev/null
+++ b/image/stock_icons/24x24/zoom-in.template@2x.png
diff --git a/image/stock_icons/24x24/zoom-in@2x.png b/image/stock_icons/24x24/zoom-in@2x.png
deleted file mode 100644
index f18d1981ec..0000000000
--- a/image/stock_icons/24x24/zoom-in@2x.png
+++ /dev/null
diff --git a/image/stock_icons/24x24/zoom-original.png b/image/stock_icons/24x24/zoom-original.png
deleted file mode 100644
index c8bb23e388..0000000000
--- a/image/stock_icons/24x24/zoom-original.png
+++ /dev/null
diff --git a/image/stock_icons/24x24/zoom-original.template.png b/image/stock_icons/24x24/zoom-original.template.png
new file mode 100644
index 0000000000..ca7c3ae970
--- /dev/null
+++ b/image/stock_icons/24x24/zoom-original.template.png
diff --git a/image/stock_icons/24x24/zoom-original.template.svg b/image/stock_icons/24x24/zoom-original.template.svg
new file mode 100644
index 0000000000..e347e53b31
--- /dev/null
+++ b/image/stock_icons/24x24/zoom-original.template.svg
@@ -0,0 +1,135 @@
+<?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: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"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
+   sodipodi:docname="zoom-original.template.svg"
+   inkscape:export-filename="zoom-in.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient9558">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.12156863"
+         offset="0"
+         id="stop9554" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.24705882"
+         offset="1"
+         id="stop9556" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9558"
+       id="radialGradient9560"
+       cx="7.3559246"
+       cy="6.8546762"
+       fx="7.3559246"
+       fy="6.8546762"
+       r="5.338872"
+       gradientTransform="matrix(0.86913421,0.45161541,-0.50352622,0.78491975,4.1889809,-1.7632862)"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="21.875"
+     inkscape:cx="12"
+     inkscape:cy="12"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1147"
+     inkscape:window-height="686"
+     inkscape:window-x="105"
+     inkscape:window-y="64"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2983"
+       empspacing="4"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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,-1028.3622)">
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect2987"
+       width="2.8566203"
+       height="7.9998097"
+       x="-728.15637"
+       y="748.66986"
+       rx="1.000185"
+       ry="0.99981523"
+       transform="matrix(0.7068911,-0.7073224,0.70685814,0.70735534,0,0)" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 14.241789,1042.3622 C 21,1049.1249 21,1049.1249 21,1049.1249"
+       id="path3757"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:type="arc"
+       style="fill:url(#radialGradient9560);fill-opacity:1;stroke:#000000;stroke-width:0.67774409;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path2985"
+       sodipodi:cx="7"
+       sodipodi:cy="6.5"
+       sodipodi:rx="5"
+       sodipodi:ry="4.5"
+       d="M 12,6.5 A 5,4.5 0 0 1 7,11 5,4.5 0 0 1 2,6.5 5,4.5 0 0 1 7,2 5,4.5 0 0 1 12,6.5 Z"
+       transform="matrix(1.2122332,-0.69988316,0.77764788,1.3469257,-4.0403435,1034.0064)" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect3760"
+       width="7"
+       height="1"
+       x="6"
+       y="1038.3622"
+       rx="0.5"
+       ry="0.5" />
+    <rect
+       ry="0.5"
+       rx="0.5"
+       y="1036.3622"
+       x="6"
+       height="1"
+       width="7"
+       id="rect50338"
+       style="fill:#000000;fill-opacity:1;stroke:none" />
+  </g>
+</svg>
diff --git a/image/stock_icons/24x24/zoom-original.template@2x.png b/image/stock_icons/24x24/zoom-original.template@2x.png
new file mode 100644
index 0000000000..bfc13414ee
--- /dev/null
+++ b/image/stock_icons/24x24/zoom-original.template@2x.png
diff --git a/image/stock_icons/24x24/zoom-original@2x.png b/image/stock_icons/24x24/zoom-original@2x.png
deleted file mode 100644
index 2d574c0eb7..0000000000
--- a/image/stock_icons/24x24/zoom-original@2x.png
+++ /dev/null
diff --git a/image/stock_icons/24x24/zoom-out.png b/image/stock_icons/24x24/zoom-out.png
deleted file mode 100644
index e582655d3e..0000000000
--- a/image/stock_icons/24x24/zoom-out.png
+++ /dev/null
diff --git a/image/stock_icons/24x24/zoom-out.template.png b/image/stock_icons/24x24/zoom-out.template.png
new file mode 100644
index 0000000000..7cfdbcc5c4
--- /dev/null
+++ b/image/stock_icons/24x24/zoom-out.template.png
diff --git a/image/stock_icons/24x24/zoom-out.template.svg b/image/stock_icons/24x24/zoom-out.template.svg
new file mode 100644
index 0000000000..2a4f7eac7c
--- /dev/null
+++ b/image/stock_icons/24x24/zoom-out.template.svg
@@ -0,0 +1,126 @@
+<?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: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"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
+   sodipodi:docname="zoom-out.template.svg"
+   inkscape:export-filename="zoom-in.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient9558">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.12156863"
+         offset="0"
+         id="stop9554" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.24705882"
+         offset="1"
+         id="stop9556" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9558"
+       id="radialGradient9560"
+       cx="7.3559246"
+       cy="6.8546762"
+       fx="7.3559246"
+       fy="6.8546762"
+       r="5.338872"
+       gradientTransform="matrix(0.86913421,0.45161541,-0.50352622,0.78491975,4.1889809,-1.7632862)"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="21.875"
+     inkscape:cx="12"
+     inkscape:cy="12"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1147"
+     inkscape:window-height="686"
+     inkscape:window-x="150"
+     inkscape:window-y="108"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2983"
+       empspacing="4"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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,-1028.3622)">
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect2987"
+       width="2.8566203"
+       height="7.9998097"
+       x="-728.15637"
+       y="748.66986"
+       rx="1.000185"
+       ry="0.99981523"
+       transform="matrix(0.7068911,-0.7073224,0.70685814,0.70735534,0,0)" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 14.241789,1042.3622 C 21,1049.1249 21,1049.1249 21,1049.1249"
+       id="path3757"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:type="arc"
+       style="fill:url(#radialGradient9560);fill-opacity:1;stroke:#000000;stroke-width:0.67774409;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path2985"
+       sodipodi:cx="7"
+       sodipodi:cy="6.5"
+       sodipodi:rx="5"
+       sodipodi:ry="4.5"
+       d="M 12,6.5 A 5,4.5 0 0 1 7,11 5,4.5 0 0 1 2,6.5 5,4.5 0 0 1 7,2 5,4.5 0 0 1 12,6.5 Z"
+       transform="matrix(1.2122332,-0.69988316,0.77764788,1.3469257,-4.0403435,1034.0064)" />
+    <rect
+       style="fill:#000000;stroke:none;fill-opacity:1"
+       id="rect3760"
+       width="7"
+       height="1"
+       x="6"
+       y="1037.3622"
+       rx="0.5"
+       ry="0.5" />
+  </g>
+</svg>
diff --git a/image/stock_icons/24x24/zoom-out.template@2x.png b/image/stock_icons/24x24/zoom-out.template@2x.png
new file mode 100644
index 0000000000..845bfd2007
--- /dev/null
+++ b/image/stock_icons/24x24/zoom-out.template@2x.png
diff --git a/image/stock_icons/24x24/zoom-out@2x.png b/image/stock_icons/24x24/zoom-out@2x.png
deleted file mode 100644
index 48a1eee8ec..0000000000
--- a/image/stock_icons/24x24/zoom-out@2x.png
+++ /dev/null
diff --git a/image/stock_icons/svg-to-png.sh b/image/stock_icons/svg-to-png.sh
index b2c5aac569..a9d68bbdfa 100755
--- a/image/stock_icons/svg-to-png.sh
+++ b/image/stock_icons/svg-to-png.sh
@@ -71,9 +71,9 @@ ICONS="
     x-filter-matching-bookmark.selected
     x-resize-columns
     x-stay-last
-    zoom-in
-    zoom-original
-    zoom-out
+    zoom-in.template
+    zoom-original.template
+    zoom-out.template
     "
 
 if [ -n "$*" ] ; then
@@ -98,11 +98,14 @@ for SIZE in 14x14 16x16 24x14 24x24 ; do
 
     for ICON in $ICONS ; do
         echo "Converting $ICON"
-        if [ -n "$SVGCLEANER" ] ; then
-            mv "$ICON.svg" "$ICON.dirty.svg"
-            $SVGCLEANER "$ICON.dirty.svg" "$ICON.svg"
-            rm "$ICON.dirty.svg"
-        fi
+
+        # XXX This seems to modify the SVG too much. Need to
+        # investigate.
+        #if [ -n "$SVGCLEANER" ] ; then
+        #    mv "$ICON.svg" "$ICON.dirty.svg"
+        #    $SVGCLEANER "$ICON.dirty.svg" "$ICON.svg"
+        #    rm "$ICON.dirty.svg"
+        #fi
 
         set_source_svgs "$ICON"