Qt: Add zoom and column resize actions.

Plumb signals and slots for changing the text size in the main window.
Remove the bold font code from WiresharkApplication. It was only used in
ByteViewText. Adjust the icons a bit.

Bug: When we change the font preferences the packet list stops drawing
cached strings. I haven't been able to track down the cause.

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

19 files changed, 144 insertions, 123 deletions

diff --git a/image/toolbar.qrc b/image/toolbar.qrc
index da3ca10d4e..9234cc1b59 100644
--- a/image/toolbar.qrc
+++ b/image/toolbar.qrc
@@ -24,6 +24,10 @@
         <file>toolbar/16x16/x-capture-start.png</file>
         <file>toolbar/16x16/x-capture-stop.png</file>
         <file>toolbar/16x16/x-colorize-packets.png</file>
+        <file>toolbar/16x16/x-resize-columns.png</file>
+        <file>toolbar/16x16/zoom-in.png</file>
+        <file>toolbar/16x16/zoom-original.png</file>
+        <file>toolbar/16x16/zoom-out.png</file>
         <file>toolbar/24x24/edit-find.png</file>
         <file>toolbar/24x24/go-first.png</file>
         <file>toolbar/24x24/go-jump.png</file>
@@ -39,5 +43,9 @@
         <file>toolbar/24x24/x-capture-start.png</file>
         <file>toolbar/24x24/x-capture-stop.png</file>
         <file>toolbar/24x24/x-colorize-packets.png</file>
+        <file>toolbar/24x24/x-resize-columns.png</file>
+        <file>toolbar/24x24/zoom-in.png</file>
+        <file>toolbar/24x24/zoom-original.png</file>
+        <file>toolbar/24x24/zoom-out.png</file>
     </qresource>
 </RCC>
diff --git a/image/toolbar/16x16/x-resize-columns.png b/image/toolbar/16x16/x-resize-columns.png
index d938e7407d..9249967abd 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.svg b/image/toolbar/16x16/x-resize-columns.svg
index eab2b56c58..51bf1cf3eb 100644
--- a/image/toolbar/16x16/x-resize-columns.svg
+++ b/image/toolbar/16x16/x-resize-columns.svg
@@ -60,7 +60,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>
@@ -127,7 +127,7 @@
        style="fill:#204a87;stroke:#888a85;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
     <path
        sodipodi:type="star"
-       style="fill:#3465a4;fill-opacity:1;stroke:#204a87;stroke-width:3.77817893;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:#3465a4;fill-opacity:1;stroke:#3465a4;stroke-width:3.77817893000000016;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        id="path4292"
        sodipodi:sides="3"
        sodipodi:cx="28"
@@ -163,7 +163,7 @@
        sodipodi:cx="28"
        sodipodi:sides="3"
        id="path4590"
-       style="fill:#3465a4;fill-opacity:1;stroke:#204a87;stroke-width:3.77817893;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:#3465a4;fill-opacity:1;stroke:#3465a4;stroke-width:3.77817893000000016;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        sodipodi:type="star"
        inkscape:transform-center-y="-3.5440869e-05" />
   </g>
diff --git a/image/toolbar/16x16/zoom-in.png b/image/toolbar/16x16/zoom-in.png
index 4b2d18290c..1be8ecf308 100644
--- a/image/toolbar/16x16/zoom-in.png
+++ b/image/toolbar/16x16/zoom-in.png
diff --git a/image/toolbar/16x16/zoom-in.svg b/image/toolbar/16x16/zoom-in.svg
index 9b4453e6f7..9604c17452 100644
--- a/image/toolbar/16x16/zoom-in.svg
+++ b/image/toolbar/16x16/zoom-in.svg
@@ -15,7 +15,7 @@
    version="1.1"
    inkscape:version="0.48.2 r9819"
    sodipodi:docname="zoom-in.svg"
-   inkscape:export-filename="edit-find.png"
+   inkscape:export-filename="zoom-in.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90">
   <defs
@@ -35,14 +35,14 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="32.125"
+     inkscape:zoom="30.9375"
      inkscape:cx="8"
      inkscape:cy="8"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
-     inkscape:window-width="931"
-     inkscape:window-height="683"
+     inkscape:window-width="1239"
+     inkscape:window-height="664"
      inkscape:window-x="132"
      inkscape:window-y="882"
      inkscape:window-maximized="0">
@@ -102,15 +102,15 @@
     <rect
        style="fill:#2e3436;stroke:none"
        id="rect3760"
