diff --git a/installer/resources/ahelper-conflict-header.ht b/installer/resources/ahelper-conflict-header.ht
index 7f34d21cc33331542ffbb501fad8098ca3f67b4a..068558d6a57c5ee260d2b69fdfdf959b9594d679 100644
--- a/installer/resources/ahelper-conflict-header.ht
+++ b/installer/resources/ahelper-conflict-header.ht
@@ -4,45 +4,24 @@ Cache-control: no-cache
 Connection: close
 Proxy-Connection: close
 
-<html><head>
-<title>Destination key conflict</title>
-<link rel="shortcut icon" href="http://127.0.0.1:7657/favicon.ico" />
-<style type='text/css'>
-div.warning {
-	margin: 0em 1em 1em 224px;
-	padding: .5em 1em;
-	background-color: #ffefef;
-	border: medium solid #ffafaf;
-	text-align: left;
-	color: inherit;
-}
-div.logo {
-	float: left;
-	width: 200px;
-	left: 1em;
-	top: 1em;
-	margin: 0em;
-	padding: .5em;
-	text-align: left;
-	border: medium solid #efefff;
-	background-color: #fafaff;
-	color: inherit;
-}
-</style>
-</head>
-<body>
-<div class=logo>
- <a href="http://127.0.0.1:7657/index.jsp" title="Router Console"><img src="http://127.0.0.1:7657/i2plogo.png" alt="Router Console" width="187" height="35" border="0"/></a><br />
- [<a href="http://127.0.0.1:7657/config.jsp">configuration</a> | <a href="http://127.0.0.1:7657/help.jsp">help</a>]
-</div>
-<div class=warning id=warning>
-The addresshelper link you followed specifies a different destination key
-than a host entry in your host database.
-Someone could be trying to impersonate another eepsite,
-or people have given two eepsites identical names.
-<P/>
-You can resolve the conflict by considering which key you trust,
-and either discarding the addresshelper link,
-discarding the host entry from your host database,
-or naming one of them differently.
-<P/>
+<html><head>
+<title>Destination key conflict</title>
+<link rel="shortcut icon" href="http://proxy.i2p/themes/console/images/favicon.ico" />
+<link href="http://proxy.i2p/themes/console/console.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+<div class=logo>
+ <a href="http://127.0.0.1:7657/index.jsp" title="Router Console"><img src="http://proxy.i2p/themes/console/images/i2plogo.png" alt="Router Console" width="187" height="35" border="0"/></a><br />
+ [<a href="http://127.0.0.1:7657/config.jsp">configuration</a> | <a href="http://127.0.0.1:7657/help.jsp">help</a>]
+</div>
+<div class=warning id=warning>
+The addresshelper link you followed specifies a different destination key
+than a host entry in your host database.
+Someone could be trying to impersonate another eepsite,
+or people have given two eepsites identical names.
+<P/>
+You can resolve the conflict by considering which key you trust,
+and either discarding the addresshelper link,
+discarding the host entry from your host database,
+or naming one of them differently.
+<P/>
diff --git a/installer/resources/dnf-header.ht b/installer/resources/dnf-header.ht
index 2293d938c843ea98958cfa47eb24898efa718962..8de2824bf8276263d0c7dafa5d8fc3045f95d211 100644
--- a/installer/resources/dnf-header.ht
+++ b/installer/resources/dnf-header.ht
@@ -6,33 +6,12 @@ Proxy-Connection: close
 
 <html><head>
 <title>Eepsite not reachable</title>
