Qt: Add a set of 2x 16-pixel toolbar icons.

Optimize the toolbar PNGs.

To do: The rest of the PNGs.

Change-Id: Ieed8b0d099655994d43cdc9cf6c9a094d84c1802
Reviewed-on: https://code.wireshark.org/review/4978
Reviewed-by: Gerald Combs <gerald@wireshark.org>

88 files changed, 302 insertions, 78 deletions

diff --git a/image/toolbar.qrc b/image/toolbar.qrc
index 695f52d89f..2fc46fcb53 100644
--- a/image/toolbar.qrc
+++ b/image/toolbar.qrc
@@ -10,24 +10,45 @@
     </qresource>
     <qresource prefix="/icons">
         <file>toolbar/16x16/edit-find.png</file>
+        <file>toolbar/16x16/edit-find@2x.png</file>
         <file>toolbar/16x16/go-first.png</file>
+        <file>toolbar/16x16/go-first@2x.png</file>
         <file>toolbar/16x16/go-jump.png</file>
+        <file>toolbar/16x16/go-jump@2x.png</file>
         <file>toolbar/16x16/go-last.png</file>
+        <file>toolbar/16x16/go-last@2x.png</file>
         <file>toolbar/16x16/go-next.png</file>
+        <file>toolbar/16x16/go-next@2x.png</file>
         <file>toolbar/16x16/go-previous.png</file>
+        <file>toolbar/16x16/go-previous@2x.png</file>
         <file>toolbar/16x16/x-capture-file-close.png</file>
-        <file>toolbar/16x16/x-capture-file-reload.png</file>
+        <file>toolbar/16x16/x-capture-file-close@2x.png</file>
         <file>toolbar/16x16/x-capture-file-save.png</file>
+        <file>toolbar/16x16/x-capture-file-save@2x.png</file>
+        <file>toolbar/16x16/x-capture-file-reload.png</file>
+        <file>toolbar/16x16/x-capture-file-reload@2x.png</file>
         <file>toolbar/16x16/x-capture-options.png</file>
+        <file>toolbar/16x16/x-capture-options@2x.png</file>
         <file>toolbar/16x16/x-capture-restart.png</file>
+        <file>toolbar/16x16/x-capture-restart@2x.png</file>
         <file>toolbar/16x16/x-capture-start.on.png</file>
+        <file>toolbar/16x16/x-capture-start.on@2x.png</file>
         <file>toolbar/16x16/x-capture-start.png</file>
+        <file>toolbar/16x16/x-capture-start@2x.png</file>
         <file>toolbar/16x16/x-capture-stop.png</file>
+        <file>toolbar/16x16/x-capture-stop@2x.png</file>
         <file>toolbar/16x16/x-colorize-packets.png</file>
+        <file>toolbar/16x16/x-colorize-packets@2x.png</file>
         <file>toolbar/16x16/x-resize-columns.png</file>
+        <file>toolbar/16x16/x-resize-columns@2x.png</file>
+        <file>toolbar/16x16/x-stay-last.png</file>
+        <file>toolbar/16x16/x-stay-last@2x.png</file>
         <file>toolbar/16x16/zoom-in.png</file>
+        <file>toolbar/16x16/zoom-in@2x.png</file>
         <file>toolbar/16x16/zoom-original.png</file>
+        <file>toolbar/16x16/zoom-original@2x.png</file>
         <file>toolbar/16x16/zoom-out.png</file>
+        <file>toolbar/16x16/zoom-out@2x.png</file>
         <file>toolbar/24x24/edit-find.png</file>
         <file>toolbar/24x24/edit-find@2x.png</file>
         <file>toolbar/24x24/go-first.png</file>
