diff --git a/apps/i2ptunnel/java/build.xml b/apps/i2ptunnel/java/build.xml
index 9758b84687c70820fcd37c5883aa39cdf3b3d7b8..c656a3df37f877323430ed4661641b24c4989081 100644
--- a/apps/i2ptunnel/java/build.xml
+++ b/apps/i2ptunnel/java/build.xml
@@ -99,6 +99,8 @@
          -->
         <gzip src="../../routerconsole/jsp/themes/console/light/console.css" destfile="./build/obj/net/i2p/i2ptunnel/resources/themes/console/light/console.css.gz" />
         <gzip src="../../routerconsole/jsp/themes/console/dark/console.css" destfile="./build/obj/net/i2p/i2ptunnel/resources/themes/console/dark/console.css.gz" />
+        <gzip src="../../i2ptunnel/resources/proxy/css/light/proxy.css" destfile="./build/obj/net/i2p/i2ptunnel/resources/themes/console/light/proxy.css.gz" />
+        <gzip src="../../i2ptunnel/resources/proxy/css/dark/proxy.css" destfile="./build/obj/net/i2p/i2ptunnel/resources/themes/console/dark/proxy.css.gz" />
         <jar destfile="./build/i2ptunnel.jar" basedir="./build/obj" excludes="**/ui/*.class **/web/*.class" >
             <manifest>
                 <attribute name="Main-Class" value="net.i2p.i2ptunnel.I2PTunnel" />
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java
index 814145b623f0b99f91888e9afd71a8214b8d9163..7807b699f25775571650d84cc11460ca58ae9db9 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java
@@ -985,7 +985,7 @@ public abstract class I2PTunnelHTTPClientBase extends I2PTunnelClientBase implem
 
                     if (first) {
                         first = false;
-                        out.write("<br><br>\n<div id=\"jumplinks\">\n<h4>");
+                        out.write("<br>\n<div id=\"jumplinks\">\n<h4>");
                         out.write(_t("Click a link below for an address helper from a jump service"));
                         out.write("</h4>\n");
                     } else {
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java
index 2ab1059a9b198dbe6e2867f20a0fd69c69842ab6..4c5427c21f97557d921b17a75b645635181ab241 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java
@@ -300,7 +300,7 @@ public abstract class LocalHTTPServer {
                                .append(_t("Your new encryption key"))
                                .append("</title>\n" +
                                        "<link rel=\"shortcut icon\" href=\"http://proxy.i2p/themes/console/images/favicon.ico\" >\n" +
-                                       "<link href=\"http://proxy.i2p/themes/console/default/console.css\" rel=\"stylesheet\" type=\"text/css\" >\n" +
+                                       "<link href=\"http://proxy.i2p/themes/console/default/proxy.css\" rel=\"stylesheet\" type=\"text/css\" >\n" +
                                        "</head><body>\n" +
                                        "<div class=logo>\n" +
                                        "<a href=\"")
@@ -375,7 +375,7 @@ public abstract class LocalHTTPServer {
                   "<html><head>"+
                   "<title>" + _t("Redirecting to {0}", idn) + "</title>\n" +
                   "<link rel=\"shortcut icon\" href=\"http://proxy.i2p/themes/console/images/favicon.ico\" >\n" +
-                  "<link href=\"http://proxy.i2p/themes/console/default/console.css\" rel=\"stylesheet\" type=\"text/css\" >\n" +
+                  "<link href=\"http://proxy.i2p/themes/console/default/proxy.css\" rel=\"stylesheet\" type=\"text/css\" >\n" +
                   "<meta http-equiv=\"Refresh\" content=\"1; url=" + url + "\">\n" +
                   "</head><body>\n" +
                   "<div class=logo>\n" +
@@ -410,7 +410,7 @@ public abstract class LocalHTTPServer {
                   "<html><head>"+
                   "<title>" + _t("Redirecting to {0}", idn) + "</title>\n" +
                   "<link rel=\"shortcut icon\" href=\"http://proxy.i2p/themes/console/images/favicon.ico\" >\n" +
-                  "<link href=\"http://proxy.i2p/themes/console/default/console.css\" rel=\"stylesheet\" type=\"text/css\" >\n" +
+                  "<link href=\"http://proxy.i2p/themes/console/default/proxy.css\" rel=\"stylesheet\" type=\"text/css\" >\n" +
                   "<meta http-equiv=\"Refresh\" content=\"1; url=" + url + "\">\n" +
                   "</head><body>\n" +
                   "<div class=logo>\n" +
diff --git a/apps/i2ptunnel/resources/proxy/ahelper-conflict-header.ht b/apps/i2ptunnel/resources/proxy/ahelper-conflict-header.ht
index 8d37fa8dea69070314750d74bcbf20a0c01d23db..33907c69e7d9d6850ba151aa374482b3853670b4 100644
--- a/apps/i2ptunnel/resources/proxy/ahelper-conflict-header.ht
+++ b/apps/i2ptunnel/resources/proxy/ahelper-conflict-header.ht
@@ -13,7 +13,7 @@ Content-Security-Policy: default-src 'none'; style-src 'self' 'unsafe-inline' ht
 <html><head>
 <title>_("Warning: Destination Key Conflict")</title>
 <link rel="shortcut icon" href="http://proxy.i2p/themes/console/images/favicon.ico">
-<link href="http://proxy.i2p/themes/console/default/console.css" rel="stylesheet" type="text/css">
+<link href="http://proxy.i2p/themes/console/default/proxy.css" rel="stylesheet" type="text/css">
 </head>
 <body>
 <div class="logo">
diff --git a/apps/i2ptunnel/resources/proxy/ahelper-new-header.ht b/apps/i2ptunnel/resources/proxy/ahelper-new-header.ht
index 11916962a776177a97354093263650fc5ed83b83..76a28982c40741a31339cce898971edcca963374 100644
--- a/apps/i2ptunnel/resources/proxy/ahelper-new-header.ht
+++ b/apps/i2ptunnel/resources/proxy/ahelper-new-header.ht
@@ -14,7 +14,7 @@ Content-Security-Policy: default-src 'none'; style-src 'self' 'unsafe-inline' ht
 <head>
 <title>_("Information: New Host Name")</title>
 <link rel="shortcut icon" href="http://proxy.i2p/themes/console/images/favicon.ico">
-<link href="http://proxy.i2p/themes/console/default/console.css" rel="stylesheet" type="text/css">
+<link href="http://proxy.i2p/themes/console/default/proxy.css" rel="stylesheet" type="text/css">
 </head>
 <body id="proxyNewAddressHelper">
 <div class="logo">
diff --git a/apps/i2ptunnel/resources/proxy/ahelper-notfound-header.ht b/apps/i2ptunnel/resources/proxy/ahelper-notfound-header.ht
index 8ef7d66f084452964f8c65949fb26a33144f095d..3288caac50048c36c2335d1e55bab6b9c1bff8a6 100644
--- a/apps/i2ptunnel/resources/proxy/ahelper-notfound-header.ht
+++ b/apps/i2ptunnel/resources/proxy/ahelper-notfound-header.ht
@@ -12,7 +12,7 @@ Content-Security-Policy: default-src 'none'; style-src 'self' 'unsafe-inline' ht
 <html><head>
 <title>_("Warning: Bad Address Helper")</title>
 <link rel="shortcut icon" href="http://proxy.i2p/themes/console/images/favicon.ico">
-<link href="http://proxy.i2p/themes/console/default/console.css" rel="stylesheet" type="text/css">
+<link href="http://proxy.i2p/themes/console/default/proxy.css" rel="stylesheet" type="text/css">
 </head>
 <body>
 <div class="logo">
diff --git a/apps/i2ptunnel/resources/proxy/b32-auth-header.ht b/apps/i2ptunnel/resources/proxy/b32-auth-header.ht
index 03c03337c0a0797b8f98ac4cc68605d83e5c5248..b784ea517a78b31229f7cc7f0f6b5bca210027cf 100644
--- a/apps/i2ptunnel/resources/proxy/b32-auth-header.ht
+++ b/apps/i2ptunnel/resources/proxy/b32-auth-header.ht
@@ -12,7 +12,7 @@ Content-Security-Policy: default-src 'none'; style-src 'self' 'unsafe-inline' ht
 <html><head>
 <title>_("Warning: Authorization Required")</title>
 <link rel="shortcut icon" href="http://proxy.i2p/themes/console/images/favicon.ico">
-<link href="http://proxy.i2p/themes/console/default/console.css" rel="stylesheet" type="text/css">
+<link href="http://proxy.i2p/themes/console/default/proxy.css" rel="stylesheet" type="text/css">
 </head>
 <body>
 <div class="logo">
@@ -22,5 +22,5 @@ Content-Security-Policy: default-src 'none'; style-src 'self' 'unsafe-inline' ht
 <div class="warning" id="warning">
 <h3>_("Warning: Authorization Required")</h3>
 <p>
-<p><b>_("Could not find the following destination:")</b>
-</p>
+<span><b>_("Could not find the following destination:")</b>
+</span>
\ No newline at end of file
diff --git a/apps/i2ptunnel/resources/proxy/b32-header.ht b/apps/i2ptunnel/resources/proxy/b32-header.ht
index dc95000d30bdda5e7e6b6d26b8bfea20f9d8ffee..cef838296e7253124c8f357ea5c31d3c43f4a910 100644
--- a/apps/i2ptunnel/resources/proxy/b32-header.ht
+++ b/apps/i2ptunnel/resources/proxy/b32-header.ht
@@ -12,7 +12,7 @@ Content-Security-Policy: default-src 'none'; style-src 'self' 'unsafe-inline' ht
 <html><head>
 <title>_("Website Unreachable")</title>
 <link rel="shortcut icon" href="http://proxy.i2p/themes/console/images/favicon.ico">
-<link href="http://proxy.i2p/themes/console/default/console.css" rel="stylesheet" type="text/css">
+<link href="http://proxy.i2p/themes/console/default/proxy.css" rel="stylesheet" type="text/css">
 </head>
 <body>
 <div class="logo">
@@ -24,5 +24,5 @@ Content-Security-Policy: default-src 'none'; style-src 'self' 'unsafe-inline' ht
 <p>
 _("The Base32 address is invalid.")
 <hr>
-<p><b>_("Could not find the following destination:")</b>
-</p>
+<span><b>_("Could not find the following destination:")</b>
+</span>
\ No newline at end of file
diff --git a/apps/i2ptunnel/resources/proxy/baduri-header.ht b/apps/i2ptunnel/resources/proxy/baduri-header.ht
index 70f8c57be48a68bd682ffe1905f524d7e2ba7e71..f91ce6aa351602c825c184f535c449368d24e90c 100644
--- a/apps/i2ptunnel/resources/proxy/baduri-header.ht
+++ b/apps/i2ptunnel/resources/proxy/baduri-header.ht
@@ -12,7 +12,7 @@ Content-Security-Policy: default-src 'none'; style-src 'self' 'unsafe-inline' ht
 <html><head>
 <title>_("Warning: Invalid Request URI")</title>
 <link rel="shortcut icon" href="http://proxy.i2p/themes/console/images/favicon.ico">
-<link href="http://proxy.i2p/themes/console/default/console.css" rel="stylesheet" type="text/css">
+<link href="http://proxy.i2p/themes/console/default/proxy.css" rel="stylesheet" type="text/css">
 </head>
 <body>
 <div class="logo">
diff --git a/apps/i2ptunnel/resources/proxy/css/dark/proxy.css b/apps/i2ptunnel/resources/proxy/css/dark/proxy.css
new file mode 100644
index 0000000000000000000000000000000000000000..270bb837c610fd7c595dde3ecb56950ad6d76e53
--- /dev/null
+++ b/apps/i2ptunnel/resources/proxy/css/dark/proxy.css
@@ -0,0 +1,291 @@
+
+body {
+    margin: 5px 0px 0px;
+    padding: 0px;
+    text-align: center;
+    background-color: rgb(31, 26, 36);
+    color: rgb(230, 230, 231);
+    font-style: normal;
+    font-variant: normal;
+    font-weight: normal;
+    font-size: 8.5pt;
+    line-height: 130%;
+    font-family: 'Droid Sans', 'Noto Sans', Ubuntu, 'Segoe UI', 'Bitstream Vera Sans', 'DejaVu Sans', Verdana, 'Lucida Grande', Helvetica, sans-serif;
+    background-position: initial initial;
+    background-repeat: initial initial;
+}
+
+img {
+    border: none;
+}
+
+table {
+    border-collapse: collapse;
+    width: 100%;
+    border: 1px groove rgb(82, 75, 94);
+    padding: 1px;
+    font-size: 9pt;
+    margin: 1px 0px;
+}
+
+tr {
+    vertical-align: middle;
+}
+
+tr:nth-child(odd) {
+    vertical-align: middle;
+}
+
+td {
+    padding: 4px 6px;
+    color: rgb(230, 230, 231);
+    vertical-align: middle;
+    border-top-width: 1px;
+    border-top-style: inset;
+    border-top-color: rgb(41, 41, 41);
+}
+
+td img {
+    padding: 0px 1px 0px 2px;
+}
+
+a:link {
+    color: rgb(119, 120, 191);
+    text-decoration: none;
+    font-weight: bold;
+    word-wrap: break-word;
+}
+
+a:visited {
+    color: rgb(119, 120, 191);
+    text-decoration: none;
+    font-weight: bold;
+    word-wrap: break-word;
+}
+
+p {
+    text-align: justify;
+    line-height: 160%;
+}
+
+p img:first-child {
+    display: none !important;
+}
+
+h1 {
+    text-align: left;
+    color: rgb(230, 230, 231);
+    padding: 13px 15px;
+    font-size: 17pt;
+    font-weight: bold;
+    font-style: normal;
+    letter-spacing: 0.15em;
+    text-shadow: rgb(0, 17, 0) 0px 0px 2px;
+    white-space: normal;
+    background-image: url(images/header.png);
+    background-color: rgb(0, 0, 0);
+    border: 1px solid rgb(41, 41, 41);
+    border-top-left-radius: 2px;
+    border-top-right-radius: 2px;
+    border-bottom-right-radius: 0px;
+    border-bottom-left-radius: 0px;
+    line-height: 120%;
+    min-width: 620px;
+    box-shadow: rgb(0, 0, 0) 0px 1px 5px;
+    margin: 0px 5px 0px 216px !important;
+    background-position: 50% 50%;
+    background-repeat: initial initial;
+}
+
+h2 {
+    font-size: 12pt;
+    color: rgb(230, 230, 231);
+    text-shadow: rgb(0, 17, 0) 0px 0px 2px;
+    letter-spacing: 0.08em;
+    word-spacing: 0.1em;
+    padding: 10px;
+    border: 1px solid rgb(41, 41, 41);
+    border-top-left-radius: 2px;
+    border-top-right-radius: 2px;
+    border-bottom-right-radius: 2px;
+    border-bottom-left-radius: 2px;
+    vertical-align: middle;
+    word-wrap: break-word;
+    margin: 15px 0px 12px !important;
+}
+
+h2 {
+    box-shadow: rgb(0, 0, 0) 0px 0px 0px 1px inset;
+}
+
+h1 {
+    background-color: rgb(31, 26, 36);
+    box-shadow: rgb(0, 0, 0) 0px 0px 0px 1px inset;
+    text-shadow: rgb(0, 0, 0) 0px 1px 1px;
+    border: 1px groove rgb(82, 75, 94);
+    background-position: initial initial;
+    background-repeat: initial initial;
+}
+
+hr {
+    background-color: rgb(225, 219, 233);
+    height: 1px;
+    border: 0px solid rgb(82, 75, 94);
+    margin: 20px 0px 10px;
+    background-position: initial initial;
+    background-repeat: initial initial;
+}
+
+hr:last-child {
+    margin-top: 20px;
+    margin-bottom: 20px;
+}
+
+.right {
+    text-align: right;
+    margin: 0px 1px;
+    display: inline-block;
+    width: 40%;
+}
+
+.hostadd {
+    height: 10rem;
+    width: 100%;
+}
+
+.hostaddform {
+    width: 48%;
+    display: inline-block;
+    vertical-align: top;
+}
+
+.logo {
+    float: left;
+    padding: 10px;
+    text-align: center;
+    color: rgb(34, 34, 34);
+    margin: 0px 85px;
+    border: 1px solid rgb(68, 68, 119);
+    border-top-left-radius: 2px;
+    border-top-right-radius: 2px;
+    border-bottom-right-radius: 2px;
+    border-bottom-left-radius: 2px;
+    background-position: initial initial;
+    background-repeat: initial initial;
+}
+
+.logo hr {
+    margin: 8px -10px;
+    height: 1px;
+    background-position: initial initial;
+    background-repeat: initial initial;
+}
+
+.warning hr {
+    background-image: linear-gradient(to right, rgb(119, 120, 191), rgb(194, 196, 239));
+    background-position: initial initial;
+    background-repeat: initial initial;
+}
+
+.logo a {
+    width: 100%;
+    display: inline-block !important;
+}
+
+.logo hr~a {
+    margin: 3px 2px;
+}
+
+.warning {
+    padding: 10px 25px 20px 75px;
+    text-align: start;
+    margin: 0px 10px;
+}
+
+.warning:not(old) {
+    background-attachment: scroll, initial;
+    background-origin: initial, initial;
+    background-clip: initial, initial;
+    background-size: 54px, 100%;
+    background-position: 10px calc(50% + 32px);
+    background-repeat: no-repeat;
+}
+
+.warning h3 {
+    text-align: left;
+    padding: 10px 10px 8px;
+    font-size: 1.1rem;
+}
+
+#jumplinks {
+    text-align: start;
+}
+
+#jumplinks > a {
+    border: black;
+        border-top-style: none;
+        border-top-width: medium;
+        border-right-style: none;
+        border-right-width: medium;
+        border-bottom-style: none;
+        border-bottom-width: medium;
+        border-left-style: none;
+        border-left-width: medium;
+    border-style: outset;
+    margin: 2px;
+    float: none;
+    display: inline-block;
+    width: 80%;
+    border-width: 1px;
+    border-radius: 12px;
+    vertical-align: middle;
+    font-size: 1.1rem;
+    text-align: start;
+    padding-top: 1.5%;
+    padding-bottom: 1.5%;
+    padding-left: 1%;
+}
+
+#jumplinks > a:hover {
+    text-decoration: none;
+    color: #da736b !important;
+    border: 1px solid #da736b !important;
+    box-shadow: inset 0 1px 1px 0 #eff;
+}
+
+#jumplinks > h4 {
+    text-align: center;
+    font-size: 1.1rem;
+}
+
+#warning > a {
+    font-size: 1.1rem;
+}
+
+span b {
+    font-size: 1.1rem;
+}
+
+element {
+    height: 6em;
+    min-width: 0;
+    min-height: 0;
+    width: 96%;
+}
+
+table,
+tr,
+td {
+    font-family: 'Droid Sans', 'Noto Sans', Ubuntu, 'Segoe UI', 'Lucida Grande', Verdana, Helvetica, sans-serif;
+    font-size: 10pt;
+}
+
+@media screen and (min-width: 1500px) {
+    body {
+        font-size: 10pt !important;
+    }
+    h1 {
+        margin-left: 242px !important;
+    }
+}
+
diff --git a/apps/i2ptunnel/resources/proxy/css/light/proxy.css b/apps/i2ptunnel/resources/proxy/css/light/proxy.css
new file mode 100644
index 0000000000000000000000000000000000000000..bbb63dbaf29cf50465671e71d2087f9f0a984b11
--- /dev/null
+++ b/apps/i2ptunnel/resources/proxy/css/light/proxy.css
@@ -0,0 +1,311 @@
+
+
+html {
+    margin: 0px !important;
+}
+
+body {
+    margin: 6px;
+    text-align: center;
+    color: rgb(51, 51, 63);
+    font-size: 9pt;
+    line-height: 130%;
+    background-color: rgb(246, 246, 250);
+    background-position: initial initial;
+    background-repeat: initial initial;
+}
+
+b {
+    color: rgb(65, 70, 95);
+}
+
+body {
+    font-family: 'Droid Sans', 'Noto Sans', Ubuntu, 'Segoe UI', 'Lucida Grande', Verdana, Helvetica, sans-serif;
+}
+
+* {
+    outline: none;
+}
+
+img {
+    border: none;
+}
+
+.logo {
+    float: left;
+    padding: 10px;
+    text-align: center;
+    color: rgb(34, 34, 34);
+    margin: 0px 10px;
+    border: 1px solid rgb(68, 68, 119);
+    border-top-left-radius: 2px;
+    border-top-right-radius: 2px;
+    border-bottom-right-radius: 2px;
+    border-bottom-left-radius: 2px;
+    background-color: rgb(248, 248, 255);
+    box-shadow: rgb(187, 187, 255) 0px 0px 0px 1px inset;
+    background-position: initial initial;
+    background-repeat: initial initial;
+}
+
+.logo hr {
+    margin: 8px -10px;
+    background-color: rgb(119, 120, 191);
+    height: 1px;
+    background-position: initial initial;
+    background-repeat: initial initial;
+}
+
+.warning hr {
+    background-image: linear-gradient(to right, rgb(119, 120, 191), rgb(194, 196, 239));
+    background-position: initial initial;
+    background-repeat: initial initial;
+}
+
+.logo a {
+    width: 100%;
+    display: inline-block !important;
+}
+
+.logo hr~a {
+    margin: 3px 2px;
+}
+
+.warning {
+    padding: 10px 25px 20px 75px;
+    text-align: start;
+    color: rgb(34, 34, 34);
+    margin: 0px 10px;
+    border: 1px solid rgb(68, 68, 119);
+    border-top-left-radius: 2px;
+    border-top-right-radius: 2px;
+    border-bottom-right-radius: 2px;
+    border-bottom-left-radius: 2px;
+    background-color: rgb(248, 248, 255);
+    box-shadow: rgb(187, 187, 255) 0px 0px 0px 1px inset;
+}
+
+.warning:not(old) {
+    background-image: url(/themes/console/images/itoopie_sm.png), linear-gradient(rgba(248, 248, 255, 0.8), rgba(240, 240, 255, 0.8));
+    background-attachment: scroll, initial;
+    background-origin: initial, initial;
+    background-clip: initial, initial;
+    background-size: 54px, 100%;
+    background-position: 10px calc(50% + 32px);
+    background-repeat: no-repeat;
+}
+
+.warning h3 {
+    text-align: left;
+    border-style: none none solid;
+    border-bottom-width: 1px;
+    border-bottom-color: rgb(68, 68, 119);
+    border-top-left-radius: 2px;
+    border-top-right-radius: 2px;
+    border-bottom-right-radius: 0px;
+    border-bottom-left-radius: 0px;
+    padding: 10px 10px 8px;
+    font-size: 1.1rem;
+}
+
+@media screen and (max-width: 800px) {
+    .warning {
+        margin: 114px 5px 0px !important;
+        background-image: linear-gradient(rgba(255, 255, 255, 0.8), rgba(255, 255, 255, 0.298039)) !important;
+        background-color: rgb(248, 248, 255) !important;
+        padding-left: 25px !important;
+        background-position: initial initial !important;
+        background-repeat: initial initial !important;
+    }
+    .warning h3 {
+        font-size: 10pt !important;
+    }
+    .logo {
+        position: absolute;
+        top: 0px;
+        min-width: 430px;
+        width: calc(100% - 40px) !important;
+        margin: 10px 5px 0px !important;
+    }
+    .logo a:link:not(img) {
+        display: inline-block;
+        width: auto;
+        margin: 0px 5px;
+    }
+}
+
+.logo hr {
+    visibility: hidden;
+}
+
+@media screen and (min-height: 700px) {
+    .warning {
+        margin-bottom: 30px;
+    }
+}
+
+.logo {
+    background-color: rgb(246, 246, 250) !important;
+    background-position: initial initial !important;
+    background-repeat: initial initial !important;
+}
+
+hr {
+    color: rgb(17, 17, 51);
+    background-color: rgb(17, 17, 51);
+    height: 1px;
+    border: 0px solid rgb(17, 17, 51);
+    margin: 10px 0px;
+    background-position: initial initial;
+    background-repeat: initial initial;
+}
+
+a,
+h3 {
+    text-shadow: rgb(255, 255, 255) 0px 1px 1px;
+}
+
+a:link {
+    color: rgb(59, 107, 191);
+    text-decoration: none;
+    font-weight: bold;
+    word-wrap: break-word;
+    outline: none;
+    padding-top: 4px;
+}
+
+a:hover {
+    color: rgb(59, 107, 191);
+    text-decoration: none;
+    font-weight: bold;
+    word-wrap: break-word;
+    outline: none;
+    padding-top: 4px;
+}
+
+p {
+    text-align: justify;
+    line-height: 130%;
+}
+
+h3 {
+    padding: 7px 5px 6px 7px;
+    border-top-left-radius: 0px;
+    border-top-right-radius: 2px;
+    border-bottom-right-radius: 2px;
+    border-bottom-left-radius: 0px;
+    font-size: 11pt;
+    letter-spacing: 0.08em;
+    word-spacing: 0.1em;
+    color: rgb(65, 70, 95);
+    border: 1px solid rgb(222, 226, 230);
+}
+
+h3 {
+    background-color: rgb(245, 245, 245) !important;
+    background-position: initial initial !important;
+    background-repeat: initial initial !important;
+}
+
+.right {
+    text-align: right;
+    margin: 0px 1px;
+    display: inline-block;
+    width: 40%;
+}
+
+.hostadd {
+    height: 10rem;
+    width: 100%;
+    border-radius: 12px;
+    background: #eef;
+}
+
+.hostaddform {
+    width: 48%;
+    display: inline-block;
+    vertical-align: top;
+}
+
+#jumplinks {
+    text-align: start;
+}
+
+#jumplinks > a {
+    border: black;
+        border-top-style: none;
+        border-top-width: medium;
+        border-right-style: none;
+        border-right-width: medium;
+        border-bottom-style: none;
+        border-bottom-width: medium;
+        border-left-style: none;
+        border-left-width: medium;
+    border-style: outset;
+    margin: 2px;
+    float: none;
+    display: inline-block;
+    width: 80%;
+    border-width: 1px;
+    border-radius: 12px;
+    vertical-align: middle;
+    font-size: 1.1rem;
+    text-align: start;
+    padding-top: 1.5%;
+    padding-bottom: 1.5%;
+    padding-left: 1%;
+    background: #ddd;
+    background: linear-gradient(to bottom, #eee, #fff);
+}
+
+#jumplinks > a:hover {
+    text-decoration: none;
+    color: #19191f;
+    border: 1px solid #f60 !important;
+    background: #ddd;
+    background: linear-gradient(to bottom, #eee, #fff);
+    box-shadow: inset 0 0 0 1px #fff !important;
+    filter: drop-shadow(0 0 1px rgba(204, 204, 204, 0.8));
+    transition: ease border 0.7s;
+}
+
+
+#jumplinks > h4 {
+    text-align: center;
+    font-size: 1.1rem;
+}
+
+#warning > a {
+    font-size: 1.1rem;
+}
+
+span b {
+    font-size: 1.1rem;
+}
+
+element {
+    height: 6em;
+    min-width: 0;
+    min-height: 0;
+    width: 96%;
+}
+
+table,
+tr,
+td {
+    font-family: 'Droid Sans', 'Noto Sans', Ubuntu, 'Segoe UI', 'Lucida Grande', Verdana, Helvetica, sans-serif;
+    font-size: 10pt;
+}
+
+@media screen and (max-width: 1500px) {
+    body {
+        margin: 4px;
+    }
+}
+
+@media screen and (min-width: 1500px) {
+    body {
+        font-size: 10pt !important;
+    }
+}
+
diff --git a/apps/i2ptunnel/resources/proxy/denied-header.ht b/apps/i2ptunnel/resources/proxy/denied-header.ht
index 227c96188148fe79c0dbd46339cfb98160214765..ac1df3b8a06242562c3aa1781ccefe8c32a4ac9c 100644
--- a/apps/i2ptunnel/resources/proxy/denied-header.ht
+++ b/apps/i2ptunnel/resources/proxy/denied-header.ht
@@ -12,7 +12,7 @@ Content-Security-Policy: default-src 'none'; style-src 'self' 'unsafe-inline' ht
 <html><head>
 <title>_("Warning: Request Denied")</title>
 <link rel="shortcut icon" href="http://proxy.i2p/themes/console/images/favicon.ico">
