Merge pull request #698 from 3nids/svgpan

timlinux · timlinux · commit 69d80b942e61 · 2013-08-15T03:47:24.000-07:00
SVG for pan icons
diff --git a/images/images.qrc b/images/images.qrc
@@ -230,8 +230,7 @@
         <file>themes/default/mActionOffsetCurve.png</file>
         <file>themes/default/mActionOpenTable.png</file>
         <file>themes/default/mActionOptions.svg</file>
-        <file>themes/default/mActionPan.png</file>
-        <file>themes/default/mActionPanToSelected.png</file>
+        <file>themes/default/mActionPan.svg</file>
         <file>themes/default/mActionPanToSelected.svg</file>
         <file>themes/default/mActionPinLabels.svg</file>
         <file>themes/default/mActionProjectProperties.png</file>
diff --git a/images/themes/default/mActionPan.png b/images/themes/default/mActionPan.png
diff --git a/images/themes/default/mActionPan.svg b/images/themes/default/mActionPan.svg
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="mActionPan.svg">
+  <defs
+     id="defs20" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1427"
+     inkscape:window-height="870"
+     id="namedview18"
+     showgrid="false"
+     inkscape:zoom="13.455444"
+     inkscape:cx="-14.09132"
+     inkscape:cy="17.475132"
+     inkscape:window-x="1976"
+     inkscape:window-y="97"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <title
+     id="title4">hand</title>
+  <metadata
+     id="metadata7">image/svg+xmlSergio Luiz Araujo Silvahandcomputermousecursor<rdf:RDF>
+  <cc:Work
+     rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type
+       rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+  </cc:Work>
+</rdf:RDF>
+</metadata>
+  <path
+     d="m 9.3797641,0.75499793 c -0.982122,0 -1.8925021,0.62609527 -1.8925021,1.49615247 -2.7e-6,0.00101 -2.7e-6,0.00202 0,0.00303 L 7.5455234,10.450793 6.6116701,8.3592004 C 6.5864716,8.3020719 6.5518985,8.2479804 6.509283,8.1990104 6.1416524,7.7811174 5.6597049,7.493544 5.1534569,7.4222077 4.6471552,7.3508239 4.2319201,7.4517453 3.8312081,7.5370475 3.2235682,7.66642 2.8749888,8.1070813 2.7366509,8.5224183 c -0.1314355,0.394696 -0.114703,0.820638 0.061796,1.2331811 l -0.00177,0 2.0284108,6.0814056 c 0.01635,0.04943 0.039516,0.09723 0.068864,0.14206 l 3.4071564,5.182189 0.8226844,2.369697 c 0.094212,0.270356 0.4118979,0.471091 0.7414497,0.468494 l 7.8153118,-0.05439 c 0.346661,-0.0029 0.672884,-0.232329 0.743219,-0.522935 l 2.127319,-8.753353 c 0.0027,-0.01052 0.0051,-0.02109 0.0071,-0.03171 0.105254,-0.57349 0.06782,-1.537511 0.04235,-2.531403 -0.01276,-0.496946 -0.029,-0.978127 -0.04059,-1.351097 -0.01166,-0.372921 -0.0087,-0.72369 -0.01414,-0.654387 0.0012,-0.01508 0.0018,-0.03019 0.0018,-0.0453 l 0,-2.933438 C 20.547775,7.073715 20.541812,7.025985 20.529932,6.9793689 20.437329,6.6223988 20.307719,6.2864006 20.010886,5.9925302 19.734984,5.7193955 19.248451,5.5473241 18.791022,5.5693358 l 0,-0.00601 c -0.02104,0 -0.04092,0.00535 -0.0618,0.00601 -0.01403,0.00129 -0.02844,-0.00161 -0.04235,0 l 0,0.00455 c -0.319316,0.017561 -0.619681,0.1108161 -0.866813,0.256946 l 0,-0.1934672 c 0,-0.8705782 -0.911708,-1.4961849 -1.894267,-1.4961849 l -0.0053,0 c -0.560586,0 -1.091519,0.2088514 -1.449377,0.5456083 l 0,-0.8810871 c 0,-0.8691577 -0.911321,-1.4946719 -1.892446,-1.4946719 -0.487525,0 -0.957875,0.1537523 -1.308166,0.4156202 l 0,-0.4754938 c 0,-0.8686375 -0.908617,-1.49615727 -1.8907353,-1.49615727 z"
+     id="path3926"
+     inkscape:connector-curvature="0"
+     style="fill:#cccccc;fill-rule:nonzero;stroke-width:1.14897895"
+     sodipodi:nodetypes="cccccccccccccccccccccccccccccccccssscsscscc" />
+  <path
+     id="path3920"
+     d="m 9.7362401,0.34032241 c -0.9821192,0 -1.8925026,0.62609028 -1.8925026,1.49614789 -2.7e-6,0.00101 -2.7e-6,0.00202 0,0.00303 L 7.9020013,9.9313623 6.9680927,7.8397689 C 6.9428939,7.7826414 6.9083208,7.7285509 6.8657056,7.6795816 6.4981279,7.2616879 6.01618,6.9741135 5.5098786,6.9027771 5.0036331,6.8313933 4.5883409,6.9323156 4.1876298,7.0176178 3.5800449,7.1469892 3.2314106,7.5876507 3.0931271,8.0029886 2.9616365,8.3976847 2.9784247,8.8236253 3.1548685,9.2361677 l -0.00171,0 2.02841,6.0814083 c 0.016334,0.04944 0.039481,0.09723 0.068811,0.142057 l 3.4072099,5.182189 0.8226855,2.369699 c 0.094211,0.270357 0.4118967,0.471092 0.7414491,0.468497 l 7.815316,-0.05439 c 0.346662,-0.0029 0.672882,-0.232329 0.743217,-0.522935 l 2.127266,-8.753304 c 0.0027,-0.01054 0.005,-0.02112 0.0071,-0.03177 0.105314,-0.57344 0.06787,-1.537511 0.04242,-2.531401 -0.01276,-0.496944 -0.029,-0.978127 -0.04064,-1.351096 -0.01159,-0.3729232 -0.0086,-0.7236913 -0.01414,-0.6543431 0.0012,-0.015094 0.0018,-0.03023 0.0018,-0.045354 l 0,-2.9333886 c 1.75e-4,-0.047714 -0.0058,-0.095444 -0.01765,-0.1420597 -0.09261,-0.3570071 -0.222215,-0.693006 -0.519106,-0.9868753 -0.275904,-0.273137 -0.762436,-0.4452072 -1.219864,-0.423147 l 0,-0.00607 c -0.02099,0 -0.04087,0.00534 -0.0618,0.00607 -0.01403,0.00124 -0.02839,-0.00166 -0.04236,0 l 0,0.00449 c -0.319254,0.017566 -0.61962,0.1108193 -0.866807,0.2569483 l 0,-0.1934654 c 0,-0.8705792 -0.911656,-1.4961397 -1.894215,-1.4961397 l -0.0053,0 c -0.56059,0 -1.091575,0.2088052 -1.449377,0.545561 l 0,-0.8810851 c 0,-0.8691588 -0.911377,-1.4946719 -1.892503,-1.4946719 -0.487472,0 -0.957874,0.1537505 -1.308111,0.4156202 l 0,-0.3707439 c 0,-0.86863692 -0.90867,-1.49615338 -1.8907349,-1.49615338 z"
+     inkscape:connector-curvature="0"
+     style="fill:#999999;fill-rule:nonzero;stroke-width:1.14897895"
+     sodipodi:nodetypes="cccccccccccccccccccccccccccccccccssscsscscc" />
+  <path
+     style="fill:#000000;fill-rule:nonzero;stroke:#000000;stroke-width:0.03530137;stroke-miterlimit:4;stroke-dashoffset:0"
+     inkscape:connector-curvature="0"
+     d="m 10.291029,0.06303052 c -0.960084,0 -1.8500346,0.61286024 -1.8500346,1.46449338 -2.7e-6,9.965e-4 -2.7e-6,0.00199 0,0.00299 L 8.4979315,9.526866 7.5850084,7.4795335 C 7.5603681,7.4236031 7.5265597,7.3706469 7.4848865,7.3227063 7.1255394,6.9136662 6.6544155,6.6321982 6.159489,6.562376 5.6645638,6.4925074 5.2586068,6.5913006 4.8668955,6.6748014 4.272896,6.8014294 3.9321036,7.2327657 3.7969131,7.6392963 3.6684049,8.0256158 3.6848067,8.4425596 3.8573289,8.8463938 l -0.00176,0 1.9829592,5.9526482 c 0.015968,0.04838 0.038596,0.09516 0.067265,0.139031 l 3.3307772,5.07251 0.8041867,2.319522 c 0.09211,0.264626 0.40267,0.461099 0.724825,0.458552 l 7.640031,-0.05326 c 0.338866,-0.0028 0.657758,-0.227376 0.726541,-0.511808 l 2.079606,-8.568028 c 0.0026,-0.01032 0.0049,-0.02069 0.0069,-0.0311 0.102885,-0.561323 0.06632,-1.504945 0.04142,-2.47777 -0.01248,-0.486435 -0.02833,-0.957442 -0.03971,-1.3225051 -0.01138,-0.3650653 -0.0083,-0.7084011 -0.0138,-0.6405203 0.0011,-0.014778 0.0018,-0.029589 0.0018,-0.044401 l 0,-2.8712826 C 21.208529,6.221287 21.20267,6.174578 21.19109,6.1289597 21.100531,5.7795143 20.973846,5.450615 20.683636,5.1629487 20.413916,4.8955873 19.93832,4.727209 19.491111,4.748747 l 0,-0.00591 c -0.02049,0 -0.03998,0.00525 -0.06037,0.00591 -0.01375,0.00124 -0.02782,-0.00161 -0.04142,0 l 0,0.00445 c -0.312129,0.017184 -0.60576,0.1084513 -0.847371,0.2514559 l 0,-0.1893483 c 0,-0.8521168 -0.891217,-1.4644708 -1.851746,-1.4644708 l -0.0052,0 c -0.548052,0 -1.067054,0.2044019 -1.41685,0.5340109 l 0,-0.8624354 c 0,-0.850744 -0.890942,-1.4630026 -1.850033,-1.4630026 -0.476591,0 -0.936393,0.1505313 -1.278842,0.4068156 l 0,-0.438697 c 0,-0.85024612 -0.888238,-1.46449341 -1.848268,-1.46449341 l 0,0 z"
+     id="path3917"
+     stroke-miterlimit="4"
+     sodipodi:nodetypes="cccccccscccccccccccccscccccccccccssscsscsccc" />
+  <path
+     style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.01642426;stroke-miterlimit:4;stroke-dashoffset:0"
+     inkscape:connector-curvature="0"
+     d="m 10.290257,0.80959703 c -0.6092983,0 -1.1004663,0.36643757 -1.1004663,0.82210417 l 0.06555,9.3816458 C 9.238166,11.402174 8.5631525,11.471096 8.4359149,11.186649 L 6.8864695,7.7091655 C 6.3091489,7.0519363 5.8162665,7.1342544 5.0486416,7.2978996 4.5270415,7.4091414 4.3110568,8.1077442 4.5760262,8.6704406 l 1.9816346,5.9526974 3.3723074,5.13613 0.8292568,2.387969 7.639094,-0.0533 2.080598,-8.56883 c 0.137012,-0.747173 -0.04247,-4.0967016 -0.01938,-4.3864068 l 0,-2.8705721 C 20.307389,5.6805786 20.022042,5.321338 19.490446,5.3842475 c -0.6104,0 -0.923911,0.4282129 -0.923911,0.8838795 l 0,2.8411758 c 0.106528,0.3851373 -0.813685,0.4854894 -0.774364,-0.00194 l 0,-4.2914437 c 0,-0.4556679 -0.491777,-0.8227677 -1.102179,-0.8227677 l -0.0052,0 c -0.610401,0 -1.101295,0.3670998 -1.101295,0.8227677 l 0,3.4464279 c 0.111221,0.4166163 -1.09003,0.53846 -1.063467,-0.00194 l 0,-5.2372416 c 0,-0.4556676 -0.491779,-0.8221511 -1.102179,-0.8221511 -0.610456,0 -1.102232,0.3664835 -1.102232,0.8221511 l 0,5.5051713 c 0.04827,0.3819148 -0.901381,0.4781515 -0.925792,-0.00129 l 0,-6.8953548 c 0,-0.4556666 -0.490286,-0.82210383 -1.09958,-0.82210383 l 0,0 0,0 0,0 0,0 z"
+     id="rect3906"
+     stroke-miterlimit="4"
+     sodipodi:nodetypes="cccccccccccccccsccssssccsssccscccccc" />
+  <g
+     id="layer1"
+     transform="matrix(0.03040111,0,0,0.03040111,0.46940191,-5.5820931)" />
+</svg>
diff --git a/images/themes/default/mActionPanToSelected.png b/images/themes/default/mActionPanToSelected.png
diff --git a/images/themes/default/mActionPanToSelected.svg b/images/themes/default/mActionPanToSelected.svg
@@ -13,8 +13,8 @@
    height="24"
    id="svg5692"
    version="1.1"