diff --git a/image/toolbar/16x16/edit-find.png b/image/toolbar/16x16/edit-find.png
index 32bc0149c7..5ea11cf618 100644
--- a/image/toolbar/16x16/edit-find.png
+++ b/image/toolbar/16x16/edit-find.png
diff --git a/image/toolbar/16x16/edit-find@2x.png b/image/toolbar/16x16/edit-find@2x.png
new file mode 100644
index 0000000000..b9d22f4717
--- /dev/null
+++ b/image/toolbar/16x16/edit-find@2x.png
diff --git a/image/toolbar/16x16/go-first.png b/image/toolbar/16x16/go-first.png
index 137708d95a..19b5574597 100644
--- a/image/toolbar/16x16/go-first.png
+++ b/image/toolbar/16x16/go-first.png
diff --git a/image/toolbar/16x16/go-first@2x.png b/image/toolbar/16x16/go-first@2x.png
new file mode 100644
index 0000000000..129355f229
--- /dev/null
+++ b/image/toolbar/16x16/go-first@2x.png
diff --git a/image/toolbar/16x16/go-jump.png b/image/toolbar/16x16/go-jump.png
index 7cc1568ca6..edcd505a4d 100644
--- a/image/toolbar/16x16/go-jump.png
+++ b/image/toolbar/16x16/go-jump.png
diff --git a/image/toolbar/16x16/go-jump@2x.png b/image/toolbar/16x16/go-jump@2x.png
new file mode 100644
index 0000000000..9bf7ed1fb7
--- /dev/null
+++ b/image/toolbar/16x16/go-jump@2x.png
diff --git a/image/toolbar/16x16/go-last.png b/image/toolbar/16x16/go-last.png
index 6dde22f1f6..b8af76a6d1 100644
--- a/image/toolbar/16x16/go-last.png
+++ b/image/toolbar/16x16/go-last.png
diff --git a/image/toolbar/16x16/go-last@2x.png b/image/toolbar/16x16/go-last@2x.png
new file mode 100644
index 0000000000..54457c2772
--- /dev/null
+++ b/image/toolbar/16x16/go-last@2x.png
diff --git a/image/toolbar/16x16/go-next.png b/image/toolbar/16x16/go-next.png
index 8086b7b7d9..291cc816da 100644
--- a/image/toolbar/16x16/go-next.png
+++ b/image/toolbar/16x16/go-next.png
diff --git a/image/toolbar/16x16/go-next@2x.png b/image/toolbar/16x16/go-next@2x.png
new file mode 100644
index 0000000000..d5ecb0a369
--- /dev/null
+++ b/image/toolbar/16x16/go-next@2x.png
diff --git a/image/toolbar/16x16/go-previous.png b/image/toolbar/16x16/go-previous.png
index ee99b938ee..f9a7908292 100644
--- a/image/toolbar/16x16/go-previous.png
+++ b/image/toolbar/16x16/go-previous.png
diff --git a/image/toolbar/16x16/go-previous@2x.png b/image/toolbar/16x16/go-previous@2x.png
new file mode 100644
index 0000000000..36c642f40f
--- /dev/null
+++ b/image/toolbar/16x16/go-previous@2x.png
diff --git a/image/toolbar/16x16/x-capture-file-close.png b/image/toolbar/16x16/x-capture-file-close.png
index 4f5b41b73d..06a8598859 100644
--- a/image/toolbar/16x16/x-capture-file-close.png
+++ b/image/toolbar/16x16/x-capture-file-close.png
diff --git a/image/toolbar/16x16/x-capture-file-close.svg b/image/toolbar/16x16/x-capture-file-close.svg
index d6a0c37e08..cc09a35d2a 100644
--- a/image/toolbar/16x16/x-capture-file-close.svg
+++ b/image/toolbar/16x16/x-capture-file-close.svg
@@ -36,16 +36,16 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="32.125"
-     inkscape:cx="8.6038579"
-     inkscape:cy="8"
+     inkscape:zoom="34.727236"
+     inkscape:cx="8"
+     inkscape:cy="7.7500087"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:window-width="1200"
      inkscape:window-height="742"
-     inkscape:window-x="484"
-     inkscape:window-y="196"
+     inkscape:window-x="226"
+     inkscape:window-y="316"
      inkscape:window-maximized="0">
     <inkscape:grid
        type="xygrid"
@@ -73,24 +73,30 @@
      id="layer1"
      transform="translate(0,-1036.3622)">
     <image
-       sodipodi:absref="/Users/gerald/Development/wireshark/image/toolbar/16x16/x-capture-file-save.png"
-       xlink:href="x-capture-file-save.png"
        y="1036.3622"
        x="0"
-       id="image3882"
+       id="image3135"
+       xlink:href="../../WiresharkDoc-16.png"
        height="16"
        width="16" />
     <path
-       style="fill:#2e3436;stroke:#2e3436;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
-       d="m 3,1049.3622 10,-10"
-       id="path3769"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
-    <path
        sodipodi:nodetypes="cc"
        inkscape:connector-curvature="0"
        id="path3771"
        d="m 13,1049.3622 -10,-10"
        style="fill:#2e3436;stroke:#2e3436;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       style="fill:none;stroke:#888a85;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 1.5,0.5 0,15 13,0 0,-11 -4,-4 z"
+       id="path3140"
+       inkscape:connector-curvature="0"
+       transform="translate(0,1036.3622)"
+       sodipodi:nodetypes="cccccc" />
+    <path
+       style="fill:#2e3436;stroke:#2e3436;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 3,1049.3622 10,-10"
+       id="path3769"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
   </g>
 </svg>
diff --git a/image/toolbar/16x16/x-capture-file-close@2x.png b/image/toolbar/16x16/x-capture-file-close@2x.png
new file mode 100644
index 0000000000..cb349c94b1
--- /dev/null
+++ b/image/toolbar/16x16/x-capture-file-close@2x.png
diff --git a/image/toolbar/24x24/x-capture-file-close-orig.svg b/image/toolbar/16x16/x-capture-file-close@2x.svg
index f5b191d3a5..a44a4034b4 100644
--- a/image/toolbar/24x24/x-capture-file-close-orig.svg
+++ b/image/toolbar/16x16/x-capture-file-close@2x.svg
@@ -10,12 +10,12 @@
    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"
+   width="32"
+   height="32"
    id="svg2"
    version="1.1"
    inkscape:version="0.48.2 r9819"
-   sodipodi:docname="x-capture-file-close.svg"
+   sodipodi:docname="x-capture-file-close@2x.svg"
    inkscape:export-filename="x-capture-file-close.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90">