-       width="7"
+       width="5"
        height="1"
-       x="3"
+       x="4"
        y="1042.3622" />
     <rect
        y="-7"
-       x="1039.3622"
+       x="1040.3622"
        height="1"
-       width="7"
+       width="5"
        id="rect3762"
        style="fill:#2e3436;stroke:none"
        transform="matrix(0,1,-1,0,0,0)" />
diff --git a/image/toolbar/16x16/zoom-original.png b/image/toolbar/16x16/zoom-original.png
index fbe95e11c5..8ccb181cee 100644
--- a/image/toolbar/16x16/zoom-original.png
+++ b/image/toolbar/16x16/zoom-original.png
diff --git a/image/toolbar/16x16/zoom-original.svg b/image/toolbar/16x16/zoom-original.svg
index 22b89524c5..ef8541e6a9 100644
--- a/image/toolbar/16x16/zoom-original.svg
+++ b/image/toolbar/16x16/zoom-original.svg
@@ -35,14 +35,14 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="32.125"
+     inkscape:zoom="31.6875"
      inkscape:cx="8"
      inkscape:cy="8"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
-     inkscape:window-width="931"
-     inkscape:window-height="683"
+     inkscape:window-width="1301"
+     inkscape:window-height="676"
      inkscape:window-x="132"
      inkscape:window-y="882"
      inkscape:window-maximized="0">
@@ -62,7 +62,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>
@@ -102,15 +102,15 @@
     <rect
        style="fill:#2e3436;stroke:none"
        id="rect3760"
-       width="7"
+       width="5"
        height="1"
-       x="3"
+       x="4"
        y="1041.3622" />
     <rect
        y="1043.3622"
-       x="3"
+       x="4"
        height="1"
-       width="7"
+       width="5"
        id="rect3816"
        style="fill:#2e3436;stroke:none" />
   </g>
diff --git a/image/toolbar/16x16/zoom-out.png b/image/toolbar/16x16/zoom-out.png
index fa295789ae..8c83b38026 100644
--- a/image/toolbar/16x16/zoom-out.png
+++ b/image/toolbar/16x16/zoom-out.png
diff --git a/image/toolbar/16x16/zoom-out.svg b/image/toolbar/16x16/zoom-out.svg
index 9c0af8f6b0..d56b57f608 100644
--- a/image/toolbar/16x16/zoom-out.svg
+++ b/image/toolbar/16x16/zoom-out.svg
@@ -15,7 +15,7 @@
    version="1.1"
    inkscape:version="0.48.2 r9819"
    sodipodi:docname="zoom-out.svg"
-   inkscape:export-filename="zoom-in.png"
+   inkscape:export-filename="zoom-out.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90">
   <defs
@@ -35,14 +35,14 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="32.125"
+     inkscape:zoom="30.8125"
      inkscape:cx="8"
      inkscape:cy="8"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
-     inkscape:window-width="931"
-     inkscape:window-height="683"
+     inkscape:window-width="1241"
+     inkscape:window-height="662"
      inkscape:window-x="132"
      inkscape:window-y="882"
      inkscape:window-maximized="0">
@@ -102,9 +102,9 @@
     <rect
        style="fill:#2e3436;stroke:none"
        id="rect3760"
-       width="7"
+       width="5"
        height="1"
-       x="3"
+       x="4"
        y="1042.3622" />
   </g>
 </svg>
diff --git a/image/toolbar/24x24/x-capture-start.png b/image/toolbar/24x24/x-capture-start.png
index 0b3ffd476a..dbffe63ab6 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.svg b/image/toolbar/24x24/x-capture-start.svg
index ec9f569134..099c716f4c 100644
--- a/image/toolbar/24x24/x-capture-start.svg
+++ b/image/toolbar/24x24/x-capture-start.svg
@@ -58,10 +58,10 @@
    inkscape:collect="always"
    xlink:href="#linearGradient5075"
    id="linearGradient5081"
-   x1="15"
-   y1="4"
-   x2="18"
-   y2="11.5"
+   x1="10"
+   y1="6.5"
+   x2="12.5"
+   y2="14"
    gradientUnits="userSpaceOnUse" /></defs>
 <path
    fill="#FFFFFF"
@@ -74,13 +74,13 @@
    inkscape:guide-bbox="true"
    inkscape:window-maximized="0"
    inkscape:window-height="837"
