diff --git a/apps/routerconsole/jsp/index.jsp b/apps/routerconsole/jsp/index.jsp
index 87287b412..73ad4e15b 100644
--- a/apps/routerconsole/jsp/index.jsp
+++ b/apps/routerconsole/jsp/index.jsp
@@ -6,7 +6,7 @@
I2P Router Console - home
<%@include file="css.jsp" %>
-
+
<%
if (System.getProperty("router.consoleNonce") == null) {
diff --git a/apps/routerconsole/jsp/nav.jsp b/apps/routerconsole/jsp/nav.jsp
index ad0021487..43d8d336e 100644
--- a/apps/routerconsole/jsp/nav.jsp
+++ b/apps/routerconsole/jsp/nav.jsp
@@ -1,6 +1,6 @@
<%@page import="java.io.File" %>
-
+
<% if (new File("docs/toolbar.html").exists()) { %>
diff --git a/apps/routerconsole/jsp/viewtheme.jsp b/apps/routerconsole/jsp/viewtheme.jsp
index 05ccfecbf..95b1e91c0 100644
--- a/apps/routerconsole/jsp/viewtheme.jsp
+++ b/apps/routerconsole/jsp/viewtheme.jsp
@@ -14,7 +14,9 @@ if (uri.endsWith(".css")) {
response.setContentType("image/gif");
} else if (uri.endsWith(".jpg")) {
response.setContentType("image/jpeg");
+} else if (uri.endsWith(".ico")) {
+ response.setContentType("image/x-icon");
}
-
+response.setHeader("Cache-Control", "max-age=86400"); // cache for a day
net.i2p.util.FileUtil.readFile(uri, "./docs", response.getOutputStream());
%>
\ No newline at end of file
diff --git a/build.xml b/build.xml
index da8cfc4c2..525364929 100644
--- a/build.xml
+++ b/build.xml
@@ -320,6 +320,13 @@
+
+
+
+
+
+
+
diff --git a/installer/resources/favicon.ico b/installer/resources/favicon.ico
deleted file mode 100644
index fd09b1b4c..000000000
Binary files a/installer/resources/favicon.ico and /dev/null differ
diff --git a/apps/routerconsole/jsp/favicon.ico b/installer/resources/themes/console/images/favicon.ico
similarity index 100%
rename from apps/routerconsole/jsp/favicon.ico
rename to installer/resources/themes/console/images/favicon.ico
diff --git a/apps/routerconsole/jsp/i2plogo.png b/installer/resources/themes/console/images/i2plogo.png
similarity index 100%
rename from apps/routerconsole/jsp/i2plogo.png
rename to installer/resources/themes/console/images/i2plogo.png