@@ -36,21 +36,21 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="12.925293"
-     inkscape:cx="13.757393"
-     inkscape:cy="11.816252"
+     inkscape:zoom="17.906231"
+     inkscape:cx="16.000017"
+     inkscape:cy="16.000017"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
-     inkscape:window-width="1055"
-     inkscape:window-height="786"
-     inkscape:window-x="264"
-     inkscape:window-y="261"
+     inkscape:window-width="1200"
+     inkscape:window-height="742"
+     inkscape:window-x="226"
+     inkscape:window-y="316"
      inkscape:window-maximized="0">
     <inkscape:grid
        type="xygrid"
        id="grid3064"
-       empspacing="5"
+       empspacing="4"
        visible="true"
        enabled="true"
        snapvisiblegridlinesonly="true" />
@@ -71,26 +71,30 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-1028.3622)">
+     transform="translate(0,-1020.3622)">
     <image
-       sodipodi:absref="/Users/gcombs/Development/wireshark/image/toolbar/24x24/x-capture-file-save.png"
-       xlink:href="x-capture-file-save.png"
-       y="1028.3622"
+       y="1020.3622"
        x="0"
-       id="image3836"
-       height="24"
-       width="24"
-       style="fill:#2e3436;stroke:#2e3436" />
+       id="image3272"
+       xlink:href="file:///Users/gcombs/Development/wireshark/image/WiresharkDoc-32.png"
+       height="32"
+       width="32" />
     <path
        sodipodi:nodetypes="cc"
        inkscape:connector-curvature="0"
        id="path3771"
-       d="m 18,1046.3622 -12,-12"
-       style="fill:#2e3436;stroke:#2e3436;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+       d="m 26,1046.3622 -20,-20"
+       style="fill:#2e3436;stroke:#2e3436;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-       style="fill:#2e3436;stroke:#2e3436;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 6,1046.3622 12,-12"
-       id="path3791"
+       style="fill:none;stroke:#888a85;stroke-width:2px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 3,1021.3622 0,30 26,0 0,-22 -8,-8 z"
+       id="path3140"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+    <path
+       style="fill:#2e3436;stroke:#2e3436;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 6,1046.3622 20,-20"
+       id="path3769"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cc" />
   </g>
diff --git a/image/toolbar/16x16/x-capture-file-reload.png b/image/toolbar/16x16/x-capture-file-reload.png
index d033fe20d2..5552aa686b 100644
--- a/image/toolbar/16x16/x-capture-file-reload.png
+++ b/image/toolbar/16x16/x-capture-file-reload.png
diff --git a/image/toolbar/16x16/x-capture-file-reload.svg b/image/toolbar/16x16/x-capture-file-reload.svg
index 0fce386261..90e3ee7870 100644
--- a/image/toolbar/16x16/x-capture-file-reload.svg
+++ b/image/toolbar/16x16/x-capture-file-reload.svg
@@ -87,8 +87,7 @@
      id="layer1"
      transform="translate(0,-1036.3622)">
     <image
-       sodipodi:absref="/Users/gcombs/Development/wireshark/image/toolbar/16x16/x-capture-file-save.png"
-       xlink:href="x-capture-file-save.png"
+       xlink:href="../../WiresharkDoc-16.png"
        y="1036.3622"
        x="0"
        id="image3882"
