diff --git a/apps/i2psnark/java/build.xml b/apps/i2psnark/java/build.xml
index 5b64c3136..b06593af0 100644
--- a/apps/i2psnark/java/build.xml
+++ b/apps/i2psnark/java/build.xml
@@ -298,6 +298,12 @@
             value="url(/i2psnark/.resources/themes/ubergine/images/" >
             <include name="**/*.css" />
         </replace>
+        <replace dir="build/standalone-resources/.resources/themes"
+            summary="true"
+            token="url(/themes/console/images/buttons/"
+            value="url(/i2psnark/.resources/icons/" >
+            <include name="**/*.css" />
+        </replace>
 
         <!-- Rather than pulling in all the console theme images, let's just specify the ones we need -->
         <copy file="../../routerconsole/jsp/themes/console/images/transparent.gif"
@@ -308,6 +314,8 @@
               todir="build/standalone-resources/.resources/themes/light/images" />
         <copy file="../../routerconsole/jsp/themes/console/images/info/errortriangle.png"
               todir="build/standalone-resources/.resources/themes/ubergine/images" />
+        <copy file="../../routerconsole/jsp/themes/console/images/buttons/search.png"
+              todir="build/standalone-resources/.resources/icons" />
 
         <mkdir dir="build/standalone-resources/.resources/js" />
         <copy file="../../routerconsole/jsp/js/ajax.js" todir="build/standalone-resources/.resources/js" />
diff --git a/apps/i2psnark/java/src/org/klomp/snark/CommandLine.java b/apps/i2psnark/java/src/org/klomp/snark/CommandLine.java
index f82943704..642ef82eb 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/CommandLine.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/CommandLine.java
@@ -4,8 +4,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import net.i2p.CoreVersion;
-
 /**
  * Simple command line access to various utilities.
  * Not a public API. Subject to change.
@@ -38,7 +36,7 @@ public class CommandLine extends net.i2p.util.CommandLine {
     }
 
     private static void usage(List<String> classes) {
-        System.err.println("I2PSnark version " + CoreVersion.VERSION + '\n' +
+        System.err.println("I2PSnark version " + SnarkManager.FULL_VERSION + '\n' +
                            "USAGE: java -jar /path/to/i2psnark.jar command [args]");
         printCommands(classes);
     }
diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
index fbc0e6c0a..e703cb9f8 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
@@ -25,6 +25,7 @@ import java.util.Set;
 import java.util.StringTokenizer;
 import java.util.concurrent.ConcurrentHashMap;
 
+import net.i2p.CoreVersion;
 import net.i2p.I2PAppContext;
 import net.i2p.app.ClientApp;
 import net.i2p.app.ClientAppManager;
@@ -174,6 +175,9 @@ public class SnarkManager implements CompleteListener, ClientApp, DisconnectList
     private static final String SUBDIR_PREFIX = "s";
     private static final String B64 = Base64.ALPHABET_I2P;
     private static final int MAX_MESSAGES = 100;
+    private static final String EXTRA = "";
+    /** @since 0.9.58 */
+    public static final String FULL_VERSION = CoreVersion.VERSION + EXTRA;
 
     /**
      *  "name", "announceURL=websiteURL" pairs
diff --git a/apps/i2psnark/java/src/org/klomp/snark/standalone/RunStandalone.java b/apps/i2psnark/java/src/org/klomp/snark/standalone/RunStandalone.java
index 6bbbd99a8..4cce5e8fd 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/standalone/RunStandalone.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/standalone/RunStandalone.java
@@ -15,6 +15,8 @@ import net.i2p.jetty.I2PLogger;
 import net.i2p.jetty.JettyStart;
 import net.i2p.util.SystemVersion;
 
+import org.klomp.snark.SnarkManager;
+
 /**
  *  @since moved from ../web and fixed in 0.9.27
  */
@@ -71,7 +73,7 @@ public class RunStandalone {
     public void start() {
         try {
             String url = "http://" + _host + ':' + _port + "/i2psnark/";
-            System.out.println("Starting i2psnark at " + url);
+            System.out.println("Starting i2psnark " + SnarkManager.FULL_VERSION + " at " + url);
             startTrayApp();
             _jettyStart.startup();
             try {
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 30a565952..80b268ac1 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
@@ -367,7 +367,7 @@ public class I2PSnarkServlet extends BasicServlet {
         else
             out.write(_contextName);
         if (!_context.isRouterContext()) {
-            out.write(' ' + CoreVersion.VERSION);
+            out.write(' ' + SnarkManager.FULL_VERSION);
         }
         out.write("</a>");
         List<Tracker> sortedTrackers = null;