-<link href="http://proxy.i2p/themes/console/default/console.css" rel="stylesheet" type="text/css">
+<link href="http://proxy.i2p/themes/console/default/proxy.css" rel="stylesheet" type="text/css">
 </head>
 <body>
 <div class="logo">
diff --git a/apps/i2ptunnel/resources/proxy/dnf-header.ht b/apps/i2ptunnel/resources/proxy/dnf-header.ht
index 7d30752d64c5043981dc2bbbd2df2635525e7bd7..a2d2350ab907bb5a80d48f47386f57da11d29d14 100644
--- a/apps/i2ptunnel/resources/proxy/dnf-header.ht
+++ b/apps/i2ptunnel/resources/proxy/dnf-header.ht
@@ -12,7 +12,7 @@ Content-Security-Policy: default-src 'none'; style-src 'self' 'unsafe-inline' ht
 <html><head>
 <title>_("Website Unreachable")</title>
 <link rel="shortcut icon" href="http://proxy.i2p/themes/console/images/favicon.ico">
-<link href="http://proxy.i2p/themes/console/default/console.css" rel="stylesheet" type="text/css">
+<link href="http://proxy.i2p/themes/console/default/proxy.css" rel="stylesheet" type="text/css">
 </head>
 <body>
 <div class="logo">
