Index: src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java
==============
--- UploadSelectionDialog.java	
+++ proposed-UploadSelectionDialog.java
@@ -262,7 +262,6 @@
 
     class CancelAction extends AbstractAction {
         CancelAction() {
-            putValue(Action.SHORT_DESCRIPTION, tr("Cancel uploading"));
             putValue(Action.NAME, tr("Cancel"));
             new ImageProvider("cancel").getResource().attachImageIcon(this);
             InputMapUtils.addEscapeAction(getRootPane(), this);
@@ -278,9 +277,8 @@
 
     class ContinueAction extends AbstractAction implements ListSelectionListener {
         ContinueAction() {
-            putValue(Action.SHORT_DESCRIPTION, tr("Continue uploading"));
-            putValue(Action.NAME, tr("Continue"));
-            new ImageProvider("upload").getResource().attachImageIcon(this);
+            putValue(Action.NAME, tr("Continue"));
+            new ImageProvider("ok").getResource().attachImageIcon(this);
             updateEnabledState();
         }