Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/MoveDownAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/MoveDownAction.java	(revision 16804)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/MoveDownAction.java	(revision 16807)
@@ -24,5 +24,5 @@
     public MoveDownAction(IRelationEditorActionAccess editorAccess, String actionMapKey) {
         super(editorAccess, actionMapKey, IRelationEditorUpdateOn.MEMBER_TABLE_SELECTION);
-        new ImageProvider("dialogs", "movedown").getResource().attachImageIcon(this, true);
+        new ImageProvider("dialogs", "down").getResource().attachImageIcon(this, true);
         Shortcut sc = Shortcut.registerShortcut("relationeditor:movedown", tr("Relation Editor: Move Down"), KeyEvent.VK_DOWN, Shortcut.ALT);
         sc.setAccelerator(this);
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/MoveUpAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/MoveUpAction.java	(revision 16804)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/MoveUpAction.java	(revision 16807)
@@ -24,5 +24,5 @@
     public MoveUpAction(IRelationEditorActionAccess editorAccess, String actionMapKey) {
         super(editorAccess, actionMapKey, IRelationEditorUpdateOn.MEMBER_TABLE_SELECTION);
-        new ImageProvider("dialogs", "moveup").getResource().attachImageIcon(this, true);
+        new ImageProvider("dialogs", "up").getResource().attachImageIcon(this, true);
         Shortcut sc = Shortcut.registerShortcut("relationeditor:moveup", tr("Relation Editor: Move Up"), KeyEvent.VK_UP, Shortcut.ALT);
         sc.setAccelerator(this);
Index: trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java	(revision 16804)
+++ trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java	(revision 16807)
@@ -93,5 +93,5 @@
                 new ButtonSpec(
                         tr("Go back to Upload Dialog"),
-                        new ImageProvider("dialogs", "uploadproperties"),
+                        new ImageProvider("preference"),
                         tr("Click to return to the Upload Dialog"),
                         null /* no specific help text */
Index: trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java	(revision 16804)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java	(revision 16807)
@@ -795,8 +795,8 @@
             JButton b = new JButton();
             if ("up".equals(name)) {
-                b.setIcon(ImageProvider.get("dialogs", "moveup", ImageSizes.LARGEICON));
+                b.setIcon(ImageProvider.get("dialogs", "up", ImageSizes.LARGEICON));
                 b.setToolTipText(tr("Move the currently selected members up"));
             } else if ("down".equals(name)) {
-                b.setIcon(ImageProvider.get("dialogs", "movedown", ImageSizes.LARGEICON));
+                b.setIcon(ImageProvider.get("dialogs", "down", ImageSizes.LARGEICON));
                 b.setToolTipText(tr("Move the currently selected members down"));
             } else if ("<".equals(name)) {