diff --git a/image/toolbar/16x16/x-capture-file-reload@2x.png b/image/toolbar/16x16/x-capture-file-reload@2x.png
new file mode 100644
index 0000000000..6acdd59a5a
--- /dev/null
+++ b/image/toolbar/16x16/x-capture-file-reload@2x.png
diff --git a/image/toolbar/16x16/x-capture-file-save.png b/image/toolbar/16x16/x-capture-file-save.png
index a263bb54ab..40680c27fb 100644
--- a/image/toolbar/16x16/x-capture-file-save.png
+++ b/image/toolbar/16x16/x-capture-file-save.png
diff --git a/image/toolbar/16x16/x-capture-file-save.svg b/image/toolbar/16x16/x-capture-file-save.svg
new file mode 100644
index 0000000000..090fb45453
--- /dev/null
+++ b/image/toolbar/16x16/x-capture-file-save.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: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="x-capture-file-open.svg"
+   inkscape:export-filename="x-capture-file-close.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="34.727236"
+     inkscape:cx="8"
+     inkscape:cy="7.7500087"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1200"
+     inkscape:window-height="742"
+     inkscape:window-x="226"
+     inkscape:window-y="316"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3064"
+       empspacing="5"
+       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)">
+    <image
+       y="1036.3622"
+       x="0"
+       id="image3135"
+       xlink:href="file:///Users/gcombs/Development/wireshark/image/WiresharkDoc-16.png"
+       height="16"
+       width="16" />
+    <path
+       style="fill:none;stroke:#888a85;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 1.5,0.5 0,15 13,0 0,-11 -4,-4 z"
+       id="path3140"
+       inkscape:connector-curvature="0"
+       transform="translate(0,1036.3622)"
+       sodipodi:nodetypes="cccccc" />
+  </g>
+</svg>
diff --git a/image/toolbar/16x16/x-capture-file-save@2x.png b/image/toolbar/16x16/x-capture-file-save@2x.png
new file mode 100644
index 0000000000..bdfb871c52
--- /dev/null
+++ b/image/toolbar/16x16/x-capture-file-save@2x.png
diff --git a/image/toolbar/16x16/x-capture-file-save@2x.svg b/image/toolbar/16x16/x-capture-file-save@2x.svg
new file mode 100644
index 0000000000..e34ba10dac
--- /dev/null
+++ b/image/toolbar/16x16/x-capture-file-save@2x.svg
@@ -0,0 +1,89 @@
+<?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="32"
+   height="32"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="x-capture-file-open@2x.svg"
+   inkscape:export-filename="x-capture-file-close.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="17.90624"
+     inkscape:cx="16"
+     inkscape:cy="16.000009"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1200"
+     inkscape:window-height="742"
+     inkscape:window-x="226"
+     inkscape:window-y="316"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3064"
+       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,-1020.3622)">
+    <image
+       y="1020.3622"
+       x="0"
+       id="image3272"
+       xlink:href="file:///Users/gcombs/Development/wireshark/image/WiresharkDoc-32.png"
+       height="32"
+       width="32" />
+    <path
+       style="fill:none;stroke:#888a85;stroke-width:2px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 3,1021.3622 0,30 26,0 0,-22 -8,-8 z"
+       id="path3140"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+  </g>
+</svg>
diff --git a/image/toolbar/16x16/x-capture-options.png b/image/toolbar/16x16/x-capture-options.png
index 4f26785ed0..042b67f8ff 100644
--- a/image/toolbar/16x16/x-capture-options.png
+++ b/image/toolbar/16x16/x-capture-options.png
diff --git a/image/toolbar/16x16/x-capture-options@2x.png b/image/toolbar/16x16/x-capture-options@2x.png
new file mode 100644
index 0000000000..42d86322c6
--- /dev/null
+++ b/image/toolbar/16x16/x-capture-options@2x.png
diff --git a/image/toolbar/16x16/x-capture-restart.png b/image/toolbar/16x16/x-capture-restart.png
index d8b0f65ce3..baa8ba6db4 100644
--- a/image/toolbar/16x16/x-capture-restart.png
+++ b/image/toolbar/16x16/x-capture-restart.png
diff --git a/image/toolbar/16x16/x-capture-restart@2x.png b/image/toolbar/16x16/x-capture-restart@2x.png
new file mode 100644
index 0000000000..4a9e660946
--- /dev/null
+++ b/image/toolbar/16x16/x-capture-restart@2x.png
diff --git a/image/toolbar/16x16/x-capture-start.on.png b/image/toolbar/16x16/x-capture-start.on.png
index bd41a7da44..73435a6ce0 100644
--- a/image/toolbar/16x16/x-capture-start.on.png
+++ b/image/toolbar/16x16/x-capture-start.on.png
diff --git a/image/toolbar/16x16/x-capture-start.on@2x.png b/image/toolbar/16x16/x-capture-start.on@2x.png
new file mode 100644
index 0000000000..64e19cfcaa
--- /dev/null
+++ b/image/toolbar/16x16/x-capture-start.on@2x.png
diff --git a/image/toolbar/16x16/x-capture-start.png b/image/toolbar/16x16/x-capture-start.png
index ae157a3bd8..a5ced435fa 100644
--- a/image/toolbar/16x16/x-capture-start.png
+++ b/image/toolbar/16x16/x-capture-start.png
diff --git a/image/toolbar/16x16/x-capture-start@2x.png b/image/toolbar/16x16/x-capture-start@2x.png
new file mode 100644
index 0000000000..d3f12242a3
--- /dev/null
+++ b/image/toolbar/16x16/x-capture-start@2x.png
diff --git a/image/toolbar/16x16/x-capture-stop.png b/image/toolbar/16x16/x-capture-stop.png
index 94be4c7142..7d62a876d9 100644
--- a/image/toolbar/16x16/x-capture-stop.png
+++ b/image/toolbar/16x16/x-capture-stop.png
diff --git a/image/toolbar/16x16/x-capture-stop@2x.png b/image/toolbar/16x16/x-capture-stop@2x.png
new file mode 100644
index 0000000000..5c19dedc03
--- /dev/null
+++ b/image/toolbar/16x16/x-capture-stop@2x.png
diff --git a/image/toolbar/16x16/x-colorize-packets.png b/image/toolbar/16x16/x-colorize-packets.png
index 3efe934602..3509c1f50e 100644
--- a/image/toolbar/16x16/x-colorize-packets.png
+++ b/image/toolbar/16x16/x-colorize-packets.png
diff --git a/image/toolbar/16x16/x-colorize-packets@2x.png b/image/toolbar/16x16/x-colorize-packets@2x.png
new file mode 100644
index 0000000000..884bc38e62
--- /dev/null
+++ b/image/toolbar/16x16/x-colorize-packets@2x.png
diff --git a/image/toolbar/16x16/x-resize-columns.png b/image/toolbar/16x16/x-resize-columns.png
index 9249967abd..6b63a4d56a 100644
--- a/image/toolbar/16x16/x-resize-columns.png
+++ b/image/toolbar/16x16/x-resize-columns.png
diff --git a/image/toolbar/16x16/x-resize-columns@2x.png b/image/toolbar/16x16/x-resize-columns@2x.png
new file mode 100644
index 0000000000..5b29e87a68
--- /dev/null
+++ b/image/toolbar/16x16/x-resize-columns@2x.png
diff --git a/image/toolbar/16x16/x-stay-last.png b/image/toolbar/16x16/x-stay-last.png
index 6a6d72d1e0..e5bb6ea5b5 100644
--- a/image/toolbar/16x16/x-stay-last.png
+++ b/image/toolbar/16x16/x-stay-last.png
diff --git a/image/toolbar/16x16/x-stay-last@2x.png b/image/toolbar/16x16/x-stay-last@2x.png
new file mode 100644
index 0000000000..cb8ee9eb88
--- /dev/null
+++ b/image/toolbar/16x16/x-stay-last@2x.png
diff --git a/image/toolbar/16x16/zoom-in.png b/image/toolbar/16x16/zoom-in.png
index 1be8ecf308..142c56c9d8 100644
--- a/image/toolbar/16x16/zoom-in.png
+++ b/image/toolbar/16x16/zoom-in.png
diff --git a/image/toolbar/16x16/zoom-in@2x.png b/image/toolbar/16x16/zoom-in@2x.png
new file mode 100644
index 0000000000..545e4134d7
--- /dev/null
+++ b/image/toolbar/16x16/zoom-in@2x.png
diff --git a/image/toolbar/16x16/zoom-original.png b/image/toolbar/16x16/zoom-original.png
index 8ccb181cee..f48b59191a 100644
--- a/image/toolbar/16x16/zoom-original.png
+++ b/image/toolbar/16x16/zoom-original.png
diff --git a/image/toolbar/16x16/zoom-original@2x.png b/image/toolbar/16x16/zoom-original@2x.png
new file mode 100644
index 0000000000..bf36d767e1
--- /dev/null
+++ b/image/toolbar/16x16/zoom-original@2x.png
diff --git a/image/toolbar/16x16/zoom-out.png b/image/toolbar/16x16/zoom-out.png
index 8c83b38026..7fa79bf4c9 100644
--- a/image/toolbar/16x16/zoom-out.png
+++ b/image/toolbar/16x16/zoom-out.png
diff --git a/image/toolbar/16x16/zoom-out@2x.png b/image/toolbar/16x16/zoom-out@2x.png
new file mode 100644
index 0000000000..8164d78ed1
--- /dev/null
+++ b/image/toolbar/16x16/zoom-out@2x.png
diff --git a/image/toolbar/24x24/edit-find.png b/image/toolbar/24x24/edit-find.png
index 189cf65ed8..4bd717b984 100644
--- a/image/toolbar/24x24/edit-find.png
+++ b/image/toolbar/24x24/edit-find.png
diff --git a/image/toolbar/24x24/edit-find@2x.png b/image/toolbar/24x24/edit-find@2x.png
index 19135a9b98..1e9fb5a402 100644
--- a/image/toolbar/24x24/edit-find@2x.png
+++ b/image/toolbar/24x24/edit-find@2x.png
diff --git a/image/toolbar/24x24/go-first.png b/image/toolbar/24x24/go-first.png
index 5aaedb1234..d6ff007651 100644
--- a/image/toolbar/24x24/go-first.png
+++ b/image/toolbar/24x24/go-first.png
diff --git a/image/toolbar/24x24/go-first@2x.png b/image/toolbar/24x24/go-first@2x.png
index cda110f27c..d3afc1c6ff 100644
--- a/image/toolbar/24x24/go-first@2x.png
+++ b/image/toolbar/24x24/go-first@2x.png
diff --git a/image/toolbar/24x24/go-jump.png b/image/toolbar/24x24/go-jump.png
index 39135a9608..830cd36a54 100644
--- a/image/toolbar/24x24/go-jump.png
+++ b/image/toolbar/24x24/go-jump.png
diff --git a/image/toolbar/24x24/go-jump@2x.png b/image/toolbar/24x24/go-jump@2x.png
index 51d9bf5b9d..a56ac38972 100644
--- a/image/toolbar/24x24/go-jump@2x.png
+++ b/image/toolbar/24x24/go-jump@2x.png
diff --git a/image/toolbar/24x24/go-last.png b/image/toolbar/24x24/go-last.png
index d02776d143..8d09f3eff8 100644
--- a/image/toolbar/24x24/go-last.png
+++ b/image/toolbar/24x24/go-last.png
diff --git a/image/toolbar/24x24/go-last@2x.png b/image/toolbar/24x24/go-last@2x.png
index 9039177704..5e911bbb6d 100644
--- a/image/toolbar/24x24/go-last@2x.png
+++ b/image/toolbar/24x24/go-last@2x.png
diff --git a/image/toolbar/24x24/go-next.png b/image/toolbar/24x24/go-next.png
index 3ff3fe985b..b5194bf42e 100644
--- a/image/toolbar/24x24/go-next.png
+++ b/image/toolbar/24x24/go-next.png
diff --git a/image/toolbar/24x24/go-next@2x.png b/image/toolbar/24x24/go-next@2x.png
index 724d877705..16b000c94c 100644
--- a/image/toolbar/24x24/go-next@2x.png
+++ b/image/toolbar/24x24/go-next@2x.png
diff --git a/image/toolbar/24x24/go-previous.png b/image/toolbar/24x24/go-previous.png
index 605318ea4b..3829b8dfae 100644
--- a/image/toolbar/24x24/go-previous.png
+++ b/image/toolbar/24x24/go-previous.png
diff --git a/image/toolbar/24x24/go-previous@2x.png b/image/toolbar/24x24/go-previous@2x.png
index e8735e4cab..5f39a8cf37 100644
--- a/image/toolbar/24x24/go-previous@2x.png
+++ b/image/toolbar/24x24/go-previous@2x.png
diff --git a/image/toolbar/24x24/x-capture-file-close.png b/image/toolbar/24x24/x-capture-file-close.png
index fac3f82321..abbc2f3ac3 100644
--- a/image/toolbar/24x24/x-capture-file-close.png
+++ b/image/toolbar/24x24/x-capture-file-close.png
diff --git a/image/toolbar/24x24/x-capture-file-close@2x.png b/image/toolbar/24x24/x-capture-file-close@2x.png
index efe2c2798d..87c7c0838a 100644
--- a/image/toolbar/24x24/x-capture-file-close@2x.png
+++ b/image/toolbar/24x24/x-capture-file-close@2x.png
diff --git a/image/toolbar/24x24/x-capture-file-reload.png b/image/toolbar/24x24/x-capture-file-reload.png
index b0b76a602b..78921b4b42 100644
--- a/image/toolbar/24x24/x-capture-file-reload.png
+++ b/image/toolbar/24x24/x-capture-file-reload.png
diff --git a/image/toolbar/24x24/x-capture-file-reload.svg b/image/toolbar/24x24/x-capture-file-reload.svg
index cad49c7efb..e244d08a03 100644
--- a/image/toolbar/24x24/x-capture-file-reload.svg
+++ b/image/toolbar/24x24/x-capture-file-reload.svg
@@ -87,8 +87,7 @@
      id="layer1"
      transform="translate(0,-1028.3622)">
     <image
