Index: /trunk/src/org/openstreetmap/josm/actions/corrector/TagCorrector.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/corrector/TagCorrector.java	(revision 17596)
+++ /trunk/src/org/openstreetmap/josm/actions/corrector/TagCorrector.java	(revision 17597)
@@ -28,4 +28,5 @@
 import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.correction.RoleCorrectionTable;
@@ -115,5 +116,5 @@
                         tagCorrections);
                 final JScrollPane scrollPane = new JScrollPane(table);
-                p.add(scrollPane, GBC.eop().fill(GBC.HORIZONTAL));
+                p.add(scrollPane, GBC.eop().fill(GBC.BOTH));
 
                 tagTableMap.put(primitive, table);
@@ -141,5 +142,5 @@
                 final RoleCorrectionTable table = new RoleCorrectionTable(roleCorrections);
                 final JScrollPane scrollPane = new JScrollPane(table);
-                p.add(scrollPane, GBC.eop().fill(GBC.HORIZONTAL));
+                p.add(scrollPane, GBC.eop().fill(GBC.BOTH));
                 primitiveLabel.setLabelFor(table);
 
@@ -147,14 +148,13 @@
             }
 
-            int answer = JOptionPane.showOptionDialog(
+            ExtendedDialog dialog = new ExtendedDialog(
                     MainApplication.getMainFrame(),
-                    p,
                     tr("Automatic tag correction"),
-                    JOptionPane.YES_NO_CANCEL_OPTION,
-                    JOptionPane.PLAIN_MESSAGE,
-                    null,
-                    APPLICATION_OPTIONS,
-                    APPLICATION_OPTIONS[0]
+                    APPLICATION_OPTIONS
             );
+            dialog.setContent(p, false);
+            dialog.setButtonIcons("dialogs/edit", "dialogs/next", "cancel");
+            dialog.showDialog();
+            int answer = dialog.getValue();
 
             if (answer == JOptionPane.YES_OPTION) {