Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/ConflictResolver.java
===================================================================
--- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/ConflictResolver.java	(revision 18404)
+++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/ConflictResolver.java	(revision 18408)
@@ -65,5 +65,6 @@
 
         // And finalize initializing the form.
-        setupDialog(mainPanel, new String[] {});
+        setContent(mainPanel);
+        setupDialog();
         // TODO: Why does it always crash if the modality is set in constructor?
         setModal(false);
Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/HouseEditor.java
===================================================================
--- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/HouseEditor.java	(revision 18404)
+++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/HouseEditor.java	(revision 18408)
@@ -34,5 +34,7 @@
 
         // And finalize initializing the form.
-        setupDialog(mainPanel, new String[] {"ok.png", "cancel.png"});
+        setContent(mainPanel);
+        this.setButtonIcons(new String[] {"ok.png", "cancel.png"});
+        setupDialog();
     }
 
Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/StreetEditor.java
===================================================================
--- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/StreetEditor.java	(revision 18404)
+++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/StreetEditor.java	(revision 18408)
@@ -45,5 +45,7 @@
 
         // And finalize initializing the form.
-        setupDialog(mainPanel, new String[] {"ok.png", "cancel.png"});
+        setContent(mainPanel);
+        this.setButtonIcons(new String[] {"ok.png", "cancel.png"});
+        setupDialog();
     }
 
Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/SuburbEditor.java
===================================================================
--- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/SuburbEditor.java	(revision 18404)
+++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/SuburbEditor.java	(revision 18408)
@@ -53,5 +53,7 @@
 
         // And finalize initializing the form.
-        setupDialog(mainPanel, new String[] {"ok.png", "cancel.png"});
+        setContent(mainPanel);
+        this.setButtonIcons(new String[] {"ok.png", "cancel.png"});
+        setupDialog();
     }