-       sodipodi:absref="/Users/gcombs/Development/wireshark/image/toolbar/24x24/x-capture-file-save.png"
-       xlink:href="x-capture-file-save.png"
+       xlink:href="../../WiresharkDoc-24.png"
        style="fill:#2e3436;stroke:#2e3436"
        width="24"
        height="24"
diff --git a/image/toolbar/24x24/x-capture-file-reload@2x.png b/image/toolbar/24x24/x-capture-file-reload@2x.png
index 399ea09515..6e0adb188b 100644
--- a/image/toolbar/24x24/x-capture-file-reload@2x.png
+++ b/image/toolbar/24x24/x-capture-file-reload@2x.png
diff --git a/image/toolbar/24x24/x-capture-file-save.png b/image/toolbar/24x24/x-capture-file-save.png
index 3cb4f49a15..05fdefe943 100644
--- a/image/toolbar/24x24/x-capture-file-save.png
+++ b/image/toolbar/24x24/x-capture-file-save.png
diff --git a/image/toolbar/24x24/x-capture-file-save@2x.png b/image/toolbar/24x24/x-capture-file-save@2x.png
index 6f76c14a4c..b8cea84f59 100644
--- a/image/toolbar/24x24/x-capture-file-save@2x.png
+++ b/image/toolbar/24x24/x-capture-file-save@2x.png
diff --git a/image/toolbar/24x24/x-capture-options.png b/image/toolbar/24x24/x-capture-options.png
index 795f79f6a9..4c67bc03aa 100644
--- a/image/toolbar/24x24/x-capture-options.png
+++ b/image/toolbar/24x24/x-capture-options.png
diff --git a/image/toolbar/24x24/x-capture-options@2x.png b/image/toolbar/24x24/x-capture-options@2x.png
index d85f8a49e6..8180bb3462 100644
--- a/image/toolbar/24x24/x-capture-options@2x.png
+++ b/image/toolbar/24x24/x-capture-options@2x.png
diff --git a/image/toolbar/24x24/x-capture-restart.png b/image/toolbar/24x24/x-capture-restart.png
index 7c79beb824..9b22112991 100644
--- a/image/toolbar/24x24/x-capture-restart.png
+++ b/image/toolbar/24x24/x-capture-restart.png
diff --git a/image/toolbar/24x24/x-capture-restart@2x.png b/image/toolbar/24x24/x-capture-restart@2x.png
index 6f3f4b5e9b..de857040e4 100644
--- a/image/toolbar/24x24/x-capture-restart@2x.png
+++ b/image/toolbar/24x24/x-capture-restart@2x.png
diff --git a/image/toolbar/24x24/x-capture-start.on.png b/image/toolbar/24x24/x-capture-start.on.png
index 81adac9788..cb9572b1e5 100644
--- a/image/toolbar/24x24/x-capture-start.on.png
+++ b/image/toolbar/24x24/x-capture-start.on.png
diff --git a/image/toolbar/24x24/x-capture-start.on@2x.png b/image/toolbar/24x24/x-capture-start.on@2x.png
index e9b5eb3bf4..4a6ce888fa 100644
--- a/image/toolbar/24x24/x-capture-start.on@2x.png
+++ b/image/toolbar/24x24/x-capture-start.on@2x.png
diff --git a/image/toolbar/24x24/x-capture-start.png b/image/toolbar/24x24/x-capture-start.png
index cdfc2e487e..2d80c3ed56 100644
--- a/image/toolbar/24x24/x-capture-start.png
+++ b/image/toolbar/24x24/x-capture-start.png
diff --git a/image/toolbar/24x24/x-capture-start@2x.png b/image/toolbar/24x24/x-capture-start@2x.png
index d18ca52869..358134e0ff 100644
--- a/image/toolbar/24x24/x-capture-start@2x.png
+++ b/image/toolbar/24x24/x-capture-start@2x.png
diff --git a/image/toolbar/24x24/x-capture-stop.png b/image/toolbar/24x24/x-capture-stop.png
index 004c16fd52..8726209d8b 100644
--- a/image/toolbar/24x24/x-capture-stop.png
+++ b/image/toolbar/24x24/x-capture-stop.png
diff --git a/image/toolbar/24x24/x-capture-stop@2x.png b/image/toolbar/24x24/x-capture-stop@2x.png
index 0ca709f2c0..963cc02685 100644
--- a/image/toolbar/24x24/x-capture-stop@2x.png
+++ b/image/toolbar/24x24/x-capture-stop@2x.png
diff --git a/image/toolbar/24x24/x-colorize-packets.png b/image/toolbar/24x24/x-colorize-packets.png
index ee04849adf..624b7eae46 100644
--- a/image/toolbar/24x24/x-colorize-packets.png
+++ b/image/toolbar/24x24/x-colorize-packets.png
diff --git a/image/toolbar/24x24/x-colorize-packets@2x.png b/image/toolbar/24x24/x-colorize-packets@2x.png
index 274fc76b49..013798c5b7 100644
--- a/image/toolbar/24x24/x-colorize-packets@2x.png
+++ b/image/toolbar/24x24/x-colorize-packets@2x.png
diff --git a/image/toolbar/24x24/x-resize-columns.png b/image/toolbar/24x24/x-resize-columns.png
index 4ed0ac9c9c..f79cf3216f 100644
--- a/image/toolbar/24x24/x-resize-columns.png
+++ b/image/toolbar/24x24/x-resize-columns.png
diff --git a/image/toolbar/24x24/x-resize-columns@2x.png b/image/toolbar/24x24/x-resize-columns@2x.png
index 5b39c89644..2fc793c987 100644
--- a/image/toolbar/24x24/x-resize-columns@2x.png
+++ b/image/toolbar/24x24/x-resize-columns@2x.png
diff --git a/image/toolbar/24x24/x-stay-last.png b/image/toolbar/24x24/x-stay-last.png
index 9d26572c7e..06b9d30bcd 100644
--- a/image/toolbar/24x24/x-stay-last.png
+++ b/image/toolbar/24x24/x-stay-last.png
diff --git a/image/toolbar/24x24/x-stay-last@2x.png b/image/toolbar/24x24/x-stay-last@2x.png
index 0b707e6752..fff5b22a0f 100644
--- a/image/toolbar/24x24/x-stay-last@2x.png
+++ b/image/toolbar/24x24/x-stay-last@2x.png
diff --git a/image/toolbar/24x24/zoom-in.png b/image/toolbar/24x24/zoom-in.png
index dc596faa4e..92ce48d532 100644
--- a/image/toolbar/24x24/zoom-in.png
+++ b/image/toolbar/24x24/zoom-in.png
diff --git a/image/toolbar/24x24/zoom-in@2x.png b/image/toolbar/24x24/zoom-in@2x.png
index 0b83e7757c..ccf3cb132c 100644
--- a/image/toolbar/24x24/zoom-in@2x.png
+++ b/image/toolbar/24x24/zoom-in@2x.png
diff --git a/image/toolbar/24x24/zoom-original.png b/image/toolbar/24x24/zoom-original.png
index 57cbf4cc00..76b40935ca 100644
--- a/image/toolbar/24x24/zoom-original.png
+++ b/image/toolbar/24x24/zoom-original.png
diff --git a/image/toolbar/24x24/zoom-original@2x.png b/image/toolbar/24x24/zoom-original@2x.png
index a0ed544c38..02a6f59c08 100644
--- a/image/toolbar/24x24/zoom-original@2x.png
+++ b/image/toolbar/24x24/zoom-original@2x.png
diff --git a/image/toolbar/24x24/zoom-out.png b/image/toolbar/24x24/zoom-out.png
index f4c9f69ddc..c3c805168a 100644
--- a/image/toolbar/24x24/zoom-out.png
+++ b/image/toolbar/24x24/zoom-out.png
diff --git a/image/toolbar/24x24/zoom-out@2x.png b/image/toolbar/24x24/zoom-out@2x.png
index ad8c2bbb90..5807863378 100644
--- a/image/toolbar/24x24/zoom-out@2x.png
+++ b/image/toolbar/24x24/zoom-out@2x.png
diff --git a/image/toolbar/svg-to-png.sh b/image/toolbar/svg-to-png.sh
index 734be8b65b..739eea2e42 100755
--- a/image/toolbar/svg-to-png.sh
+++ b/image/toolbar/svg-to-png.sh
@@ -24,25 +24,29 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 COMMON_ARGS="--export-area-page"
-ONE_X_ARGS="--export-width=24 --export-height=24"
-TWO_X_ARGS="--export-width=48 --export-height=48"
 