-   inkscape:version="0.47 r22583"
-   sodipodi:docname="pan-selection.svg"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="mActionPanToSelected.svg"
    inkscape:export-filename="/mnt/home1/robert/svn/graphics/trunk/toolbar-icons/24x24/pan-selection.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90"
@@ -485,18 +485,18 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="14.520833"
-     inkscape:cx="17.806537"
+     inkscape:cx="-6.5033632"
      inkscape:cy="15.182873"
      inkscape:current-layer="layer4"
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
      borderlayer="false"
-     inkscape:window-width="1280"
-     inkscape:window-height="950"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:window-maximized="1"
+     inkscape:window-width="1294"
+     inkscape:window-height="922"
+     inkscape:window-x="491"
+     inkscape:window-y="109"
+     inkscape:window-maximized="0"
      showguides="true"
      inkscape:guide-bbox="true"
      inkscape:snap-bbox="true"
@@ -573,34 +573,35 @@
     <path
        sodipodi:nodetypes="ccccc"
        id="rect7374"
-       d="m 0.5,8.5 14,-0.12473 0,11.12473 -14,0 0,-11 z"
-       style="opacity:0.98999999;fill:#fce94f;fill-opacity:1;fill-rule:nonzero;stroke:#555753;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:2.4;display:inline;enable-background:new" />
-    <g
-       id="g6905"
-       transform="translate(-18,-16)">
-      <path
-         style="fill:#82a0b4;fill-opacity:1;fill-rule:evenodd;stroke:#3c5a6e;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;enable-background:new"
-         d="m 30,47 4.5,-4.5 -3,0 0,-3 -3,0 0,3 -3,0 4.5,4.5 z"
-         id="path2844"
-         sodipodi:nodetypes="cccccccc"
-         inkscape:export-filename="E:\Program Files\QGIS-Dev\themes\gis-0.1.1\path2844.png"
-         inkscape:export-xdpi="90"
-         inkscape:export-ydpi="90" />
-      <path
-         sodipodi:nodetypes="cccccccc"
-         id="path2846"
-         d="m 19,36 4.5,4.5 0,-3 3,0 0,-3 -3,0 0,-3 L 19,36 z"
-         style="fill:#82a0b4;fill-opacity:1;fill-rule:evenodd;stroke:#3c5a6e;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;enable-background:new" />
-      <path
-         sodipodi:nodetypes="cccccccc"
-         id="path2848"
-         d="m 30,25 4.5,4.5 -3,0 0,3 -3,0 0,-3 -3,0 L 30,25 z"
-         style="fill:#82a0b4;fill-opacity:1;fill-rule:evenodd;stroke:#3c5a6e;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;enable-background:new" />
-      <path
-         style="fill:#82a0b4;fill-opacity:1;fill-rule:evenodd;stroke:#3c5a6e;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;enable-background:new"
-         d="m 41,36 -4.5,4.5 0,-3 -3,0 0,-3 3,0 0,-3 4.5,4.5 z"
-         id="path2850"
-         sodipodi:nodetypes="cccccccc" />
-    </g>
+       d="m 0.53779721,8.6681332 15.49999979,-0.130336 0,11.6247298 -15.49999979,0 0,-11.4943938 z"
+       style="opacity:0.98999999;fill:#fce94f;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.07559443;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:2.15118878, 2.15118878;stroke-dashoffset:2.58142654;display:inline;enable-background:new"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="E:\Program Files\QGIS-Dev\themes\gis-0.1.1\path2844.png"
+       sodipodi:nodetypes="cccccccc"
+       id="path2844"
+       d="m 12,31 4.5,-4.5 -3,0 0,-3 -3,0 0,3 -3,0 4.5,4.5 z"
+       style="fill:#6d97c4;fill-opacity:1;fill-rule:evenodd;stroke:#415a75;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;enable-background:new" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#6d97c4;fill-opacity:1;fill-rule:evenodd;stroke:#415a75;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;enable-background:new"
+       d="m 1,20 4.5,4.5 0,-3 3,0 0,-3 -3,0 0,-3 L 1,20 z"
+       id="path2846"
+       sodipodi:nodetypes="cccccccc" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#6d97c4;fill-opacity:1;fill-rule:evenodd;stroke:#415a75;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;enable-background:new"
+       d="m 12,9 4.5,4.5 -3,0 0,3 -3,0 0,-3 -3,0 L 12,9 z"
+       id="path2848"
+       sodipodi:nodetypes="cccccccc" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccc"
+       id="path2850"
+       d="m 23,20 -4.5,4.5 0,-3 -3,0 0,-3 3,0 0,-3 4.5,4.5 z"
+       style="fill:#6d97c4;fill-opacity:1;fill-rule:evenodd;stroke:#415a75;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;enable-background:new" />
   </g>
 </svg>
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -1767,7 +1767,7 @@ void QgisApp::setTheme( QString theThemeName )
 #ifdef HAVE_TOUCH
   mActionTouch->setIcon( QgsApplication::getThemeIcon( "/mActionTouch.png" ) );
 #endif
