diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
index 1b29273927..ae4cf09a19 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
@@ -893,13 +893,16 @@ public class SnarkManager implements CompleteListener, ClientApp {
      * @since 0.9.48
      */
     public String getThemeIconSet() {
-        String iconset = "";
+        String iconset;
+        String theme = getTheme();
         if (_log.shouldLog(Log.DEBUG))
-            _log.debug("Theme was: " + this.getTheme());
-        if (this.getTheme().equals("dark") || this.getTheme().equals("light")) {
+            _log.debug("Theme was: " + theme);
+        if (theme.equals("dark") || theme.equals("light")) {
             if (_log.shouldLog(Log.DEBUG))
                 _log.debug("Using solid iconset.");
             iconset = "solid/";
+        } else {
+            iconset = "";
         }
         return iconset;
     }
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 d74d579287..684ea62bfe 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
@@ -4206,7 +4206,7 @@ public class I2PSnarkServlet extends BasicServlet {
      *  @since 0.8.2
      */
     private String toImg(String icon, String altText) {
-        return "<img alt=\"" + altText + "\" height=\"16\" width=\"16\" src=\"" + _contextPath + WARBASE + "icons/" + _manager.getThemeIconSet() + icon + ".png\">";
+        return "<img alt=\"" + altText + "\" height=\"16\" width=\"16\" src=\"" + _contextPath + WARBASE + "icons/" + _manager.getThemeIconSet() + icon + ".png?" + CoreVersion.VERSION + "\">";
     }
 
     /**