-set_source_svg() {
+set_source_svgs() {
     local out_icon=$1
     case $out_icon in
     x-capture-options)
-        SOURCE_SVG=x-capture-options-gear.svg
+        out_icon=x-capture-options-gear
         ;;
     x-capture-restart)
-        SOURCE_SVG=x-capture-restart-fin.svg
+        out_icon=x-capture-restart-fin
         ;;
     x-capture-stop)
-        SOURCE_SVG=x-capture-stop-red.svg
-        ;;
-    *)
-        SOURCE_SVG=$out_icon.svg
+        out_icon=x-capture-stop-red
         ;;
     esac
+    ONE_X_SVG=${out_icon}.svg
+    TWO_X_SVG=${out_icon}@2x.svg
+    if [ ! -f ${TWO_X_SVG} ] ; then
+        TWO_X_SVG=$ONE_X_SVG
+    fi
+    if [ ! -f ${ONE_X_SVG} ] ; then
+        >&2 echo "Can't find ${ONE_X_SVG}"
+        exit 1
+    fi
 }
 
 ICONS="
@@ -52,6 +56,8 @@ ICONS="
     go-last
     go-next
     go-previous
+    x-capture-file-close
+    x-capture-file-save
     x-capture-file-reload
     x-capture-options
     x-capture-restart