-   inkscape:cy="11.54297"
-   inkscape:cx="15.291385"
-   inkscape:window-x="206"
+   inkscape:cy="12"
+   inkscape:cx="17.508885"
+   inkscape:window-x="0"
    id="base"
-   inkscape:window-y="0"
+   inkscape:window-y="759"
    showgrid="true"
-   inkscape:zoom="24.101265">
+   inkscape:zoom="27.833333">
 	
 		<inkscape:grid
    type="xygrid"
diff --git a/image/toolbar/24x24/x-resize-columns.png b/image/toolbar/24x24/x-resize-columns.png
index 56b404fb0a..4ed0ac9c9c 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.svg b/image/toolbar/24x24/x-resize-columns.svg
index 9b08891b10..fd8f79bcc8 100644
--- a/image/toolbar/24x24/x-resize-columns.svg
+++ b/image/toolbar/24x24/x-resize-columns.svg
@@ -27,16 +27,16 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="23.291667"
-     inkscape:cx="11.248658"
+     inkscape:zoom="23.170984"
+     inkscape:cx="13.544453"
      inkscape:cy="12"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
-     inkscape:window-width="1028"
-     inkscape:window-height="728"
-     inkscape:window-x="132"
-     inkscape:window-y="821"
+     inkscape:window-width="1278"
+     inkscape:window-height="725"
+     inkscape:window-x="98"
+     inkscape:window-y="800"
      inkscape:window-maximized="0"
      showguides="true"
      inkscape:guide-bbox="true">
@@ -140,12 +140,12 @@
        inkscape:connector-curvature="0" />
     <path
        style="fill:#888a85;stroke:#888a85;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 12.5,1029.8622 c 0,21 0,21 0,21"
+       d="m 14.5,1029.8622 c 0,21 0,21 0,21"
        id="path4546"
        inkscape:connector-curvature="0" />
     <path
        sodipodi:type="star"
-       style="fill:#3465a4;fill-opacity:1;stroke:#204a87;stroke-width:3.77799654;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:#3465a4;fill-opacity:1;stroke:#3465a4;stroke-width:3.77799654;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        id="path4292"
        sodipodi:sides="3"
        sodipodi:cx="28"
@@ -158,17 +158,17 @@
        inkscape:rounded="1"
        inkscape:randomized="0"
        d="M 28,14 C 17.607695,14 17.607695,14 22.803847,5.0000001 28,-4 28,-4 33.196152,4.9999999 38.392305,14 38.392305,14 28,14 z"
-       transform="matrix(0,0.36782069,0.19047619,0,12.833333,1025.8965)"
+       transform="matrix(0,0.36782069,0.19047619,0,14.833333,1025.8965)"
        inkscape:transform-center-x="0.35719799"
        inkscape:transform-center-y="-3.6850305e-05" />
     <path
        inkscape:connector-curvature="0"
        id="path4548"
-       d="m 5.4999996,1029.8604 c 0,21.0018 0,21.0018 0,21.0018"
+       d="m 6.4999994,1029.8604 c 0,21.0018 0,21.0018 0,21.0018"
        style="fill:#888a85;stroke:#888a85;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
     <path
        inkscape:transform-center-x="-0.35719839"
-       transform="matrix(0,0.36781774,-0.19047619,0,5.1666667,1025.8956)"
+       transform="matrix(0,0.36781774,-0.19047619,0,6.1666667,1025.8956)"
        d="M 28,14 C 17.607695,14 17.607695,14 22.803847,5.0000001 28,-4 28,-4 33.196152,4.9999999 38.392305,14 38.392305,14 28,14 z"
        inkscape:randomized="0"
        inkscape:rounded="1"
@@ -181,7 +181,7 @@
        sodipodi:cx="28"
        sodipodi:sides="3"
        id="path4550"
-       style="fill:#3465a4;fill-opacity:1;stroke:#204a87;stroke-width:3.7780118;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:#3465a4;fill-opacity:1;stroke:#3465a4;stroke-width:3.7780118;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        sodipodi:type="star"
        inkscape:transform-center-y="-4.3803627e-05" />
   </g>
