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 351e80e167..fe561bfe23 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
@@ -2494,14 +2494,14 @@ public class I2PSnarkServlet extends BasicServlet {
                .append(name).append("\" title=\"").append(_t("Mark tracker for deletion")).append("\">" +
                        "</td><td><label for=\"").append(name).append("\">").append(name)
                .append("</td><td>").append(urlify(homeURL, 35))
-               .append("</td><td><input type=\"radio\" class=\"optbox\" value=\"0\" name=\"ttype_")
+               .append("</td><td><input type=\"radio\" class=\"optbox\" value=\"0\" tabindex=\"-1\" name=\"ttype_")
                .append(announceURL).append("\"");
             if (!(isOpen || isPrivate))
                 buf.append(" checked=\"checked\"");
             else if (isKnownOpen)
                 buf.append(" disabled=\"disabled\"");
             buf.append(">" +
-                       "</td><td><input type=\"radio\" class=\"optbox\" value=\"1\" name=\"ttype_")
+                       "</td><td><input type=\"radio\" class=\"optbox\" value=\"1\" tabindex=\"-1\" name=\"ttype_")
                .append(announceURL).append("\"");
             if (isOpen)
                 buf.append(" checked=\"checked\"");
@@ -2509,7 +2509,7 @@ public class I2PSnarkServlet extends BasicServlet {
                      t.announceURL.equals("http://tracker2.postman.i2p/announce.php"))
                 buf.append(" disabled=\"disabled\"");
             buf.append(">" +
-                       "</td><td><input type=\"radio\" class=\"optbox\" value=\"2\" name=\"ttype_")
+                       "</td><td><input type=\"radio\" class=\"optbox\" value=\"2\" tabindex=\"-1\" name=\"ttype_")
                .append(announceURL).append("\"");
             if (isPrivate) {
                 buf.append(" checked=\"checked\"");
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java
index 399269c5a9..5f4d28eb54 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java
@@ -743,7 +743,7 @@ public abstract class I2PTunnelHTTPClientBase extends I2PTunnelClientBase implem
 
                     if (first) {
                         first = false;
-                        out.write("<br><br><h3>");
+                        out.write("<br><br>\n<div id=\"jumplinks\">\n<h3>");
                         out.write(_t("Click a link below for an address helper from a jump service"));
                         out.write("</h3>\n");
                     } else {
@@ -759,7 +759,7 @@ public abstract class I2PTunnelHTTPClientBase extends I2PTunnelClientBase implem
                 }
             }
         }
-        out.write("</div>");
+        out.write("</div>\n</div>\n");
         writeFooter(out);
     }
 
@@ -791,7 +791,7 @@ public abstract class I2PTunnelHTTPClientBase extends I2PTunnelClientBase implem
         StringBuilder buf = new StringBuilder(128);
         buf.append("<div class=\"proxyfooter\"><p><i>I2P HTTP Proxy Server<br>Generated on: ")
            .append(new Date().toString())
-           .append("</i></div></body></html>\n");
+           .append("</i></div>\n</body>\n</html>\n");
         return buf.toString();
     }
 
