diff --git a/apps/systray/java/src/net/i2p/apps/systray/BrowserChooser.java b/apps/systray/java/src/net/i2p/apps/systray/BrowserChooser.java
index 6c6cae9f0..53107d608 100644
--- a/apps/systray/java/src/net/i2p/apps/systray/BrowserChooser.java
+++ b/apps/systray/java/src/net/i2p/apps/systray/BrowserChooser.java
@@ -12,20 +12,18 @@ import java.awt.FileDialog;
 import java.awt.Frame;
 
 /**
- * A rather nasty AWT file chooser dialog (thanks, Kaffe!) which allows the user
- * to select their preferred browser with.
+ * A simple file chooser dialog.
  * 
  * @author hypercubus
  */
 public class BrowserChooser extends FileDialog {
 
-	public BrowserChooser(Frame owner, String windowTitle) {
-		super(owner, windowTitle);
-		initialize();
-	}
+    public BrowserChooser(Frame owner, String windowTitle) {
+        super(owner, windowTitle);
+        initialize();
+    }
 
-	public void initialize(){
-		this.setSize(300,400);
+    public void initialize(){
         this.show();
-	}
+    }
 }
diff --git a/apps/systray/java/src/net/i2p/apps/systray/SysTray.java b/apps/systray/java/src/net/i2p/apps/systray/SysTray.java
index d284f0a4a..650d789a9 100644
--- a/apps/systray/java/src/net/i2p/apps/systray/SysTray.java
+++ b/apps/systray/java/src/net/i2p/apps/systray/SysTray.java
@@ -32,7 +32,7 @@ public class SysTray implements SysTrayMenuListener {
     private SysTrayMenuItem _itemExit          = new SysTrayMenuItem("Exit systray", "exit");
     private SysTrayMenuItem _itemSelectBrowser = new SysTrayMenuItem("Select preferred browser...", "selectbrowser");
     private SysTrayMenuIcon _sysTrayMenuIcon   = new SysTrayMenuIcon("../icons/iggy");
-    private SysTrayMenu     _sysTrayMenu       = new SysTrayMenu(_sysTrayMenuIcon, "I2P Console");
+    private SysTrayMenu     _sysTrayMenu       = new SysTrayMenu(_sysTrayMenuIcon, "I2P Router Console");
 
     public SysTray() {
         _sysTrayMenuIcon.addSysTrayMenuListener(this);
@@ -78,7 +78,9 @@ public class SysTray implements SysTrayMenuListener {
             _itemExit = null;
             _itemSelectBrowser = null;
             _sysTrayMenuIcon = null;
-            _sysTrayMenu = null;       
+            _sysTrayMenu = null;
+            _browserChooser = null;
+            _frame = null;
             System.exit(0);
         } else if (e.getActionCommand().equals("selectbrowser")) {
             setBrowser(promptForBrowser("Select preferred browser"));
diff --git a/apps/systray/java/src/net/i2p/apps/systray/i2psystray.bat b/apps/systray/java/src/net/i2p/apps/systray/i2psystray.bat
index 9ba3580c8..ac41dd738 100644
--- a/apps/systray/java/src/net/i2p/apps/systray/i2psystray.bat
+++ b/apps/systray/java/src/net/i2p/apps/systray/i2psystray.bat
@@ -1 +1 @@
-java -cp systray4j.jar;. -Djava.library.path=. SysTray
\ No newline at end of file
+java -cp systray4j.jar;. -Djava.library.path=. -jar systray.jar
diff --git a/apps/systray/java/src/net/i2p/apps/systray/i2psystray.sh b/apps/systray/java/src/net/i2p/apps/systray/i2psystray.sh
index 18ba553eb..da54e5913 100644
--- a/apps/systray/java/src/net/i2p/apps/systray/i2psystray.sh
+++ b/apps/systray/java/src/net/i2p/apps/systray/i2psystray.sh
@@ -1 +1 @@
-java -cp systray4j.jar:. -Djava.library.path=. SysTray
+java -cp systray4j.jar:. -Djava.library.path=. -jar systray.jar