diff --git a/image/toolbar/24x24/zoom-in.png b/image/toolbar/24x24/zoom-in.png
index b792c9c691..dc596faa4e 100644
--- a/image/toolbar/24x24/zoom-in.png
+++ b/image/toolbar/24x24/zoom-in.png
diff --git a/image/toolbar/24x24/zoom-in.svg b/image/toolbar/24x24/zoom-in.svg
index 4c140e2ffe..bae0b0748d 100644
--- a/image/toolbar/24x24/zoom-in.svg
+++ b/image/toolbar/24x24/zoom-in.svg
@@ -15,7 +15,7 @@
    version="1.1"
    inkscape:version="0.48.2 r9819"
    sodipodi:docname="zoom-in.svg"
-   inkscape:export-filename="edit-find.png"
+   inkscape:export-filename="zoom-in.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90">
   <defs
@@ -35,16 +35,16 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="21.416667"
-     inkscape:cx="12"
+     inkscape:zoom="21.541667"
+     inkscape:cx="11.46994"
      inkscape:cy="12"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
-     inkscape:window-width="931"
-     inkscape:window-height="683"
-     inkscape:window-x="285"
-     inkscape:window-y="790"
+     inkscape:window-width="1147"
+     inkscape:window-height="686"
+     inkscape:window-x="1837"
+     inkscape:window-y="214"
      inkscape:window-maximized="0">
     <inkscape:grid
        type="xygrid"
@@ -72,47 +72,52 @@
      id="layer1"
      transform="translate(0,-1028.3622)">
     <g
-       id="g3759"
-       transform="matrix(0.67307799,-0.67353235,0.67334032,0.67379466,-697.89982,353.9867)">
+       id="g3043"
+       transform="matrix(0.70712074,-0.70710678,0.70712074,0.70710678,-735.46474,319.5415)">
       <rect
-         ry="1.0495892"
-         rx="1.0504072"
-         y="1042.3622"
-         x="16.5"
-         height="9"
-         width="3"
+         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:1.04999804;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         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 18,1030.3622 c 0,13 0,13 0,13"
-         style="fill:none;stroke:#2e3436;stroke-width:2.09999609;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         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>
     <path
        sodipodi:type="arc"
-       style="fill:#eeeeec;fill-opacity:1;stroke:#2e3436;stroke-width:0.59280384;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       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"
        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"
-       transform="matrix(1.3854093,-0.80046638,0.88874043,1.5404982,-5.9746781,1033.4462)" />
+       transform="matrix(1.2122332,-0.69988316,0.77764788,1.3469257,-4.0403435,1034.0064)" />
     <rect
        style="fill:#2e3436;stroke:none"
        id="rect3760"
-       width="11"
+       width="7"
        height="1"
-       x="4"
-       y="1037.3622" />
+       x="6"
+       y="1037.3622"
+       rx="0.5"
+       ry="0.5" />
     <rect
        y="-10"
-       x="1032.3622"
+       x="1034.3622"
        height="1"
-       width="11.000004"
+       width="7.0000296"
        id="rect3762"
        style="fill:#2e3436;stroke:none"
-       transform="matrix(0,1,-1,0,0,0)" />
+       transform="matrix(0,1,-1,0,0,0)"
+       rx="0.5"
+       ry="0.5" />
   </g>
 </svg>
diff --git a/image/toolbar/24x24/zoom-original.png b/image/toolbar/24x24/zoom-original.png
index f02c8ab327..57cbf4cc00 100644
--- a/image/toolbar/24x24/zoom-original.png
+++ b/image/toolbar/24x24/zoom-original.png
diff --git a/image/toolbar/24x24/zoom-original.svg b/image/toolbar/24x24/zoom-original.svg
index a74693fda5..5f7c85a258 100644
--- a/image/toolbar/24x24/zoom-original.svg
+++ b/image/toolbar/24x24/zoom-original.svg
@@ -35,16 +35,16 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="21.416667"
+     inkscape:zoom="22.041667"
      inkscape:cx="12"
      inkscape:cy="12"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
-     inkscape:window-width="931"
-     inkscape:window-height="683"
-     inkscape:window-x="285"
-     inkscape:window-y="790"
+     inkscape:window-width="1255"
+     inkscape:window-height="698"
+     inkscape:window-x="87"
+     inkscape:window-y="784"
      inkscape:window-maximized="0">
     <inkscape:grid
        type="xygrid"
@@ -62,7 +62,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>
@@ -72,46 +72,51 @@
      id="layer1"
      transform="translate(0,-1028.3622)">
     <g
-       id="g3759"
-       transform="matrix(0.67307799,-0.67353235,0.67334032,0.67379466,-697.89982,353.9867)">
+       id="g3043"
+       transform="matrix(0.70712074,-0.70710678,0.70712074,0.70710678,-735.46474,319.5415)">
       <rect