diff --git a/installer/resources/eepsite/docroot/help/lib/eepsite.css b/installer/resources/eepsite/docroot/help/lib/eepsite.css
index 935b4c0d15..0c83c8d8c4 100644
--- a/installer/resources/eepsite/docroot/help/lib/eepsite.css
+++ b/installer/resources/eepsite/docroot/help/lib/eepsite.css
@@ -1,5 +1,4 @@
 body {
-    margin: 6% 8.7%;
     margin: 25px 10%;
     text-align: justify;
     color: #ffffe0;
@@ -253,10 +252,9 @@ div.notify {
 }
 
 code {
-    font-size: 9pt;
+    font-family: "Droid Sans Mono", "Noto Mono", "Lucida Console", "DejaVu Sans Mono", monospace;
     font-weight: bold;
-    color: #ff5;
-    text-shadow: 1px 1px 1px #000;
+    color: #dd5;
 }
 
 #navbar {
@@ -276,4 +274,12 @@ code {
      background: #000;
      text-decoration: none;
      outline: none;
+}
+
+/* responsive layout */
+
+@media screen and (max-width: 1000px) {
+body {
+     margin: 10px !important;
+}
 }
\ No newline at end of file
diff --git a/installer/resources/eepsite/docroot/help/lib/eepsite_zh.css b/installer/resources/eepsite/docroot/help/lib/eepsite_zh.css
index 19a65d2b88..326b8ec4b3 100644
--- a/installer/resources/eepsite/docroot/help/lib/eepsite_zh.css
+++ b/installer/resources/eepsite/docroot/help/lib/eepsite_zh.css
@@ -2,7 +2,8 @@ body, p, li, a {
      font-size: 12pt;
      line-height: 160%;
      font-weight: normal;
-     letter-spacing: 0.08em;
+     letter-spacing: 0.1em;
+     word-spacing: 0.1em;
 }
 
 .langbar, h1 {
@@ -25,10 +26,15 @@ p {
 li {
      padding-right: 35px;
      margin-left: 15px;
+     line-height: 180%;
+}
+
+li a {
+     white-space: nowrap;
 }
 
 code {
-     font-size: 11pt;
+     font-family: "Droid Sans Mono", "Noto Mono", "Lucida Console", "DejaVu Sans Mono", monospace;
      font-weight: normal;
 }
 
@@ -40,6 +46,6 @@ code {
 }
 
 .footnote {
-     font-size: 10pt !important; 
+     font-size: 11pt !important;
  }
  
\ No newline at end of file
diff --git a/installer/resources/eepsite/docroot/help/lib/jetty-dir.css b/installer/resources/eepsite/docroot/help/lib/jetty-dir.css
index f83f3868d7..80b8992bc8 100644
--- a/installer/resources/eepsite/docroot/help/lib/jetty-dir.css
+++ b/installer/resources/eepsite/docroot/help/lib/jetty-dir.css
@@ -3,6 +3,7 @@ html {
 }
 
 body {
+     min-width: 500px;
      background: #bfbfff;
      background: linear-gradient(to bottom, #bfbfff, #dfdfff) !important;
      color: #333;
@@ -16,9 +17,9 @@ h1 {
      font-size: 12pt;
      color: #fff;
      width: auto;
-     padding: 7px 5px 7px 30px;
-     background: #bbf url(itoopie.png) 5px center no-repeat;
-     background: url(itoopie.png) 5px center no-repeat, linear-gradient(to right, #ddf, #bbf);
+     padding: 10px 5px 10px 45px;
+     background: #bbf url(resources/folder_32x32.png) 6px center no-repeat;
+     background: url(resources/folder_32x32.png) 6px center no-repeat, linear-gradient(to right, #ddf, #bbf);
      background-size: auto 80%, 100% 100%;
 }
 
@@ -45,8 +46,8 @@ table {
 }
 
 tr {
-     border-top: 1px solid #337;
-     border-bottom: 1px solid #337;
+     border-top: 1px solid #99b;
+     border-bottom: 1px solid #99b;
 }
 
 tr:hover td {
@@ -65,7 +66,7 @@ tr:nth-child(even) {
 }
 
 td {
-     padding: 5px;
+     padding: 7px 5px;
      text-align: right;
      white-space: nowrap;
 }
@@ -74,11 +75,13 @@ td:first-child {
      width: 90%;
      white-space: nowrap;
      text-align: left;
+     padding-left: 8px;
 }
 
 td:last-child {
      text-align: right;
      font-style: italic;
+     padding-right: 8px;
 }
 
 /* filetype icons */
@@ -173,4 +176,10 @@ td:first-child a[href$=".pdf"] {
 td:first-child a[href$=".iso"],
 td:first-child a[href$=".nrg"]  {
      background: url(resources/iso.png) left center no-repeat;
+}
+
+@media screen and (max-width: 600px) {
+body, table {
+     font-size: 9pt !important;
+}
 }
\ No newline at end of file
diff --git a/installer/resources/eepsite/docroot/help/lib/resources/folder_32x32.png b/installer/resources/eepsite/docroot/help/lib/resources/folder_32x32.png
new file mode 100644
index 0000000000..ef6bee374c
Binary files /dev/null and b/installer/resources/eepsite/docroot/help/lib/resources/folder_32x32.png differ
diff --git a/installer/resources/proxy/dnfh-header.ht b/installer/resources/proxy/dnfh-header.ht
index b03ecbc503..58283ab570 100644
--- a/installer/resources/proxy/dnfh-header.ht
+++ b/installer/resources/proxy/dnfh-header.ht
@@ -6,14 +6,16 @@ Connection: close
 Proxy-Connection: close
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head>
+<html>
+<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">
 </head>
 <body>
 <div class="logo">
- <a href="http://127.0.0.1:7657/" title="_("Router Console")"><img src="http://proxy.i2p/themes/console/images/i2plogo.png" alt="_("I2P Router Console")" border="0"></a><hr>
+ <a href="http://127.0.0.1:7657/" title="_("Router Console")"><img src="http://proxy.i2p/themes/console/images/i2plogo.png" alt="_("I2P Router Console")" border="0"></a>
+ <hr>
  <a href="http://127.0.0.1:7657/config.jsp">_("Configuration")</a> <a href="http://127.0.0.1:7657/help.jsp">_("Help")</a> <a href="http://127.0.0.1:7657/susidns/index">_("Addressbook")</a>
 </div>
 <div class="warning" id="warning">
@@ -25,8 +27,9 @@ _("If you have the Base 64 address, {0}add it to your addressbook{1}.", "<a href
 _("Otherwise, find a Base 32 or address helper link, or use a jump service link below.")
 </p>
 <p>
-_("Seeing this page often? See {0}the FAQ{1} for help in {2}adding some subscriptions{3} to your addressbook.", "<a href=\"http://i2p-projekt.i2p/faq.html#subscriptions\">", "</a>", "<a href=\"http://127.0.0.1:7657/susidns/config.jsp\">", "</a>")
-</p><hr>
+_("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.jsp\">", "</a>")
+</p>
+<hr>
 <p>
 <b>_("Could not find the following destination:")</b>
 </p>
diff --git a/installer/resources/proxy/dnfp-header.ht b/installer/resources/proxy/dnfp-header.ht
index 364505433d..d248fa2fa7 100644
--- a/installer/resources/proxy/dnfp-header.ht
+++ b/installer/resources/proxy/dnfp-header.ht
@@ -5,7 +5,8 @@ Connection: close
 Proxy-Connection: close
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head>
+<html>
+<head>
 <title>_("Outproxy Not Found")</title>
 <noscript><style>.script {display: none;}</style></noscript>
 <link rel="shortcut icon" href="http://proxy.i2p/themes/console/images/favicon.ico">
diff --git a/installer/resources/themes/console/classic/console.css b/installer/resources/themes/console/classic/console.css
index 7a18aa0f35..8653eef4ee 100644
--- a/installer/resources/themes/console/classic/console.css
+++ b/installer/resources/themes/console/classic/console.css
@@ -130,13 +130,15 @@ img {
      margin: 5px 0;
 }
 
-.warning h3 {
+#jumplinks h3 {
      border: 0;
+     border-top: 1px solid #fb7;
      border-bottom: 1px solid #fb7;
      padding-bottom: 10px;
-     background: none !important;
-     padding-left: 0;
+     background: #ffe !important;
+     padding-left: 15px;
      font-size: 10.5pt;
+     margin-top: 20px;
 }
 
 .warning h3:first-child {
@@ -145,6 +147,7 @@ img {
      background: #ffe !important;
      background: #ffe url(/themes/console/images/itoopie_sm.png) 6px center no-repeat !important;
      background-size: auto 80% !important;
+     border: none;
      border-bottom: 1px solid #fb7;
      text-transform: uppercase;
      letter-spacing: 0.08em;
@@ -201,7 +204,7 @@ img {
      vertical-align: top;
 }
 
-.warning a[href*="jump"]::before {
+#jumplinks a::before {
      content: "\279F\00A0";
      font-size: 14pt;
      display: inline-block;
@@ -1304,9 +1307,6 @@ button::-moz-focus-inner, input[type="submit"]::-moz-focus-inner, input[type="re
 
 .main li b {
      color: #1f7096 !important;
-     letter-spacing: 0.01em;
-     font-size: 9.5pt;
-     line-height: 170%;
 }
 
 .main hr:last-child {
@@ -4024,6 +4024,10 @@ td#pw_adduser input {
      text-align: left;
 }
 
+#clientconfig td:nth-child(3) {
+     white-space: nowrap;
+}
+
 #netconfig {
      line-height: 160%;
 }
@@ -5238,7 +5242,7 @@ input[name="pluginURL"] {
      margin: 0 5px !important;
      display: block;
      background-size: 200px auto !important;
-     min-width: 500px;
+     min-width: 530px;
      width: calc(100% - 36px);
 }
 
@@ -5252,6 +5256,10 @@ input[name="pluginURL"] {
      font-size: 10pt;
 }
 
+#jumplinks {
+     margin-bottom: -15px;
+}
+
 .proxyfooter {
      display: none;
 }
diff --git a/installer/resources/themes/console/dark/console.css b/installer/resources/themes/console/dark/console.css
index 91afe21ea8..288fb73d6e 100644
--- a/installer/resources/themes/console/dark/console.css
+++ b/installer/resources/themes/console/dark/console.css
@@ -63,7 +63,7 @@ pre {
      color: #EE9;
 }
 
-/* proxy error messages */
+/* proxy errors */
 
 div.logo { /* proxy error "fake" sidebar */
      float: left;
@@ -156,6 +156,24 @@ div.warning {
      text-align: left;
 }
 
+#jumplinks a {
+     display: inline-block;
+     padding: 2px 0;
+     line-height: 16px;
+}
+
+#jumplinks a::before {
+     content: "\279F\00A0";
+     font-size: 16pt;
+     display: inline-block;
+     padding: 3px 0;
+     vertical-align: sub;
+     line-height: 16px;
+}
+
+/* end proxy errors */
+
+
 div.routersummaryouter {
      float: left;
      width: 200px;
@@ -1212,8 +1230,6 @@ div.main li {
 
 div.main li b {
      color: #bb0 !important;
-     letter-spacing: 0.08em;
-     font-size: 9pt;
 }
 
 .tidylist {
@@ -5241,8 +5257,9 @@ table#configstats {
 }
 
 #configstats td:first-child {
-     width: 20px;
+     width: 1%;
      white-space: nowrap;
+     padding: 6px 8px;
 }
 
 #configstats td:first-child:empty + td > label { /* remove pointer from inert labels */
diff --git a/installer/resources/themes/console/light/console.css b/installer/resources/themes/console/light/console.css
index 00dddbc711..7ded136bb0 100644
--- a/installer/resources/themes/console/light/console.css
+++ b/installer/resources/themes/console/light/console.css
@@ -585,6 +585,10 @@ div.logo {
      width: 100%;
 }
 
+.logo hr ~ a {
+     margin: 3px 2px;
+}
+
 div.warning {
      margin: 20px 20px 30px 240px;
      padding: 10px 25px 20px 75px;
@@ -610,6 +614,25 @@ div.warning {
      text-align: left;
 }
 
+#jumplinks h3 {
+     margin: 0 0 10px;
+}
+
+#jumplinks a {
+     display: inline-block;
+     padding: 2px 0;
+     line-height: 16px;
+}
+
+#jumplinks a::before {
+     content: "\279F\00A0";
+     font-size: 16pt;
+     display: inline-block;
+     padding: 3px 0;
+     vertical-align: sub;
+     line-height: 16px;
+}
+
 .proxyfooter {
      margin: 0 20px 10px 240px;
      padding: 20px 25px 20px 75px;
@@ -1283,12 +1306,14 @@ p#enablefullstats {
 }
 
 #configstats td:first-child {
-     width: 48px;
+     width: 1%;
      white-space: nowrap;
+     padding: 4px 8px;
 }
 
 #configstats td:first-child:empty + td > label { /* remove pointer from inert labels */
-     cursor: default;
+     cursor: text;
+     color: #333;
 }
 
 #configstats td:last-child {
@@ -2069,8 +2094,6 @@ div.main li {
 
 div.main li b, .statlist b a:hover {
      color: #335 !important;
-     font-size: 9.5pt;
-     line-height: 170%;
 }
 
 .tidylist {
@@ -4410,6 +4433,7 @@ p.sybil_info, p.family, p.threatpoints, p.hashdist, p#sybil_totals, p.notfound {
      padding: 5px 5px 5px 30px;
      margin: 3px 0;
      font-weight: bold;
+     text-align: left;
      background: url(images/eye.png) 8px center no-repeat, repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(240, 240, 255, 0.3) 3px, #fff 5px), #fff;
 }
 
@@ -4967,6 +4991,7 @@ table#floodfills th {
      background-size: 24px 24px !important;
      padding-left: 46px !important;
      color: #333 !important;
+     padding-right: 15px !important;
 }
 
 #sidebarhelp ul {
@@ -5367,10 +5392,6 @@ input[name="pluginURL"] {
      vertical-align: middle;
      letter-spacing: -0.25em;
 }
-
-.main#help h3, #faq h3 {
-     font-size: 10.5pt !important;
-}
 }
 
 @media screen and (min-width: 1500px) {
@@ -5527,6 +5548,10 @@ button.control {
      background-position: left center !important;
 }
 
+.topness, .footnote {
+     font-size: 9pt !important;
+}
+
 _:-ms-lang(x), #browseronstart {
      margin-bottom: -15px !important;
 }
diff --git a/installer/resources/themes/console/light/console_ar.css b/installer/resources/themes/console/light/console_ar.css
index f369d15f7c..73f73a0a3c 100644
--- a/installer/resources/themes/console/light/console_ar.css
+++ b/installer/resources/themes/console/light/console_ar.css
@@ -132,6 +132,10 @@ div.wideload {
      margin-right: 16px;
 }
 
+.routersummary h3 a {
+     font-size: 140% !important;
+}
+
 .routersummary h3, .routersummary h4 {
      text-align: center !important;
 }
@@ -530,6 +534,10 @@ div.news h3, #news h3 {
      margin-bottom: -2px !important;
 }
 
+.newsAuthor {
+     float: left;
+}
+
 #netdboverview, #netdboverview td, #netdboverview table {
      direction: ltr;
 }
@@ -736,6 +744,11 @@ pre#transports {
      border-width: 1px 5px 1px 1px !important;
 }
 
+#help.main td.infohelp, #help.main td.infowarn {
+     padding-right: 46px !important;
+     padding-left: 15px !important;
+}
+
 #faq h3 {
      background: url(/themes/console/images/info/question.png) no-repeat, linear-gradient(to bottom, #fff 50%, rgba(255, 255, 255, 0.6) 50%, rgba(240, 240, 240, 0.4)) repeat scroll 0 0%, rgba(0, 0, 0, 0) linear-gradient(to left, #fff 5%, rgba(231, 231, 255, 0.8) 15%) !important;
      background-position: right 6px center, right center, right center !important;
diff --git a/installer/resources/themes/console/midnight/console.css b/installer/resources/themes/console/midnight/console.css
index b62e1d99dd..9c6f5cf5c4 100644
--- a/installer/resources/themes/console/midnight/console.css
+++ b/installer/resources/themes/console/midnight/console.css
@@ -749,7 +749,7 @@ button.search:active {
 
 /* client/plugin/webapps buttons aka project "X" */
 
-button.control {
+button.control, button.control:hover, button.control:focus {
      padding: 12px !important;
      font-size: 0 !important;
      text-indent: -99999px !important;
@@ -956,7 +956,7 @@ pre {
      color: #c9ceff;
 }
 
-/* proxy error messages */
+/* proxy errors */
 
 div.logo { /* proxy error "fake" sidebar */
      float: left;
@@ -1027,6 +1027,21 @@ div.logo hr {
      padding: 5px 10px;
 }
 
+#jumplinks a {
+     display: inline-block;
+     padding: 2px 0;
+     line-height: 16px;
+}
+
+#jumplinks a::before {
+     content: "\279F\00A0";
+     font-size: 16pt;
+     display: inline-block;
+     padding: 3px 0;
+     vertical-align: sub;
+     line-height: 16px;
+}
+
 .proxyfooter {
      margin: 0 20px 10px 240px;
      padding: 20px 25px 20px 75px;
@@ -1051,7 +1066,8 @@ div.logo hr {
      display: none;
 }
 }
-/* end proxy error messages */
+
+/* end proxy errors */
 
 .routersummaryouter {
      float: left;
@@ -3868,6 +3884,10 @@ table#clientconfig th:first-child {
      padding-right: 5px;
 }
 
+#clientconfig td:nth-child(3) {
+     white-space: nowrap;
+}
+
 table#clientconfig th:last-child {
      text-align: left;
      padding-left: 5px;
@@ -5716,20 +5736,21 @@ table#configstats {
      word-spacing: 0.1em;
 }
 
+#configstats td {
+    color: #b2bcf7;
+    padding: 8px 4px;
+}
+
 #configstats td:first-child {
-     width: 40px;
+     width: 1%;
      white-space: nowrap;
+    padding: 8px;
 }
 
 #configstats td:first-child:empty + td > label { /* remove pointer from inert labels */
      cursor: default;
 }
 
