diff --git a/apps/i2psnark/_icons/application.png b/apps/i2psnark/icons/application.png
similarity index 100%
rename from apps/i2psnark/_icons/application.png
rename to apps/i2psnark/icons/application.png
diff --git a/apps/i2psnark/_icons/cancel.png b/apps/i2psnark/icons/cancel.png
similarity index 100%
rename from apps/i2psnark/_icons/cancel.png
rename to apps/i2psnark/icons/cancel.png
diff --git a/apps/i2psnark/_icons/cd.png b/apps/i2psnark/icons/cd.png
similarity index 100%
rename from apps/i2psnark/_icons/cd.png
rename to apps/i2psnark/icons/cd.png
diff --git a/apps/i2psnark/_icons/clock.png b/apps/i2psnark/icons/clock.png
similarity index 100%
rename from apps/i2psnark/_icons/clock.png
rename to apps/i2psnark/icons/clock.png
diff --git a/apps/i2psnark/_icons/clock_red.png b/apps/i2psnark/icons/clock_red.png
similarity index 100%
rename from apps/i2psnark/_icons/clock_red.png
rename to apps/i2psnark/icons/clock_red.png
diff --git a/apps/i2psnark/_icons/compress.png b/apps/i2psnark/icons/compress.png
similarity index 100%
rename from apps/i2psnark/_icons/compress.png
rename to apps/i2psnark/icons/compress.png
diff --git a/apps/i2psnark/_icons/film.png b/apps/i2psnark/icons/film.png
similarity index 100%
rename from apps/i2psnark/_icons/film.png
rename to apps/i2psnark/icons/film.png
diff --git a/apps/i2psnark/_icons/folder.png b/apps/i2psnark/icons/folder.png
similarity index 100%
rename from apps/i2psnark/_icons/folder.png
rename to apps/i2psnark/icons/folder.png
diff --git a/apps/i2psnark/_icons/html.png b/apps/i2psnark/icons/html.png
similarity index 100%
rename from apps/i2psnark/_icons/html.png
rename to apps/i2psnark/icons/html.png
diff --git a/apps/i2psnark/_icons/magnet.png b/apps/i2psnark/icons/magnet.png
similarity index 100%
rename from apps/i2psnark/_icons/magnet.png
rename to apps/i2psnark/icons/magnet.png
diff --git a/apps/i2psnark/_icons/music.png b/apps/i2psnark/icons/music.png
similarity index 100%
rename from apps/i2psnark/_icons/music.png
rename to apps/i2psnark/icons/music.png
diff --git a/apps/i2psnark/_icons/package.png b/apps/i2psnark/icons/package.png
similarity index 100%
rename from apps/i2psnark/_icons/package.png
rename to apps/i2psnark/icons/package.png
diff --git a/apps/i2psnark/_icons/page.png b/apps/i2psnark/icons/page.png
similarity index 100%
rename from apps/i2psnark/_icons/page.png
rename to apps/i2psnark/icons/page.png
diff --git a/apps/i2psnark/_icons/page_white.png b/apps/i2psnark/icons/page_white.png
similarity index 100%
rename from apps/i2psnark/_icons/page_white.png
rename to apps/i2psnark/icons/page_white.png
diff --git a/apps/i2psnark/_icons/page_white_acrobat.png b/apps/i2psnark/icons/page_white_acrobat.png
similarity index 100%
rename from apps/i2psnark/_icons/page_white_acrobat.png
rename to apps/i2psnark/icons/page_white_acrobat.png
diff --git a/apps/i2psnark/_icons/photo.png b/apps/i2psnark/icons/photo.png
similarity index 100%
rename from apps/i2psnark/_icons/photo.png
rename to apps/i2psnark/icons/photo.png
diff --git a/apps/i2psnark/_icons/plugin.png b/apps/i2psnark/icons/plugin.png
similarity index 100%
rename from apps/i2psnark/_icons/plugin.png
rename to apps/i2psnark/icons/plugin.png
diff --git a/apps/i2psnark/_icons/tick.png b/apps/i2psnark/icons/tick.png
similarity index 100%
rename from apps/i2psnark/_icons/tick.png
rename to apps/i2psnark/icons/tick.png
diff --git a/apps/i2psnark/java/build.xml b/apps/i2psnark/java/build.xml
index c5a3b106f..bd8e25d14 100644
--- a/apps/i2psnark/java/build.xml
+++ b/apps/i2psnark/java/build.xml
@@ -95,9 +95,13 @@
     <target name="war" depends="jar, bundle, warUpToDate, listChangedFiles" unless="war.uptodate" > 
         <!-- set if unset -->
         <property name="workspace.changes.tr" value="" />
-        <war destfile="../i2psnark.war" webxml="../web.xml" basedir="../" includes="_icons/*" >
+        <copy todir="build/icons/.icons" >
+            <fileset dir="../icons/" />
+        </copy>
+        <war destfile="../i2psnark.war" webxml="../web.xml" >
           <!-- include only the web stuff, as of 0.7.12 the router will add i2psnark.jar to the classpath for the war -->
           <classes dir="./build/obj" includes="**/web/*.class" />
+            <fileset dir="build/icons/" />
             <manifest>
                 <attribute name="Implementation-Version" value="${full.version}" />
                 <attribute name="Build-Date" value="${build.timestamp}" />
@@ -109,7 +113,7 @@
     
     <target name="warUpToDate">
         <uptodate property="war.uptodate" targetfile="../i2psnark.war" >
-            <srcfiles dir= "." includes="build/obj/org/klomp/snark/web/*.class ../_icons/* ../web.xml" />
+            <srcfiles dir= "." includes="build/obj/org/klomp/snark/web/*.class ../icons/* ../web.xml" />
         </uptodate>
     </target>
     
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 80a784b1f..beebc226a 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
@@ -102,7 +102,7 @@ public class I2PSnarkServlet extends Default {
     protected Resource getResource(String pathInContext) throws IOException
     {
         if (pathInContext == null || pathInContext.equals("/") || pathInContext.equals("/index.jsp") ||
-            pathInContext.equals("/index.html") || pathInContext.startsWith("/_icons/"))
+            pathInContext.equals("/index.html") || pathInContext.startsWith("/.icons/"))
             return super.getResource(pathInContext);
         // files in the i2psnark/ directory
         return _resourceBase.addPath(pathInContext);
@@ -2115,12 +2115,12 @@ public class I2PSnarkServlet extends Default {
     
     /** @since 0.7.14 */
     private static String toImg(String icon) {
-        return "<img alt=\"\" height=\"16\" width=\"16\" src=\"/i2psnark/_icons/" + icon + ".png\">";
+        return "<img alt=\"\" height=\"16\" width=\"16\" src=\"/i2psnark/.icons/" + icon + ".png\">";
     }
 
     /** @since 0.8.2 */
     private static String toImg(String icon, String altText) {
-        return "<img alt=\"" + altText + "\" height=\"16\" width=\"16\" src=\"/i2psnark/_icons/" + icon + ".png\">";
+        return "<img alt=\"" + altText + "\" height=\"16\" width=\"16\" src=\"/i2psnark/.icons/" + icon + ".png\">";
     }
 
     /** @since 0.8.1 */