Index: trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java	(revision 10365)
+++ trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java	(revision 10367)
@@ -19,4 +19,5 @@
 import javax.swing.AbstractAction;
 import javax.swing.BorderFactory;
+import javax.swing.JButton;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
@@ -33,5 +34,4 @@
 import org.openstreetmap.josm.gui.HelpAwareOptionPane;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
-import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.help.HelpUtil;
 import org.openstreetmap.josm.gui.preferences.server.UserNameValidator;
@@ -201,5 +201,5 @@
         tfPassword.getDocument().addDocumentListener(runAuthorisationAction);
         tfUserName.getDocument().addDocumentListener(runAuthorisationAction);
-        pnl.add(new SideButton(runAuthorisationAction));
+        pnl.add(new JButton(runAuthorisationAction));
         return pnl;
     }
@@ -236,6 +236,6 @@
         // the actions
         JPanel pnl1 = new JPanel(new FlowLayout(FlowLayout.LEFT));
-        pnl1.add(new SideButton(new BackAction()));
-        pnl1.add(new SideButton(new TestAccessTokenAction()));
+        pnl1.add(new JButton(new BackAction()));
+        pnl1.add(new JButton(new TestAccessTokenAction()));
         gc.gridy = 2;
         pnl.add(pnl1, gc);
@@ -325,5 +325,5 @@
         RunAuthorisationAction() {
             putValue(NAME, tr("Authorize now"));
-            putValue(SMALL_ICON, ImageProvider.get("oauth", "oauth-small"));
+            new ImageProvider("oauth", "oauth-small").getResource().getImageIcon(this);
             putValue(SHORT_DESCRIPTION, tr("Click to redirect you to the authorization form on the JOSM web site"));
             updateEnabledState();
@@ -362,5 +362,5 @@
             putValue(NAME, tr("Back"));
             putValue(SHORT_DESCRIPTION, tr("Run the automatic authorization steps again"));
-            putValue(SMALL_ICON, ImageProvider.get("dialogs", "previous"));
+            new ImageProvider("dialogs", "previous").getResource().getImageIcon(this);
         }
 
@@ -377,5 +377,5 @@
         TestAccessTokenAction() {
             putValue(NAME, tr("Test Access Token"));
-            putValue(SMALL_ICON, ImageProvider.get("logo"));
+            new ImageProvider("logo").getResource().getImageIcon(this);
         }
 
Index: trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java	(revision 10365)
+++ trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java	(revision 10367)
@@ -16,4 +16,5 @@
 import javax.swing.AbstractAction;
 import javax.swing.BorderFactory;
+import javax.swing.JButton;
 import javax.swing.JCheckBox;
 import javax.swing.JLabel;
@@ -25,5 +26,4 @@
 
 import org.openstreetmap.josm.data.oauth.OAuthToken;
-import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.preferences.server.OAuthAccessTokenHolder;
 import org.openstreetmap.josm.gui.widgets.DefaultTextComponentValidator;
@@ -147,5 +147,5 @@
         JPanel pnl = new JPanel(new FlowLayout(FlowLayout.LEFT));
         TestAccessTokenAction actTestAccessToken = new TestAccessTokenAction();
-        pnl.add(new SideButton(actTestAccessToken));
+        pnl.add(new JButton(actTestAccessToken));
         this.addPropertyChangeListener(actTestAccessToken);
         return pnl;
