diff --git a/installer/resources/themes/console/classic/console.css b/installer/resources/themes/console/classic/console.css
index f8b78ed417..6eb7380e49 100644
--- a/installer/resources/themes/console/classic/console.css
+++ b/installer/resources/themes/console/classic/console.css
@@ -11,6 +11,20 @@ body {
      font: 9pt/130% "Droid Sans", "Noto Sans", Ubuntu, "Bitstream Vera Sans", "Lucida Grande", "DejaVu Sans", "Segoe UI", Verdana, Helvetica, sans-serif;
 }
 
+/* preload button mouseovers */
+body {
+     background: url(images/bg.png) fixed, 
+     url(/themes/console/images/buttons/clean_hover.png) no-repeat,
+     url(/themes/console/images/buttons/configure_hover.png) no-repeat,
+     url(/themes/console/images/buttons/delete_hover.png) no-repeat,
+     url(/themes/console/images/buttons/restart_hover.png) no-repeat,
+     url(/themes/console/images/buttons/restore_hover.png) no-repeat,
+     url(/themes/console/images/buttons/search_hover.png) no-repeat,
+     url(/themes/console/images/buttons/shutdown_hover.png) no-repeat,
+     url(/themes/console/images/buttons/update_hover.png) no-repeat, #bbf;
+     background-size: 150px 150px, 0 0, 0 0, 0 0, 0 0, 0 0, 0 0, 0 0, 0 0;
+}
+
 .hide, .hideme {
      display: none;
 }
@@ -183,6 +197,7 @@ div.sorry {
      background: #fff url(/themes/console/images/info/errortriangle.png) 10px center no-repeat;
      background: url(/themes/console/images/info/errortriangle.png) 10px center no-repeat, linear-gradient(to bottom, #fff 0%, #ffe 100%);
      margin: -1px 1px 0 200px;
+     min-width: 460px;
      border: 1px solid #89f;
      box-shadow: inset 0 0 0 1px #ff9;
      text-align: justify;
@@ -252,7 +267,6 @@ div.routersummary hr {
 }
 
 .routersummary b {
-     white-space: nowrap;
      text-transform: capitalize;
 }
 
@@ -639,6 +653,7 @@ button:active, input[type="submit"]:active, input[type="reset"]:active {
      background-blend-mode: luminosity;
      filter: saturate(100%) drop-shadow(0 0 1px #ccc);
      -webkit-filter: saturate(100%) drop-shadow(0 0 1px #ccc);
+     color: #555;
 }
 
 input.accept, button.accept {
@@ -721,7 +736,7 @@ input.accept[value^="Show"]:hover, button.accept[value^="Show"]:hover,
 input.check[value^="View"]:hover, button.check[value^="View"]:hover,
 input.accept[value^="Show"]:focus, button.accept[value^="Show"]:focus,
 input.check[value^="View"]:focus, button.check[value^="View"]:focus {
-     background: url(/themes/console/images/buttons/show.png) no-repeat 6px center, linear-gradient(to bottom, #fff 0%, #ddd 100%);
+     background: url(/themes/console/images/buttons/show.png) no-repeat 6px center, linear-gradient(to bottom, #ddd 0%, #fff 100%);
 }
 
 input.cancel[value^="Hide"], button.cancel[value^="Hide"],
@@ -1280,12 +1295,14 @@ div.confignav {
 
 .tab2::before {
      content: '\1F892\00A0';
+     content: '\25B8\00A0';
      font-size: 10pt;
      line-height: 110%;
 }
 
 .tab2::after {
      content: '\00A0\1F890';
+     content: '\00A0\25C2';
      font-size: 10pt;
      line-height: 110%;
 }
@@ -1831,7 +1848,7 @@ h3.ptitle {
 }
 
 h3.ptitle, h3.tabletitle, th.th_title {
-     font-size: 10pt;
+     font-size: 11pt;
 }
 
 h3.enbeddedtitle, h4.embeddedtitle {
@@ -1922,6 +1939,10 @@ h3#pluginmanage {
      margin-bottom: -18px !important;
 }
 
+.configure > h3#pluginmanage {
+     margin-top: 15px;
+}
+
 h3#advancedclientconfig, h3#pluginconfig {
      margin-top: 15px;
 }
@@ -2098,6 +2119,10 @@ h4.app, h4.app2 {
      background: linear-gradient(to bottom, #fff 0%, #fff 50%, #eff2ff 50%, #eff2ff 100%);
 }
 
+h4.app {
+     margin-top: -5px;
+}
+
 h4.app2 {
      clear: left;
      margin-top: 5px !important;
@@ -2795,9 +2820,11 @@ tt, code {
      padding: 2px 5px;
 }
 
+/*
 .main[id^="config_"] tr:nth-child(even) {
      background: #f7f8ff;
 }
+*/
 
 #netconfig tr, #externali2cp tr {
      background: #fff; 
@@ -2897,6 +2924,7 @@ p#graphopts {
 
 h3#graphinfo {
      margin: 5px 10px 15px;
+     text-transform: capitalize;
 }
 
 p#graphopts + p {
@@ -2912,6 +2940,64 @@ p#graphopts + p {
      margin: -3px -10px -5px;
 }
 
+/* new graphs optionbox */
+
+#graphs form {
+     padding: 0 !important;
+}
+
+#graphs form hr {
+     margin: 0 -1px 8px !important;
+}
+
+#graphs form table {
+     border: none;
+     margin: 0;
+}
+
+.formaction#graphing {
+     margin: -8px 0 0 !important;
+     padding: 5px;
+     border-left: none;
+     border-right: none;
+}
+
+#graphs tr:first-child td {
+     border-top: none;
+}
+
+#graphs td:first-child {
+     text-align: right;
+     width: 85px;
+     white-space: nowrap;
+     padding: 13px 3px 13px 5px;
+}
+
+#graphs td:nth-child(2) {
+     width: 260px;
+     white-space: nowrap;
+}
+
+#graphs td.infohelp {
+     border: none;
+     border-right: none;
+     background-size: 20px 20px !important;
+     padding: 5px 5px 5px 40px !important;
+     background-color: #eff1ff !important;
+     text-align: left;
+}
+
+#graphs form input, #graphs form select {
+     margin: 3px 5px 3px 0;
+     vertical-align: middle;
+}
+
+#graphs input[type="text"] {
+     min-width: 60px;
+}
+
+/* end new graphs optionbox */
+
 div.footnote {
      text-align: right;
      color: #339;
@@ -3033,6 +3119,14 @@ div.themechoice {
      font-weight: bold;
 }
 
+.themechoice .optbox:focus + object ~ div.themelabel {
+     color: #f60 !important;
+}
+
+.themechoice .optbox:active + object ~ div.themelabel {
+     color: #fff !important;
+}
+
 .themechoice:active .optbox:checked + object ~ .themelabel {
      background: #ddf !important;
      color: #338 !important;
@@ -3166,6 +3260,14 @@ div.langselect { /* containing box for lang selection */
      box-shadow: none !important;
 } 
 
+.langselect input[name="lang"]:focus + img + .ui_lang {
+     color: #f60 !important;
+}
+
+.langselect input[name="lang"]:active + img + .ui_lang {
+     color: #fff !important;
+}
+
 div.flagradio {
      margin-top: 2px;
 }
@@ -3555,9 +3657,11 @@ div#sybilnav {
 
 #sybilnav ul li::before {
      content: '\00A0\1F441\00A0';
+     content: url(images/eye.png);
+     padding: 0 5px;
      font-size: 16pt;
      line-height: 50%;
-     vertical-align: sub;
+     vertical-align: middle;
 }
 
 p.sybil_floodfill, p.family, p.threatpoints, p.hashdist {
@@ -3651,6 +3755,8 @@ ul.statlist li b, ul.statlist b a:hover, h3.stats a:hover  {
 
 ul.statlist li::before {
      content: "\1F6C8\00A0";
+     content: "\2B26\00A0";
+     margin-left: 5px;
      font-size: 14pt;
      line-height: 60%;
      vertical-align: baseline;
@@ -3716,6 +3822,7 @@ ul.statlist li li:last-child::before {
      margin-top: 2px !important;
 }
 
+/*
 .statlist a[href*="graph"]::before {
      content: "\1F5E0";
      font-size: 16pt;
@@ -3723,6 +3830,7 @@ ul.statlist li li:last-child::before {
      font-weight: normal !important;
      padding-bottom: 2px;
 }
+*/
 
 .statlist li a[href*="graph"]:first-of-type {
      margin-left: -1px;
@@ -4123,8 +4231,6 @@ p#enablefullstats, p#gatherstats {
 }
 /* end informational images */
 
-
-
 /* login inputs */
 
 #consolepass input[name="name"], #externali2cp input[name="user"] {
@@ -4144,7 +4250,7 @@ p#enablefullstats, p#gatherstats {
 @media screen and (min-width: 1500px) {
 body, .main, .main td, .news p, #news p, .tab, .tab2, .main li b, div.joblog li, .themelabel, .ui_lang, .applabel a, .statusnotes,
 #peerdefs, #profile_defs, #thresholds, #configinfo, .infohelp, .infowarn, button, input, select, textarea, code, tt, pre,
-.netdbentry th, .configtable th {
+.netdbentry th, .configtable th, ul.statlist a[name], ul.statlist b, ul.statlist li b, ul.statlist a[name]:hover, div.messages {
      font-size: 10pt !important;
 }
 
@@ -4181,6 +4287,10 @@ div.news {
      margin: 2px 4px 1px;
 }
 
+.routersummary button[value="cancelShutdown"] {
+     padding-left: 20px !important;
+}
+
 div.app {
      width: 154px;
 }
@@ -4214,6 +4324,9 @@ h4#updateplugins {
      margin-top: -16px !important;
 }
 
+h3#webappconfig {
+     margin-bottom: -33px;
+}
 
 #shutdown.formaction, #restart.formaction, #systray.formaction, #runonstart.formaction, #dumpthreads.formaction, #browserstart.formaction,  #updateplugins.formaction {
      margin-top: -15px;
@@ -4238,4 +4351,12 @@ table#leasesetdebug th, table#leasesetsummary th {
 div.news {
      padding-bottom: 5px !important;
 }
+
+.sorry {
+     margin-left: 232px !important;
+}
+
+div.joblog h3 {
+     margin-top: 8px;
+}
 }
diff --git a/installer/resources/themes/console/dark/console.css b/installer/resources/themes/console/dark/console.css
index 9a6c4ed5be..e367c8715c 100644
--- a/installer/resources/themes/console/dark/console.css
+++ b/installer/resources/themes/console/dark/console.css
@@ -591,7 +591,7 @@ div.sorry {
      background-repeat:no-repeat;
      box-shadow: inset 0 0 0 1px #d00;
      word-wrap: break-word;
-/*     font-weight: bold;*/
+     min-width: 555px;
      color: #EE9;
      font-size: 10pt;
 }
@@ -778,14 +778,16 @@ div.confignav {
 
 .tab2::before {
      content: '\1F892\00A0';
-     font-size: 12pt;
+     content: '\25B8\00A0';
+     font-size: 11pt;
      line-height: 50%;
      vertical-align: baseline;
 }
 
 .tab2::after {
      content: '\00A0\1F890';
-     font-size: 12pt;
+     content: '\00A0\25C2';
+     font-size: 11pt;
      line-height: 50%;
      vertical-align: baseline;
 }
@@ -830,10 +832,14 @@ div.widepanel h3 {
      border: 1px solid #494;
 }
 
+#graphs .messages {
+     margin-top: 15px;
+}
+
 div.graphspanel {
      padding: 0;
      margin: 15px 0 -15px 0;
-     background: none;/* url(images/camotile.png);*/
+     background: none;
      text-align: center;
      overflow: hidden;
      width: 100%;
@@ -901,6 +907,94 @@ div.graphspanel p:last-child {
      display: none;
 }
 
+form[action="graphs"] {
+     border: 1px solid #494;
+     padding: 10px 10px 0 !important;
+     background: #000;
+     margin-top: -11px;
+     margin-bottom: 10px;
+}
+
+.formaction#graphing {
+     margin: -4px -5px 5px !important;
+     border-left: none;
+     border-right: none;
+}
+
+/*
+.main#graphs hr {
+     margin: 10px -10px 8px !important;
+}
+*/
+
+h3#graphinfo {
+     text-transform: capitalize;
+     letter-spacing: normal;
+     word-spacing: normal;
+}
+
+h3#graphdisplay a {
+     text-transform: capitalize;
+     letter-spacing: normal;
+     float: right;
+     font-size: 9pt;
+}
+
+/* new graphs optionbox */
+
+#graphs form {
+     padding: 0 !important;
+}
+
+#graphs form hr {
+     margin: 0 -1px 8px !important;
+}
+
+#graphs form table {
+     border: none;
+     margin: 0;
+}
+
+.formaction#graphing {
+     margin: -4px 3px 5px !important;
+     padding-top: 1px;
+}
+
+#graphs tr:first-child td {
+     border-top: none;
+}
+
+#graphs td:first-child {
+     text-align: right;
+     width: 85px;
+     white-space: nowrap;
+     padding: 13px 3px 13px 5px;
+}
+
+#graphs td:nth-child(2) {
+     width: 260px;
+     white-space: nowrap;
+}
+
+#graphs td.infohelp {
+     border: 1px solid #131;
+     border-right: none;
+     background-size: 20px 20px !important;
+     padding: 5px 5px 5px 40px !important;
+     background-color: #000800 !important;
+     text-align: left;
+}
+
+#graphs form input, #graphs form select {
+     margin: 3px 5px 3px 0;
+}
+
+#graphs input[type="text"] {
+     min-width: 60px;
+}
+
+/* end new graphs optionbox */
+
 table {
      border-collapse: collapse;
      width: 100%;
@@ -1415,15 +1509,12 @@ select option { /* dropdown menu reverts to normal font-weight */
      font-size: 9.5pt !important;
      box-shadow: inset 0 0 20px 20px #000;
      color: #fff !important;
+     background: #000 !important;
 }
 
 select option:hover, select option:checked {
      box-shadow: inset 0 0 20px 20px #f60;
-}
-
-select option:not(hover) {
-     color: #f00;
-     background: none;
+     background: #000 !important;
 }
 
 select:focus, select:hover {
@@ -1435,8 +1526,18 @@ select:hover {
      box-shadow: inset 0 1px 1px 0 #ee9;
 }
 
-@-moz-document url-prefix() { /* target firefox and derivatives only */
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+select {
+     padding: 3px 4px !important;
+}
 
+select option {
+     background: #000 !important;
+     color: #f60 !important;
+}
+}
+
+@-moz-document url-prefix() { /* target firefox and derivatives only */
 select {
      -moz-appearance: none;
      background: #000 url(images/dropdown.png) right center no-repeat !important;
@@ -1769,6 +1870,7 @@ ul.statlist a[name], ul.statlist b, ul.statlist li b, ul.statlist a[name]:hover
 
 ul.statlist li::before {
      content: "\1F6C8\00A0";
+     content: "\2B26\00A0";
      font-size: 14pt;
      line-height: 50%;
      vertical-align: baseline;
@@ -1811,12 +1913,14 @@ ul.statlist li li:last-child::before {
      color: #994
 }
 
+/*
 .statlist a[href*="graph"]::before {
      content: "\1F4CA\00A0";
      font-size: 11pt;
      line-height: 140%;
      font-weight: normal;     
 }
+*/
 
 .main#stats form {
      border: 1px solid #494;
@@ -1834,10 +1938,6 @@ ul.statlist li li:last-child {
      margin-bottom: -20px !important;
 }
 
-ul.statlist:last-of-type {
-     margin-bottom: -5px !important;
-}
-
 li.noevents {
      padding: 0 0 20px !important;
 }
@@ -1849,8 +1949,6 @@ li.noevents {
 
 /* end stats */
 
-
-
 /* /eventlogs */
 
 table#eventlog {
@@ -2128,7 +2226,7 @@ div.themechoice {
 .themechoice:active .themelabel {
      background: #f60 !important;
      color: #ee9 !important;
-     box-shadow: inset 0 0 0 1px #000;
+     box-shadow: inset 0 0 0 1px #000 !important;
 }
 
 .themechoice .optbox:hover + object ~ .themelabel {
@@ -2142,6 +2240,16 @@ div.themechoice {
      box-shadow: none !important
 }
 
+.themechoice .optbox:focus + object ~ .themelabel {
+     color: #f60 !important;
+     box-shadow: inset 0 0 10px 3px #000 !important;
+}
+
+.themechoice .optbox:active + object ~ .themelabel {
+     color: #ee9 !important;
+     box-shadow: inset 0 0 0 1px #000 !important;
+}
+
 .themechoice .optbox {
      min-width: 114px !important;
      min-height: 72px !important;
@@ -2152,12 +2260,6 @@ div.themechoice {
      position: absolute;
 }
 
-/*
-.themechoice .optbox + img {
-     padding: 3px 0 !important;
-}
-*/
-
 .themechoice object {
      padding: 3px 0;
 }
@@ -2225,12 +2327,6 @@ td#themeselect {
      margin: -1px 0;
 }
 
-/*
-#themeselect hr {
-     display: inline !important;
-}
-*/
-
 .langselect { /* containing box for lang selection */
      background: #000;
      background: linear-gradient(to bottom, #010 0%, #000 80%);     
@@ -2291,6 +2387,16 @@ td#themeselect {
      background: #000;
 }
 
+.langselect input:focus + img + div.ui_lang {
+     color: #f60 !important;
+     box-shadow: inset 0 0 10px 3px #000 !important;
+}
+
+.langselect input:active + img + div.ui_lang {
+     color: #ee9 !important;
+     box-shadow: inset 0 0 0 1px #000 !important;
+}
+
 .langselect:hover .ui_lang {
      border-top: 1px solid #f60;
      background: #000;
@@ -2765,31 +2871,6 @@ table#i2pupdates tr:last-child td {
      background: #000 !important;
 }
 
-form[action="graphs"] {
-     border: 1px solid #494;
-     padding: 10px 10px 0 !important;
-     background: #000;
-     margin-top: -11px;
-     margin-bottom: 10px;
-}
-
-.formaction#graphing {
-     margin: -4px -5px 5px !important;
-     border-left: none;
-     border-right: none;
-}
-
-.main#graphs hr {
-     margin: 10px -10px 8px !important;
-}
-
-h3#graphdisplay a {
-     text-transform: capitalize;
-     letter-spacing: normal;
-     float: right;
-     font-size: 9pt;
-}
-
 /* /configlogging */
 
 input[name="logfilename"], input[name="logformat"], input[name="logdateformat"], input[name="logfilesize"], select[name="defaultloglevel"], select[name="newloglevel"] {
@@ -3801,7 +3882,7 @@ td.app {
 div.applabel {
      font-size: 8pt;
      margin: 2px 0 0;
-     padding: 5px 2px;
+     padding: 4px 2px 6px;
      text-align: center;
      vertical-align: bottom;
      line-height: 95%;
@@ -4276,10 +4357,13 @@ div#sybilnav {
 }
 
 #sybilnav ul li::before {
-     content: '\1F441\00A0';
+/*     content: '\1F441\00A0'; */
+     content: url(/themes/console/images/buttons/show.png);
+     mix-blend-mode: luminosity;
+     margin-right: 5px;
      font-size: 16pt;
      line-height: 50%;
-     vertical-align: sub;
+     vertical-align: middle;
      padding-left: 5px;
 }
 
@@ -4336,6 +4420,7 @@ p.sybil_floodfill, p.family, p.threatpoints, p.hashdist, p#sybil_totals {
      font-weight: bold;
      background: url(images/eye.png) 8px center no-repeat;
      background: url(images/eye.png) 8px center no-repeat, linear-gradient(to right, #000 0%, #001000 80%, #002000 100%);
+     background-blend-mode: luminosity;
      box-shadow: inset 0 0 0 1px #300;
 }
 
@@ -4693,6 +4778,7 @@ table#configstats {
      border-top: 1px inset #131;
 }
 
+/*
 #configstats .tablefooter b:not(old) {
      font-size: 0;
 }
@@ -4703,6 +4789,7 @@ table#configstats {
      filter: sepia(100%) hue-rotate(70deg) !important;
      -webkit-filter: sepia(100%) hue-rotate(70deg) !important;     
 }
+*/
 
 #configstats .tablefooter:last-child td {
      background: #000 !important;
@@ -4915,7 +5002,8 @@ form[action="events"] {
 /* responsive layout */
 
 @media screen and (min-width: 1500px) {
-body, .main, .main td, .news p, #news p, textarea, .main textarea, code, tt, pre {
+body, .main, .main td, .news p, #news p, textarea, .main textarea, code, tt, pre, 
+ul.statlist a[name], ul.statlist b, ul.statlist li b, ul.statlist a[name]:hover {
      font-size: 10pt !important;
 }
 
@@ -4940,7 +5028,7 @@ body, .main, .main td, .news p, #news p, textarea, .main textarea, code, tt, pre
 }
 
 .routersummary td, .routersummary a, .routersummary button, .routersummary h4, .routersummary h4 a,
-#floodfill th, code, tt, .applabel a, #jardump td {
+#floodfill th, .applabel a, #jardump td {
      font-size: 9pt !important;
 }
 
@@ -4952,7 +5040,7 @@ div.app {
      width: 134px !important;
 }
 
-th {
+th, #configinfo th, code, tt {
      font-size: 10pt;
 }
 
@@ -4976,4 +5064,22 @@ h3#pluginmanage {
 h4#updateplugins {
      margin-top: -15px !important;
 }
+
+.sorry {
+     margin-left: 232px !important;
+}
+
+div.joblog h3 {
+     margin-top: 7px !important;
+     padding-top: 7px !important;
+}
+
+ p#gatherstats {
+      margin-bottom: 12px !important; 
+}
+
+
+#certs.main p + p:empty + h4 {
+     margin-top: -15px !important;
+}
 }
diff --git a/installer/resources/themes/console/dark/console_ar.css b/installer/resources/themes/console/dark/console_ar.css
index b95b9db28d..d6f06cfc4e 100644
--- a/installer/resources/themes/console/dark/console_ar.css
+++ b/installer/resources/themes/console/dark/console_ar.css
@@ -40,6 +40,10 @@ h1,h2,h3,h4 {
      text-align: right;
 }
 
+h4.app, h4.app2 {
+     text-align: right;
+}
+
 button.search {
      margin-right: 30px;
 }
@@ -226,6 +230,10 @@ table.netdbentry th:last-child, table#leasesetdebug td:nth-child(2n+1) {
      float: left;
 }
 
+table#enviro td {
+     padding: 5px 10px 5px 5px !important;
+}
+
 table#enviro td:first-child {
      text-align: left;
 }