-#configstats td {
-    color: #b2bcf7;
-    padding: 8px 4px;
-}
-
 #configstats td:last-child {
      border-right: 1px solid #443da0;
 }
@@ -6157,7 +6178,7 @@ div.joblog h3 {
      margin-top: 5px;
 }
 
-button.control {
+button.control, button.control:hover, button.control:focus {
      padding: 14px !important;
      font-size: 0 !important;
 }
diff --git a/installer/resources/themes/snark/dark/snark.css b/installer/resources/themes/snark/dark/snark.css
index f33f687aeb..be6a76c423 100644
--- a/installer/resources/themes/snark/dark/snark.css
+++ b/installer/resources/themes/snark/dark/snark.css
@@ -386,13 +386,6 @@ tfoot tr:nth-child(n+1) {
      margin-left: -4px;
 }
 
-.priority {
-     font-size: 8pt;
-     vertical-align: middle;
-     max-width: 160px;
-     width: 1% !important;
-}
-
 .SnarkTorrents {
      margin: 0;
      border: 1px solid #101;
@@ -1997,6 +1990,24 @@ label.toggleview, .snarkConfigTitle a:visited {
      font-weight: bold;
 }
 
+.priority {
+     font-size: 8pt;
+     vertical-align: middle;
+     max-width: 160px;
+     width: 1% !important;
+}
+
+.priority::after {
+     content: "";
+     display: inline-block;
+     min-height: 30px;
+     vertical-align: middle;
+}
+
+.priority input[type="radio"] {
+     margin: 3px;
+}
+
 .priorityHigh, .priorityNormal, .prioritySkip {
      display: inline-block;
      width: 48px;
@@ -2004,18 +2015,19 @@ label.toggleview, .snarkConfigTitle a:visited {
      font-size: 0;
      overflow: hidden;
      text-align: left;
+     vertical-align: middle;
 }
 
 .priorityHigh {
-     background: url(/i2psnark/.resources/icons/clock_red.png) left 28px center no-repeat;
+     background: url(/i2psnark/.resources/icons/clock_red.png) left 24px center no-repeat;
 }
 
 .priorityNormal {
-     background: url(/i2psnark/.resources/icons/clock.png) left 28px  center no-repeat;
+     background: url(/i2psnark/.resources/icons/clock.png) left 24px  center no-repeat;
 }
 
 .prioritySkip {
-     background: url(/i2psnark/.resources/icons/cancel.png) left 26px center no-repeat;
+     background: url(/i2psnark/.resources/icons/cancel.png) left 22px center no-repeat;
 }
 
 /* configs */
diff --git a/installer/resources/themes/snark/light/snark.css b/installer/resources/themes/snark/light/snark.css
index 5098475f80..e46219d9ee 100644
--- a/installer/resources/themes/snark/light/snark.css
+++ b/installer/resources/themes/snark/light/snark.css
@@ -406,7 +406,8 @@ tfoot tr:nth-child(n+1) {
 
 .priority {
      vertical-align: middle;
-     width: 200px;
+     width: 1%;
+     white-space: nowrap;
 }
 
 .snarkTorrents {
@@ -1515,7 +1516,7 @@ input#toggle_addtorrent:checked + label + hr + table, input#toggle_createtorrent
 /* Downloading Priorities */
 
 .snarkDirInfo input[type="radio"], .snarkDirInfo input[type="radio"]:checked {
-     margin: 0;
+     margin: 4px;
      padding: 0;
      min-height: 16px;
      min-width: 16px;
@@ -1528,27 +1529,34 @@ input#toggle_addtorrent:checked + label + hr + table, input#toggle_createtorrent
      white-space: nowrap;
 }
 
+.priority::after {
+     content: "";
+     display: inline-block;
+     min-height: 30px;
+     vertical-align: middle;
+}
+
 .priorityHigh, .priorityNormal, .prioritySkip {
      display: inline-block;
-     width: 40px;
+     width: 44px;
      color: transparent;
      vertical-align: middle;
-     margin: 3px 10px 3px 3px;
+     margin: 3px;
      overflow: hidden;
      font-size: 0;
      text-align: left;
 }
 
 .priorityHigh {
-     background: url(/i2psnark/.resources/icons/clock_red.png) left 20px center no-repeat;
+     background: url(/i2psnark/.resources/icons/clock_red.png) left 24px center no-repeat;
 }
 
 .priorityNormal {
-     background: url(/i2psnark/.resources/icons/clock.png) left 20px center no-repeat;
+     background: url(/i2psnark/.resources/icons/clock.png) left 24px center no-repeat;
 }
 
 .prioritySkip {
-     background: url(/i2psnark/.resources/icons/cancel.png) left 18px center no-repeat;
+     background: url(/i2psnark/.resources/icons/cancel.png) left 22px center no-repeat;
 }
 
 /* end priorities */
diff --git a/installer/resources/themes/snark/midnight/snark.css b/installer/resources/themes/snark/midnight/snark.css
index 037f8d3940..48fee9ae2e 100644
--- a/installer/resources/themes/snark/midnight/snark.css
+++ b/installer/resources/themes/snark/midnight/snark.css
@@ -387,12 +387,6 @@ tfoot tr:nth-child(n+1) {
      width: 100%;
 }
 
-.priority {
-     font-size: 8pt;
-     min-width: 160px;
-     vertical-align: middle;
-}
-
 .snarkTorrents {
      margin: 10px 0 0 0;
      border: none;
@@ -639,14 +633,6 @@ tfoot tr:nth-child(n+1) {
      border-bottom: 1px solid #443da0 !important;
 }
 
-/*
-.snarkDirInfo .ParentDir a, .snarkDirInfo .snarkFileName a, .snarkTorrents .snarkTorrentName a {
-     display: inline-block;
-     width: 100%;
-     padding: 2px 0;
-}
-*/
-
 .snarkDirInfo .headerpriority {
      text-align: center !important;
      vertical-align: middle;
@@ -671,13 +657,6 @@ table.SnarkDirInfo img {
      margin: 0 !important;
 }
 
-/*
-.snarkDirInfo .headerpriority {
-     text-align: center !important;
-     vertical-align: middle;
-}
-*/
-
 td.subHeaderPriority, td.priority {
      width: 0;
      min-width: 160px !important;
@@ -702,15 +681,6 @@ td.subHeaderPriority {
      padding: 4px !important;
 }
 
-/*
-.headerstatus {
-     min-width: 250px;
-}
-
-td.priority:last-child {
-}
-*/
-
 .priority {
      white-space: nowrap;
 }
@@ -2149,9 +2119,24 @@ td#bwHelp a {
 
 /* torrent priorities */
 
+.priority {
+     font-size: 8pt;
+     width: 1%;
+     min-width: 160px;
+     white-space: nowrap;
+     vertical-align: middle;
+}
+
+.priority::after {
+     content: "";
+     display: inline-block;
+     min-height: 30px;
+     vertical-align: middle;
+}
+
 .priority input[type="radio"] {
      text-align: left;
-     margin: 0;
+     margin: 3px;
 }
 
 .priorityHigh, .priorityNormal, .prioritySkip {
@@ -2160,20 +2145,21 @@ td#bwHelp a {
      width: 50px;
      font-size: 0;
      text-align: left;
+     vertical-align: middle;
      color: transparent;
      overflow: hidden;
 }
 
 .priorityHigh {
-     background: url(/i2psnark/.resources/icons/clock_red.png) left 20px center no-repeat;
+     background: url(/i2psnark/.resources/icons/clock_red.png) left 24px center no-repeat;
 }
 
 .priorityNormal {
-     background: url(/i2psnark/.resources/icons/clock.png) left 20px  center no-repeat;
+     background: url(/i2psnark/.resources/icons/clock.png) left 24px  center no-repeat;
 }
 
 .prioritySkip {
-     background: url(/i2psnark/.resources/icons/cancel.png) left 18px center no-repeat;
+     background: url(/i2psnark/.resources/icons/cancel.png) left 22px center no-repeat;
 }
 
 #setPriority a.control img {
diff --git a/installer/resources/themes/snark/ubergine/snark.css b/installer/resources/themes/snark/ubergine/snark.css
index 82f20f829f..927d16773b 100644
--- a/installer/resources/themes/snark/ubergine/snark.css
+++ b/installer/resources/themes/snark/ubergine/snark.css
@@ -434,14 +434,6 @@ tfoot tr:nth-child(n+1) {
      display: none;
 }
 
-.priority {
-     font-size: 8pt;
-     vertical-align: middle;
-     text-align: right !important;
-     padding-right: 15px;
-     white-space: nowrap;
-}
-
 .script {
      display: inline-block;
      vertical-align: top;
@@ -1954,9 +1946,25 @@ label.toggleview img:active, label.toggleview:active img, .snarkConfigTitle a:ac
      font-weight: bold;
 }
 
+.priority {
+     font-size: 8pt;
+     vertical-align: middle;
+     text-align: right !important;
+     padding-right: 15px;
+     white-space: nowrap;
+     width: 1%;
+}
+
+.priority::after {
+     content: "";
+     display: inline-block;
+     min-height: 30px;
+     vertical-align: middle;
+}
+
 .priority input[type="radio"] {
      text-align: left;
-     margin: 0;
+     margin: 3px;
 }
 
 .priorityHigh, .priorityNormal, .prioritySkip {
@@ -1965,20 +1973,21 @@ label.toggleview img:active, label.toggleview:active img, .snarkConfigTitle a:ac
      width: 50px;
      font-size: 0;
      text-align: left;
+     vertical-align: middle;
      color: transparent;
      overflow: hidden;
 }
 
 .priorityHigh {
-     background: url(/i2psnark/.resources/icons/clock_red.png) left 20px center no-repeat;
+     background: url(/i2psnark/.resources/icons/clock_red.png) left 24px center no-repeat;
 }
 
 .priorityNormal {
-     background: url(/i2psnark/.resources/icons/clock.png) left 20px  center no-repeat;
+     background: url(/i2psnark/.resources/icons/clock.png) left 24px center no-repeat;
 }
 
 .prioritySkip {
-     background: url(/i2psnark/.resources/icons/cancel.png) left 18px center no-repeat;
+     background: url(/i2psnark/.resources/icons/cancel.png) left 22px center no-repeat;
 }
 
 .priority, .snarkDirInfo .headerpriority {
@@ -2193,7 +2202,6 @@ b.alwaysShow {
 #trackerselect td a {
      max-width: 350px;
 }
-
 }
 
 @media screen and (-webkit-min-device-pixel-ratio:0) and (max-width: 1050px) {
@@ -2211,7 +2219,7 @@ b.alwaysShow {
 
 .snarkRefresh:link,.snarkRefresh:visited {
      background-size: 15px auto, 100% 100% !important;
-     background-position: 11px 4px, center center !important;
+     background-position: 11px 60%, center center !important;
      padding: 4px 10px 4px 28px !important;
      margin-right: -5px !important;
 }
diff --git a/installer/resources/themes/snark/vanilla/snark.css b/installer/resources/themes/snark/vanilla/snark.css
index 4b44ae1c79..e65d83e320 100644
--- a/installer/resources/themes/snark/vanilla/snark.css
+++ b/installer/resources/themes/snark/vanilla/snark.css
@@ -481,14 +481,6 @@ tfoot tr:nth-child(n+1) {
      padding: 4px 0 4px 4px;
 }
 
-.priority {
-     font-size: 8pt;
-     vertical-align: middle;
-     text-align: center;
-     white-space: nowrap;
-     width: 2%;
-}
-
 .snarkTorrents {
      margin: 0;
      border: 1px solid #6f533e;
@@ -1878,25 +1870,47 @@ code, tt {
 
 /* end Resource Errors */
 
-.priorityHigh {
-     background: url(/i2psnark/.resources/icons/clock_red.png) left 28px center no-repeat;
+.priority {
+     font-size: 8pt;
+     vertical-align: middle;
+     text-align: center;
+     white-space: nowrap;
+     width: 2%;
+}
+
+.priority::after {
+     content: "";
      display: inline-block;
-     width: 48px;
+     min-height: 30px;
+     vertical-align: middle;
+}
+
+.priority input[type="radio"] {
+     text-align: left;
+     margin: 3px;
+}
+
+.priorityHigh, .priorityNormal, .prioritySkip {
+     padding: 0;
+     display: inline-block;
+     width: 50px;
+     font-size: 0;
+     text-align: left;
+     vertical-align: middle;
      color: transparent;
+     overflow: hidden;
+}
+
+.priorityHigh {
+     background: url(/i2psnark/.resources/icons/clock_red.png) left 24px center no-repeat;
 }
 
 .priorityNormal {
-     background: url(/i2psnark/.resources/icons/clock.png) left 28px  center no-repeat;
-     display: inline-block;
-     width: 48px;
-     color: transparent;
+     background: url(/i2psnark/.resources/icons/clock.png) left 24px center no-repeat;
 }
 
 .prioritySkip {
-     background: url(/i2psnark/.resources/icons/cancel.png) left 26px center no-repeat;
-     display: inline-block;
-     width: 48px;
-     color: transparent;
+     background: url(/i2psnark/.resources/icons/cancel.png) left 22px center no-repeat;
 }
 
 /* configs */
diff --git a/installer/resources/themes/susidns/light/susidns.css b/installer/resources/themes/susidns/light/susidns.css
index 873bc677fd..4b7fbc9cbb 100644
--- a/installer/resources/themes/susidns/light/susidns.css
+++ b/installer/resources/themes/susidns/light/susidns.css
@@ -228,6 +228,8 @@ form[action="subscriptions"] #content {
      border-radius: 2px;
      background: linear-gradient(to bottom, #fff 50%, rgba(255,255,255,0.6) 50%, rgba(240,240,240,0.4)), linear-gradient(to right, #fff 5%, rgba(231, 231, 255, 0.8) 15%) !important;
      box-shadow: inset 0 0 0 1px #fff, 0 0 1px #ccc;
+     text-transform: none;
+     letter-spacing: 0;
 }
 
 .iframed #content h3 {
@@ -936,7 +938,7 @@ p.book {
 }
 
 #buttons {
-     padding: 10px 5px;
+     padding: 5px;
      text-align: right;
      background: #fff;
      background: linear-gradient(to bottom, #fff 50%, rgba(220,220,255,0.3)), repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fff 5px), #fff !important;
@@ -949,7 +951,7 @@ p.buttons {
 }
 
 table + p.buttons {
-     padding: 10px 5px;
+     padding: 5px;
 }
 
 #book + #buttons {