@@ -66,44 +72,54 @@ ICONS="
     zoom-out
     "
 
+QRC_FILES=""
+
 # XXX Add support for 16 pixel icons.
-for SIZE in 24 ; do
+for SIZE in 16 24 ; do
     SIZE_DIR=${SIZE}x${SIZE}
-    cd $SIZE_DIR
-
-    QRC_FILES=""
-    for ICON in $ICONS ; do
-        set_source_svg $ICON
-        ONE_X_PNG=${ICON}.png
-        TWO_X_PNG=${ICON}@2x.png
-
-        inkscape $COMMON_ARGS $ONE_X_ARGS \
-            --file=$SOURCE_SVG --export-png=$ONE_X_PNG || exit 1
 
-        inkscape $COMMON_ARGS $TWO_X_ARGS \
-            --file=$SOURCE_SVG --export-png=$TWO_X_PNG || exit 1
+    TWO_X_SIZE=`expr $SIZE \* 2`
+    ONE_X_ARGS="--export-width=${SIZE} --export-height=${SIZE}"
+    TWO_X_ARGS="--export-width=${TWO_X_SIZE} --export-height=${TWO_X_SIZE}"
 
-        QRC_FILES="${QRC_FILES} ${ONE_X_PNG} ${TWO_X_PNG}"
-    done
+    cd $SIZE_DIR
 
