Index: applications/editors/josm/plugins/agpifoj/build.xml
===================================================================
--- applications/editors/josm/plugins/agpifoj/build.xml	(revision 17523)
+++ applications/editors/josm/plugins/agpifoj/build.xml	(revision 17526)
@@ -34,5 +34,5 @@
                 <attribute name="Plugin-Early" value="false"/>
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/index.php/JOSM/Plugins/AgPifoJ"/>
-                <attribute name="Plugin-Mainversion" value="2005"/>
+                <attribute name="Plugin-Mainversion" value="2081"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>
Index: applications/editors/josm/plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java
===================================================================
--- applications/editors/josm/plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java	(revision 17523)
+++ applications/editors/josm/plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java	(revision 17526)
@@ -572,10 +572,14 @@
         GpxDataWrapper selectedGpx = null;
         while (! isOk) {
-            int answer = new ExtendedDialog(Main.parent,
+        	ExtendedDialog dialog = new ExtendedDialog(
+        			Main.parent,
                 tr("Correlate images with GPX track"),
-                panel,
-                new String[] { tr("Correlate"), tr("Auto-Guess"), tr("Cancel") },
-                new String[] { "ok.png", "dialogs/gpx2imgManual.png", "cancel.png" }).getValue();
-
+                new String[] { tr("Correlate"), tr("Auto-Guess"), tr("Cancel") }
+        			);
+
+        	dialog.setContent(panel);
+        	dialog.setButtonIcons(new String[] { "ok.png", "dialogs/gpx2imgManual.png", "cancel.png" });
+        	dialog.showDialog();
+        	int answer = dialog.getValue();
             if(answer != 1 && answer != 2)
                 return;
@@ -880,11 +884,13 @@
         // immediately. Therefore "Close" is marked with an "OK" icon.
         // Settings are only saved temporarily to the layer.
-        int answer = new ExtendedDialog(Main.parent,
+        ExtendedDialog d = new ExtendedDialog(Main.parent,
             tr("Adjust timezone and offset"),
-            p,
-            new String[] { tr("Close"),  tr("Default Values") },
-            new String[] { "ok.png", "dialogs/refresh.png"}
-        ).getValue();
-
+            new String[] { tr("Close"),  tr("Default Values") }           
+        );
+
+        d.setContent(p);
+        d.setButtonIcons(new String[] { "ok.png", "dialogs/refresh.png"});
+        d.showDialog();
+        int answer = d.getValue();
         // User wants default values; discard old result and re-open dialog
         if(answer == 2) {