Index: applications/editors/josm/plugins/photoadjust/README
===================================================================
--- applications/editors/josm/plugins/photoadjust/README	(revision 35598)
+++ applications/editors/josm/plugins/photoadjust/README	(revision 35599)
@@ -31,4 +31,11 @@
         License: GNU General Public License v2 or later
     License: GPL v2 or later
+  images/photopropedit.svg:
+    combination of:
+      JOSM resources/images/dialogs/edit.svg
+      JOSM resources/images/dialogs/geoimage/togglegit.svg
+        Author: JOSM contributors and others, see JOSM CONTRIBUTION
+        License: GNU General Public License v2 or later
+    License: GPL v2 or later
   src/org/openstreetmap/josm/plugins/photoadjust/
     different authors (see SVN log)
Index: applications/editors/josm/plugins/photoadjust/images/photopropedit.svg
===================================================================
--- applications/editors/josm/plugins/photoadjust/images/photopropedit.svg	(revision 35599)
+++ applications/editors/josm/plugins/photoadjust/images/photopropedit.svg	(revision 35599)
@@ -0,0 +1,278 @@
+<?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"
+   viewBox="0 0 16 16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
+   sodipodi:docname="photopropedit.svg">
+  <defs
+     id="defs4">
+    <mask
+       id="id0">
+      <linearGradient
+         id="id1"
+         gradientUnits="userSpaceOnUse"
+         x1="1680.3101"
+         y1="435.362"
+         x2="1680.3101"
+         y2="1639.5699">
+        <stop
+           offset="0"
+           style="stop-opacity:1; stop-color:white"
+           id="stop4" />
+        <stop
+           offset="1"
+           style="stop-opacity:0; stop-color:white"
+           id="stop6" />
+      </linearGradient>
+      <rect
+         style="fill:url(#id1)"
+         x="74"
+         y="63"
+         width="3213"
+         height="1950"
+         id="rect9" />
+    </mask>
+    <mask
+       id="id2">
+      <linearGradient
+         id="id3"
+         gradientUnits="userSpaceOnUse"
+         x1="1683.09"
+         y1="773.80603"
+         x2="1683.09"
+         y2="1471.39">
+        <stop
+           offset="0"
+           style="stop-opacity:1; stop-color:white"
+           id="stop12" />
+        <stop
+           offset="1"
+           style="stop-opacity:0; stop-color:white"
+           id="stop14" />
+      </linearGradient>
+      <rect
+         style="fill:url(#id3)"
+         x="861"
+         y="556"
+         width="1645"
+         height="1133"
+         id="rect17" />
+    </mask>
+    <linearGradient
+       x1="48.90625"
+       y1="17.376184"
+       x2="50.988335"
+       y2="22.250591"
+       id="linearGradient2554"
+       xlink:href="#linearGradient2966"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.52680028,-0.18845804,0.19367302,0.51261528,-17.8199,1.0676243)" />
+    <linearGradient
+       id="linearGradient2966">
+      <stop
+         id="stop2968"
+         style="stop-color:#ffd1d1;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3006"
+         style="stop-color:#ff1d1d;stop-opacity:1"
+         offset="0.5" />
+      <stop
+         id="stop2970"
+         style="stop-color:#6f0000;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="46"
+       y1="19.8125"
+       x2="47.6875"
+       y2="22.625"
+       id="linearGradient2556"
+       xlink:href="#linearGradient2974"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.52680028,-0.18845804,0.19367302,0.51261528,-17.8199,1.0676243)" />
+    <linearGradient
+       id="linearGradient2974">
+      <stop
+         id="stop2976"
+         style="stop-color:#c1c1c1;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2978"
+         style="stop-color:#acacac;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="29.053354"
+       cy="27.640751"
+       r="3.2408545"
+       fx="29.053354"
+       fy="27.640751"
+       id="radialGradient2558"
+       xlink:href="#linearGradient2984"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5401347,-0.55096929,0.3931014,1.040464,-52.661086,-2.694057)" />
+    <linearGradient
+       id="linearGradient2984">
+      <stop
+         id="stop2986"
+         style="stop-color:#e7e2b8;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2988"
+         style="stop-color:#e7e2b8;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="25.71875"
+       y1="31.046875"
+       x2="25.514589"
+       y2="30.703125"
+       id="linearGradient2560"
+       xlink:href="#linearGradient2994"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.52680028,-0.18845804,0.19367302,0.51261528,-17.878004,1.1611473)" />
+    <linearGradient
+       id="linearGradient2994">
+      <stop
+         id="stop2996"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2998"
+         style="stop-color:#c9c9c9;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="33.712941"
+     inkscape:cx="4.7552693"
+     inkscape:cy="9.096856"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:window-width="2571"
+     inkscape:window-height="1372"
+     inkscape:window-x="3189"
+     inkscape:window-y="751"
+     inkscape:window-maximized="0"
+     viewbox-height="16">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4136"
+       originx="0"
+       originy="0"
+       spacingx="1"
+       spacingy="1" />
+  </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:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1037.3622)">
+    <rect
+       style="opacity:1;fill:#d0d0d0;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.69925934;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.83990926;stroke-opacity:1;paint-order:normal"
+       id="rect838-6"
+       width="9.9877405"
+       height="5.8747663"
+       x="0.52534699"
+       y="1038.9001"
+       ry="1.1015315" />
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.73044729;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.83990926;stroke-opacity:1;paint-order:normal"
+       id="rect840-9"
+       width="2.1913419"
+       height="0.73044729"
+       x="1.8915637"
+       y="1040.4767"
+       ry="0.36522365" />
+    <circle
+       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ababab;stroke-width:0.73044729;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.83990926;stroke-opacity:1;paint-order:normal"
+       id="path842-9"
+       cx="7.5385656"
+       cy="1041.8376"
+       r="2.1913419" />
+    <g
+       id="g968"
+       transform="matrix(0.96850819,0.14105992,0.12935496,0.97845204,2.1886159,1038.6629)">
+      <path
+         inkscape:connector-curvature="0"
+         style="display:inline;overflow:visible;visibility:visible;fill:#cb9022;fill-opacity:1;fill-rule:evenodd;stroke:#5c410c;stroke-width:0.55366516;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         id="path2960"
+         d="M 0.59638485,13.391116 2.470226,9.4475786 11.167306,0.66275107 c 1.47001,-1.25325777 3.386423,0.75245043 2.186591,2.12726663 L 4.6171145,11.370836 Z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient2554);stroke-width:0.55366516"
+         id="path2964"
+         d="m 9.2327717,3.0277763 c 0,0 0.7754323,-0.2228512 1.3138493,0.3119107 0.554681,0.5509155 0.514443,1.3616339 0.514443,1.3616339 l 2.172335,-2.2136983 c 0,0 0.594232,-0.7254498 -0.205047,-1.58142563 -0.78836,-0.84428283 -1.639708,-0.086231 -1.639708,-0.086231 z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient2556);stroke-width:0.55366516"
+         id="path2962"
+         d="m 9.2327717,3.0277763 c 0,0 0.7754323,-0.2228512 1.3138493,0.3119107 0.554681,0.5509155 0.514443,1.3616339 0.514443,1.3616339 l 0.859929,-0.8895313 c 0,0 0.180251,-0.8319322 -0.405259,-1.4188787 C 10.914131,1.7898312 10.092699,2.1382444 10.092699,2.1382444 Z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:url(#radialGradient2558);stroke-width:0.55366516"
+         id="path2982"
+         d="M 1.2089521,12.753734 2.7080248,9.5989052 C 3.655584,9.732718 4.3273951,10.274312 4.4159968,11.151834 Z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient2560);stroke-width:0.55366516"
+         id="path2992"
+         d="m 1.6444879,11.77963 -0.547385,1.123224 1.1741655,-0.601891 C 2.2473022,11.891296 1.966716,11.791645 1.6444879,11.77963 Z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ffffff;fill-opacity:0.36363639;stroke-width:0.55366516"
+         id="path3002"
+         d="M 2.7019732,9.582886 3.7671893,9.9291892 10.455815,3.2776593 C 10.055894,2.9225949 9.5915949,2.9556989 9.2280157,3.0405734 Z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#000000;fill-opacity:0.36363639;stroke-width:0.55366516"
+         id="path3004"
+         d="M 4.4281019,11.183874 4.3816209,10.764076 11.024552,4.2389122 c 0,0 0.06082,0.3353152 0.03141,0.4248127 z" />
+    </g>
+  </g>
+</svg>
Index: applications/editors/josm/plugins/photoadjust/src/org/openstreetmap/josm/plugins/photoadjust/PhotoPropertyEditor.java
===================================================================
--- applications/editors/josm/plugins/photoadjust/src/org/openstreetmap/josm/plugins/photoadjust/PhotoPropertyEditor.java	(revision 35598)
+++ applications/editors/josm/plugins/photoadjust/src/org/openstreetmap/josm/plugins/photoadjust/PhotoPropertyEditor.java	(revision 35599)
@@ -68,11 +68,11 @@
     private static class PropertyEditorAction extends JosmAction implements LayerChangeListener, ImageDataUpdateListener {
         public PropertyEditorAction() {
-            super(tr("Edit photo GPS data"),    // String name
-                    (String)null,                         // String iconName
-                    tr("Edit GPS data of selected photo."), // String tooltip
-                    null,                                 // Shortcut shortcut
-                    true,                                 // boolean registerInToolbar
-                    "photoadjust/propertyeditor", // String toolbarId
-                    false                          // boolean installAdapters
+            super(tr("Edit photo GPS data"),  // String name
+                    "photopropedit",  // String iconName
+                    tr("Edit GPS data of selected photo."),  // String tooltip
+                    null,  // Shortcut shortcut
+                    true,  // boolean registerInToolbar
+                    "photoadjust/propertyeditor",  // String toolbarId
+                    false  // boolean installAdapters
                     );
             this.installAdapters();