@@ -27,5 +27,5 @@ _("The website is offline, there is network congestion, or your router is not ye
 <span>_("You may want to {0}retry{1}.", "<a href=\"\">", "</a>")</span>
 </p>
 <hr>
-<p><b>_("Could not find the following destination:")</b>
-</p>
+<span><b>_("Could not find the following destination:")</b>
+</span>
\ No newline at end of file
diff --git a/apps/i2ptunnel/resources/proxy/dnfb-header.ht b/apps/i2ptunnel/resources/proxy/dnfb-header.ht
index 2b8a826502bb9ebb81281898d314b70f9fdec3b5..4ef98514d3924dd3c3a7787ed027bfde54b48718 100644
--- a/apps/i2ptunnel/resources/proxy/dnfb-header.ht
+++ b/apps/i2ptunnel/resources/proxy/dnfb-header.ht
@@ -12,7 +12,7 @@ Content-Security-Policy: default-src 'none'; style-src 'self' 'unsafe-inline' ht
 <html><head>
 <title>_("Warning: Invalid Destination")</title>
 <link rel="shortcut icon" href="http://proxy.i2p/themes/console/images/favicon.ico">
-<link href="http://proxy.i2p/themes/console/default/console.css" rel="stylesheet" type="text/css">
+<link href="http://proxy.i2p/themes/console/default/proxy.css" rel="stylesheet" type="text/css">
 </head>
 <body>
 <div class="logo">
@@ -28,5 +28,5 @@ _("The I2P host could also be offline.")
 <span>_("You may want to {0}retry{1}.", "<a href=\"\">", "</a>")</span>
 </p>
 <hr>
-<p><b>_("Could not find the following destination:")</b>
-</p>
+<span><b>_("Could not find the following destination:")</b>
+</span>
\ No newline at end of file
diff --git a/apps/i2ptunnel/resources/proxy/dnfh-header.ht b/apps/i2ptunnel/resources/proxy/dnfh-header.ht
index 3ad17dd08214e153886ee75e281935ce04ac1302..276d03fde7a3a85753591d6ccddc4f9953feb8fa 100644
--- a/apps/i2ptunnel/resources/proxy/dnfh-header.ht
+++ b/apps/i2ptunnel/resources/proxy/dnfh-header.ht
@@ -14,7 +14,7 @@ Content-Security-Policy: default-src 'none'; style-src 'self' 'unsafe-inline' ht
 <head>
 <title>_("Website Unknown")</title>
 <link rel="shortcut icon" href="http://proxy.i2p/themes/console/images/favicon.ico">
-<link href="http://proxy.i2p/themes/console/default/console.css" rel="stylesheet" type="text/css">
+<link href="http://proxy.i2p/themes/console/default/proxy.css" rel="stylesheet" type="text/css">
 </head>
 <body>
 <div class="logo">
@@ -34,6 +34,5 @@ _("Otherwise, find a Base 32 or address helper link, or use a jump service link
 _("Seeing this page often? See {0}the FAQ{1} for help in {2}adding some subscriptions{3} to your addressbook.", "<a href=\"http://127.0.0.1:7657/help#addressbooksubs\">", "</a>", "<a href=\"http://127.0.0.1:7657/susidns/config\">", "</a>")
 </p>
 <hr>
-<p>
-<b>_("Could not find the following destination:")</b>
-</p>
+<span><b>_("Could not find the following destination:")</b>
+</span>
\ No newline at end of file
diff --git a/apps/i2ptunnel/resources/proxy/dnfp-header.ht b/apps/i2ptunnel/resources/proxy/dnfp-header.ht
index f567e049dda8f9374975de724e78b70f1eaf03e1..7adaf626d50c25fcf3264ec1e1081ef95459bf3d 100644
--- a/apps/i2ptunnel/resources/proxy/dnfp-header.ht
+++ b/apps/i2ptunnel/resources/proxy/dnfp-header.ht
@@ -13,7 +13,7 @@ Content-Security-Policy: default-src 'none'; style-src 'self' 'unsafe-inline' ht
 <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/default/console.css" rel="stylesheet" type="text/css">
+<link href="http://proxy.i2p/themes/console/default/proxy.css" rel="stylesheet" type="text/css">
 </head>
 <body>
 <div class="logo">
@@ -28,4 +28,5 @@ _("It is offline, there is network congestion, or your router is not yet well-in
 <span>_("You may want to {0}retry{1} as this will randomly reselect an outproxy from the pool you have defined {2}here{3} (if you have more than one configured).", "<a href=\"\">", "</a>", "<a href=\"http://127.0.0.1:7657/i2ptunnelmgr\">", "</a>")</span>
 _("If you continue to have trouble you may want to edit your outproxy list {0}here{1}.", "<a href=\"http://127.0.0.1:7657/i2ptunnelmgr/edit?tunnel=0\">", "</a>")
 </p>
-<hr><p><b>_("Could not find the following destination:")</b></p>
+<hr><span><b>_("Could not find the following destination:")</b>
+</span>
diff --git a/apps/i2ptunnel/resources/proxy/enc-header.ht b/apps/i2ptunnel/resources/proxy/enc-header.ht
index 0a55b7877f311be93bd4588ac512b3dc273281d7..090ce8d354090606397dcb7ef155991d5cf7758b 100644
--- a/apps/i2ptunnel/resources/proxy/enc-header.ht
+++ b/apps/i2ptunnel/resources/proxy/enc-header.ht
@@ -12,7 +12,7 @@ Content-Security-Policy: default-src 'none'; style-src 'self' 'unsafe-inline' ht
 <html><head>
 <title>_("Website Unreachable")</title>
 <link rel="shortcut icon" href="http://proxy.i2p/themes/console/images/favicon.ico">
-<link href="http://proxy.i2p/themes/console/default/console.css" rel="stylesheet" type="text/css">
+<link href="http://proxy.i2p/themes/console/default/proxy.css" rel="stylesheet" type="text/css">
 </head>
 <body>
 <div class="logo">
@@ -24,5 +24,5 @@ Content-Security-Policy: default-src 'none'; style-src 'self' 'unsafe-inline' ht
 <p>
 _("The website was not reachable, because it uses encryption options that are not supported by your I2P or Java version.")
 <hr>
-<p><b>_("Could not connect to the following destination:")</b>
-</p>
+<span><b>_("Could not find the following destination:")</b>
+</span>
\ No newline at end of file
diff --git a/apps/i2ptunnel/resources/proxy/encp-header.ht b/apps/i2ptunnel/resources/proxy/encp-header.ht
index fffcdc135c9e66f95cd1a1a9370a22764a17be7d..d677a713a5baa248c8fb898a72b4b0ece267e336 100644
--- a/apps/i2ptunnel/resources/proxy/encp-header.ht
+++ b/apps/i2ptunnel/resources/proxy/encp-header.ht
@@ -12,7 +12,7 @@ Content-Security-Policy: default-src 'none'; style-src 'self' 'unsafe-inline' ht
 <html><head>
 <title>_("Outproxy Unreachable")</title>
 <link rel="shortcut icon" href="http://proxy.i2p/themes/console/images/favicon.ico">
-<link href="http://proxy.i2p/themes/console/default/console.css" rel="stylesheet" type="text/css">
+<link href="http://proxy.i2p/themes/console/default/proxy.css" rel="stylesheet" type="text/css">
 </head>
 <body>
 <div class="logo">
@@ -26,4 +26,5 @@ _("The HTTP outproxy was not reachable, because it uses encryption options that
 <span>_("You may want to {0}retry{1} as this will randomly reselect an outproxy from the pool you have defined {2}here{3} (if you have more than one configured).", "<a href=\"\">", "</a>", "<a href=\"http://127.0.0.1:7657/i2ptunnelmgr\">", "</a>")</span>
 _("If you continue to have trouble you may want to edit your outproxy list {0}here{1}.", "<a href=\"http://127.0.0.1:7657/i2ptunnelmgr/edit?tunnel=0\">", "</a>")
 </p>
-<hr><p><b>_("Could not connect to the following destination:")</b></p>
+<hr><span><b>_("Could not find the following destination:")</b>
+</span>
diff --git a/apps/i2ptunnel/resources/proxy/localhost-header.ht b/apps/i2ptunnel/resources/proxy/localhost-header.ht
index bec436a738ede0ca85550e816d5a0aa4034f4d49..b77572ae23c07cd026d79fd3427eb4857b21f745 100644
--- a/apps/i2ptunnel/resources/proxy/localhost-header.ht
+++ b/apps/i2ptunnel/resources/proxy/localhost-header.ht
@@ -12,7 +12,7 @@ Content-Security-Policy: default-src 'none'; style-src 'self' 'unsafe-inline' ht
 <html><head>
 <title>_("Error: Request Denied")</title>
 <link rel="shortcut icon" href="http://proxy.i2p/themes/console/images/favicon.ico">
-<link href="http://proxy.i2p/themes/console/default/console.css" rel="stylesheet" type="text/css">
+<link href="http://proxy.i2p/themes/console/default/proxy.css" rel="stylesheet" type="text/css">
 </head>
 <body>
 <!-----------------------------
diff --git a/apps/i2ptunnel/resources/proxy/nols-header.ht b/apps/i2ptunnel/resources/proxy/nols-header.ht
index 8d85bbe8361017354d954bd480675db581f7eb1e..de6e8dddb55cce116f4756a7bdd40706cbbabd6f 100644
--- a/apps/i2ptunnel/resources/proxy/nols-header.ht
+++ b/apps/i2ptunnel/resources/proxy/nols-header.ht
@@ -12,7 +12,7 @@ Content-Security-Policy: default-src 'none'; style-src 'self' 'unsafe-inline' ht
 <html><head>
 <title>_("Website Unreachable")</title>
 <link rel="shortcut icon" href="http://proxy.i2p/themes/console/images/favicon.ico">
-<link href="http://proxy.i2p/themes/console/default/console.css" rel="stylesheet" type="text/css">
+<link href="http://proxy.i2p/themes/console/default/proxy.css" rel="stylesheet" type="text/css">
 </head>
 <body>
 <div class="logo">
@@ -27,5 +27,5 @@ _("The website is probably down, but there could also be network congestion.")
 <span>_("You may want to {0}retry{1}.", "<a href=\"\">", "</a>")</span>
 </p>
 <hr>
-<p><b>_("Could not find the following destination:")</b>
-</p>
+<span><b>_("Could not find the following destination:")</b>
+</span>
\ No newline at end of file
diff --git a/apps/i2ptunnel/resources/proxy/nolsp-header.ht b/apps/i2ptunnel/resources/proxy/nolsp-header.ht
index bf5ab3a291689bf728fa579968b351bc98bc4c64..438e16c60eabc01a6531ad56ea54ec933a8f1267 100644
--- a/apps/i2ptunnel/resources/proxy/nolsp-header.ht
+++ b/apps/i2ptunnel/resources/proxy/nolsp-header.ht
@@ -12,7 +12,7 @@ Content-Security-Policy: default-src 'none'; style-src 'self' 'unsafe-inline' ht
 <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/default/console.css" rel="stylesheet" type="text/css">
+<link href="http://proxy.i2p/themes/console/default/proxy.css" rel="stylesheet" type="text/css">
 </head>
 <body>
 <div class="logo">
@@ -27,4 +27,5 @@ _("The outproxy is probably down, but there could also be network congestion.")
 <span>_("You may want to {0}retry{1} as this will randomly reselect an outproxy from the pool you have defined {2}here{3} (if you have more than one configured).", "<a href=\"\">", "</a>", "<a href=\"http://127.0.0.1:7657/i2ptunnelmgr\">", "</a>")</span>
 _("If you continue to have trouble you may want to edit your outproxy list {0}here{1}.", "<a href=\"http://127.0.0.1:7657/i2ptunnelmgr/edit?tunnel=0\">", "</a>")
 </p>
-<hr><p><b>_("Could not find the following destination:")</b></p>
+<hr><span><b>_("Could not find the following destination:")</b>
+</span>
diff --git a/apps/i2ptunnel/resources/proxy/noproxy-header.ht b/apps/i2ptunnel/resources/proxy/noproxy-header.ht
index a7cb9b5b37594e2041dca4b077c61f1205a3f6d0..87e401f477f3f9b014b42e2d3d59516d9f40cbfe 100644
--- a/apps/i2ptunnel/resources/proxy/noproxy-header.ht
+++ b/apps/i2ptunnel/resources/proxy/noproxy-header.ht
@@ -12,7 +12,7 @@ Content-Security-Policy: default-src 'none'; style-src 'self' 'unsafe-inline' ht
 <html><head>
 <title>_("Warning: No Outproxy Configured")</title>
 <link rel="shortcut icon" href="http://proxy.i2p/themes/console/images/favicon.ico">
-<link href="http://proxy.i2p/themes/console/default/console.css" rel="stylesheet" type="text/css">
+<link href="http://proxy.i2p/themes/console/default/proxy.css" rel="stylesheet" type="text/css">
 </head>
 <body>
 <div class="logo">
diff --git a/apps/i2ptunnel/resources/proxy/protocol-header.ht b/apps/i2ptunnel/resources/proxy/protocol-header.ht
index 124d66b53fd831cf3bbf34af4d5c972adbf16189..071891c6d25cad463e34e9380288cd8bebb83585 100644
--- a/apps/i2ptunnel/resources/proxy/protocol-header.ht
+++ b/apps/i2ptunnel/resources/proxy/protocol-header.ht
@@ -12,7 +12,7 @@ Content-Security-Policy: default-src 'none'; style-src 'self' 'unsafe-inline' ht
 <html><head>
 <title>_("Warning: Non-HTTP Protocol")</title>
 <link rel="shortcut icon" href="http://proxy.i2p/themes/console/images/favicon.ico">
-<link href="http://proxy.i2p/themes/console/default/console.css" rel="stylesheet" type="text/css">
+<link href="http://proxy.i2p/themes/console/default/proxy.css" rel="stylesheet" type="text/css">
 </head>
 <body>
 <div class="logo">
diff --git a/apps/i2ptunnel/resources/proxy/reset-header.ht b/apps/i2ptunnel/resources/proxy/reset-header.ht
index 2d3c5cfff9ec8c4e0a143aead4de6e0dd38663a2..38b3bb2609168436a85a940bb5499c44f2beed94 100644
--- a/apps/i2ptunnel/resources/proxy/reset-header.ht
+++ b/apps/i2ptunnel/resources/proxy/reset-header.ht
@@ -12,7 +12,7 @@ Content-Security-Policy: default-src 'none'; style-src 'self' 'unsafe-inline' ht
 <html><head>
 <title>_("Connection Reset")</title>
 <link rel="shortcut icon" href="http://proxy.i2p/themes/console/images/favicon.ico">
-<link href="http://proxy.i2p/themes/console/default/console.css" rel="stylesheet" type="text/css">
+<link href="http://proxy.i2p/themes/console/default/proxy.css" rel="stylesheet" type="text/css">
 </head>
 <body>
 <div class="logo">
@@ -27,5 +27,5 @@ _("The website could be temporarily unavailable, too busy, or it has blocked you
 <span>_("You may want to {0}retry{1}.", "<a href=\"\">", "</a>")</span>
 </p>
 <hr>
-<p><b>_("Could not find the following destination:")</b>
-</p>
+<span><b>_("Could not find the following destination:")</b>
+</span>
diff --git a/apps/i2ptunnel/resources/proxy/resetp-header.ht b/apps/i2ptunnel/resources/proxy/resetp-header.ht
index 23a22ce1646a90059744edb26735a991914f0ac0..3516525f5900d871d65bcca6ec63b19f845fad49 100644
--- a/apps/i2ptunnel/resources/proxy/resetp-header.ht
+++ b/apps/i2ptunnel/resources/proxy/resetp-header.ht
@@ -12,7 +12,7 @@ Content-Security-Policy: default-src 'none'; style-src 'self' 'unsafe-inline' ht
 <html><head>
 <title>_("Connection Reset")</title>
 <link rel="shortcut icon" href="http://proxy.i2p/themes/console/images/favicon.ico">
-<link href="http://proxy.i2p/themes/console/default/console.css" rel="stylesheet" type="text/css">
+<link href="http://proxy.i2p/themes/console/default/proxy.css" rel="stylesheet" type="text/css">
 </head>
 <body>
 <div class="logo">
@@ -28,5 +28,5 @@ _("The proxy could be temporarily unavailable, too busy, or it has blocked your
 _("If you continue to have trouble you may want to edit your outproxy list {0}here{1}.", "<a href=\"http://127.0.0.1:7657/i2ptunnelmgr/edit?tunnel=0\">", "</a>")
 </p>
 <hr>
-<p><b>_("Could not find the following destination:")</b>
-</p>
+<span><b>_("Could not find the following destination:")</b>
+</span>