Index: /applications/editors/josm/plugins/AddressEdit/.externalToolBuilders/JOSM-Ant.launch
===================================================================
--- /applications/editors/josm/plugins/AddressEdit/.externalToolBuilders/JOSM-Ant.launch	(revision 23879)
+++ /applications/editors/josm/plugins/AddressEdit/.externalToolBuilders/JOSM-Ant.launch	(revision 23879)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
+<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/AddressEdit/build.xml"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="AddressEdit"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/AddressEdit/build.xml}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+</launchConfiguration>
Index: /applications/editors/josm/plugins/AddressEdit/.externalToolBuilders/org.eclipse.jdt.core.javabuilder (2).launch
===================================================================
--- /applications/editors/josm/plugins/AddressEdit/.externalToolBuilders/org.eclipse.jdt.core.javabuilder (2).launch	(revision 23879)
+++ /applications/editors/josm/plugins/AddressEdit/.externalToolBuilders/org.eclipse.jdt.core.javabuilder (2).launch	(revision 23879)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.ui.externaltools.ProgramBuilderLaunchConfigurationType">
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_DISABLED_BUILDER" value="org.eclipse.jdt.core.javabuilder"/>
+<mapAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+</launchConfiguration>
Index: /applications/editors/josm/plugins/AddressEdit/.project
===================================================================
--- /applications/editors/josm/plugins/AddressEdit/.project	(revision 23878)
+++ /applications/editors/josm/plugins/AddressEdit/.project	(revision 23879)
@@ -7,6 +7,21 @@
 	<buildSpec>
 		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
+			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+			<triggers>full,incremental,</triggers>
 			<arguments>
+				<dictionary>
+					<key>LaunchConfigHandle</key>
+					<value>&lt;project&gt;/.externalToolBuilders/org.eclipse.jdt.core.javabuilder (2).launch</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+				<dictionary>
+					<key>LaunchConfigHandle</key>
+					<value>&lt;project&gt;/.externalToolBuilders/JOSM-Ant.launch</value>
+				</dictionary>
 			</arguments>
 		</buildCommand>
Index: /applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/AddressEditDialog.java
===================================================================
--- /applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/AddressEditDialog.java	(revision 23878)
+++ /applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/AddressEditDialog.java	(revision 23879)
@@ -46,4 +46,5 @@
 import org.openstreetmap.josm.data.osm.Tag;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.dialogs.properties.PresetListPanel.PresetHandler;
 import org.openstreetmap.josm.plugins.addressEdit.AddressEditContainer;
@@ -57,6 +58,5 @@
 	private static final String UNRESOLVED_HEADER_FMT = tr("Unresolved Addresses (%d)");
 	private static final String STREET_HEADER_FMT = tr("Streets (%d)");
-	private static final String CANCEL_COMMAND = "Cancel";
-	private static final String OK_COMMAND = "Ok";
+	private static final String OK_COMMAND = tr("Close");
 	/**
 	 * 
@@ -119,5 +119,5 @@
 			
 			JPanel unresolvedButtons = new JPanel(new FlowLayout());
-			JButton assign = new JButton(resolveAction);
+			SideButton assign = new SideButton(resolveAction, "assignstreet_24");															   
 			unresolvedButtons.add(assign);
 			unresolvedPanel.add(unresolvedButtons, BorderLayout.SOUTH);
@@ -143,7 +143,4 @@
 		JButton ok = new JButton(OK_COMMAND);
 		ok.addActionListener(this);
-		buttonPanel.add(ok);
-		
-		// JMapViewer
 		
 		// Murks
@@ -151,4 +148,7 @@
 			buttonPanel.add(new JSeparator());
 		}
+
+		buttonPanel.add(ok);
+		
 		
 		this.getContentPane().add(buttonPanel, BorderLayout.SOUTH);
@@ -174,9 +174,4 @@
 	public void actionPerformed(ActionEvent e) {
 		if (OK_COMMAND.equals(e.getActionCommand())) {
-			this.setVisible(false);
-		}
-		
-		// TODO: Check, if there is some kind of undo; otherwise this button is not necessary
-		if (CANCEL_COMMAND.equals(e.getActionCommand())) {
 			this.setVisible(false);
 		}