diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
index 309d57c84..eed367e7a 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
@@ -1484,7 +1484,7 @@ public class SnarkManager implements Snark.CompleteListener {
                 byte[] ih = Base64.decode(b64);
                 // ignore value - TODO put tracker URL in value
                 if (ih != null && ih.length == 20)
-                    addMagnet("* " + _("Magnet") + ' ' + I2PSnarkUtil.toHex(ih), ih, null, false);
+                    addMagnet(_("Magnet") + ' ' + I2PSnarkUtil.toHex(ih), ih, null, false);
                 // else remove from config?
             }
         }
diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/FetchAndAdd.java b/apps/i2psnark/java/src/org/klomp/snark/web/FetchAndAdd.java
index c5f31d8f5..98521e739 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/web/FetchAndAdd.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/web/FetchAndAdd.java
@@ -72,7 +72,7 @@ public class FetchAndAdd extends Snark implements EepGet.StatusListener, Runnabl
         _log = ctx.logManager().getLog(FetchAndAdd.class);
         _mgr = mgr;
         _url = url;
-        _name = "* " + _("Download torrent file from {0}", url);
+        _name = _("Download torrent file from {0}", url);
         byte[] fake = null;
         try {
             fake = SHA1.getInstance().digest(url.getBytes("ISO-8859-1"));
diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
index e333f3cc5..731c43727 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
@@ -912,11 +912,17 @@ public class I2PSnarkServlet extends DefaultServlet {
         TreeSet<String> fileNames = new TreeSet(new TorrentNameComparator());
         fileNames.addAll(files);
         ArrayList<Snark> rv = new ArrayList(fileNames.size());
+        int magnet = 0;
         for (Iterator iter = fileNames.iterator(); iter.hasNext(); ) {
             String name = (String)iter.next();
             Snark snark = _manager.getTorrent(name);
-            if (snark != null)
-                rv.add(snark);
+            if (snark != null) {
+                // put downloads and magnets first
+                if (snark.getStorage() == null)
+                    rv.add(magnet++, snark);
+                else
+                    rv.add(snark);
+            }
         }
         return rv;
     }
@@ -1783,7 +1789,7 @@ public class I2PSnarkServlet extends DefaultServlet {
             }
             ihash = xt.substring("urn:btih:".length());
             trackerURL = getTrackerParam(url);
-            name = "* " + _("Magnet") + ' ' + ihash;
+            name = _("Magnet") + ' ' + ihash;
             String dn = getParam("dn", url);
             if (dn != null)
                 name += " (" + Storage.filterName(dn) + ')';
@@ -1793,7 +1799,7 @@ public class I2PSnarkServlet extends DefaultServlet {
             int col = ihash.indexOf(':');
             if (col >= 0)
                 ihash = ihash.substring(0, col);
-            name = "* " + _("Magnet") + ' ' + ihash;
+            name = _("Magnet") + ' ' + ihash;
         } else {
             return;
         }
diff --git a/history.txt b/history.txt
index 023eed17b..6a030bb40 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,8 @@
+2012-08-31 zzz
+ * i2psnark: Remove * from magnet and download names
+ * Router: Lengthen shutdown spinner life
+ * Startup: Don't complain about clients.config missing on Android
+
 2012-08-29 zzz
  * ClientManager: Cleanups
  * i2psnark:
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 43dca9240..9319fc01c 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 21;
+    public final static long BUILD = 22;
 
     /** for example "-test" */
     public final static String EXTRA = "";