-         ry="1.0495892"
-         rx="1.0504072"
-         y="1042.3622"
-         x="16.5"
-         height="9"
-         width="3"
+         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:1.04999804;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         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 18,1030.3622 c 0,13 0,13 0,13"
-         style="fill:none;stroke:#2e3436;stroke-width:2.09999609;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         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>
     <path
        sodipodi:type="arc"
-       style="fill:#eeeeec;fill-opacity:1;stroke:#2e3436;stroke-width:0.59280384;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:#eeeeec;fill-opacity:1;stroke:#2e3436;stroke-width:0.67774415;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"
-       transform="matrix(1.3854093,-0.80046638,0.88874043,1.5404982,-5.9746781,1033.4462)" />
+       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(1.2122332,-0.69988313,0.77764791,1.3469257,-4.0403436,1034.0064)" />
     <rect
        style="fill:#2e3436;stroke:none"
        id="rect3760"
-       width="11"
+       width="7"
        height="1"
-       x="4"
-       y="1035.3622" />
+       x="6"
+       y="1036.3623"
+       rx="0.5"
+       ry="0.5" />
     <rect
-       y="1039.3622"
-       x="4"
+       y="1038.3623"
+       x="6"
        height="1"
-       width="11"
+       width="7"
        id="rect4485"
-       style="fill:#2e3436;stroke:none" />
+       style="fill:#2e3436;stroke:none"
+       rx="0.5"
+       ry="0.5" />
   </g>
 </svg>
diff --git a/image/toolbar/24x24/zoom-out.png b/image/toolbar/24x24/zoom-out.png
index 52f95d8de5..f4c9f69ddc 100644
--- a/image/toolbar/24x24/zoom-out.png
+++ b/image/toolbar/24x24/zoom-out.png
diff --git a/image/toolbar/24x24/zoom-out.svg b/image/toolbar/24x24/zoom-out.svg
index 179273f21c..354f18f40d 100644
--- a/image/toolbar/24x24/zoom-out.svg
+++ b/image/toolbar/24x24/zoom-out.svg
@@ -15,7 +15,7 @@
    version="1.1"
    inkscape:version="0.48.2 r9819"
    sodipodi:docname="zoom-out.svg"
-   inkscape:export-filename="zoom-in.png"
+   inkscape:export-filename="zoom-out.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90">
   <defs
@@ -35,16 +35,16 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="21.416667"
+     inkscape:zoom="23.583333"
      inkscape:cx="12"
      inkscape:cy="12"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
-     inkscape:window-width="931"
-     inkscape:window-height="683"
-     inkscape:window-x="285"
-     inkscape:window-y="790"
+     inkscape:window-width="1312"
+     inkscape:window-height="735"
+     inkscape:window-x="1750"
+     inkscape:window-y="260"
      inkscape:window-maximized="0">
     <inkscape:grid
        type="xygrid"
@@ -72,39 +72,42 @@
      id="layer1"
      transform="translate(0,-1028.3622)">
     <g
-       id="g3759"
-       transform="matrix(0.67307799,-0.67353235,0.67334032,0.67379466,-697.89982,353.9867)">
+       id="g3043"
+       transform="matrix(0.70712074,-0.70710678,0.70712074,0.70710678,-735.46474,319.5415)">
       <rect
-         ry="1.0495892"
-         rx="1.0504072"
-         y="1042.3622"
-         x="16.5"
-         height="9"
-         width="3"
+         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:1.04999804;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         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 18,1030.3622 c 0,13 0,13 0,13"
-         style="fill:none;stroke:#2e3436;stroke-width:2.09999609;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         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>
     <path
        sodipodi:type="arc"
-       style="fill:#eeeeec;fill-opacity:1;stroke:#2e3436;stroke-width:0.59280384;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       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"
        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"
-       transform="matrix(1.3854093,-0.80046638,0.88874043,1.5404982,-5.9746781,1033.4462)" />
+       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(1.2122332,-0.69988318,0.77764791,1.3469257,-4.0403436,1034.0064)" />
     <rect
        style="fill:#2e3436;stroke:none"
        id="rect3760"
-       width="11"
-       height="1"
-       x="4"
-       y="1037.3622" />
+       width="7"
+       height="0.99997389"
+       x="5.999999"
+       y="1037.3619"
+       rx="0.5"
+       ry="0.5" />
   </g>
 </svg>