Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java	(revision 10437)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java	(revision 10438)
@@ -24,4 +24,5 @@
 import javax.swing.DefaultListSelectionModel;
 import javax.swing.ImageIcon;
+import javax.swing.JButton;
 import javax.swing.JComponent;
 import javax.swing.JFrame;
@@ -49,5 +50,4 @@
 import org.openstreetmap.josm.gui.HelpAwareOptionPane;
 import org.openstreetmap.josm.gui.JosmUserIdentityManager;
-import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.dialogs.changeset.query.ChangesetQueryDialog;
 import org.openstreetmap.josm.gui.help.ContextSensitiveHelpAction;
@@ -71,11 +71,4 @@
 public class ChangesetCacheManager extends JFrame {
 
-    // CHECKSTYLE.OFF: SingleSpaceSeparator
-    /** The changeset download icon **/
-    public static final ImageIcon DOWNLOAD_CONTENT_ICON = ImageProvider.get("dialogs/changeset", "downloadchangesetcontent");
-    /** The changeset update icon **/
-    public static final ImageIcon UPDATE_CONTENT_ICON   = ImageProvider.get("dialogs/changeset", "updatechangesetcontent");
-    // CHECKSTYLE.ON: SingleSpaceSeparator
-
     /** the unique instance of the cache manager  */
     private static volatile ChangesetCacheManager instance;
@@ -134,8 +127,8 @@
         JPanel pnl = new JPanel(new FlowLayout(FlowLayout.LEFT));
 
-        SideButton btn = new SideButton(new QueryAction());
+        JButton btn = new JButton(new QueryAction());
         pnl.add(btn);
         pnl.add(new SingleChangesetDownloadPanel());
-        pnl.add(new SideButton(new DownloadMyChangesets()));
+        pnl.add(new JButton(new DownloadMyChangesets()));
 
         return pnl;
@@ -151,8 +144,8 @@
 
         //-- cancel and close action
-        pnl.add(new SideButton(new CancelAction()));
+        pnl.add(new JButton(new CancelAction()));
 
         //-- help action
-        pnl.add(new SideButton(new ContextSensitiveHelpAction(HelpUtil.ht("/Dialog/ChangesetManager"))));
+        pnl.add(new JButton(new ContextSensitiveHelpAction(HelpUtil.ht("/Dialog/ChangesetManager"))));
 
         return pnl;
@@ -359,5 +352,5 @@
         CancelAction() {
             putValue(NAME, tr("Close"));
-            putValue(SMALL_ICON, ImageProvider.get("cancel"));
+            new ImageProvider("cancel").getResource().attachImageIcon(this);
             putValue(SHORT_DESCRIPTION, tr("Close the dialog"));
         }
@@ -380,5 +373,5 @@
         QueryAction() {
             putValue(NAME, tr("Query"));
-            putValue(SMALL_ICON, ImageProvider.get("dialogs", "search"));
+            new ImageProvider("dialogs", "search").getResource().attachImageIcon(this);
             putValue(SHORT_DESCRIPTION, tr("Launch the dialog for querying changesets"));
             setEnabled(!Main.isOffline(OnlineResource.OSM_API));
@@ -416,5 +409,5 @@
         RemoveFromCacheAction(ChangesetCacheManagerModel model) {
             putValue(NAME, tr("Remove from cache"));
-            putValue(SMALL_ICON, ImageProvider.get("dialogs", "delete"));
+            new ImageProvider("dialogs", "delete").getResource().attachImageIcon(this);
             putValue(SHORT_DESCRIPTION, tr("Remove the selected changesets from the local cache"));
             this.model = model;
@@ -446,5 +439,5 @@
         CloseSelectedChangesetsAction(ChangesetCacheManagerModel model) {
             putValue(NAME, tr("Close"));
-            putValue(SMALL_ICON, ImageProvider.get("closechangeset"));
+            new ImageProvider("closechangeset").getResource().attachImageIcon(this);
             putValue(SHORT_DESCRIPTION, tr("Close the selected changesets"));
             this.model = model;
@@ -490,5 +483,5 @@
         DownloadSelectedChangesetsAction(ChangesetCacheManagerModel model) {
             putValue(NAME, tr("Update changeset"));
-            putValue(SMALL_ICON, ImageProvider.get("dialogs/changeset", "updatechangeset"));
+            new ImageProvider("dialogs/changeset", "updatechangeset").getResource().attachImageIcon(this);
             putValue(SHORT_DESCRIPTION, tr("Updates the selected changesets with current data from the OSM server"));
             this.model = model;
@@ -523,5 +516,5 @@
         DownloadSelectedChangesetContentAction(ChangesetCacheManagerModel model) {
             putValue(NAME, tr("Download changeset content"));
-            putValue(SMALL_ICON, DOWNLOAD_CONTENT_ICON);
+            new ImageProvider("dialogs/changeset", "downloadchangesetcontent").getResource().attachImageIcon(this);
             putValue(SHORT_DESCRIPTION, tr("Download the content of the selected changesets from the server"));
             this.model = model;
@@ -570,5 +563,5 @@
         DownloadMyChangesets() {
             putValue(NAME, tr("My changesets"));
-            putValue(SMALL_ICON, ImageProvider.get("dialogs/changeset", "downloadchangeset"));
+            new ImageProvider("dialogs/changeset", "downloadchangeset").getResource().attachImageIcon(this);
             putValue(SHORT_DESCRIPTION, tr("Download my changesets from the OSM server (max. 100 changesets)"));
             setEnabled(!Main.isOffline(OnlineResource.OSM_API));
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java	(revision 10437)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java	(revision 10438)
@@ -253,5 +253,5 @@
         ShowHistoryAction() {
             putValue(NAME, tr("Show history"));
-            putValue(SMALL_ICON, ImageProvider.get("dialogs", "history"));
+            new ImageProvider("dialogs", "history").getResource().attachImageIcon(this);
             putValue(SHORT_DESCRIPTION, tr("Download and show the history of the selected objects"));
             updateEnabledState();
@@ -371,5 +371,5 @@
         SelectInCurrentLayerAction() {
             putValue(NAME, tr("Select in layer"));
-            putValue(SMALL_ICON, ImageProvider.get("dialogs", "select"));
+            new ImageProvider("dialogs", "select").getResource().attachImageIcon(this);
             putValue(SHORT_DESCRIPTION, tr("Select the corresponding primitives in the current data layer"));
             updateEnabledState();
@@ -394,5 +394,5 @@
         ZoomInCurrentLayerAction() {
             putValue(NAME, tr("Zoom to in layer"));
-            putValue(SMALL_ICON, ImageProvider.get("dialogs/autoscale", "selection"));
+            new ImageProvider("dialogs/autoscale", "selection").getResource().attachImageIcon(this);
             putValue(SHORT_DESCRIPTION, tr("Zoom to the corresponding objects in the current data layer"));
             updateEnabledState();
@@ -442,5 +442,5 @@
                 putValue(NAME, tr("Download now"));
                 putValue(SHORT_DESCRIPTION, tr("Download the changeset content"));
-                putValue(SMALL_ICON, ChangesetCacheManager.DOWNLOAD_CONTENT_ICON);
+                new ImageProvider("dialogs/changeset", "downloadchangesetcontent").getResource().attachImageIcon(this);
             }
 
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java	(revision 10437)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java	(revision 10438)
@@ -273,5 +273,5 @@
         RemoveFromCacheAction() {
             putValue(NAME, tr("Remove from cache"));
-            putValue(SMALL_ICON, ImageProvider.get("dialogs", "delete"));
+            new ImageProvider("dialogs", "delete").getResource().attachImageIcon(this);
             putValue(SHORT_DESCRIPTION, tr("Remove the changeset in the detail view panel from the local cache"));
         }
@@ -296,5 +296,5 @@
         UpdateChangesetAction() {
             putValue(NAME, tr("Update changeset"));
-            putValue(SMALL_ICON, ChangesetCacheManager.UPDATE_CONTENT_ICON);
+            new ImageProvider("dialogs/changeset", "updatechangesetcontent").getResource().attachImageIcon(this);
             putValue(SHORT_DESCRIPTION, tr("Update the changeset from the OSM server"));
         }
@@ -324,5 +324,5 @@
         SelectInCurrentLayerAction() {
             putValue(NAME, tr("Select in layer"));
-            putValue(SMALL_ICON, ImageProvider.get("dialogs", "select"));
+            new ImageProvider("dialogs", "select").getResource().attachImageIcon(this);
             putValue(SHORT_DESCRIPTION, tr("Select the primitives in the content of this changeset in the current data layer"));
             updateEnabledState();
@@ -385,5 +385,5 @@
         ZoomInCurrentLayerAction() {
             putValue(NAME, tr("Zoom to in layer"));
-            putValue(SMALL_ICON, ImageProvider.get("dialogs/autoscale", "selection"));
+            new ImageProvider("dialogs/autoscale", "selection").getResource().attachImageIcon(this);
             putValue(SHORT_DESCRIPTION, tr("Zoom to the objects in the content of this changeset in the current data layer"));
             updateEnabledState();
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDiscussionPanel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDiscussionPanel.java	(revision 10437)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDiscussionPanel.java	(revision 10438)
@@ -25,4 +25,5 @@
 import org.openstreetmap.josm.data.osm.Changeset;
 import org.openstreetmap.josm.io.OnlineResource;
+import org.openstreetmap.josm.tools.ImageProvider;
 
 /**
@@ -64,5 +65,5 @@
         UpdateChangesetDiscussionAction() {
             putValue(NAME, tr("Update changeset discussion"));
-            putValue(SMALL_ICON, ChangesetCacheManager.UPDATE_CONTENT_ICON);
+            new ImageProvider("dialogs/changeset", "updatechangesetcontent").getResource().attachImageIcon(this);
             putValue(SHORT_DESCRIPTION, tr("Update the changeset discussion from the OSM server"));
         }
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/DownloadChangesetContentAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/DownloadChangesetContentAction.java	(revision 10437)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/DownloadChangesetContentAction.java	(revision 10438)
@@ -11,4 +11,5 @@
 import org.openstreetmap.josm.actions.downloadtasks.ChangesetContentDownloadTask;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.ImageProvider;
 
 /**
@@ -26,5 +27,5 @@
         CheckParameterUtil.ensureParameterNotNull(component, "component");
         putValue(NAME, tr("Download content"));
-        putValue(SMALL_ICON, ChangesetCacheManager.DOWNLOAD_CONTENT_ICON);
+        new ImageProvider("dialogs/changeset", "downloadchangesetcontent").getResource().attachImageIcon(this);
         putValue(SHORT_DESCRIPTION, tr("Download the changeset content from the OSM server"));
         this.component = component;
@@ -51,9 +52,9 @@
         if (component.getCurrentChangeset().getContent() == null) {
             putValue(NAME, tr("Download content"));
-            putValue(SMALL_ICON, ChangesetCacheManager.DOWNLOAD_CONTENT_ICON);
+            new ImageProvider("dialogs/changeset", "downloadchangesetcontent").getResource().attachImageIcon(this);
             putValue(SHORT_DESCRIPTION, tr("Download the changeset content from the OSM server"));
         } else {
             putValue(NAME, tr("Update content"));
-            putValue(SMALL_ICON, ChangesetCacheManager.UPDATE_CONTENT_ICON);
+            new ImageProvider("dialogs/changeset", "updatechangesetcontent").getResource().attachImageIcon(this);
             putValue(SHORT_DESCRIPTION, tr("Update the changeset content from the OSM server"));
         }
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java	(revision 10437)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java	(revision 10438)
@@ -22,4 +22,5 @@
 import org.openstreetmap.josm.gui.widgets.SelectAllOnFocusGainedDecorator;
 import org.openstreetmap.josm.io.OnlineResource;
+import org.openstreetmap.josm.tools.ImageProvider;
 
 /**
@@ -80,5 +81,5 @@
 
         DownloadAction() {
-            putValue(SMALL_ICON, ChangesetCacheManager.DOWNLOAD_CONTENT_ICON);
+            new ImageProvider("dialogs/changeset", "downloadchangesetcontent").getResource().attachImageIcon(this);
             putValue(SHORT_DESCRIPTION, tr("Download the changeset with the specified id, including the changeset content"));
             updateEnabledState();