diff --git a/apps/desktopgui/resources/images/logo.png b/apps/desktopgui/resources/images/logo.png
new file mode 100644
index 000000000..ad89a9864
Binary files /dev/null and b/apps/desktopgui/resources/images/logo.png differ
diff --git a/apps/desktopgui/src/net/i2p/desktopgui/TrayManager.java b/apps/desktopgui/src/net/i2p/desktopgui/TrayManager.java
index 01a5d611f..17b472d8a 100644
--- a/apps/desktopgui/src/net/i2p/desktopgui/TrayManager.java
+++ b/apps/desktopgui/src/net/i2p/desktopgui/TrayManager.java
@@ -62,6 +62,7 @@ public abstract class TrayManager {
         if(SystemTray.isSupported()) {
             tray = SystemTray.getSystemTray();
             trayIcon = new TrayIcon(getTrayImage(), "I2P", getMainMenu());
+            trayIcon.setImageAutoSize(true); //Resize image to fit the system tray
             try {
                 tray.add(trayIcon);
             } catch (AWTException e) {
@@ -85,7 +86,7 @@ public abstract class TrayManager {
      * @return image used for the tray icon
      */
     private Image getTrayImage() {
-        URL url = getClass().getResource("/desktopgui/resources/images/logo.jpg");
+        URL url = getClass().getResource("/desktopgui/resources/images/logo.png");
         Image image = Toolkit.getDefaultToolkit().getImage(url);
         return image;
     }