@@ -292,3 +300,57 @@ td.optionsave {
 #tunnelconfig th {
      text-align: right;
 }
+
+#consolepass input[name="nofilter_pw"], #externali2cp input[name="nofilter_pw"], #consolepass input[name="nofilter_pw"]:focus, #externali2cp input[name="nofilter_pw"]:focus,
+#consolepass input[name="name"], #externali2cp input[name="user"], #consolepass input[name="name"]:focus, #externali2cp input[name="user"]:focus {
+     background-position: right 3px center, center center !important;
+     padding: 4px 20px 4px 4px !important;
+     margin: 5px 3px 5px 15px !important;
+}
+
+#consolepass tr:first-child td, p#clientconf.infohelp, p#webappconfigtext.infohelp, #floodfillconfig .infohelp, 
+#bandwidthconfig tr:first-child .infohelp, h3#shutdownrouter + p.infohelp, h3#restartrouter + p.infohelp, h3#systray + p.infohelp, 
+h3#servicedebug + p.infohelp, h3#browseronstart + p.infohelp, table#addkeyring td:first-child, #config_peers tr:nth-child(3) td.infohelp, 
+#config_reseed.main p.infohelp, #plugininstall tr:nth-child(3) td:nth-last-child(2), #manualreseed tr:nth-child(3) td:nth-last-child(2), 
+#manualreseed tr:nth-child(5) td:nth-last-child(2), #plugininstall tr:nth-child(5) td:nth-last-child(2), #manualreseed tr:nth-last-child(2) td.infohelp, 
+p#enablefullstats, p#gatherstats, #oldhome td:first-child, p#pluginconfigtext, #plugininstall .infohelp, #config_family .infohelp, 
+#joinfamily tr:nth-child(3) td:first-child, #newfamily tr:last-child td:first-child, #config_summarybar .configtable td:not(.optionsave),
+table#bugreports td.infohelp {
+     background-position: right 12px center !important;
+     padding: 15px 50px 15px 15px !important;
+}
+
+div[lang="ar"] ul li {
+     list-style-image: url("images/link.png") !important;
+     list-style-position: inside;
+     margin-left: 0 !important;
+     padding-left: 0 !important;
+     margin-top: 15px !important;]
+}
+
+div[lang="ar"] ul, div[lang="ar"] p {
+     margin: 10px;
+}
+
+@media screen and (min-width: 1500px) {
+.main, .news, h1 {
+     margin-right: 232px !important;
+     margin-left: 0 !important;
+}
+
+div.routersummaryouter {
+     margin-right: 27px !important;
+}
+
+.routersummary h4 {
+     font-size: 11pt !important;
+}
+
+.routersummary td, .routersummary a {
+     font-size: 10pt !important;
+}
+
+div[lang="ar"], div[lang="ar"] code, div[lang="ar"] b {
+     font-size: 11pt !important;
+}
+}
\ No newline at end of file
diff --git a/installer/resources/themes/console/dark/i2ptunnel.css b/installer/resources/themes/console/dark/i2ptunnel.css
index 50c8eb9c63..70c35b2c74 100644
--- a/installer/resources/themes/console/dark/i2ptunnel.css
+++ b/installer/resources/themes/console/dark/i2ptunnel.css
@@ -144,7 +144,7 @@ hr {
 }
 
 .iframed #globalTunnelControl {
-     margin: 6px 0 -26px !important; 
+     margin: 6px auto -26px !important; 
 }
 
 #serverTunnels {
@@ -170,7 +170,7 @@ h2, h3 {
 
 h3 {
      border-radius: 0;
-     margin-top: -1px;
+     margin-top: 15px;
 }
 
 .iframed #globalTunnelControl h2 {
diff --git a/installer/resources/themes/console/light/console.css b/installer/resources/themes/console/light/console.css
index 1d07bafd23..c44c127ec6 100644
--- a/installer/resources/themes/console/light/console.css
+++ b/installer/resources/themes/console/light/console.css
@@ -15,6 +15,20 @@ body {
      background-size: 32px 32px;
 }
 
+/* preload button mouseovers */
+body {
+     background: url(images/tile2.png) fixed, 
+     url(/themes/console/images/buttons/clean_hover.png) no-repeat,
+     url(/themes/console/images/buttons/configure_hover.png) no-repeat,
+     url(/themes/console/images/buttons/delete_hover.png) no-repeat,
+     url(/themes/console/images/buttons/restart_hover.png) no-repeat,
+     url(/themes/console/images/buttons/restore_hover.png) no-repeat,
+     url(/themes/console/images/buttons/search_hover.png) no-repeat,
+     url(/themes/console/images/buttons/shutdown_hover.png) no-repeat,
+     url(/themes/console/images/buttons/update_hover.png) no-repeat, #a4a4cb;
+     background-size: 32px 32px, 0 0, 0 0, 0 0, 0 0, 0 0, 0 0, 0 0, 0 0;
+}
+
 .hide, .hideme {
      display: none;
 }
@@ -281,10 +295,12 @@ div.routersummary tr {
      border: 0 !important;
 }
 
+/*
 div.routersummary td:first-child {
      max-width: 90px;
      overflow: hidden;
 }
+*/
 
 div.routersummary a:hover {
      color: #f60;
@@ -464,16 +480,13 @@ div.warning {
 /* console error messages */
 
 div.sorry {
-     margin: 5px 0 10px 207px;
-     padding: 20px 20px 20px 75px;
-     background: #ffe;
+     margin: -11px 0 10px 207px;
+     padding: 20px 25px 20px 80px;
      border: 1px solid #447;
-     border-radius: 2px;
+     border-radius: 0 0 2px 2px;
      text-align: justify;
-     background-image: url(/themes/console/images/info/errortriangle.png);
-     background-position: 15px center;
-     background-repeat: no-repeat;
-     box-shadow: inset 0 0 0 1px #d00;
+     background: #ffe url(/themes/console/images/info/errortriangle.png) 20px center no-repeat;
+     box-shadow: inset 0 0 1px #f00;
      word-wrap: break-word;
      font-weight: bold;
      color: #531;
@@ -485,7 +498,7 @@ div.sorry hr {
      background: #531;
      height: 1px;
      border: 1px solid #531;
-     margin: 10px 0 15px 0;
+     margin: 10px 0 !important;
 }
 
 div.main {
@@ -834,6 +847,12 @@ div.configure h3, div.graphspanel h3 {
      text-align: left;
 }
 
+div.graphspanel h3 {
+     text-transform: capitalize;
+     letter-spacing: normal;
+     word-spacing: normal;
+}
+
 h3#advancedconfig a, h3#bwlimiter a, h3.tabletitle a, h3.ptitle a, th a.script, th#upnpconfig a, h3#graphinfo a, h3#graphdisplay a, .h3navlinks {
      float: right;
      font-size: 9pt;
@@ -1027,7 +1046,6 @@ p#enablefullstats {
      padding: 5px !important;
 }
 
-
 #sidebarconf tr:last-child td:last-child {
      text-align: left;
 }
@@ -1046,6 +1064,7 @@ div.graphspanel img {
      padding: 2px;
      margin: 6px;
      text-align: center !important;
+     vertical-align: top !important;
      background: #001;
      box-shadow: inset 0 0 1px 1px #99f;
      max-width: 98%;
@@ -1082,6 +1101,8 @@ h3#graphdisplay {
      border-radius: 0;
      border-width: 1px;
      box-shadow: none;
+     filter: none;
+     -webkit-filter: none;
 }
 
 .main#graphs form {
@@ -1090,6 +1111,65 @@ h3#graphdisplay {
      margin: -16px 0 5px;
 }
 
+/* new graphs optionbox */
+
+#graphs form {
+     padding: 0 !important;
+}
+
+#graphs form hr {
+     margin: 0 -1px 8px !important;
+}
+
+#graphs form table {
+     border: none;
+     margin: 0;
+}
+
+.formaction#graphing {
+     margin: -1px 0 !important;
+     padding: 5px 3px;
+     border-left: none;
+     border-right: none;
+}
+
+#graphs tr:first-child td {
+     border-top: none;
+}
+
+#graphs td:first-child {
+     text-align: right;
+     width: 85px;
+     white-space: nowrap;
+     padding: 13px 3px 13px 5px;
+}
+
+#graphs td:nth-child(2) {
+     width: 260px;
+     white-space: nowrap;
+}
+
+#graphs td.infohelp {
+     border: 1px solid #cfd1ff !important;
+     border-right: none !important;
+     background-size: 20px 20px !important;
+     padding: 5px 5px 5px 40px !important;
+     background-color: #f7f8ff !important;
+     text-align: left;
+}
+
+#graphs form input, #graphs form select {
+     margin: 3px 5px 3px 0;
+     vertical-align: middle;
+}
+
+#graphs input[type="text"] {
+     min-width: 60px;
+}
+
+/* end new graphs optionbox */
+
+
 div.messages {
      padding: 15px;
      margin: 15px 0;
@@ -1111,6 +1191,10 @@ div.messages {
      background-size: 28px 28px, auto 100%, 100% 100% !important;
 }
 
+.main#graphs .messages { /* "graphing not supported" error */
+     margin-bottom: 20px;
+}
+
 div.error {
      color: #900;
 }
