diff --git a/apps/i2psnark/java/build.xml b/apps/i2psnark/java/build.xml
index 486d66a80..c51eb7342 100644
--- a/apps/i2psnark/java/build.xml
+++ b/apps/i2psnark/java/build.xml
@@ -272,7 +272,7 @@
             <!-- we really don't need all of these -->
             <fileset dir="../../../installer/resources/themes/console/images/" />
         </copy>
-        <copy file="../../../installer/resources/themes/console/dark/images/transparent.gif"
+        <copy file="../../../installer/resources/themes/console/images/transparent.gif"
               todir="build/standalone-resources/.resources/themes/snark/ubergine/images" />
         <copy file="../../../installer/resources/themes/console/dark/images/header.png"
               todir="build/standalone-resources/.resources/themes/snark/ubergine/images" />
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 09c4699bd..67945ac82 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
@@ -3318,10 +3318,11 @@ public class I2PSnarkServlet extends BasicServlet {
         else if (mime.equals("text/plain") ||
                  mime.equals("text/x-sfv") ||
                  mime.equals("application/rtf") ||
-                 mime.equals("application/epub+zip") ||
-                 mime.equals("application/x-mobipocket-ebook") ||
                  plc.endsWith(".azw4"))
             icon = "page";
+        else if  (mime.equals("application/epub+zip") ||
+                 mime.equals("application/x-mobipocket-ebook"))
+            icon = "ebook";
         else if (mime.equals("application/java-archive") ||
                  plc.endsWith(".deb"))
             icon = "package";
@@ -3347,7 +3348,7 @@ public class I2PSnarkServlet extends BasicServlet {
             icon = "compress";
         else if (plc.endsWith(".exe"))
             icon = "application";
-        else if (plc.endsWith(".iso"))
+        else if (plc.endsWith(".iso") || plc.endsWith(".nrg"))
             icon = "cd";
         else if (mime.equals("application/x-bittorrent"))
             icon = "magnet";
diff --git a/apps/i2psnark/resources/icons/basket_put.png b/apps/i2psnark/resources/icons/basket_put.png
index be62faaaa..01fc58610 100644
Binary files a/apps/i2psnark/resources/icons/basket_put.png and b/apps/i2psnark/resources/icons/basket_put.png differ
diff --git a/apps/i2psnark/resources/icons/cancel.png b/apps/i2psnark/resources/icons/cancel.png
index c149c2bc0..d6921565d 100644
Binary files a/apps/i2psnark/resources/icons/cancel.png and b/apps/i2psnark/resources/icons/cancel.png differ
diff --git a/apps/i2psnark/resources/icons/cd.png b/apps/i2psnark/resources/icons/cd.png
index ef4322357..fae703d7a 100644
Binary files a/apps/i2psnark/resources/icons/cd.png and b/apps/i2psnark/resources/icons/cd.png differ
diff --git a/apps/i2psnark/resources/icons/compress.png b/apps/i2psnark/resources/icons/compress.png
index 8606ff0fd..183511d3f 100644
Binary files a/apps/i2psnark/resources/icons/compress.png and b/apps/i2psnark/resources/icons/compress.png differ
diff --git a/apps/i2psnark/resources/icons/ebook.png b/apps/i2psnark/resources/icons/ebook.png
new file mode 100644
index 000000000..8af80d3e8
Binary files /dev/null and b/apps/i2psnark/resources/icons/ebook.png differ
diff --git a/apps/i2psnark/resources/icons/film.png b/apps/i2psnark/resources/icons/film.png
index b0ce7bb19..91c2126e7 100644
Binary files a/apps/i2psnark/resources/icons/film.png and b/apps/i2psnark/resources/icons/film.png differ
diff --git a/apps/i2psnark/resources/icons/folder.png b/apps/i2psnark/resources/icons/folder.png
index 784e8fa48..87ff12017 100644
Binary files a/apps/i2psnark/resources/icons/folder.png and b/apps/i2psnark/resources/icons/folder.png differ
diff --git a/apps/i2psnark/resources/icons/html.png b/apps/i2psnark/resources/icons/html.png
index 55d1072ea..98cff2a2e 100644
Binary files a/apps/i2psnark/resources/icons/html.png and b/apps/i2psnark/resources/icons/html.png differ
diff --git a/apps/i2psnark/resources/icons/music.png b/apps/i2psnark/resources/icons/music.png
index a8b3ede3d..e6dc2de8c 100644
Binary files a/apps/i2psnark/resources/icons/music.png and b/apps/i2psnark/resources/icons/music.png differ
diff --git a/apps/i2psnark/resources/icons/package.png b/apps/i2psnark/resources/icons/package.png
index da3c2a2d7..a9ad768c2 100644
Binary files a/apps/i2psnark/resources/icons/package.png and b/apps/i2psnark/resources/icons/package.png differ
diff --git a/apps/i2psnark/resources/icons/page.png b/apps/i2psnark/resources/icons/page.png
index 03ddd799f..8c1184dff 100644
Binary files a/apps/i2psnark/resources/icons/page.png and b/apps/i2psnark/resources/icons/page.png differ
diff --git a/apps/i2psnark/resources/icons/page_white.png b/apps/i2psnark/resources/icons/page_white.png
index 8b8b1ca00..0847f096d 100644
Binary files a/apps/i2psnark/resources/icons/page_white.png and b/apps/i2psnark/resources/icons/page_white.png differ
diff --git a/apps/i2psnark/resources/icons/page_white_acrobat.png b/apps/i2psnark/resources/icons/page_white_acrobat.png
index 8f8095e46..641a41972 100644
Binary files a/apps/i2psnark/resources/icons/page_white_acrobat.png and b/apps/i2psnark/resources/icons/page_white_acrobat.png differ
diff --git a/apps/i2psnark/resources/icons/photo.png b/apps/i2psnark/resources/icons/photo.png
index 6c2aaaaaf..607c25d10 100644
Binary files a/apps/i2psnark/resources/icons/photo.png and b/apps/i2psnark/resources/icons/photo.png differ
diff --git a/apps/i2psnark/resources/icons/plugin.png b/apps/i2psnark/resources/icons/plugin.png
index 6187b15ae..3ca4d1b59 100644
Binary files a/apps/i2psnark/resources/icons/plugin.png and b/apps/i2psnark/resources/icons/plugin.png differ
diff --git a/apps/i2psnark/resources/icons/tick.png b/apps/i2psnark/resources/icons/tick.png
index a9925a06a..a7d7a96be 100644
Binary files a/apps/i2psnark/resources/icons/tick.png and b/apps/i2psnark/resources/icons/tick.png differ