Index: /applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java
===================================================================
--- /applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java	(revision 27956)
+++ /applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java	(revision 27957)
@@ -4,9 +4,7 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.awt.GridLayout;
 import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
 import java.text.DecimalFormat;
@@ -14,4 +12,5 @@
 import java.util.Collection;
 
+import javax.swing.AbstractAction;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
@@ -24,4 +23,6 @@
 import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
+import org.openstreetmap.josm.gui.help.HelpUtil;
+import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -31,6 +32,5 @@
  * @author ramack
  */
-public class MeasurementDialog extends ToggleDialog implements ActionListener
-{
+public class MeasurementDialog extends ToggleDialog {
     private static final long serialVersionUID = 4708541586297950021L;
 
@@ -69,6 +69,17 @@
         KeyEvent.VK_U, Shortcut.CTRL_SHIFT), 150);
 
-        resetButton = new SideButton(marktr("Reset"), "select", "Measurement",
-                tr("Reset current measurement results and delete measurement path."), this);
+        resetButton = new SideButton(new AbstractAction() {
+        	{
+        		putValue(NAME, marktr("Reset"));
+        		putValue(SMALL_ICON,ImageProvider.get("dialogs", "select"));
+        		putValue(SHORT_DESCRIPTION, tr("Reset current measurement results and delete measurement path."));
+        		putValue("help", HelpUtil.ht("/Dialog/Measurement#Reset"));
+        	}
+            @Override
+            public void actionPerformed(ActionEvent e)
+            {
+            	resetValues();
+            }
+        });
 
         JPanel valuePanel = new JPanel(new GridLayout(0,2));
@@ -149,13 +160,4 @@
     }
 
-    @Override
-    public void actionPerformed(ActionEvent e)
-    {
-        String actionCommand = e.getActionCommand();
-        if( actionCommand.equals("Reset")){
-            resetValues();
-        }
-    }
-
     /**
      * Cleans the active Meausurement Layer