Index: applications/editors/josm/plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java
===================================================================
--- applications/editors/josm/plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java	(revision 17551)
+++ applications/editors/josm/plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java	(revision 17552)
@@ -147,11 +147,13 @@
         ExtendedDialog diag = new ExtendedDialog(Main.parent,
                 tr("Add Rectified Image"),
-                panel,
-                new String[] {tr("Add Rectified Image"), tr("Cancel")},
-                new String[] {"OLmarker.png", "cancel.png"});
+
+                new String[] {tr("Add Rectified Image"), tr("Cancel")});
+        diag.setContent(panel);
+        diag.setButtonIcons(new String[] {"OLmarker.png", "cancel.png"});
 
         // This repeatedly shows the dialog in case there has been an error.
         // The loop is break;-ed if the users cancels
         outer: while(true) {
+        	diag.showDialog();
             int answer = diag.getValue();
             // Break loop when the user cancels
Index: applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java
===================================================================
--- applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java	(revision 17551)
+++ applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java	(revision 17552)
@@ -173,6 +173,13 @@
        pnl.add(layerList, GBC.eol());
    
-       int decision = new ExtendedDialog(Main.parent, tr("Select WMS layer"), pnl, new String[] { tr("Start adjusting"),
-           tr("Cancel") }, new String[] { "mapmode/adjustwms", "cancel" }).getValue();
+       ExtendedDialog diag = new ExtendedDialog(
+    		   Main.parent, 
+    		   tr("Select WMS layer"), 
+    		   new String[] { tr("Start adjusting"),tr("Cancel") }
+    		   );
+       diag.setContent(pnl);
+       diag.setButtonIcons(new String[] { "mapmode/adjustwms", "cancel" });
+       diag.showDialog();
+       int decision = diag.getValue();
        if (decision != 1)
            return null;