-<link rel="shortcut icon" href="http://127.0.0.1:7657/favicon.ico" />
-<style type='text/css'>
-div.warning {
-	margin: 0em 1em 1em 224px;
-	padding: .5em 1em;
-	background-color: #ffefef;
-	border: medium solid #ffafaf;
-	text-align: left;
-	color: inherit;
-}
-div.logo {
-	float: left;
-	width: 200px;
-	left: 1em;
-	top: 1em;
-	margin: 0em;
-	padding: .5em;
-	text-align: left;
-	border: medium solid #efefff;
-	background-color: #fafaff;
-	color: inherit;
-}
-</style>
+<link rel="shortcut icon" href="http://proxy.i2p/themes/console/images/favicon.ico" />
+<link href="http://proxy.i2p/themes/console/console.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 <div class=logo>
- <a href="http://127.0.0.1:7657/index.jsp" title="Router Console"><img src="http://127.0.0.1:7657/i2plogo.png" alt="Router Console" width="187" height="35" border="0"/></a><br />
+ <a href="http://127.0.0.1:7657/index.jsp" title="Router Console"><img src="http://proxy.i2p/themes/console/images/i2plogo.png" alt="Router Console" width="187" height="35" border="0"/></a><br />
  [<a href="http://127.0.0.1:7657/config.jsp">configuration</a> | <a href="http://127.0.0.1:7657/help.jsp">help</a>]
 </div>
 <div class=warning id=warning>
diff --git a/installer/resources/dnfb-header.ht b/installer/resources/dnfb-header.ht
index 51f9c63ad1d2fb57b4b0a4de304d7230a1d9c176..890a1910fbbfa93a656f873f9f445508cd2ed7fe 100644
--- a/installer/resources/dnfb-header.ht
+++ b/installer/resources/dnfb-header.ht
@@ -6,33 +6,12 @@ Proxy-Connection: close
 
 <html><head>
 <title>Invalid eepsite destination</title>
-<link rel="shortcut icon" href="http://127.0.0.1:7657/favicon.ico" />
-<style type='text/css'>
-	div.warning {
-	margin: 0em 1em 1em 224px;
-	padding: .5em 1em;
-	background-color: #ffefef;
-	border: medium solid #ffafaf;
-	text-align: left;
-	color: inherit;
-}
-div.logo {
-	float: left;
-	width: 200px;
-	left: 1em;
-	top: 1em;
-	margin: 0em;
-	padding: .5em;
-	text-align: left;
-	border: medium solid #efefff;
-	background-color: #fafaff;
-	color: inherit;
-}
-</style>
+<link rel="shortcut icon" href="http://proxy.i2p/themes/console/images/favicon.ico" />
+<link href="http://proxy.i2p/themes/console/console.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 <div class=logo>
- <a href="http://127.0.0.1:7657/index.jsp" title="Router Console"><img src="http://127.0.0.1:7657/i2plogo.png" alt="Router Console" width="187" height="35" border="0"/></a><br />
+ <a href="http://127.0.0.1:7657/index.jsp" title="Router Console"><img src="http://proxy.i2p/themes/console/images/i2plogo.png" alt="Router Console" width="187" height="35" border="0"/></a><br />
  [<a href="http://127.0.0.1:7657/config.jsp">configuration</a> | <a href="http://127.0.0.1:7657/help.jsp">help</a>]
 </div>
 <div class=warning id=warning>
diff --git a/installer/resources/dnfh-header.ht b/installer/resources/dnfh-header.ht
index eea94252e1a6767618a4cc44c8b730a28a1c5327..307621aaae9222b7576c2dc8d6f23c1bf2c9e107 100644
--- a/installer/resources/dnfh-header.ht
+++ b/installer/resources/dnfh-header.ht
@@ -6,33 +6,12 @@ Proxy-Connection: close
 
 <html><head>
 <title>Eepsite unknown</title>
-<link rel="shortcut icon" href="http://127.0.0.1:7657/favicon.ico" />
-<style type='text/css'>
-div.warning {
-	margin: 0em 1em 1em 224px;
-	padding: .5em 1em;
-	background-color: #ffefef;
-	border: medium solid #ffafaf;
-	text-align: left;
-	color: inherit;
-}
-div.logo {
-	float: left;
-	width: 200px;
-	left: 1em;
-	top: 1em;
-	margin: 0em;
-	padding: .5em;
-	text-align: left;
-	border: medium solid #efefff;
-	background-color: #fafaff;
-	color: inherit;
-}
-</style>
+<link rel="shortcut icon" href="http://proxy.i2p/themes/console/images/favicon.ico" />
+<link href="http://proxy.i2p/themes/console/console.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 <div class=logo>
- <a href="http://127.0.0.1:7657/index.jsp" title="Router Console"><img src="http://127.0.0.1:7657/i2plogo.png" alt="Router Console" width="187" height="35" border="0"/></a><br />
+ <a href="http://127.0.0.1:7657/index.jsp" title="Router Console"><img src="http://proxy.i2p/themes/console/images/i2plogo.png" alt="Router Console" width="187" height="35" border="0"/></a><br />
  [<a href="http://127.0.0.1:7657/config.jsp">configuration</a> | <a href="http://127.0.0.1:7657/help.jsp">help</a>]
 </div>
 <div class=warning id=warning>