@@ -223,5 +223,5 @@
         TestAccessTokenAction() {
             putValue(NAME, tr("Test Access Token"));
-            putValue(SMALL_ICON, ImageProvider.get("oauth", "oauth-small"));
+            new ImageProvider("oauth", "oauth-small").getResource().getImageIcon(this);
             putValue(SHORT_DESCRIPTION, tr("Click to test the Access Token"));
             updateEnabledState();
Index: trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java	(revision 10365)
+++ trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java	(revision 10367)
@@ -26,4 +26,5 @@
 import javax.swing.AbstractAction;
 import javax.swing.BorderFactory;
+import javax.swing.JButton;
 import javax.swing.JComponent;
 import javax.swing.JDialog;
@@ -42,5 +43,4 @@
 import org.openstreetmap.josm.data.oauth.OAuthParameters;
 import org.openstreetmap.josm.data.oauth.OAuthToken;
-import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.help.ContextSensitiveHelpAction;
 import org.openstreetmap.josm.gui.help.HelpUtil;
@@ -99,7 +99,7 @@
         pnlManualAuthorisationUI.addPropertyChangeListener(actAcceptAccessToken);
 
-        pnl.add(new SideButton(actAcceptAccessToken));
-        pnl.add(new SideButton(new CancelAction()));
-        pnl.add(new SideButton(new ContextSensitiveHelpAction(HelpUtil.ht("/Dialog/OAuthAuthorisationWizard"))));
+        pnl.add(new JButton(actAcceptAccessToken));
+        pnl.add(new JButton(new CancelAction()));
+        pnl.add(new JButton(new ContextSensitiveHelpAction(HelpUtil.ht("/Dialog/OAuthAuthorisationWizard"))));
 
         return pnl;
@@ -351,5 +351,5 @@
         CancelAction() {
             putValue(NAME, tr("Cancel"));
-            putValue(SMALL_ICON, ImageProvider.get("cancel"));
+            new ImageProvider("cancel").getResource().getImageIcon(this);
             putValue(SHORT_DESCRIPTION, tr("Close the dialog and cancel authorization"));
         }
@@ -373,5 +373,5 @@
         AcceptAccessTokenAction() {
             putValue(NAME, tr("Accept Access Token"));
-            putValue(SMALL_ICON, ImageProvider.get("ok"));
+            new ImageProvider("ok").getResource().getImageIcon(this);
             putValue(SHORT_DESCRIPTION, tr("Close the dialog and accept the Access Token"));
             updateEnabledState(null);
Index: trunk/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java	(revision 10365)
+++ trunk/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java	(revision 10367)
@@ -18,4 +18,5 @@
 import javax.swing.AbstractAction;
 import javax.swing.BorderFactory;
+import javax.swing.JButton;
 import javax.swing.JCheckBox;
 import javax.swing.JLabel;
@@ -23,5 +24,4 @@
 
 import org.openstreetmap.josm.data.oauth.OAuthToken;
-import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.preferences.server.OAuthAccessTokenHolder;
 import org.openstreetmap.josm.gui.util.GuiHelper;
@@ -195,5 +195,5 @@
 
             JPanel pnl1 = new JPanel(new FlowLayout(FlowLayout.LEFT));
-            pnl1.add(new SideButton(new RetrieveRequestTokenAction()));
+            pnl1.add(new JButton(new RetrieveRequestTokenAction()));
             gc.fill = GridBagConstraints.HORIZONTAL;
             gc.weightx = 1.0;
@@ -269,6 +269,6 @@
         protected JPanel buildActionPanel() {
             JPanel pnl = new JPanel(new FlowLayout(FlowLayout.LEFT));
-            pnl.add(new SideButton(new BackAction()));
-            pnl.add(new SideButton(new RetrieveAccessTokenAction()));
+            pnl.add(new JButton(new BackAction()));
+            pnl.add(new JButton(new RetrieveAccessTokenAction()));
             return pnl;
         }
@@ -292,5 +292,5 @@
                 putValue(NAME, tr("Back"));
                 putValue(SHORT_DESCRIPTION, tr("Go back to step 1/3"));
-                putValue(SMALL_ICON, ImageProvider.get("dialogs", "previous"));
+                new ImageProvider("dialogs", "previous").getResource().getImageIcon(this);
             }
 
@@ -349,6 +349,6 @@
         protected JPanel buildActionPanel() {
             JPanel pnl = new JPanel(new FlowLayout(FlowLayout.LEFT));
-            pnl.add(new SideButton(new RestartAction()));
-            pnl.add(new SideButton(new TestAccessTokenAction()));
+            pnl.add(new JButton(new RestartAction()));
+            pnl.add(new JButton(new TestAccessTokenAction()));
             return pnl;
         }
@@ -368,5 +368,5 @@
                 putValue(NAME, tr("Restart"));
                 putValue(SHORT_DESCRIPTION, tr("Go back to step 1/3"));
-                putValue(SMALL_ICON, ImageProvider.get("dialogs", "previous"));
+                new ImageProvider("dialogs", "previous").getResource().getImageIcon(this);
             }
 
@@ -389,5 +389,5 @@
         RetrieveRequestTokenAction() {
             putValue(NAME, tr("Retrieve Request Token"));
-            putValue(SMALL_ICON, ImageProvider.get("oauth", "oauth-small"));
+            new ImageProvider("oauth", "oauth-small").getResource().getImageIcon(this);
             putValue(SHORT_DESCRIPTION, tr("Click to retrieve a Request Token"));
         }
@@ -425,5 +425,5 @@
         RetrieveAccessTokenAction() {
             putValue(NAME, tr("Retrieve Access Token"));
-            putValue(SMALL_ICON, ImageProvider.get("oauth", "oauth-small"));
+            new ImageProvider("oauth", "oauth-small").getResource().getImageIcon(this);
             putValue(SHORT_DESCRIPTION, tr("Click to retrieve an Access Token"));
         }
@@ -462,5 +462,5 @@
         TestAccessTokenAction() {
             putValue(NAME, tr("Test Access Token"));
-            putValue(SMALL_ICON, ImageProvider.get("oauth", "oauth-small"));
+            new ImageProvider("oauth", "oauth-small").getResource().getImageIcon(this);
             putValue(SHORT_DESCRIPTION, tr("Click to test the Access Token"));
         }