@@ -1222,6 +1306,10 @@ table[id$="logs"] td:empty {
      display: none;
 }
 
+table[id$="logs"] tr:first-child {
+     border-bottom: 1px solid #7778bf;
+}
+
 table[id$="logs"] ul li:last-child {
      margin-bottom: 10px !important;
 }
@@ -1346,13 +1434,14 @@ h4.app, h4.app2 {
 
 h4.app {
      background: url(/themes/console/images/eepsite.png) 10px center no-repeat, linear-gradient(to bottom, #fff 0%, #fff 50%, #eef 50%, #eef 100%);
-     background-size: 16px 16px, 100% 100%;    
+     background-size: 16px 16px, 100% 100%;
+     margin-top: 15px;
 }
 
 h4.app2 {
      clear: left;
      margin-top: 10px !important;
-     background: url(images/application-icon.png) 10px center no-repeat, linear-gradient(to bottom, #fff 0%, #fff 50%, #eef 50%, #eef 100%);
+     background: url(images/globe.png) 10px center no-repeat, linear-gradient(to bottom, #fff 0%, #fff 50%, #eef 50%, #eef 100%);
 }
 
 div.ag2 {
@@ -1378,8 +1467,8 @@ div.app:hover {
      border: 1px solid #f60;
      background: #fff;
      box-shadow: none;
-     filter: none;
-     -webkit-filter: none;
+/*     filter: none;
+     -webkit-filter: none;*/
 }
 
 div.app:hover a:link, div.app:hover a:visited {
@@ -1396,6 +1485,7 @@ div.app:hover img.app {
 div.app:hover .applabel {
      border-color: #f60;
      background: #fff !important;
+     background: linear-gradient(to bottom, #fff 0%, #fff 50%, #ffe8bf 50%, #efd9b3 100%) !important;
 }
 
 div.app:active .applabel {
@@ -1456,6 +1546,7 @@ table.search td:nth-child(3) {
 table.search input[type="text"] {
      min-width: 40px !important;
      width: 100%;
+     padding-left: 24px;
 }
 
 table.search select {
@@ -1520,7 +1611,7 @@ div.applabel {
 /* end home page */
 
 tt {
-     font: bold 8.5pt "Droid Sans Mono", "Lucida Console", "DejaVu Sans Mono", Courier, mono;
+     font: bold 9pt "Droid Sans Mono", "Lucida Console", "DejaVu Sans Mono", Courier, mono;
      color: #050;
 }
 
@@ -1541,7 +1632,6 @@ div.main li {
 div.main li b {
      color: #514 !important;
      color: #003 !important;
-     letter-spacing: 0.01em;
      font-size: 9.5pt;
      line-height: 170%;
 }
@@ -2200,7 +2290,7 @@ input.accept[value^="Show"]:hover, button.accept[value^="Show"]:hover,
 input.check[value^="View"]:hover, button.check[value^="View"]:hover,
 input.accept[value^="Show"]:focus, button.accept[value^="Show"]:focus,
 input.check[value^="View"]:focus, button.check[value^="View"]:focus {
-     background: url(/themes/console/images/buttons/show.png) no-repeat 6px center, linear-gradient(to bottom, #fff 0%, #ddd 100%);
+     background: url(/themes/console/images/buttons/show.png) no-repeat 6px center, linear-gradient(to bottom, #ddd 0%, #fff 100%);
 }
 
 input.cancel[value^="Hide"], button.cancel[value^="Hide"],
@@ -2491,6 +2581,10 @@ button::-moz-focus-inner, input[type="submit"]::-moz-focus-inner, input[type="re
 /*     margin-top: -4px;*/
 }
 
+.routersummary .cancel {
+     margin-top: 10px;
+}
+
 @media screen and (-webkit-min-device-pixel-ratio:0) {
 .routersummary .download, .routersummary .download:hover, .routersummary .download:focus, .routersummary .download:active {
      padding-left: 19px !important;
@@ -2922,6 +3016,7 @@ div.themechoice {
 .themechoice:hover > object ~ .themelabel {
      border-top: 1px solid #f60 !important;
      background: #fff !important;
+     background: linear-gradient(to bottom, #fff 0%, #fff 50%, #ffe8bf 50%, #efd9b3 100%) !important;
      color: #f60;
 }
 
@@ -2991,10 +3086,20 @@ div.themelabel {
 
 .themechoice .optbox:checked + object ~ div.themelabel {
      background: #ddf !important;
-     color: #338;
+     color: #338 !important;
      font-weight: bold;
 }
 
+.themechoice .optbox:focus + object ~ div.themelabel {
+     color: #f60 !important;
+     box-shadow: inset 0 0 1px #def;
+}
+
+.themechoice .optbox:active + object ~ div.themelabel {
+     color: #fff !important;
+     box-shadow: inset 0 0 0 1px #fff;
+}
+
 div#themesettings {
      clear: both;
      padding: 4px 5px 0;
@@ -3076,7 +3181,7 @@ div.langselect { /* containing box for lang selection */
      color: #f60;
      border-top: 1px solid #f60;
      background: #fff !important;
-     transition: all 0.1s ease 0s;
+     background: linear-gradient(to bottom, #fff 0%, #fff 50%, #ffe8bf 50%, #efd9b3 100%) !important;
 }
 
 .langselect:active > input[name="lang"] + img + .ui_lang {
@@ -3092,6 +3197,16 @@ div.langselect { /* containing box for lang selection */
      z-index: 2;
 }
 
+.langselect input[name="lang"]:focus + img + div.ui_lang {
+     color: #f60 !important;
+     box-shadow: inset 0 0 1px #def;
+}
+
+.langselect input[name="lang"]:active + img + div.ui_lang {
+     color: #fff !important;
+     box-shadow: inset 0 0 0 1px #fff;
+}
+
 div.flagradio {
      margin-top: 2px;
 }
@@ -4071,4 +4186,8 @@ h3#pluginconfig, h3#webappconfig, h3#i2pclientconfig, h3#pluginmanage, p#clientc
 #jardump tt, #jardump td {
      font-size: 9pt !important;
 }
+
+.sorry {
+     margin-left: 232px !important;
+}
 }
\ No newline at end of file
diff --git a/installer/resources/themes/console/light/console_ar.css b/installer/resources/themes/console/light/console_ar.css
index 116c8e4014..e3a41becd0 100644
--- a/installer/resources/themes/console/light/console_ar.css
+++ b/installer/resources/themes/console/light/console_ar.css
@@ -445,4 +445,43 @@ table.netdbentry th:last-child {
 
 #logs table td:first-child {
      text-align: left;
+}
+
+#pluginconfigactions {
+     margin: -6px -32px -6px 32px !important;
+}
+
+
+#pluginupdater.formaction {
+     margin: -16px 0;
+}
+
+#consolepass input[name="nofilter_pw"], #externali2cp input[name="nofilter_pw"], #consolepass input[name="nofilter_pw"]:focus, #externali2cp input[name="nofilter_pw"]:focus,
+#consolepass input[name="name"], #externali2cp input[name="user"], #consolepass input[name="name"]:focus, #externali2cp input[name="user"]:focus {
+     background-position: right 3px center, center center !important;
+     padding: 4px 20px 4px 4px !important;
+     margin: 5px 3px 5px 15px !important;
+}
+
+#consolepass tr:first-child td, p#clientconf.infohelp, p#webappconfigtext.infohelp, #floodfillconfig .infohelp, 
+#bandwidthconfig tr:first-child .infohelp, h3#shutdownrouter + p.infohelp, h3#restartrouter + p.infohelp, h3#systray + p.infohelp, 
+h3#servicedebug + p.infohelp, h3#browseronstart + p.infohelp, table#addkeyring td:first-child, #config_peers tr:nth-child(3) td.infohelp, 
+#config_reseed.main p.infohelp, #plugininstall tr:nth-child(3) td:nth-last-child(2), #manualreseed tr:nth-child(3) td:nth-last-child(2), 
+#manualreseed tr:nth-child(5) td:nth-last-child(2), #plugininstall tr:nth-child(5) td:nth-last-child(2), #manualreseed tr:nth-last-child(2) td.infohelp, 
+p#enablefullstats, p#gatherstats, #oldhome td:first-child, p#pluginconfigtext, #plugininstall .infohelp, #config_family .infohelp, 
+#joinfamily tr:nth-child(3) td:first-child, #newfamily tr:last-child td:first-child, #config_summarybar .configtable td:not(.optionsave),
+table#bugreports td.infohelp {
+     background-position: right 12px center !important;
+     padding: 15px 50px 15px 15px !important;
+}
+
+@media screen and (min-width: 1500px) {
+.main, .news, h1 {
+     margin-right: 232px !important;
+     margin-left: 0 !important;
+}
+
+html {
+     margin: 0 3px !important;
+}
 }
\ No newline at end of file
diff --git a/installer/resources/themes/console/light/images/globe.png b/installer/resources/themes/console/light/images/globe.png
new file mode 100644
index 0000000000..2cef329e0d
Binary files /dev/null and b/installer/resources/themes/console/light/images/globe.png differ
diff --git a/installer/resources/themes/console/midnight/console.css b/installer/resources/themes/console/midnight/console.css
index 3d0df4f2e1..85e6f62633 100644
--- a/installer/resources/themes/console/midnight/console.css
+++ b/installer/resources/themes/console/midnight/console.css
@@ -15,10 +15,28 @@ body {
      font: 8.5pt/130% "Droid Sans", "Noto Sans", Ubuntu, "Segoe UI", "Bitstream Vera Sans", "DejaVu Sans", Verdana, "Lucida Grande", Helvetica, sans-serif;
 }
 
+/* preload button mouseovers */
+body {
+     background: linear-gradient(to bottom, #001, #000),
+     url(/themes/console/images/buttons/clean_hover.png) no-repeat,
+     url(/themes/console/images/buttons/configure_hover.png) no-repeat,
+     url(/themes/console/images/buttons/delete_hover.png) no-repeat,
+     url(/themes/console/images/buttons/restart_hover.png) no-repeat,
+     url(/themes/console/images/buttons/restore_hover.png) no-repeat,
+     url(/themes/console/images/buttons/search_hover.png) no-repeat,
+     url(/themes/console/images/buttons/shutdown_hover.png) no-repeat,
+     url(/themes/console/images/buttons/update_hover.png) no-repeat, #000;
+     background-size: auto 2px, 0 0, 0 0, 0 0, 0 0, 0 0, 0 0, 0 0, 0 0;
+}
+
 .hide, .hideme {
      display: none;
 }
 
+small {
+     font-size: 9pt;
+}
+
 div.clearer {
      clear: left;
      height: 0;
@@ -690,6 +708,8 @@ input.stop, button.stop {
 input.stop:hover, button.stop:hover,
 input.stop:focus, button.stop:focus {
      background: #000 url(/themes/console/images/buttons/shutdown_hover.png) 6px center no-repeat !important;
+     background-size: 14px 14px, 100% 100% !important;
+     padding: 5px 5px 5px 21px !important;
 }
 
 input.stop:active, button.stop:active {
@@ -828,7 +848,7 @@ button::-moz-focus-inner, input[type="submit"]::-moz-focus-inner, input[type="re
 .routersummary .reload, .routersummary .stop {
      text-indent: -99999px;
      background-size: 16px 16px, 100% 100% !important;
-     background-position: center center, center center !important;
+     background-position: center center !important;
      padding: 5px !important;
 }
 
@@ -845,19 +865,19 @@ button::-moz-focus-inner, input[type="submit"]::-moz-focus-inner, input[type="re
 }
 
 .routersummary .stop {
-     background: url(/themes/console/images/buttons/shutdown.png) center center no-repeat;
+     background: url(/themes/console/images/buttons/shutdown.png) center center no-repeat, linear-gradient(to bottom, #1f1e32, #090812 50%, #000 50%) !important;
 }
 
 .routersummary .stop:hover, .routersummary .stop:focus {
      background: url(/themes/console/images/buttons/shutdown_hover.png) center center no-repeat;
      background-position: center center !important;
+     background-size: 16px 16px, 100% 100% !important;
 }
 
 .routersummary .download {
      background: url(/themes/console/images/buttons/download.png) 3px center no-repeat;
      background-size: 16px 16px, 100% 100% !important;
      padding: 5px 3px 5px 17px !important;
-/*     margin-top: -4px;*/
 }
 
 @media screen and (-webkit-min-device-pixel-ratio:0) {
@@ -1076,7 +1096,7 @@ div.logo hr {
 .routersummary h3 a {
      display: inline-block;
      width: calc(100% - 6px);
-     padding: 0;
+     padding: 1px 0 !important;
      margin: 0;
 }
 
@@ -1286,6 +1306,13 @@ div.routersummary a:hover {
      word-spacing: 0;
 }
 
+div.newsheadings li {
+     list-style: none outside url(images/newsbullet_mini.png);
+     margin: 0 -6px 2px 4px;
+     line-height: 110%;
+     text-transform: capitalize;
+}
+
 div.tunnels {
      padding-top: 3px !important;
      margin-left: -4px;
@@ -1326,7 +1353,7 @@ div.tunnels {
      background-repeat:no-repeat;
      box-shadow: inset 0 0 0 1px #320951;
      word-wrap: break-word;
-/*     font-weight: bold;*/
+     min-width: 555px;
      color: #c9ceff;
      font-size: 10pt;
 }
@@ -1380,6 +1407,12 @@ div.sorry hr {
      color: #c9ceff;
 }
 
+.newsentry font[size="-2"] {
+     letter-spacing: 0.15em;
+     font-style: italic;
+     text-transform: capitalize;
+}
+
 .news h4 {
      border-bottom: 1px;
      border-bottom-style: dotted;
@@ -1482,14 +1515,16 @@ div.sorry hr {
 
 .tab2::before {
      content: '\1F892\00A0';
-     font-size: 12pt;
+     content: '\25B8\00A0';
+     font-size: 10pt;
      line-height: 50%;
      vertical-align: baseline;
 }
 
 .tab2::after {
      content: '\00A0\1F890';
-     font-size: 12pt;
+     content: '\00A0\25C2';
+     font-size: 10pt;
      line-height: 50%;
      vertical-align: baseline;
 }
@@ -1640,6 +1675,8 @@ div.graphspanel img {
      padding: 2px;
      max-width: 97%;
      max-width: calc(100% - 20px);
+     vertical-align: top;
+/*     filter: sepia(100%) invert(100%);*/
 }
 
 div.graphspanel p {
@@ -1657,12 +1694,94 @@ p#graphopts {
 h3#graphinfo {
      margin-top: 0;
      border-radius: 0 !important;
+     text-transform: capitalize;
+     letter-spacing: normal;
+     word-spacing: normal;
 }
 
 div.graphspanel p:last-child {
      display: none;
 }
 
+form[action="graphs"] {
+     border: 1px solid #443da0;
+     padding: 10px 10px 0 !important;
+     background: #000;
+     margin-top: -11px;
+     margin-bottom: 10px;
+}
+
+h3#graphdisplay a {
+     text-transform: capitalize;
+     letter-spacing: normal;
+     font-size: 9pt;
+     float: right;
+}
+
+/*
+.main#graphs hr {
+     margin: 10px -10px 8px !important;
+}
+*/
+
+/* new graphs optionbox */
+
+#graphs form {
+     padding: 0 !important;
+}
+
+#graphs form hr {
+     margin: 0 -1px 8px !important;
+}
+
+#graphs form table {
+     border: none;
+     margin: 0;
+}
+
+.formaction#graphing {
+     margin: -2px 0 0 !important;
+     padding-top: 1px;
+     border-left: none;
+     border-right: none;
+}
+
+#graphs tr:first-child td {
+     border-top: none;
+}
+
+#graphs td:first-child {
+     text-align: right;
+     width: 85px;
+     white-space: nowrap;
+     padding: 13px 3px 13px 5px;
+}
+
+#graphs td:nth-child(2) {
+     width: 260px;
+     white-space: nowrap;
+}
+
+#graphs td.infohelp {
+     border: 1px solid #120f35;
+     border-right: none;
+     background-size: 20px 20px !important;
+     padding: 5px 5px 5px 40px !important;
+     background-color: #010008 !important;
+     text-align: left;
+}
+
+#graphs form input, #graphs form select {
+     margin: 3px 5px 3px 0;
+     vertical-align: middle;
+}
+
+#graphs input[type="text"] {
+     min-width: 60px;
+}
+
+/* end new graphs optionbox */
+
 table {
      border-collapse: collapse;
      width: 100%;
@@ -1915,7 +2034,7 @@ h2 a:hover {
 h3, h3.welcome, div.news h3 {
      border: 1px solid #443da0;
      border-left: 5px solid #443da0;
-     padding: 4px 10px;
+     padding: 5px 10px;
      margin: 10px 0 10px 0;
      border-radius: 0 2px 2px 0;
      background: #000 url(images/header.png) center center ;
@@ -1961,11 +2080,11 @@ h2, h3, h4, .confignav {
 .langbox img {
      opacity: 0.5;
      padding: 1px 2px !important;
-     transition: all 0.3s ease 0s;
 }
 
 .langbox img:hover {
      opacity: 1;
+     transform: scale(1.1);
 }
 
 hr {
@@ -2006,7 +2125,7 @@ div.joblog {
      border-radius: 2px 2px 0 0;
      text-align: justify !important;
      overflow-y: hidden !important;
-     margin-top: 15px !important;
+     margin-top: 10px !important;
  }
 
 div.joblog h3 {
@@ -2446,6 +2565,11 @@ div.themechoice {
      font-weight: bold;
 }
 
+.themechoice .optbox:focus + object ~ div.themelabel {
+     color: #652787;
+     box-shadow: inset 0 0 10px 3px #000; 
+}
+
 #themeoptions {
      clear: both;
      padding-top: 5px;
@@ -2558,6 +2682,16 @@ td#themeselect {
      font-weight: bold;
 }
 
+.langselect input[name="lang"]:focus + img + div.ui_lang {
+     color: #652787 !important;
+     box-shadow: inset 0 0 10px 3px #000 !important;
+}
+
+.langselect input[name="lang"]:active + img + div.ui_lang {
+     color: #c9ceff !important;
+     box-shadow: inset 0 0 0 1px #000 !important;
+}
+
 .langselect:hover, .langselect:active {
      border: 1px solid #652787;
      background: #000;
@@ -2991,6 +3125,7 @@ ul.statlist a[name], ul.statlist b, ul.statlist li b, ul.statlist a[name]:hover
 
 ul.statlist li::before {
      content: "\1F6C8\00A0";
+     content: "\2B26\00A0";
      font-size: 14pt;
      line-height: 50%; 
      vertical-align: baseline;
@@ -3023,12 +3158,13 @@ ul.statlist li li:last-child {
      padding-bottom: 5px !important;
 }
 
+/*
 .statlist a[href*="graph"]::before {
      content: "\1F4CA\00A0";
      font-size: 11pt;
      line-height: 140%;
-     
 }
+*/
 
 .main#stats form {
      border: 1px solid #443da0;
@@ -3102,31 +3238,6 @@ table#i2pupdates tr:last-child td {
      background: #000 !important;
 }
 
-form[action="graphs"] {
-     border: 1px solid #443da0;
-     padding: 10px 10px 0 !important;
-     background: #000;
-     margin-top: -11px;
-     margin-bottom: 10px;
-}
-
-.formaction#graphing {
-     margin: -4px -5px 5px !important;
-     border-left: none;
-     border-right: none;
-}
-
-.main#graphs hr {
-     margin: 10px -10px 8px !important;
-}
-
-h3#graphdisplay a {
-     text-transform: capitalize;
-     letter-spacing: normal;
-     font-size: 9pt;
-     float: right;
-}
-
 /* /configlogging */
 
 input[name="logfilename"], input[name="logformat"], input[name="logdateformat"], input[name="logfilesize"], select[name="defaultloglevel"], select[name="newloglevel"] {
@@ -3962,7 +4073,7 @@ div.ag2 {
 
 div.app {
      float: left;
-     padding: 2px 0 0 !important;
+     padding: 2px 0 4px;
      min-width: 70px;
      border: 1px solid #443da0;
      background: #000;
@@ -3970,7 +4081,6 @@ div.app {
      border-radius: 2px;
      margin: 2px 3px 5px;
      text-align: center !important;
-     padding-top: 4px;
      opacity: 0.8;
      box-shadow: inset 0 0 0 1px #000;
      transition: border ease 0.3s 0s;
@@ -4007,6 +4117,14 @@ div.app a:link, div.app a:hover, div.app a:active {
      outline: none;
 }
 
+div.app a:focus img {
+     filter: drop-shadow(0 0 3px #c96fff) !important;
+}
+
+div.app a:focus {
+     color: #652787;
+}
+
 div.app:hover a:link, div.app:hover a:visited {
      color: #652787;
 }
@@ -4120,7 +4238,7 @@ td.app {
 div.applabel {
      font-size: 8pt;
      margin: 2px 0 0;
-     padding: 5px 2px;
+     padding: 5px 2px 2px;
      text-align: center;
      vertical-align: bottom;
      line-height: 95%;
@@ -4420,8 +4538,12 @@ div#sybilnav {
 
 #sybilnav ul li::before {
      content: '\1F441\00A0\00A0';
+     content: url(/themes/console/images/buttons/show.png);
+     mix-blend-mode: luminosity;
+     vertical-align: middle;
+     margin-right: 5px;
      font-size: 16pt;
-} 
+}
 
 table.sybil_routerinfo {
      margin-bottom: 10px;
@@ -4464,6 +4586,7 @@ p.sybil_floodfill, p.family, p.threatpoints, p.hashdist, p#sybil_totals {
      font-weight: bold;
      background: url(/themes/console/images/buttons/show.png) 8px center no-repeat;
      background: url(/themes/console/images/buttons/show.png) 8px center no-repeat, linear-gradient(to right, #000, #001 80%, #002 100%);
+     background-blend-mode: luminosity;
      box-shadow: inset 0 0 0 1px #080077;
 }
 
@@ -4579,7 +4702,7 @@ p#debugmode, p#sybilinfo {
 }
 
 p#gatherstats {
-     margin-top: -5px; 
+     margin-top: 1px; 
 }
 
 td.optionsave {
@@ -5045,4 +5168,8 @@ h4#updateplugins {
 #profiles td:first-child, #profiles th:first-child, #floodfills td:first-child, #floodfills th:first-child {
      width: 56px !important;
 }
+
+.sorry {
+     margin-left: 232px !important;
+}
 }
diff --git a/installer/resources/themes/console/midnight/console_ar.css b/installer/resources/themes/console/midnight/console_ar.css
index b95b9db28d..bd065204ba 100644
--- a/installer/resources/themes/console/midnight/console_ar.css
+++ b/installer/resources/themes/console/midnight/console_ar.css
@@ -292,3 +292,57 @@ td.optionsave {
 #tunnelconfig th {
      text-align: right;
 }
+
+#consolepass input[name="nofilter_pw"], #externali2cp input[name="nofilter_pw"], #consolepass input[name="nofilter_pw"]:focus, #externali2cp input[name="nofilter_pw"]:focus,
+#consolepass input[name="name"], #externali2cp input[name="user"], #consolepass input[name="name"]:focus, #externali2cp input[name="user"]:focus {
+     background-position: right 3px center, center center !important;
+     padding: 4px 20px 4px 4px !important;
+     margin: 5px 3px 5px 15px !important;
+}
+
+#consolepass tr:first-child td, p#clientconf.infohelp, p#webappconfigtext.infohelp, #floodfillconfig .infohelp, 
+#bandwidthconfig tr:first-child .infohelp, h3#shutdownrouter + p.infohelp, h3#restartrouter + p.infohelp, h3#systray + p.infohelp, 
+h3#servicedebug + p.infohelp, h3#browseronstart + p.infohelp, table#addkeyring td:first-child, #config_peers tr:nth-child(3) td.infohelp, 
+#config_reseed.main p.infohelp, #plugininstall tr:nth-child(3) td:nth-last-child(2), #manualreseed tr:nth-child(3) td:nth-last-child(2), 
+#manualreseed tr:nth-child(5) td:nth-last-child(2), #plugininstall tr:nth-child(5) td:nth-last-child(2), #manualreseed tr:nth-last-child(2) td.infohelp, 
+p#enablefullstats, p#gatherstats, #oldhome td:first-child, p#pluginconfigtext, #plugininstall .infohelp, #config_family .infohelp, 
+#joinfamily tr:nth-child(3) td:first-child, #newfamily tr:last-child td:first-child, #config_summarybar .configtable td:not(.optionsave),
+table#bugreports td.infohelp {
+     background-position: right 12px center !important;
+     padding: 15px 50px 15px 15px !important;
+}
+
+div[lang="ar"] ul li {
+     list-style-image: url("images/link.png") !important;
+     list-style-position: inside;
+     margin-left: 0 !important;
+     padding-left: 0 !important;
+     margin-top: 15px !important;]
+}
+
+div[lang="ar"] ul, div[lang="ar"] p {
+     margin: 10px;
+}
+
+@media screen and (min-width: 1500px) {
+.main, .news, h1 {
+     margin-right: 232px !important;
+     margin-left: 0 !important;
+}
+
+div.routersummaryouter {
+     margin-right: 27px !important;
+}
+
+.routersummary h4 {
+     font-size: 11pt !important;
+}
+
+.routersummary td, .routersummary a {
+     font-size: 10pt !important;
+}
+
+div[lang="ar"], div[lang="ar"] code, div[lang="ar"] b {
+     font-size: 11pt !important;
+}
+}
\ No newline at end of file
diff --git a/installer/resources/themes/console/midnight/i2ptunnel.css b/installer/resources/themes/console/midnight/i2ptunnel.css
index dddaf17b10..0ed06ceb17 100644
--- a/installer/resources/themes/console/midnight/i2ptunnel.css
+++ b/installer/resources/themes/console/midnight/i2ptunnel.css
@@ -138,7 +138,7 @@ hr {
 }
 
 .iframed #globalTunnelControl {
-     margin: 6px 0 -26px !important; 
+     margin: 6px auto -26px !important; 
 }
 
 #serverTunnels {
diff --git a/installer/resources/themes/snark/classic/snark.css b/installer/resources/themes/snark/classic/snark.css
index 1f5212eec2..6081872b5b 100644
--- a/installer/resources/themes/snark/classic/snark.css
+++ b/installer/resources/themes/snark/classic/snark.css
@@ -4,8 +4,19 @@
 body {
      font: 9pt "Droid Sans", "Noto Sans", Ubuntu, "Segoe UI", Verdana, "Bitstream Vera Sans", "DejaVu Sans", "Lucida Grande", Helvetica, sans-serif;
      color: #0c153d;
-     background: #eef;
-     background: url(/themes/console/classic/images/bg0.png) repeat scroll center bottom #eef;
+     background: #eef url(/themes/console/classic/images/bg0.png) repeat scroll center bottom;
+}
+
+/* preload top navigation mouseovers */
+body {
+     background: url(/themes/console/classic/images/bg0.png) repeat scroll center bottom,
+     url(images/button_snark_hover.png) no-repeat,
+     url(images/button_snark_active.png) no-repeat,
+     url(images/button_tracker_hover.png) no-repeat,
+     url(images/button_tracker_active.png) no-repeat,
+     url(images/button_forum_hover.png) no-repeat,
+     url(images/button_forum_active.png) no-repeat, #eef;
+     background-size: 150px 150px, 0 0, 0 0, 0 0, 0 0, 0 0, 0 0 !important;
 }
 
 tt {
@@ -17,6 +28,17 @@ body.iframed {
      background: transparent url(/themes/console/images/transparent.gif) !important;
 }
 
+body.iframed {
+     background: transparent url(/themes/console/images/transparent.gif),
+     url(images/button_snark_hover.png) no-repeat,
+     url(images/button_snark_active.png) no-repeat,
+     url(images/button_tracker_hover.png) no-repeat,
+     url(images/button_tracker_active.png) no-repeat,
+     url(images/button_forum_hover.png) no-repeat,
+     url(images/button_forum_active.png) no-repeat !important;
+     background-size: 100% 100%, 0 0, 0 0, 0 0, 0 0, 0 0, 0 0 !important;
+}
+
 .iframed .page {
      margin: 5px 0;
      padding: 0;
@@ -586,14 +608,18 @@ table.snarkTorrents {
      text-align: center;
 }
 
-table.snarkTorrentInfo tr:last-child {
+.snarkTorrentInfo tr:nth-last-child(2) {
      border-top: 1px solid #89f !important;
+}
+
+.snarkTorrentInfo tr:last-child {
      background: none;
 }
 
-table.snarkTorrentInfo tr:last-child td {
+.snarkTorrentInfo tr:last-child td {
      padding: 5px !important;
      text-align: right !important;
+     border-top: 1px solid #89f !important;
 }
 
 table.SnarkTorrentInfo {
@@ -616,6 +642,10 @@ table.SnarkTorrentInfo {
      background: #fff;
 }
 
+.snarkTorrentInfo tr:last-child td:last-child b {
+     text-align: left;
+}
+
 table.SnarkDirInfo {
      margin-top: -2px !important;
      margin-bottom: 0;
@@ -641,6 +671,7 @@ table.SnarkDirInfo {
 
 .snarkDirInfo td:first-child {
      padding-left: 4px;
+     text-align: left;
 }
 
 .snarkDirInfo td:first-child img {
@@ -735,6 +766,11 @@ td.snarkFileIcon {
      padding: 0;
 }
 
+td.snarkFileIcon img {
+     filter: none;
+     -webkit-filter: none;
+}
+
 td.snarkFileStatusIcon {
      width: 24px;
      padding: 0 4px 0 0;
@@ -1108,6 +1144,10 @@ label.toggleview {
      -webkit-filter: drop-shadow(0 1px 1px #bbb);
 }
 
+.configsectionpanel .snarkConfigTitle {
+     color: #444;
+}
+
 @media screen and (-webkit-min-device-pixel-ratio: 0) { /* webkit hack */
 .snarkConfigTitle,
 label.toggleview {
@@ -1230,13 +1270,11 @@ input:disabled {
      opacity: .5 !important;
 }
 
-input[type=submit]:disabled,
-a.controld {
+input[type=submit]:disabled, a.controld {
      display: none;
 }
 
-input[type=image],
-thead img {
+input[type=image], thead img {
      margin: 0 2px;
      padding: 0 !important;
      opacity: 1;
@@ -1244,15 +1282,12 @@ thead img {
      border-radius: 3px;
 }
 
-input[type="image"],
-a img {
+input[type="image"], a img {
      filter: drop-shadow(0 0 1px #777);
 }
 
-input[type="image"]:hover,
-a img:hover,
-input[type="image"]:focus,
-a img:focus {
+input[type="image"]:hover, a img:hover,
+input[type="image"]:focus, a img:focus {
      outline: none !important;
      filter: drop-shadow(0 0 2px #f60) !important;
 }
@@ -1262,8 +1297,7 @@ input::-moz-focus-inner {
      outline: 0;
 }
 
-input[type="submit"],
-input[type="reset"] {
+input[type="submit"], input[type="reset"] {
      font-size: 9pt;
      font-weight: normal;
      color: #333;
@@ -1275,7 +1309,8 @@ input[type="reset"] {
      background: #eee;
      background: linear-gradient(to bottom, #fff 0%, #ddd 100%);
      box-shadow: inset 0 0 0 1px #fff;
-     
+     filter: drop-shadow(0 0 1px #ccc);
+     -webkit-filter: drop-shadow(0 0 1px #ccc);
 }
 
 input[type="submit"]:hover, input[type="reset"]:hover,
@@ -1286,8 +1321,12 @@ input[type="submit"]:focus, input[type="reset"]:focus {
      border: 1px solid #89f;
 }
 
-input[type="submit"]:active,
-input[type="reset"]:active {
+input[type="submit"]:focus, input[type="reset"]:focus {
+     filter: drop-shadow(0 0 2px #89f);
+     -webkit-filter: drop-shadow(0 0 2px #89f);
+}
+
+input[type="submit"]:active, input[type="reset"]:active {
      color: #333;
      background: #ddd;
      border: 1px solid #999;
@@ -1401,8 +1440,7 @@ img[src$="magnet.png"] {
      transform: rotate(-90deg);
 }
 
-input[type=text],
-input.r {
+input[type=text], input.r {
      min-width: 100px;
 }
 
@@ -1412,9 +1450,10 @@ input[type=radio] {
      vertical-align: bottom;
 }
 
-input[type="checkbox"],
-input[type="radio"] {
+input[type="checkbox"], input[type="radio"] {
      vertical-align: middle;
+     min-width: 16px;
+     min-height: 16px;
 }
 
 input.default {
@@ -1428,8 +1467,7 @@ input[size="85"] {
      width: calc(100% - 150px);
 }
 
-.addtorrentsection input,
-.newtorrentsection input {
+.addtorrentsection input, .newtorrentsection input {
      margin-left: 5px !important;
 }
 
@@ -1460,8 +1498,7 @@ select {
      -moz-appearance: none;
 }
 
-select:hover,
-select:active {
+select:hover, select:active {
      background: url(images/dropdown_hover.png) right center no-repeat, linear-gradient(to bottom, #ddd 0%, #fff 100%) !important;
 }
 
@@ -1508,24 +1545,6 @@ img:hover {
      border: none;
 }
 
-/*
-.infoz {
-     line-height: 100%;
-     float: left;
-     margin: 0 -1px 0 0 !important;
-     padding: 0 !important;
-}
-
-.infoz img {
-     opacity: 1 !important;
-     border: none;
-}
-
-.infoz img:hover {
-     opacity: 1 !important;
-}
-*/
-
 #pagenav img {
      padding: 5px !important;
      opacity: 0.7;
@@ -1538,8 +1557,7 @@ img:hover {
      width: 8px;
 }
 
-#pagenav img:hover,
-#pagenav img:focus {
+#pagenav img:hover, #pagenav img:focus {
      opacity: 1;
      border: 1px solid #f60 !important;
 }
@@ -1550,8 +1568,7 @@ img:hover {
      box-shadow: inset 2px 2px 3px 1px #333;
 }
 
-#pagenav img.disable,
-#pagenav img.disable:hover {
+#pagenav img.disable, #pagenav img.disable:hover {
      margin: 0 0 0 3px !important;
      opacity: .3;
      border: 1px solid #000 !important;
@@ -1630,13 +1647,11 @@ div.configsectionpanel td:first-child {
      min-width: 50px;
 }
 
-.trackerconfig th:last-child,
-.trackerconfig td:last-child {
+.trackerconfig th:last-child, .trackerconfig td:last-child {
      padding-left: 10px !important;
 }
 
-.trackerconfig tr:nth-child(odd),
-.snarkConfig tr:nth-child(odd) {
+.trackerconfig tr:nth-child(odd), .snarkConfig tr:nth-child(odd) {
      background: #ddf;
 }
 
@@ -1656,8 +1671,7 @@ div.configsectionpanel td:first-child {
      padding: 2px 3px;
 }
 
-.snarkNewTorrent td:nth-child(2),
-.snarkNewTorrent td:nth-child(3) {
+.snarkNewTorrent td:nth-child(2), .snarkNewTorrent td:nth-child(3) {
      font-weight: bold;
      padding-right: 5px;
 }
@@ -1675,8 +1689,7 @@ table.trackerconfig td:first-child {
      padding: 5px 2px;
 }
 
-.trackerconfig tr:nth-child(even),
-.snarkConfig tr:nth-child(even) {
+.trackerconfig tr:nth-child(even), .snarkConfig tr:nth-child(even) {
      background: #eef;
 }
 
@@ -1696,8 +1709,7 @@ table.trackerconfig td:first-child {
      text-align: center;
 }
 
-.trackerconfig td,
-.snarkConfig td {
+.trackerconfig td, .snarkConfig td {
      padding: 5px 1px !important;
 }
 
@@ -1716,10 +1728,8 @@ table.trackerconfig td:first-child {
      text-align: center !important;
 }
 
-.trackerconfig th,
-.trackerconfig td,
-.trackerconfig th:last-child,
-.trackerconfig td:last-child {
+.trackerconfig th, .trackerconfig td,
+.trackerconfig th:last-child, .trackerconfig td:last-child {
      text-align: left !important;
 }
 
@@ -1727,13 +1737,11 @@ table.trackerconfig td:first-child {
      text-align: right !important;
 }
 
-.configsectionpanel td[colspan="2"]:last-child,
-.configsectionpanel td[colspan="7"] {
+.configsectionpanel td[colspan="2"]:last-child, .configsectionpanel td[colspan="7"] {
      display: none;
 }
 
-.configsectionpanel td[colspan="5"],
-.configsectionpanel td[colspan="2"] {
+.configsectionpanel td[colspan="5"], .configsectionpanel td[colspan="2"] {
      border-top: 1px solid #89f;
 }
 
@@ -1741,8 +1749,7 @@ table.trackerconfig td:first-child {
      background: none;
 }
 
-.snarkConfig tr:nth-last-child(2) td,
-.configsectionpanel td[colspan="5"] {
+.snarkConfig tr:nth-last-child(2) td, .configsectionpanel td[colspan="5"] {
      padding: 11px 15px 0 !important;
      text-align: right !important;
      border-top: 1px solid #89f;
@@ -1756,9 +1763,7 @@ table.trackerconfig td:first-child {
      border: none !important;
 }
 
-div.section,
-div.mainsection div.section,
-div.mainsection {
+div.section, div.mainsection div.section, div.mainsection {
      margin: 0;
      padding: 0;
      text-align: center;
@@ -1803,8 +1808,7 @@ div.addtorrentsection {
      -webkit-filter: drop-shadow(0 0 1px #fff);
 }
 
-.addtorrentsection table,
-.newtorrentsection table {
+.addtorrentsection table, .newtorrentsection table {
      margin-top: -5px;
 }
 
@@ -1851,9 +1855,7 @@ div.configsectionpanel {
      padding-top: 0 !important;
 }
 
-.newtorrentsection form,
-.configsection form,
-.addtorrentsection form {
+.newtorrentsection form, .configsection form, .addtorrentsection form {
      color: #0c153d !important;
 }
 
@@ -1876,7 +1878,7 @@ code {
      font-size: 9pt;
      font-weight: bold;
      padding: 0 2px;
-     color: #090;
+     color: #050;
 }
 
 .iframed .snarknavbar,
@@ -1955,8 +1957,7 @@ input#toggle_createtorrent:checked + label + hr + table {
      display: none;
 }
 
-label.toggleview,
-.snarkConfigTitle a:visited {
+label.toggleview, .snarkConfigTitle a:visited {
      color: #006;
 }
 
@@ -1974,7 +1975,11 @@ label.toggleview img:active, label.toggleview:active img, .snarkConfigTitle a:ac
 /* responsive layout */
 
 @media screen and (min-width: 1400px) {
-body, th, td, table a, input, input[type="text"], input.r, input[name="nofilter_dataDir"], select, textarea, textarea[name="i2cpOpts"] {
+body, th, td, table a, input, input[type="text"], input.r, input[name="nofilter_dataDir"], select, textarea, textarea[name="i2cpOpts"], .snarkAddInfo {
      font-size: 10pt !important;
 }
+
+.snarkMessages li, .snarkTorrents tt {
+     font-size: 9pt;
+}
 }
\ No newline at end of file
diff --git a/installer/resources/themes/snark/dark/images/delete.png b/installer/resources/themes/snark/dark/images/delete.png
index c65b2c446e..40516eebe3 100644
Binary files a/installer/resources/themes/snark/dark/images/delete.png and b/installer/resources/themes/snark/dark/images/delete.png differ
diff --git a/installer/resources/themes/snark/dark/images/remove.png b/installer/resources/themes/snark/dark/images/remove.png
index f4713b8359..e5513afa3d 100644
Binary files a/installer/resources/themes/snark/dark/images/remove.png and b/installer/resources/themes/snark/dark/images/remove.png differ
diff --git a/installer/resources/themes/snark/dark/images/start.png b/installer/resources/themes/snark/dark/images/start.png
index e371d61fa8..262151e9c9 100644
Binary files a/installer/resources/themes/snark/dark/images/start.png and b/installer/resources/themes/snark/dark/images/start.png differ
diff --git a/installer/resources/themes/snark/dark/images/start_all.png b/installer/resources/themes/snark/dark/images/start_all.png
index 876efaee9c..0e1f96daa8 100644
Binary files a/installer/resources/themes/snark/dark/images/start_all.png and b/installer/resources/themes/snark/dark/images/start_all.png differ
diff --git a/installer/resources/themes/snark/dark/images/stop.png b/installer/resources/themes/snark/dark/images/stop.png
index dbf5ca3e77..bddf3d0bf5 100644
Binary files a/installer/resources/themes/snark/dark/images/stop.png and b/installer/resources/themes/snark/dark/images/stop.png differ
diff --git a/installer/resources/themes/snark/dark/images/stop_all.png b/installer/resources/themes/snark/dark/images/stop_all.png
index daf5023113..d04d318f0d 100644
Binary files a/installer/resources/themes/snark/dark/images/stop_all.png and b/installer/resources/themes/snark/dark/images/stop_all.png differ
diff --git a/installer/resources/themes/snark/dark/snark.css b/installer/resources/themes/snark/dark/snark.css
index 2c5ce93fae..88d10a5693 100644
--- a/installer/resources/themes/snark/dark/snark.css
+++ b/installer/resources/themes/snark/dark/snark.css
@@ -1,26 +1,52 @@
-/* I2PSnark theme "Camo" aka Dark by dr|z3d */
+/* I2PSnark theme "Camo" aka Dark */
+/* Author: dr|z3d */
 
 body {
      margin: 9px 8px;
      color: #ee9;
      font: 9pt "Droid Sans", "Noto Sans", Ubuntu, "Segoe UI", "Bitstream Vera Sans", "DejaVu Sans", Verdana, "Lucida Grande", Helvetica, sans-serif;
      background: #000;
-     background: linear-gradient(45deg, rgba(0,0,0,0.5), rgba(0,34,0,0.7)), url(../../console/dark/images/camotile2.png) top left;
+     background: linear-gradient(45deg, rgba(0,0,0,0.5), rgba(0,34,0,0.7)), url(/themes/console/dark/images/camotile2.png) top left;
      background-size: 3px 3px, 175px 175px;
 }
 
+/* preload top navigation mouseovers */
+body {
+     background: linear-gradient(45deg, rgba(0,0,0,0.5), rgba(0,34,0,0.7)),
+     url(/themes/console/dark/images/camotile2.png) top left,
+     url(images/button_snark_hover.png) no-repeat,
+     url(images/button_snark_active.png) no-repeat,
+     url(images/button_tracker_hover.png) no-repeat,
+     url(images/button_tracker_active.png) no-repeat,
+     url(images/button_forum_hover.png) no-repeat,
+     url(images/button_forum_active.png) no-repeat !important;
+     background-size: 3px 3px, 175px 175px, 0 0, 0 0, 0 0, 0 0, 0 0, 0 0 !important;
+}
+
 body.iframed {
-     background: transparent url('../../console/dark/images/transparent.gif') !important;
+     background: transparent url(/themes/console/images/transparent.gif) !important;
      margin: 1px 0 !important;
 }
 
+/* preload top navigation mouseovers */
+body.iframed {
+     background: url(/themes/console/images/transparent.gif),
+     url(images/button_snark_hover.png) no-repeat,
+     url(images/button_snark_active.png) no-repeat,
+     url(images/button_tracker_hover.png) no-repeat,
+     url(images/button_tracker_active.png) no-repeat,
+     url(images/button_forum_hover.png) no-repeat,
+     url(images/button_forum_active.png) no-repeat !important;
+     background-size: 100% 100%, 0 0, 0 0, 0 0, 0 0, 0 0, 0 0 !important;
+}
+
 .iframed .page {
      border: none;
      background: none;
      padding: 0;
      margin: 5px 0;
      box-shadow: none;
-     background: url("../../console/dark/images/camotile2.png") repeat scroll left top #000;
+     background: url(/themes/console/dark/images/camotile2.png) repeat scroll left top #000;
      background: linear-gradient(to right, #000 0%, #020 50%, #000 100%);
 }
 
@@ -69,7 +95,7 @@ body.iframed {
      font-size: 9pt;
      color: #3f3;
      text-shadow: 0 0 1px #000;
-     background: url(images/button_tracker.png) 7px center no-repeat, url(../../console/dark/images/header.png) center center repeat;
+     background: url(images/button_tracker.png) 7px center no-repeat, url(/themes/console/dark/images/header.png) center center repeat;
      background: url(images/button_tracker.png) 7px center no-repeat, linear-gradient(to bottom, #171 0%, #131 50%, #000 51%, #000 100%) !important;
      border-radius: 0;
      border: 1px solid #494;
@@ -87,34 +113,29 @@ body.iframed {
 .snarkRefresh:link:first-child {
      border-radius: 2px 0 0 2px;
      padding: 5px 7px 5px 15px !important;
-     background:  url(images/button_snark.png) 7px center no-repeat, url(../../console/dark/images/header.png) center center repeat;
+     background:  url(images/button_snark.png) 7px center no-repeat, url(/themes/console/dark/images/header.png) center center repeat;
      background: url(images/button_snark.png) 7px center no-repeat, linear-gradient(to bottom, #171 0%, #131 50%, #000 51%, #000 100%) !important; 
 }
 
 .snarkRefresh:link:nth-child(2) {
-     background: url(images/button_forum.png) 7px center no-repeat, url(../../console/dark/images/header.png) center center repeat;
+     background: url(images/button_forum.png) 7px center no-repeat, url(/themes/console/dark/images/header.png) center center repeat;
      background: url(images/button_forum.png) 7px center no-repeat, linear-gradient(to bottom, #171 0%, #131 50%, #000 51%, #000 100%) !important; 
 }
 
-.snarkRefresh:hover {
-     opacity: 1;
-     box-shadow: inset 0 0 0 1px #000 !important;
-}
-
 .snarkRefresh:active {
 	color: #fff !important;
 	box-shadow: inset 3px 2px 3px #000 !important;
 }
 
-.snarkRefresh:link:first-child:hover {
-     background-image: url(images/button_snark_hover.png), url('../ubergine/images/snarknav_on.png') !important;
+.snarkRefresh:link:first-child:hover, .snarkRefresh:link:first-child:focus {
+     background-image: url(images/button_snark_hover.png), url(../ubergine/images/snarknav_on.png) !important;
      background-image: url(images/button_snark_hover.png), linear-gradient(to bottom, #510 0%, #530 50%, #000 51%, #000 100%) !important; 
      background-position: 7px center, center center !important;
      background-repeat: no-repeat, repeat !important;
 }
 
-.snarkRefresh:link:hover:nth-child(2) {
-     background-image: url(images/button_forum_hover.png), url('../ubergine/images/snarknav_on.png') !important;
+.snarkRefresh:link:hover:nth-child(2), .snarkRefresh:link:focus:nth-child(2) {
+     background-image: url(images/button_forum_hover.png), url(../ubergine/images/snarknav_on.png) !important;
      background-image: url(images/button_forum_hover.png), linear-gradient(to bottom, #510 0%, #530 50%, #000 51%, #000 100%) !important; 
 }
 
@@ -135,7 +156,13 @@ body.iframed {
      background-repeat: no-repeat !important;
 }
 
-.snarkRefresh:hover {
+
+.snarkRefresh:hover, .snarkRefresh:focus {
+     opacity: 1;
+
+}
+
+.snarkRefresh:hover, .snarkRefresh:focus {
      text-decoration: none !important;
      text-transform: uppercase !important;
      font-weight: bold;
@@ -143,10 +170,10 @@ body.iframed {
      color: #f50;
      background: #000 !important;
      border-radius: 0;
-     border: 1px solid #f50;
-     box-shadow: inset 0 0 1px #f50;
+     box-shadow: inset 0 0 0 1px #000 !important;
+     border: 1px solid #f60 !important;
      opacity: 1;
-     background-image: url(images/button_tracker_hover.png), url('../ubergine/images/snarknav_on.png') !important;
+     background-image: url(images/button_tracker_hover.png), url(../ubergine/images/snarknav_on.png) !important;
      background-image: url(images/button_tracker_hover.png), linear-gradient(to bottom, #510 0%, #530 50%, #000 51%, #000 100%) !important; 
      background-position: 7px center, center center !important;
      background-repeat: no-repeat, repeat !important;
@@ -159,7 +186,8 @@ body.iframed {
      text-decoration: none !important;
      color: #fff;
      border: 1px solid #fff;
-     box-shadow: none;
+     box-shadow: inset 3px 3px 3px #000 !important;
+     box-shadow: inset 0 0 0 1px #000, inset 3px 3px 3px #000 !important;
      text-shadow: none;
 }
 
@@ -384,9 +412,11 @@ tfoot tr:nth-child(n+1) {
      padding-right: 0;
 }
 
+/*
 .SnarkTorrents th:nth-child(2) {
      text-align: center;
 }
+*/
 
 .SnarkTorrents th br {
      display: none; /* kill double height button display */
@@ -547,7 +577,7 @@ table.snarkTorrentInfo tr:last-child td {
 
 table.SnarkTorrentInfo {
      margin-bottom: 1px !important;
-     background: url("../../console/dark/images/camotile2.png") repeat scroll center bottom #001100;
+     background: url(/themes/console/dark/images/camotile2.png) repeat scroll center bottom #001100;
      border-bottom: 1px solid #494;
 }
 
@@ -587,6 +617,7 @@ table.SnarkDirInfo {
 
 .snarkDirInfo td:first-child {
      padding-left: 4px;
+     text-align: left;
 } 
 
 .snarkDirInfo td:first-child img {
@@ -1015,7 +1046,7 @@ div.percentBarInner.percentBarComplete {
      border: 1px solid #494;
      border-radius: 0;
      border-top: none;
-     background: #000 url('../../console/dark/images/header.png') repeat-x scroll center center !important;
+     background: #000 url(/themes/console/dark/images/header.png) repeat-x scroll center center !important;
      background: linear-gradient(to bottom, #1a261a 0%, #223022 7%, #212f21 9%, #172317 21%, #091109 49%, #050d05 50%, #020602 51%, #010301 53%, #000000 56%, #000000 100%) !important;
      font-variant: small-caps !important;
      filter: drop-shadow(0 2px 1px #000);
@@ -1174,7 +1205,7 @@ input[type=submit], input[type=submit]:visited {
      color: #494;
      background: #000;
      border: 1px outset #191;
-     padding: 4px 3px !important;
+     padding: 5px !important;
      font: bold 8pt "Droid Sans", "Noto Sans", Ubuntu, "Segoe UI", "Bitstream Vera Sans", "DejaVu Sans", Verdana, "Lucida Grande", Helvetica, sans-serif;
      margin-top: 6px;
      min-width: 95px;
@@ -1437,7 +1468,7 @@ img[src$="magnet.png"] {
 }
 
 #pagenav img {
-     height: 8px;
+     height: 10px;
      border: 1px solid #151 !important;
      margin: 0 0 0 2px !important;     
      padding: 4px 5px !important;
@@ -1447,6 +1478,10 @@ img[src$="magnet.png"] {
      border-radius: 2px;
 }
 
+#pagenav img:active {
+     box-shadow: inset 3px 3px 3px #000;
+}
+
 #pagenav {
      font-weight: bold !important;
 }
@@ -1657,8 +1692,8 @@ table.trackerconfig td:first-child {
      color: #ee9;
      box-shadow: inset 0 0 5px 2px #000;
      word-wrap: break-word;
-     background: #000 url('/themes/snark/ubergine/images/snark_create.png') no-repeat scroll right center;
-     background: url(images/snark_create.png) center right no-repeat, linear-gradient(to bottom, rgba(0,40,0,0.3) 0%, rgba(0,15,0,0.5) 100%), url("../../console/dark/images/camotile2.png") top left repeat;
+     background: #000 url(images/snark_create.png) no-repeat scroll right center;
+     background: url(images/snark_create.png) center right no-repeat, linear-gradient(to bottom, rgba(0,40,0,0.3) 0%, rgba(0,15,0,0.5) 100%), url(/themes/console/dark/images/camotile2.png) top left repeat;
      background-size: 80px 80px, 100% 100%, 175px 175px;
 }
 
@@ -1670,8 +1705,8 @@ table.trackerconfig td:first-child {
      color: #ee9;
      box-shadow: inset 0 0 5px 2px #000;
      word-wrap: break-word;
-     background: #000 url('/themes/snark/dark/images/snark_add.png') no-repeat scroll right center;
-     background: url(images/snark_add.png) 99% center no-repeat, linear-gradient(to bottom, rgba(0,40,0,0.3) 0%, rgba(0,15,0,0.5) 100%), url("../../console/dark/images/camotile2.png") top left repeat;
+     background: #000 url(images/snark_add.png) no-repeat scroll right center;
+     background: url(images/snark_add.png) 99% center no-repeat, linear-gradient(to bottom, rgba(0,40,0,0.3) 0%, rgba(0,15,0,0.5) 100%), url(/themes/console/dark/images/camotile2.png) top left repeat;
      background-size: 61px 61px, 100% 100%, 175px 175px;
 }
 
@@ -1685,7 +1720,7 @@ table.trackerconfig td:first-child {
      text-align: center;
      background: #000;
      font-weight: bold;
-     background: url(images/configuration.png) 102% 30% no-repeat, linear-gradient(to bottom, rgba(0,40,0,0.3) 0%, rgba(0,15,0,0.5) 100%), url("../../console/dark/images/camotile2.png") top left repeat;
+     background: url(images/configuration.png) 102% 30% no-repeat, linear-gradient(to bottom, rgba(0,40,0,0.3) 0%, rgba(0,15,0,0.5) 100%), url(/themes/console/dark/images/camotile2.png) top left repeat;
      background-size: 84px 82px, 100% 100%, 175px 175px;
 }
 
@@ -1697,9 +1732,9 @@ table.trackerconfig td:first-child {
      box-shadow: inset 0 0 5px 2px #000;
      word-wrap: break-word;
      text-align: center;
-     background: #000 url('/themes/snark/dark/images/configuration.png') no-repeat scroll right center;
+     background: #000 url(images/configuration.png) no-repeat scroll right center;
      font-weight: bold;
-     background: linear-gradient(to bottom, rgba(0,40,0,0.3) 0%, rgba(0,15,0,0.5) 100%), url("../../console/dark/images/camotile2.png") top left repeat;
+     background: linear-gradient(to bottom, rgba(0,40,0,0.3) 0%, rgba(0,15,0,0.5) 100%), url(/themes/console/dark/images/camotile2.png) top left repeat;
 }
 
 .mainsection + form > .configsectionpanel:first-child {
diff --git a/installer/resources/themes/snark/light/snark.css b/installer/resources/themes/snark/light/snark.css
index 3e8307c17f..aaac04add7 100644
--- a/installer/resources/themes/snark/light/snark.css
+++ b/installer/resources/themes/snark/light/snark.css
@@ -1,5 +1,6 @@
-/* I2PSnark theme "Light" by dr|z3d, 2012 */
+/* I2PSnark theme "Light" aka Corporat */
 /* Cat That Got The Cream Edition */
+/* Author: dr|z3d */
 /* Thanks to http://www.luxphile.com/2011/01/creative-commons-cat.html for the kitty image */
 
 body {
@@ -10,11 +11,32 @@ body {
      margin: 5px;
 }
 
+/* preload top navigation mouseovers */
+body {
+     background: url(images/tile2.png) fixed, 
+     url(images/button_snark_hover.png) no-repeat,
+     url(images/button_snark_active.png) no-repeat,
+     url(images/button_tracker_hover.png) no-repeat,
+     url(images/button_tracker_active.png) no-repeat,
+     url(images/button_forum_hover.png) no-repeat,
+     url(images/button_forum_active.png) no-repeat, #a4a4cb;
+}
+
 body.iframed {
      background: transparent url(/themes/console/images/transparent.gif) !important;
      margin: 6px 0 0 !important;
 }
 
+body.iframed {
+     background: transparent url(/themes/console/images/transparent.gif), 
+     url(images/button_snark_hover.png) no-repeat,
+     url(images/button_snark_active.png) no-repeat,
+     url(images/button_tracker_hover.png) no-repeat,
+     url(images/button_tracker_active.png) no-repeat,
+     url(images/button_forum_hover.png) no-repeat,
+     url(images/button_forum_active.png) no-repeat !important;
+}
+
 * {
      outline: none !important;
 }
@@ -87,7 +109,7 @@ button::-moz-focus-inner, input::-moz-focus-inner {
      font-weight: bold;
      font-size: 9pt;
      color: #559;
-     background: #fff url("../../console/light/images/header.png") repeat-x scroll center center;
+     background: #fff url(images/button_tracker.png) 8px center no-repeat;
      background: url(images/button_tracker.png) 8px center no-repeat, linear-gradient(to bottom, #fff 0%, #fff 50%, #eef 51%, #eef 100%);
      border-radius: 0;
      border: 1px solid #7778bf;
@@ -101,17 +123,18 @@ button::-moz-focus-inner, input::-moz-focus-inner {
 .snarkRefresh:hover, .snarkRefresh:focus {
      text-decoration: none !important;
      color: #f60;
-     background: #eef;
-     background: url(images/button_tracker_hover.png) 8px center no-repeat, linear-gradient(to bottom, #eef 0%, #eef 50%, #bbf 51%, #bbf 100%);
+     background: #eef url(images/button_tracker_hover.png) 8px center no-repeat;
+     background: url(images/button_tracker_hover.png) 8px center no-repeat, linear-gradient(to bottom, #fff 0%, #fff 50%, #ffe8bf 50%, #efd9b3 100%);
      border-radius: 0;
      box-shadow: inset 0 0 0 1px #fff;
 }
 
 .snarkRefresh:active {
      text-decoration: none !important;
-     background: url(images/button_tracker_active.png) 8px center no-repeat, linear-gradient(to bottom, #8f0038 0%, #8f0038 50%, #6f1436 51%, #6f1436 100%);
+     background: #f60 url(images/button_tracker_active.png) 8px center no-repeat;
      color: #eee !important;
-     box-shadow: inset 2px 2px 2px #210;
+     box-shadow: inset 3px 3px 3px #333;
+     box-shadow: inset 0 0 0 1px #fff, inset 3px 3px 3px #333;
 }
 
 .snarkRefresh:last-child {
@@ -121,18 +144,18 @@ button::-moz-focus-inner, input::-moz-focus-inner {
 .snarkRefresh:first-child {
      padding: 4px 10px 4px 19px !important;
      border-radius: 2px 0 0 2px;
-     background: linear-gradient(to bottom, #fff 0%, #fff 50%, #eef 51%, #eef 100%);
+     background: #fff url(images/button_snark.png) 10px center no-repeat;
      background: url(images/button_snark.png) 10px center no-repeat, linear-gradient(to bottom, #fff 0%, #fff 50%, #eef 51%, #eef 100%);
 }
 
 .snarkRefresh:first-child:hover, .snarkRefresh:first-child:focus {
-     background: url(images/button_snark_hover.png) 10px center no-repeat, linear-gradient(to bottom, #eef 0%, #eef 50%, #bbf 51%, #bbf 100%);
+     background: #eef url(images/button_snark_hover.png) 10px center no-repeat;
+     background: url(images/button_snark_hover.png) 10px center no-repeat, linear-gradient(#fff 0%, #fff 50%, #ffe8bf 50%, #efd9b3 100%);
      color: #f60;
 }
 
 .snarkRefresh:first-child:active {
-     background: url(images/button_snark_active.png) 10px center no-repeat, linear-gradient(to bottom, #8f0038 0%, #8f0038 50%, #6f1436 51%, #6f1436 100%);
-     box-shadow: inset 2px 2px 2px #210;
+     background: #f60 url(images/button_snark_active.png) 10px center no-repeat;
 }
 
 .snarkRefresh img {
@@ -148,17 +171,18 @@ button::-moz-focus-inner, input::-moz-focus-inner {
 }
 
 .snarkRefresh:nth-child(2) {
+     background: #fff url(images/button_forum.png) 8px center no-repeat;
      background: url(images/button_forum.png) 8px center no-repeat, linear-gradient(to bottom, #fff 0%, #fff 50%, #eef 51%, #eef 100%);
 }
 
 .snarkRefresh:nth-child(2):hover, .snarkRefresh:nth-child(2):focus {
-     background: url(images/button_forum_hover.png) 8px center no-repeat, linear-gradient(to bottom, #eef 0%, #eef 50%, #bbf 51%, #bbf 100%);
+     background: #eef url(images/button_forum_hover.png) 8px center no-repeat;
+     background: url(images/button_forum_hover.png) 8px center no-repeat, linear-gradient(#fff 0%, #fff 50%, #ffe8bf 50%, #efd9b3 100%);
 }
 
-.snarkRefresh:nth-child(2):focus {
-     background: url(images/button_forum_active.png) 8px center no-repeat, linear-gradient(to bottom, #8f0038 0%, #8f0038 50%, #6f1436 51%, #6f1436 100%);
+.snarkRefresh:nth-child(2):active {
+     background: #f60 url(images/button_forum_active.png) 8px center no-repeat;
      color: #fff;
-     box-shadow: inset 2px 2px 2px #210;
 }
 
 .snarkRefresh:last-child[href="/i2psnark/"] {
@@ -264,7 +288,7 @@ a:hover, a:focus {
 }
 
 a:active {
-     color: #6f072b;
+     color: #f30;
 }
 
 a.control, a.controld {
@@ -319,7 +343,7 @@ td[onclick]:hover a {
 }
 
 td[onclick]:active a {
-     color: #6f072b;
+     color: #f30;
 }
 
 thead, tfoot {
@@ -396,12 +420,11 @@ tfoot tr:nth-child(n+1) {
 }
 
 #pagenav a:active img {
-     background: #6f072b;
-     border: 1px solid #272e3f;
-     box-shadow: inset 1px 1px 1px #272e3f;
+     background: #f60;
+     box-shadow: inset 3px 3px 3px #333;
+     box-shadow: inset 0 0 0 1px #fff, inset 3px 3px 3px #333;
 }
 
-
 #pagenav img.disable, #pagenav img.disable:hover, #pagenav a:active img.disable {
      opacity: 0.2;
      margin-right: 0;
@@ -439,6 +462,10 @@ tfoot tr:nth-child(n+1) {
      background: #fff;
 }
 
+.snarkTorrents thead th:nth-child(2) {
+     text-align: left;
+}
+
 .snarkTorrents thead th:nth-child(3) {
      text-align: right !important;
 }
@@ -452,7 +479,7 @@ tfoot tr:nth-child(n+1) {
 }
 
 .snarkTorrents td:nth-child(1) {
-     max-width: 20px !important;
+     width: 20px !important;
      text-align: left;
      padding: 2px;   
 }
@@ -561,6 +588,7 @@ td:first-child {
 
 .snarkTorrentAction input[type="image"]:active, .snarkTorrents th:last-child input[type="image"]:active {
      box-shadow: inset 3px 3px 3px #333;
+     box-shadow: inset 0 0 0 1px #fff, inset 3px 3px 3px #333;
      filter: hue-rotate(110deg) !important;
      -webkit-filter: hue-rotate(110deg) !important;
 }
@@ -591,10 +619,6 @@ td:first-child {
      color: #f60;
 }
 
-.snarkTorrentStatus a:active {
-     color: #6f072b;
-}
-
 .snarkTorrentStatus:first-child {
      text-align: left !important;
      padding-left: 0;
@@ -704,7 +728,20 @@ td:first-child {
      line-height: 130% !important;
 }
 
-.snarkConfigTitle, label.toggleview {
+.snarkConfigTitle:hover, .toggleview:hover {
+     background: linear-gradient(#fff 0%, #fff 50%, #ffe8bf 50%, #efd9b3 100%);
+}
+
+.snarkConfigTitle a {
+     font-size: 11pt !important;
+}
+
+.snarkConfigTitle:hover a, .snarkConfigTitle:focus a {
+     color: #f60 !important;
+}
+
+.snarkConfigTitle, label.toggleview,
+.configsectionpanel .snarkConfigTitle:hover {
      font-size: 11pt;
      font-weight: bold;
      padding: 2px 15px 2px 15px;
@@ -718,11 +755,7 @@ td:first-child {
      box-shadow: 0 1px 3px #999;
      display: inline-block;
      min-width: 220px;
-     color: #559;
-}
-
-.snarkConfigTitle a {
-     font-size: 11pt !important;
+     color: #559 !important;
 }
 
 .snarkConfigTitle img:hover { /* inert titles */
@@ -746,7 +779,7 @@ td:first-child {
 }
 
 .snarkConfigTitle a:active, .toggleview:active {
-     color: #6f072b !important;
+     color: #f30 !important;
 }
 
 .snarkConfigTitle img, .toggleview img {
@@ -760,8 +793,8 @@ td:first-child {
 }
 
 .snarkConfigTitle:active a img, .toggleview:active img {
-     filter: drop-shadow(0 0 1px #6f072b);
-     -webkit-filter: drop-shadow(0 0 1px #6f072b);
+     filter: drop-shadow(0 0 1px #f30) !important;
+     -webkit-filter: drop-shadow(0 0 1px #f30) !important;
      transform: rotate(90deg);
      transition: ease transform 0.3s 0s;
 }
@@ -942,24 +975,26 @@ input[type=submit], a.control {
      border-radius: 2px;
      min-width: 90px;
      text-align: center;
+     box-shadow: inset 0 0 0 1px #fff;
 }
 
 input[type=submit] {
-     padding: 5px 2px !important;
+     padding: 5px !important;
 }
 
 input[type=submit]:hover, input[type=submit]:focus, a.control:hover, a.control:focus {
+     color: #f60;
      border: 1px solid #559;
-     background: #559;
-     color: #fff;
+     background: #eef;
+     background: linear-gradient(#fff 0%, #fff 50%, #ffe8bf 50%, #efd9b3 100%);
      box-shadow: inset 0 0 0 1px #fff;
 }
 
 input[type=submit]:active, a.control:active {
-     background: #6f072b !important;
+     background: #f60 !important;
      color: #fff !important;
-     border: 1px solid #227;
-     box-shadow: inset 2px 2px 2px 1px #2f1100;
+     box-shadow: inset 3px 3px 4px #333;
+     box-shadow: inset 0 0 0 1px #fff, inset 3px 3px 4px #333;
 }
 
 input[type=image], thead img {
@@ -1380,6 +1415,11 @@ a.snarkRefresh:first-child {
      padding-left: 16px !important;
 }
 
+.configsectionpanel .snarkConfigTitle:hover {
+     font-size: 12pt !important;
+     padding: 3px 15px !important;
+}
+
 .snarkConfigTitle a, label.toggleview {
      font-size: 12pt !important;
      padding: 1px 15px 4px;
@@ -1397,7 +1437,7 @@ input[type="submit"] {
 }
 
 .snarkMessages {
-     height: 60px;
+     height: 58px;
 }
 
 .snarkConfigTitle, label.toggleview {
diff --git a/installer/resources/themes/snark/midnight/images/delete.png b/installer/resources/themes/snark/midnight/images/delete.png
index 6b9484beac..a37f8c7f1a 100644
Binary files a/installer/resources/themes/snark/midnight/images/delete.png and b/installer/resources/themes/snark/midnight/images/delete.png differ
diff --git a/installer/resources/themes/snark/midnight/images/remove.png b/installer/resources/themes/snark/midnight/images/remove.png
index 2d029616cd..12f988b180 100644
Binary files a/installer/resources/themes/snark/midnight/images/remove.png and b/installer/resources/themes/snark/midnight/images/remove.png differ
diff --git a/installer/resources/themes/snark/midnight/images/start.png b/installer/resources/themes/snark/midnight/images/start.png
index 459d1070d9..6bf001c4e0 100644
Binary files a/installer/resources/themes/snark/midnight/images/start.png and b/installer/resources/themes/snark/midnight/images/start.png differ
diff --git a/installer/resources/themes/snark/midnight/images/start_all.png b/installer/resources/themes/snark/midnight/images/start_all.png
index ac398a802c..a30d3a0344 100644
Binary files a/installer/resources/themes/snark/midnight/images/start_all.png and b/installer/resources/themes/snark/midnight/images/start_all.png differ
diff --git a/installer/resources/themes/snark/midnight/images/stop.png b/installer/resources/themes/snark/midnight/images/stop.png
index 9f2878c60f..ca007e86fb 100644
Binary files a/installer/resources/themes/snark/midnight/images/stop.png and b/installer/resources/themes/snark/midnight/images/stop.png differ
diff --git a/installer/resources/themes/snark/midnight/images/stop_all.png b/installer/resources/themes/snark/midnight/images/stop_all.png
index ab8452d50e..5153c4e850 100644
Binary files a/installer/resources/themes/snark/midnight/images/stop_all.png and b/installer/resources/themes/snark/midnight/images/stop_all.png differ
diff --git a/installer/resources/themes/snark/midnight/snark.css b/installer/resources/themes/snark/midnight/snark.css
index 3340768427..ea5e8727b5 100644
--- a/installer/resources/themes/snark/midnight/snark.css
+++ b/installer/resources/themes/snark/midnight/snark.css
@@ -8,11 +8,35 @@ body {
      margin: 7px 6px;
 }
 
+/* preload top navigation mouseovers */
+body {
+     background: linear-gradient(to bottom, #000, #000),
+     url(images/button_snark_hover.png) no-repeat,
+     url(images/button_snark_active.png) no-repeat,
+     url(images/button_tracker_hover.png) no-repeat,
+     url(images/button_tracker_active.png) no-repeat,
+     url(images/button_forum_hover.png) no-repeat,
+     url(images/button_forum_active.png) no-repeat, #000;
+     background-size: 100% 100%, 0 0, 0 0, 0 0, 0 0, 0 0, 0 0;
+}
+
 body.iframed {
      margin: 1px 0 !important;
      background: transparent url(/themes/console/images/transparent.gif) !important;
 }
 
+/* preload top navigation mouseovers */
+body.iframed {
+     background: url(/themes/console/images/transparent.gif),
+     url(images/button_snark_hover.png) center 50px no-repeat,
+     url(images/button_snark_active.png) center 50px no-repeat,
+     url(images/button_tracker_hover.png) center 50px no-repeat,
+     url(images/button_tracker_active.png) center 50px no-repeat,
+     url(images/button_forum_hover.png) center 50px no-repeat,
+     url(images/button_forum_active.png) center 50px no-repeat, #000 !important;
+     background-size: 100% 100%, 0 0, 0 0, 0 0, 0 0, 0 0, 0 0;
+}
+
 * {
      outline: none;
 }
@@ -55,6 +79,7 @@ body.iframed {
 
 .iframed .snarknavbar {
      border: none;
+     border-top: 1px solid #443da0;
      border-bottom: 1px solid #443da0;
      border-radius: 0;
      padding-top: 14px;
@@ -67,8 +92,7 @@ body.iframed {
      border: 0;
 }
 
-tt,
-code {
+tt, code {
      font-family: "Droid Sans Mono", "Andale Mono", "DejaVu Sans Mono", "Lucida Console", Courier, mono;
 }
 
@@ -390,7 +414,7 @@ tfoot tr:nth-child(n+1) {
 }
 
 .snarkTorrents th:nth-child(2) {
-     text-align: center;
+     text-align: left;
 }
 
 .snarkTorrents th br {
@@ -606,6 +630,7 @@ tfoot tr:nth-child(n+1) {
 
 .snarkDirInfo td:first-child {
      padding-left: 4px;
+     text-align: left;
 }
 
 .snarkDirInfo td:first-child img {
diff --git a/installer/resources/themes/snark/ubergine/snark.css b/installer/resources/themes/snark/ubergine/snark.css
index 46fc53ce7e..05251cbde8 100644
--- a/installer/resources/themes/snark/ubergine/snark.css
+++ b/installer/resources/themes/snark/ubergine/snark.css
@@ -406,7 +406,7 @@ tfoot tr:nth-child(n+1) {
 }
 
 .snarkTorrents thead th:nth-child(2) {
-     text-align: center;
+     text-align: left;
      min-width: 50px;
 } 
 
@@ -432,6 +432,10 @@ tfoot tr:nth-child(n+1) {
      text-align: center;
 }
 
+.snarkTorrents thead th:nth-last-child(4), .snarkTorrents tfoot th:nth-last-child(4) {
+     text-align: right;
+}
+
 .snarkTorrents tfoot th:nth-child(n+2) {
      word-spacing: -0.2em;
      font-variant: all-small-caps;
@@ -676,7 +680,7 @@ table.snarkTorrents tbody tr:hover .snarkTorrentName, table.snarkDirInfo tbody t
 .snarkFileName {
      padding: 4px 0 !important; 
      text-align: left !important;
-     font-size: 7.5pt !important;
+     font-size: 8pt !important;
      white-space: nowrap;
 }
 
@@ -1061,8 +1065,11 @@ input[type="submit"]::-moz-focus-inner, input[type="reset"]::-moz-focus-inner {
      outline: none;
 }
 
-input[type=submit]:hover, input[type=submit]:focus, a.control:hover, a.control:focus {
+input[type=submit]:hover, input[type=submit]:focus {
      background-blend-mode: luminosity;
+}
+
+input[type=submit]:hover, input[type=submit]:focus, a.control:hover, a.control:focus {
      border: 1px outset #bbb;
      color: #fff;
      filter: drop-shadow(0 0 1px #515) !important;
@@ -1717,3 +1724,32 @@ label.toggleview img:active, label.toggleview:active img, .snarkConfigTitle a:ac
      transform: rotate(90deg);
      transition: ease transform 0.3s 0s;
 }
+
+/* responsive layout */
+
+@media screen and (min-width: 1400px) {
+body, .snarkTorrents td, .snarkAddInfo, th, td, .snarkFileName, .snarkFileStatus {
+     font-size: 9pt !important;
+}
+
+.snarkRefresh:link {
+     font-size: 10pt;
+}
+
+.snarkRefresh:link:first-child {
+     padding-left: 13px !important;
+}
+
+tt, .snarkTorrents tt, code, .snarkMessages, input, input[type="submit"], input[type="reset"], select, select option, button, textarea {
+     font-size: 9pt !important;
+}
+
+select {
+     padding-top: 4px;
+     padding-bottom: 4px;
+}
+
+select:nth-child(2) {
+     margin-left: -18px !important;
+}
+}
\ No newline at end of file
diff --git a/installer/resources/themes/snark/vanilla/snark.css b/installer/resources/themes/snark/vanilla/snark.css
index 1a00fcdb2a..59ec62d1f9 100644
--- a/installer/resources/themes/snark/vanilla/snark.css
+++ b/installer/resources/themes/snark/vanilla/snark.css
@@ -13,11 +13,34 @@ body {
      background-size: 3px 3px;
 }
 
+/* preload top navigation mouseovers */
+body {
+     background: linear-gradient(-45deg, #2f231a, #1f120c),
+     url(images/button_snark_hover.png) no-repeat,
+     url(images/button_snark_active.png) no-repeat,
+     url(images/button_tracker_hover.png) no-repeat,
+     url(images/button_tracker_active.png) no-repeat,
+     url(images/button_forum_hover.png) no-repeat,
+     url(images/button_forum_active.png) no-repeat !important;
+     background-size: 3px 3px, 0 0, 0 0, 0 0, 0 0, 0 0, 0 0 !important;
+}
+
 body.iframed {
-     background: transparent url(../../console/dark/images/transparent.gif) !important;
+     background: transparent url(/themes/console/images/transparent.gif) !important;
      margin: 6px 0 !important;
 }
 
+body.iframed {
+     background: url(/themes/console/images/transparent.gif),
+     url(images/button_snark_hover.png) no-repeat,
+     url(images/button_snark_active.png) no-repeat,
+     url(images/button_tracker_hover.png) no-repeat,
+     url(images/button_tracker_active.png) no-repeat,
+     url(images/button_forum_hover.png) no-repeat,
+     url(images/button_forum_active.png) no-repeat !important;
+     background-size: 100% 100%, 0 0, 0 0, 0 0, 0 0, 0 0, 0 0 !important;
+}
+
 * {
      outline: none;
 }
@@ -180,10 +203,16 @@ body.iframed {
      margin-bottom: -6px !important;
 }
 
+.snarkRefresh:first-child {
+     margin: -5px -2px -3px 0 !important;
+     display: inline-block;
+     padding: 5px 10px 2px 12px !important;
+}
+
 .snarkRefresh:last-child[href="/i2psnark/"] {
      margin: -5px 0 -3px !important;
      display: inline-block;
-     padding: 4px 10px 4px 12px !important;
+     padding: 5px 10px 3px 12px !important;
 }
 
 .iframed .snarkRefresh:last-child[href="/i2psnark/"] {
@@ -453,6 +482,11 @@ tfoot tr:nth-child(n+1) {
      border-bottom: 1px solid #6f533e;
 }
 
+.snarkTorrents thead th:nth-child(2) {
+     text-align: left;
+     min-width: 50px;
+}
+
 .snarkTorrents tfoot th {
      border-bottom: 0;
      white-space: normal !important;
@@ -1597,3 +1631,32 @@ code, tt {
      transform: rotate(90deg);
      transition: ease transform 0.3s 0s;
 }
+
+/* responsive layout */
+
+@media screen and (min-width: 1400px) {
+body, .snarkTorrents td, .snarkAddInfo, th, td {
+     font-size: 9pt !important;
+}
+
+.snarkRefresh:link {
+     font-size: 10pt;
+}
+
+.snarkRefresh:link:first-child {
+     padding-left: 13px !important;
+}
+
+tt, .snarkTorrents tt, code, .snarkMessages, input, input[type="submit"], input[type="reset"], select, button, textarea {
+     font-size: 9pt !important;
+}
+
+select {
+     padding-top: 4px;
+     padding-bottom: 4px;
+}
+
+select:nth-child(2) {
+     margin-left: -14px;
+}
+}
\ No newline at end of file
diff --git a/installer/resources/themes/susidns/classic/susidns.css b/installer/resources/themes/susidns/classic/susidns.css
index db43373fbd..368d3102fb 100644
--- a/installer/resources/themes/susidns/classic/susidns.css
+++ b/installer/resources/themes/susidns/classic/susidns.css
@@ -748,6 +748,11 @@ p.footer {
      margin-bottom: -4px;
 }
 
+/* hide export button on published page when empty */ 
+#messages + form[action="export"] {
+     display: none;
+}
+
 #filter {
      margin-top: -2px !important;
 }
@@ -766,4 +771,4 @@ p#filtered {
 p.book {
      padding-left: 26px !important;
      background-position: left center !important;
-}
+}
\ No newline at end of file
diff --git a/installer/resources/themes/susidns/dark/susidns.css b/installer/resources/themes/susidns/dark/susidns.css
index 62860af798..33de02e2f9 100644
--- a/installer/resources/themes/susidns/dark/susidns.css
+++ b/installer/resources/themes/susidns/dark/susidns.css
@@ -335,6 +335,7 @@ h3 {
      word-spacing: 0.1em;
      text-shadow: 0 0 2px #001100;
      text-transform: uppercase;
+     box-shadow: inset 0 0 0 1px #000;
 }
 
 .headline h3 {
@@ -930,3 +931,8 @@ p.book {
      border: 1px solid #2a5f29;
      background: #000 url(/themes/susidns/images/addressbook.png) 5px center no-repeat;
 }
+
+/* hide export button on published addressbook if empty */
+#messages + form[action="export"] {
+     display: none;
+}
diff --git a/installer/resources/themes/susidns/light/susidns.css b/installer/resources/themes/susidns/light/susidns.css
index 6eab5eed01..5ca32dc2ee 100644
--- a/installer/resources/themes/susidns/light/susidns.css
+++ b/installer/resources/themes/susidns/light/susidns.css
@@ -879,10 +879,15 @@ form[action="addressbook"] table {
      margin-top: -36px;
 }
 
+/* hide export button on published page when empty */ 
+#messages + form[action="export"] {
+     display: none;
+}
+
 #filter {
      margin-top: -2px !important;
 }
 
 p#filtered {
      padding-right: 200px !important;
-}
+}
\ No newline at end of file
diff --git a/installer/resources/themes/susidns/midnight/susidns.css b/installer/resources/themes/susidns/midnight/susidns.css
index e915962bc4..61546c097f 100644
--- a/installer/resources/themes/susidns/midnight/susidns.css
+++ b/installer/resources/themes/susidns/midnight/susidns.css
@@ -891,7 +891,7 @@ p.book {
 /* responsive layout */
 
 @media screen and (min-width: 1500px) {
-body, input[type="text"], select, h4, td.names a, #filter p, #search td, p, a, textarea {
+body, input[type="text"], select, h4, td.names a, #filter p, #search td, p, a, textarea, .help li {
      font-size: 10pt !important;
 }
 
@@ -936,3 +936,8 @@ p.book {
      border: 1px solid #2d295f;
      background: #000 url(/themes/susidns/images/addressbook.png) 5px center no-repeat;
 }
+
+/* hide export button on published addressbook if empty */
+#messages + form[action="export"] {
+     display: none;
+}
diff --git a/installer/resources/themes/susimail/dark/susimail.css b/installer/resources/themes/susimail/dark/susimail.css
index fc3efef7d8..0bd58c1227 100644
--- a/installer/resources/themes/susimail/dark/susimail.css
+++ b/installer/resources/themes/susimail/dark/susimail.css
@@ -189,7 +189,7 @@ table#mailbox {
 
 #mailbox th:nth-child(2) {
      background: url(/themes/susimail/images/status.png) center center no-repeat, linear-gradient(to bottom, #1a261a 0%, #223022 7%, #212f21 9%, #172317 21%, #091109 49%, #050d05 50%, #020602 51%, #010301 53%, #000000 56%, #000000 100%) !important;
-     background-blend-mode: luminosity;
+     background-blend-mode: luminosity, normal;
 }
 
 
diff --git a/installer/resources/themes/susimail/light/susimail.css b/installer/resources/themes/susimail/light/susimail.css
index ebbc8bf99d..5880774943 100644
--- a/installer/resources/themes/susimail/light/susimail.css
+++ b/installer/resources/themes/susimail/light/susimail.css
@@ -3,18 +3,45 @@
 /* Author: dr|z3d */
 
 body {
-     background-color: #eef;
      color: #333;
      font-family: "Droid Sans", "NotoSans", Ubuntu, "Bitstream Vera Sans", "Segoe UI", Verdana, "Lucida Grande", Helvetica, sans-serif;
      background: #a4a4cb url(/themes/console/light/images/tile2.png);
-     background-size: 32px 32px;
+}
+
+/* preload button mouseovers */
+body {
+     background: url(/themes/console/light/images/tile2.png),
+     url(/themes/susimail/images/compose_hover.png) no-repeat,
+     url(/themes/susimail/images/login_hover.png) no-repeat,
+     url(/themes/susimail/images/logout_hover.png) no-repeat,
+     url(/themes/susimail/images/offline_hover.png) no-repeat,
+     url(/themes/susimail/images/save_hover.png) no-repeat,
+     url(/themes/susimail/images/send_hover.png) no-repeat,
+     url(/themes/console/images/buttons/configure_hover.png),
+     url(/themes/console/images/buttons/delete_hover.png),
+     url(/themes/console/images/buttons/update_hover.png), #a4a4cb !important;
+     background-size: 32px 32px, 0 0, 0 0, 0 0, 0 0, 0 0, 0 0, 0 0, 0 0, 0 0 !important;
 }
 
 body.iframed {
-     background: transparent !important;
+     background: transparent url(/themes/console/images/transparent.gif) !important;
      margin: 5px 0 0 0;
 }
 
+body.iframed {
+     background: url(/themes/console/images/transparent.gif),
+     url(/themes/susimail/images/compose_hover.png) no-repeat,
+     url(/themes/susimail/images/login_hover.png) no-repeat,
+     url(/themes/susimail/images/logout_hover.png) no-repeat,
+     url(/themes/susimail/images/offline_hover.png) no-repeat,
+     url(/themes/susimail/images/save_hover.png) no-repeat,
+     url(/themes/susimail/images/send_hover.png) no-repeat,
+     url(/themes/console/images/buttons/configure_hover.png),
+     url(/themes/console/images/buttons/delete_hover.png),
+     url(/themes/console/images/buttons/update_hover.png), transparent !important;
+     background-size: 100% 100%, 0 0, 0 0, 0 0, 0 0, 0 0, 0 0, 0 0, 0 0, 0 0 !important;
+}
+
 li {
      color: #333;
      line-height: 12pt;
@@ -269,7 +296,7 @@ table#mailbox {
 #mailbox th:nth-child(2) {
      background: #fff url(/themes/susimail/images/status.png) center center no-repeat;
      background: url(/themes/susimail/images/status.png) center center no-repeat, linear-gradient(to bottom, #fff 0%, #fff 50%, #eef 50%, #eef 100%);
-     background-blend-mode: luminosity;
+     background-blend-mode: luminosity, normal;
 }
 
 #mailbox th:nth-child(4) {
@@ -324,7 +351,7 @@ table#mailbox {
 }
 
 #mailbox .bottombuttons td {
-     padding: 5px 3px 7px;
+     padding: 3px;
      border-top: 1px solid #7778bf;
 }
 
@@ -623,6 +650,15 @@ input.replyall:hover {
 
 /* pagenav */
 
+#pagenav tr {
+     display: block !important;
+     border: none;
+}
+
+#pagenav td {
+     border: none !important;
+}
+
 input.firstpage, input[name="firstpage"],
 input.firstpage[disabled]:hover, input[name="firstpage"][disabled]:hover {
      background: #eee url(/themes/susimail/images/first.png) no-repeat center center;
@@ -1000,6 +1036,7 @@ h3#config {
 #pagenav input {
      float: none;
      margin: 2px 1px !important;
+     padding: 5px 10px;
 }
 
 #pagenav input[name="prevpage"] {
@@ -1091,7 +1128,7 @@ div#bottombuttons {
 tr.bottombuttons table#pagenav {
      width: 100%;
      margin: 0;
-     border-bottom: 1px solid #555;
+/*     border-bottom: 1px solid #555;*/
 }
 
 tr.bottombuttons:empty {
diff --git a/installer/resources/themes/susimail/midnight/susimail.css b/installer/resources/themes/susimail/midnight/susimail.css
index 659f9da8d1..872d6d7c62 100644
--- a/installer/resources/themes/susimail/midnight/susimail.css
+++ b/installer/resources/themes/susimail/midnight/susimail.css
@@ -2,6 +2,10 @@
 /* Thanks to Florian Kuhlmann for the hatface images. [http://www.flickr.com/photos/floriankuhlmann/] */
 /* Droid Sans font family and css3 compliant browser recommended for optimal results */
 
+html {
+     min-height: 100%;
+}
+
 body {
      background-color: #000;
      color: #c9ceff;
@@ -10,11 +14,40 @@ body {
      margin: 6px 5px;
 }
 
+/* preload button mouseovers */
+body {
+     background: linear-gradient(to bottom, #000, #000),
+     url(/themes/susimail/images/compose_hover.png) no-repeat,
+     url(/themes/susimail/images/login_hover.png) no-repeat,
+     url(/themes/susimail/images/logout_hover.png) no-repeat,
+     url(/themes/susimail/images/offline_hover.png) no-repeat,
+     url(/themes/susimail/images/save_hover.png) no-repeat,
+     url(/themes/susimail/images/send_hover.png) no-repeat,
+     url(/themes/console/images/buttons/configure_hover.png) no-repeat,
+     url(/themes/console/images/buttons/delete_hover.png) no-repeat,
+     url(/themes/console/images/buttons/update_hover.png) no-repeat, #000 !important;
+     background-size: 100% 100%, 0 0, 0 0, 0 0, 0 0, 0 0, 0 0, 0 0, 0 0, 0 0 !important;
+}
+
 body.iframed {
-     background: transparent !important;
+     background: transparent url(/themes/console/images/transparent.gif) !important;
      margin: 1px 0 0;
 }
 
+body.iframed {
+     background: url(/themes/console/images/transparent.gif),
+     url(/themes/susimail/images/compose_hover.png) no-repeat,
+     url(/themes/susimail/images/login_hover.png) no-repeat,
+     url(/themes/susimail/images/logout_hover.png) no-repeat,
+     url(/themes/susimail/images/offline_hover.png) no-repeat,
+     url(/themes/susimail/images/save_hover.png) no-repeat,
+     url(/themes/susimail/images/send_hover.png) no-repeat,
+     url(/themes/console/images/buttons/configure_hover.png) no-repeat,
+     url(/themes/console/images/buttons/delete_hover.png) no-repeat,
+     url(/themes/console/images/buttons/update_hover.png) no-repeat, transparent !important;
+     background-size: 100% 100%, 0 0, 0 0, 0 0, 0 0, 0 0, 0 0, 0 0, 0 0, 0 0 !important;
+}
+
 .iframed form {
      border: 1px solid transparent !important;
 }
@@ -179,7 +212,7 @@ table#mailbox {
      background: url(/themes/susimail/images/status.png) center center no-repeat, linear-gradient(to bottom, #191729 0%, #201f33 7%, #1f1e32 9%, #161525 21%, #090812 49%, #05050e 50%, #020206 51%, #010103 53%, #000000 56%, #000000 100%) !important;
      font-size: 0;
      padding: 0;
-     background-blend-mode: luminosity;
+     background-blend-mode: luminosity, normal;
 }
 
 #mailbox th:nth-child(3) {
@@ -273,6 +306,7 @@ td#deleteattached {
 
 tr.bottombuttons:last-child td {
      padding-bottom: 20px !important;
+     border-bottom: 1px solid #443da0 !important;
 }
 
 a:link {
@@ -559,10 +593,9 @@ input[type=submit], input.cancel {
      border: 1px solid #3e3f8f;
      border-bottom-color: #14144f;
      border-right-color: #14144f; 
-     font: bold 8pt "Droid Sans", "Noto Sans", Ubuntu, "Segoe UI", "Bitstream Vera Sans", "DejaVu Sans", Verdana, "Lucida Grande", Helvetica, sans-serif;
+     font: bold 9pt "Droid Sans", "Noto Sans", Ubuntu, "Segoe UI", "Bitstream Vera Sans", "DejaVu Sans", Verdana, "Lucida Grande", Helvetica, sans-serif;
      text-align: center;
      padding: 5px 8px !important;
-/*     min-width: 95px !important;*/
      margin: 4px 5px;
      box-shadow: inset 0 0 0 1px #000;
 }