Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditDialog.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditDialog.java	(revision 33962)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditDialog.java	(revision 33963)
@@ -45,4 +45,5 @@
 import org.openstreetmap.josm.plugins.fixAddresses.StringUtils;
 import org.openstreetmap.josm.plugins.fixAddresses.gui.actions.AbstractAddressEditAction;
+import org.openstreetmap.josm.plugins.fixAddresses.gui.actions.ApplyAllGuessesAction;
 import org.openstreetmap.josm.plugins.fixAddresses.gui.actions.AddressActions;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -61,12 +62,11 @@
     private JTable streetTable;
 
+    private ApplyAllGuessesAction applyGuessesAction = AddressActions.getApplyGuessesAction();
     private AbstractAddressEditAction[] actions = new AbstractAddressEditAction[] {
         AddressActions.getResolveAction(),
         AddressActions.getGuessAddressAction(),
-        AddressActions.getApplyGuessesAction(),
-        AddressActions.getSelectAction(),
+        applyGuessesAction,
         AddressActions.getRemoveTagsAction(),
-        AddressActions.getConvertToRelationAction(),
-        AddressActions.getConvertAllToRelationAction()
+        AddressActions.getSelectAction()
     };
 
@@ -126,5 +126,5 @@
             unresolvedTable.getSelectionModel().addListSelectionListener(this);
             unresolvedTable.getSelectionModel().addListSelectionListener(new IncompleteAddressListener());
-            unresolvedTable.addMouseListener(AddressActions.getApplyGuessesAction());
+            unresolvedTable.addMouseListener(applyGuessesAction);
 
             JTableHeader header = unresolvedTable.getTableHeader();
@@ -146,19 +146,9 @@
             try {
                 JPanel unresolvedButtons = new JPanel(new GridLayout(2, 5, 5, 5));
-                SideButton assign = new SideButton(AddressActions.getResolveAction());
-                unresolvedButtons.add(assign);
-
-                SideButton guess = new SideButton(AddressActions.getGuessAddressAction());
-                unresolvedButtons.add(guess);
-                SideButton applyAllGuesses = new SideButton(AddressActions.getApplyGuessesAction());
-                unresolvedButtons.add(applyAllGuesses);
-
-                SideButton removeAddressTags = new SideButton(AddressActions.getRemoveTagsAction());
-                unresolvedButtons.add(removeAddressTags);
-
-                unresolvedButtons.add(new JPanel());
-
-                SideButton selectInMap = new SideButton(AddressActions.getSelectAction());
-                unresolvedButtons.add(selectInMap);
+                for (AbstractAddressEditAction action : actions) {
+                    action.setContainer(addressEditContainer);
+                    SideButton button = new SideButton(action);
+                    unresolvedButtons.add(button);
+                }
                 headerPanel2.setMinimumSize(new Dimension(100, 70));
 
@@ -202,8 +192,4 @@
         } else {
             this.getContentPane().add(new JLabel(tr("(No data)")), BorderLayout.CENTER);
-        }
-
-        for (int i = 0; i < actions.length; i++) {
-            actions[i].setContainer(addressEditContainer);
         }