-    # Save & close have to be done individually.
+    for ICON in $ICONS ; do
+        set_source_svgs $ICON
 
-    for ICON in x-capture-file-close x-capture-file-save ; do
         ONE_X_PNG=${ICON}.png
         TWO_X_PNG=${ICON}@2x.png
-        ONE_X_SVG=${ICON}.svg
-        TWO_X_SVG=${ICON}@2x.svg
 
-        inkscape $COMMON_ARGS $ONE_X_ARGS \
-            --file=$ONE_X_SVG --export-png=$ONE_X_PNG || exit 1
+        if [ $ONE_X_SVG -nt $ONE_X_PNG ] ; then
+            inkscape $COMMON_ARGS $ONE_X_ARGS \
+                --file=$ONE_X_SVG --export-png=$ONE_X_PNG || exit 1
+        fi
 
-        inkscape $COMMON_ARGS $TWO_X_ARGS \
-            --file=$TWO_X_SVG --export-png=$TWO_X_PNG || exit 1
+        if [ $TWO_X_SVG -nt $TWO_X_PNG ] ; then
+            inkscape $COMMON_ARGS $TWO_X_ARGS \
+                --file=$TWO_X_SVG --export-png=$TWO_X_PNG || exit 1
+        fi
 
         QRC_FILES="${QRC_FILES} ${ONE_X_PNG} ${TWO_X_PNG}"
     done
 
-    for QRC_FILE in $QRC_FILES ; do
-        echo "        <file>toolbar/${SIZE_DIR}/${QRC_FILE}</file>"
-    done
+    cd ..
+    
+done
+
+for QRC_FILE in $QRC_FILES ; do
+    echo "        <file>toolbar/${SIZE_DIR}/${QRC_FILE}</file>"
 done
+
+#
+# Editor modelines  -  https://www.wireshark.org/tools/modelines.html
+#
+# Local variables:
+# c-basic-offset: 4
+# tab-width: 8
+# indent-tabs-mode: nil
+# End:
+#
+# vi: set shiftwidth=4 tabstop=8 expandtab:
+# :indentSize=4:tabSize=8:noTabs=true:
+#