Index: trunk/src/org/openstreetmap/josm/actions/JosmAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/JosmAction.java	(revision 19121)
+++ trunk/src/org/openstreetmap/josm/actions/JosmAction.java	(revision 19122)
@@ -537,5 +537,5 @@
         if (!answer && JOptionPane.NO_OPTION == ConditionalOptionPaneUtil.getDialogReturnValue(preferenceKey)) {
             String message = tr("Operation was not performed, as per {0} preference", preferenceKey);
-            new Notification(message).show();
+            new Notification(message).setIcon(JOptionPane.INFORMATION_MESSAGE).show();
             Logging.info(message);
         }
Index: trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java	(revision 19121)
+++ trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java	(revision 19122)
@@ -167,5 +167,5 @@
                     String message = tr("Unable to locate file  ''{0}''.", file.getPath());
                     Logging.warn(message);
-                    new Notification(message).show();
+                    new Notification(message).setIcon(JOptionPane.WARNING_MESSAGE).show();
                 }
             }
Index: trunk/src/org/openstreetmap/josm/actions/ToggleUploadDiscouragedLayerAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/ToggleUploadDiscouragedLayerAction.java	(revision 19121)
+++ trunk/src/org/openstreetmap/josm/actions/ToggleUploadDiscouragedLayerAction.java	(revision 19122)
@@ -12,4 +12,5 @@
 import javax.swing.JCheckBoxMenuItem;
 
+import javax.swing.JOptionPane;
 import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
@@ -44,5 +45,5 @@
         layer.setUploadDiscouraged(!layer.isUploadDiscouraged());
         String msg = layer.isUploadDiscouraged() ? tr("Upload is discouraged") : tr("Upload is encouraged");
-        GuiHelper.runInEDT(() -> new Notification(msg).show());
+        GuiHelper.runInEDT(() -> new Notification(msg).setIcon(JOptionPane.INFORMATION_MESSAGE).show());
         LayerListDialog.getInstance().repaint();
     }
Index: trunk/src/org/openstreetmap/josm/actions/UploadAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/UploadAction.java	(revision 19121)
+++ trunk/src/org/openstreetmap/josm/actions/UploadAction.java	(revision 19122)
@@ -266,5 +266,5 @@
     public void uploadData(final OsmDataLayer layer, APIDataSet apiData) {
         if (apiData.isEmpty()) {
-            new Notification(tr("No changes to upload.")).show();
+            new Notification(tr("No changes to upload.")).setIcon(JOptionPane.INFORMATION_MESSAGE).show();
             return;
         }
@@ -273,5 +273,7 @@
                 realUploadData(layer, apiData);
             } else {
-                new Notification(tr("One of the upload verification processes failed")).show();
+                new Notification(tr("One of the upload verification processes failed"))
+                        .setIcon(JOptionPane.WARNING_MESSAGE)
+                        .show();
             }
         }));
@@ -342,5 +344,5 @@
             return;
         if (MainApplication.getMap() == null) {
-            new Notification(tr("Nothing to upload. Get some data first.")).show();
+            new Notification(tr("Nothing to upload. Get some data first.")).setIcon(JOptionPane.INFORMATION_MESSAGE).show();
             return;
         }
Index: trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java	(revision 19121)
+++ trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java	(revision 19122)
@@ -14,4 +14,5 @@
 import java.util.stream.Collectors;
 
+import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
 
@@ -97,5 +98,5 @@
         Collection<OsmPrimitive> deletedCandidates = getDeletedPrimitives(editLayer.getDataSet());
         if (modifiedCandidates.isEmpty() && deletedCandidates.isEmpty()) {
-            new Notification(tr("No changes to upload.")).show();
+            new Notification(tr("No changes to upload.")).setIcon(JOptionPane.INFORMATION_MESSAGE).show();
             return;
         }
@@ -110,5 +111,5 @@
         Collection<OsmPrimitive> toUpload = new UploadHullBuilder().build(dialog.getSelectedPrimitives());
         if (toUpload.isEmpty()) {
-            new Notification(tr("No changes to upload.")).show();
+            new Notification(tr("No changes to upload.")).setIcon(JOptionPane.INFORMATION_MESSAGE).show();
             return;
         }
Index: trunk/src/org/openstreetmap/josm/actions/ViewportFollowToggleAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/ViewportFollowToggleAction.java	(revision 19121)
+++ trunk/src/org/openstreetmap/josm/actions/ViewportFollowToggleAction.java	(revision 19122)
@@ -8,4 +8,5 @@
 import java.awt.event.KeyEvent;
 
+import javax.swing.JOptionPane;
 import org.openstreetmap.josm.actions.mapmode.DrawAction;
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
@@ -53,5 +54,5 @@
                     ? tr("Viewport following is enabled, press {0} to disable it", getShortcut().getKeyText())
                     : tr("Viewport following is disabled");
-            GuiHelper.runInEDT(() -> new Notification(msg).show());
+            GuiHelper.runInEDT(() -> new Notification(msg).setIcon(JOptionPane.INFORMATION_MESSAGE).show());
         }
         notifySelectedState();
Index: trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java	(revision 19121)
+++ trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java	(revision 19122)
@@ -316,5 +316,5 @@
                 }
                 if (!GraphicsEnvironment.isHeadless()) {
-                    new Notification(msg).show();
+                    new Notification(msg).setIcon(JOptionPane.INFORMATION_MESSAGE).show();
                 }
             } else {
Index: trunk/src/org/openstreetmap/josm/gui/MapStatus.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MapStatus.java	(revision 19121)
+++ trunk/src/org/openstreetmap/josm/gui/MapStatus.java	(revision 19122)
@@ -50,4 +50,5 @@
 import javax.swing.JLabel;
 import javax.swing.JMenuItem;
+import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
@@ -1017,4 +1018,5 @@
         if (Config.getPref().getBoolean("statusbar.notify.change-system-of-measurement", true)) {
             new Notification(tr("System of measurement changed to {0}", som.toString()))
+                .setIcon(JOptionPane.INFORMATION_MESSAGE)
                 .setDuration(Notification.TIME_SHORT)
                 .show();
Index: trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java	(revision 19121)
+++ trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java	(revision 19122)
@@ -516,5 +516,5 @@
             try {
                 new Notification(HttpClient.create(new URL(tile.getUrl() + '/' + request))
-                        .connect().fetchContent()).show();
+                        .connect().fetchContent()).setIcon(JOptionPane.INFORMATION_MESSAGE).show();
             } catch (IOException ex) {
                 Logging.error(ex);
Index: trunk/src/org/openstreetmap/josm/gui/layer/AutosaveTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/AutosaveTask.java	(revision 19121)
+++ trunk/src/org/openstreetmap/josm/gui/layer/AutosaveTask.java	(revision 19122)
@@ -53,4 +53,5 @@
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.spi.preferences.Config;
+import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Utils;
@@ -273,6 +274,7 @@
     protected void displayNotification() {
         new Notification(tr("Your work has been saved automatically."))
-        .setDuration(Notification.TIME_SHORT)
-        .show();
+                .setIcon(ImageProvider.get("save"))
+                .setDuration(Notification.TIME_SHORT)
+                .show();
     }