-  mActionPan->setIcon( QgsApplication::getThemeIcon( "/mActionPan.png" ) );
+  mActionPan->setIcon( QgsApplication::getThemeIcon( "/mActionPan.svg" ) );
   mActionPanToSelected->setIcon( QgsApplication::getThemeIcon( "/mActionPanToSelected.svg" ) );
   mActionZoomLast->setIcon( QgsApplication::getThemeIcon( "/mActionZoomLast.svg" ) );
   mActionZoomNext->setIcon( QgsApplication::getThemeIcon( "/mActionZoomNext.svg" ) );
diff --git a/src/app/qgsattributetabledialog.cpp b/src/app/qgsattributetabledialog.cpp
@@ -136,7 +136,7 @@ QgsAttributeTableDialog::QgsAttributeTableDialog( QgsVectorLayer *theLayer, QWid
   mSelectedToTopButton->setIcon( QgsApplication::getThemeIcon( "/mActionSelectedToTop.png" ) );
   mCopySelectedRowsButton->setIcon( QgsApplication::getThemeIcon( "/mActionCopySelected.png" ) );
   mZoomMapToSelectedRowsButton->setIcon( QgsApplication::getThemeIcon( "/mActionZoomToSelected.svg" ) );
-  mPanMapToSelectedRowsButton->setIcon( QgsApplication::getThemeIcon( "/mActionPanToSelected.png" ) );
+  mPanMapToSelectedRowsButton->setIcon( QgsApplication::getThemeIcon( "/mActionPanToSelected.svg" ) );
   mInvertSelectionButton->setIcon( QgsApplication::getThemeIcon( "/mActionInvertSelection.png" ) );
   mToggleEditingButton->setIcon( QgsApplication::getThemeIcon( "/mActionToggleEditing.svg" ) );
   mSaveEditsButton->setIcon( QgsApplication::getThemeIcon( "/mActionSaveEdits.svg" ) );
diff --git a/src/plugins/georeferencer/qgsgeorefplugingui.cpp b/src/plugins/georeferencer/qgsgeorefplugingui.cpp
@@ -829,7 +829,7 @@ void QgsGeorefPluginGui::createActions()
   connect( mActionMoveGCPPoint, SIGNAL( triggered() ), this, SLOT( setMovePointTool() ) );
 
   // View actions
-  mActionPan->setIcon( getThemeIcon( "/mActionPan.png" ) );
+  mActionPan->setIcon( getThemeIcon( "/mActionPan.svg" ) );
   connect( mActionPan, SIGNAL( triggered() ), this, SLOT( setPanTool() ) );
 
   mActionZoomIn->setIcon( getThemeIcon( "/mActionZoomIn.svg" ) );
@@ -1089,7 +1089,7 @@ void QgsGeorefPluginGui::updateIconTheme( QString theme )
   mActionMoveGCPPoint->setIcon( getThemeIcon( "/mActionMoveGCPPoint.png" ) );
 
   // View actions
-  mActionPan->setIcon( getThemeIcon( "/mActionPan.png" ) );
+  mActionPan->setIcon( getThemeIcon( "/mActionPan.svg" ) );
   mActionZoomIn->setIcon( getThemeIcon( "/mActionZoomIn.svg" ) );
   mActionZoomOut->setIcon( getThemeIcon( "/mActionZoomOut.svg" ) );
   mActionZoomToLayer->setIcon( getThemeIcon( "/mActionZoomToLayer.svg" ) );
diff --git a/src/ui/qgisapp.ui b/src/ui/qgisapp.ui
@@ -799,7 +799,7 @@
    </property>
    <property name="icon">
     <iconset resource="../../images/images.qrc">
-     <normaloff>:/images/themes/default/mActionPan.png</normaloff>:/images/themes/default/mActionPan.png</iconset>
+     <normaloff>:/images/themes/default/mActionPan.svg</normaloff>:/images/themes/default/mActionPan.svg</iconset>
    </property>
    <property name="text">
     <string>Pan Map</string>
@@ -1688,7 +1688,7 @@ Ctl (Cmd) increments by 15 deg.</string>
   <action name="mActionPanToSelected">
    <property name="icon">
     <iconset resource="../../images/images.qrc">
-     <normaloff>:/images/themes/default/mActionPanToSelected.png</normaloff>:/images/themes/default/mActionPanToSelected.png</iconset>
+     <normaloff>:/images/themes/default/mActionPanToSelected.svg</normaloff>:/images/themes/default/mActionPanToSelected.svg</iconset>
    </property>
    <property name="text">
     <string>Pan Map to Selection</string>
diff --git a/src/ui/qgsattributetabledialog.ui b/src/ui/qgsattributetabledialog.ui
@@ -244,7 +244,7 @@
        </property>
        <property name="icon">
         <iconset>
-         <normaloff>:/images/themes/default/mActionPanToSelected.png</normaloff>:/images/themes/default/mActionPanToSelected.png</iconset>
+         <normaloff>:/images/themes/default/mActionPanToSelected.svg</normaloff>../../images/themes/default/mActionPanToSelected.svg</iconset>
        </property>
        <property name="iconSize">
         <size>
diff --git a/src/ui/qgscomposerbase.ui b/src/ui/qgscomposerbase.ui
@@ -210,7 +210,7 @@
   <action name="mActionSelectMoveItem">
    <property name="icon">
     <iconset resource="../../images/images.qrc">
-     <normaloff>:/images/themes/default/mActionPan.png</normaloff>:/images/themes/default/mActionPan.png</iconset>
+     <normaloff>:/images/themes/default/mActionPan.svg</normaloff>:/images/themes/default/mActionPan.svg</iconset>
    </property>
    <property name="text">
     <string>Move Item</string>
diff --git a/src/ui/qgslabelingguibase.ui b/src/ui/qgslabelingguibase.ui
@@ -550,7 +550,7 @@
                  </property>
                  <property name="icon">
                   <iconset resource="../../images/images.qrc">
-                   <normaloff>:/images/themes/default/mActionPan.png</normaloff>:/images/themes/default/mActionPan.png</iconset>
+                   <normaloff>:/images/themes/default/mActionPan.svg</normaloff>:/images/themes/default/mActionPan.svg</iconset>
                  </property>
                 </item>
                 <item>