diff --git a/installer/resources/dnfp-header.ht b/installer/resources/dnfp-header.ht
index 40358c3eb4f4fef9989e63331f8e85d2e6e17e53..b579e64b91ee717e7350dcab8abbf1fe9d12e1e7 100644
--- a/installer/resources/dnfp-header.ht
+++ b/installer/resources/dnfp-header.ht
@@ -4,47 +4,25 @@ Cache-control: no-cache
 Connection: close
 Proxy-Connection: close
 
-<html><head>
-<title>Outproxy Not Found</title>
-<link rel="shortcut icon" href="http://127.0.0.1:7657/favicon.ico" />
-<style type='text/css'>
-div.warning {
-	margin: 0em 1em 1em 224px;
-	padding: .5em 1em;
-	background-color: #ffefef;
-	border: medium solid #ffafaf;
-	text-align: left;
-	color: inherit;
-}
-div.logo {
-	float: left;
-	width: 200px;
-	left: 1em;
-	top: 1em;
-	margin: 0em;
-	padding: .5em;
-	text-align: left;
-	border: medium solid #efefff;
-	background-color: #fafaff;
-	color: inherit;
-}
-</style>
-
-</head>
-<body>
-<div class=logo>
- <a href="http://127.0.0.1:7657/index.jsp" title="Router Console"><img src="http://127.0.0.1:7657/i2plogo.png" alt="Router Console" width="187" height="35" border="0"/></a><br />
- [<a href="http://127.0.0.1:7657/config.jsp">configuration</a> | <a href="http://127.0.0.1:7657/help.jsp">help</a>]
-</div>
-<div class=warning id=warning>
-The WWW Outproxy was not found. 
-It is offline, there is network congestion,
-or your router is not yet well-integrated with peers.
-You may want to 
-<a href="javascript: parent.window.location.reload()">retry</a> 
-as this will randomly reselect an outproxy from the pool you have defined 
-<a href="http://127.0.0.1:7657/i2ptunnel/index.jsp">here</a> 
-(if you have more than one configured). 
-If you continue to have trouble you may want to edit your outproxy list 
-<a href="http://127.0.0.1:7657/i2ptunnel/edit.jsp?tunnel=0">here</a>. 
-<BR><BR>Could not find the following destination:<BR><BR>
+<html><head>
+<title>Outproxy Not Found</title>
+<link rel="shortcut icon" href="http://proxy.i2p/themes/console/images/favicon.ico" />
+<link href="http://proxy.i2p/themes/console/console.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+<div class=logo>
+ <a href="http://127.0.0.1:7657/index.jsp" title="Router Console"><img src="http://proxy.i2p/themes/console/images/i2plogo.png" alt="Router Console" width="187" height="35" border="0"/></a><br />
+ [<a href="http://127.0.0.1:7657/config.jsp">configuration</a> | <a href="http://127.0.0.1:7657/help.jsp">help</a>]
+</div>
+<div class=warning id=warning>
+The WWW Outproxy was not found. 
+It is offline, there is network congestion,
+or your router is not yet well-integrated with peers.
+You may want to 
+<a href="javascript: parent.window.location.reload()">retry</a> 
+as this will randomly reselect an outproxy from the pool you have defined 
+<a href="http://127.0.0.1:7657/i2ptunnel/index.jsp">here</a> 
+(if you have more than one configured). 
+If you continue to have trouble you may want to edit your outproxy list 
+<a href="http://127.0.0.1:7657/i2ptunnel/edit.jsp?tunnel=0">here</a>. 
+<BR><BR>Could not find the following destination:<BR><BR>