diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/HomeHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/HomeHelper.java
index c568083d7..1a5df261c 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/HomeHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/HomeHelper.java
@@ -63,7 +63,7 @@ public class HomeHelper extends HelperBase {
         //"colombo-bt.i2p" + S + _x("The Italian Bittorrent Resource") + S + "http://colombo-bt.i2p/" + S + I + "colomboicon.png" + S +
         //_x("Dev Builds") + S + _x("Development builds of I2P") + S + "http://bobthebuilder.i2p/" + S + I + "script_gear.png" + S +
         _x("Dev Forum") + S + _x("Development forum") + S + "http://zzz.i2p/" + S + I + "group_gear.png" + S +
-        //_x("diftracker") + S + _x("Bittorrent tracker") + S + "http://diftracker.i2p/" + S + I + "magnet.png" + S +
+        //_x("diftracker") + S + _x("Bittorrent tracker") + S + "http://diftracker.i2p/" + S + I + "i2psnark.png" + S +
         "echelon.i2p" + S + _x("I2P Applications") + S + "http://echelon.i2p/" + S + I + "box_open.png" + S +
         //"exchanged.i2p" + S + _x("Anonymous cryptocurrency exchange") + S + "http://exchanged.i2p/" + S + I + "exchanged.png" + S +
         _x("I2P FAQ") + S + _x("Frequently Asked Questions") + S + "http://i2p-projekt.i2p/faq" + S + I + "question.png" + S +
diff --git a/apps/routerconsole/jsp/home.jsp b/apps/routerconsole/jsp/home.jsp
index 553b746ab..9ceae72da 100644
--- a/apps/routerconsole/jsp/home.jsp
+++ b/apps/routerconsole/jsp/home.jsp
@@ -21,7 +21,7 @@
 
 <div class="routersummaryouter">
  <div class="routersummary">
-  <div style="height: 36px;">
+  <div>
    <a href="/console"><img src="<%=intl.getTheme(request.getHeader("User-Agent"))%>images/i2plogo.png" alt="<%=intl._t("I2P Router Console")%>" title="<%=intl._t("I2P Router Console")%>"></a>
   </div>
 <%
diff --git a/apps/routerconsole/jsp/summarynoframe.jsi b/apps/routerconsole/jsp/summarynoframe.jsi
index 69ac9afd0..22c85834e 100644
--- a/apps/routerconsole/jsp/summarynoframe.jsi
+++ b/apps/routerconsole/jsp/summarynoframe.jsi
@@ -6,7 +6,7 @@
  * So put it in a div.
  */
 %>
-  <div style="height: 36px;">
+  <div>
    <a href="/" target="_top">
     <img src="<%=intl.getTheme(request.getHeader("User-Agent"))%>images/i2plogo.png" alt="<%=intl._t("I2P Router Console")%>" title="<%=intl._t("I2P Router Console")%>">
    </a>
diff --git a/installer/resources/themes/console/dark/console.css b/installer/resources/themes/console/dark/console.css
index 0b615dfb4..0bb5876d2 100644
--- a/installer/resources/themes/console/dark/console.css
+++ b/installer/resources/themes/console/dark/console.css
@@ -353,7 +353,7 @@ div.warning {
 }
 
 .routersummary h3:hover {
-     background: #010 !important;
+     background: #332940 !important;
      box-shadow: inset 0 0 2px 2px #000;
 }
 
@@ -461,7 +461,7 @@ div.warning {
 #sb_warning { /* check connection/firewall */
      padding: 4px 4px 4px 26px;
      background: #000;
-     background: url(images/warning24x24.png) 4px center no-repeat, linear-gradient(to right, #001900, #001000 5%, #000 25%, #000 50%, #000 75%, #001000 95%, #001900);
+     background: url(images/warning24x24.png) 4px center no-repeat;
      background-size: 22px 22px, 100% 100%;
      text-align: center;
      line-height: 120%;
@@ -527,7 +527,7 @@ div.warning {
 }
 
 .sb_notice {
-     background: #010;
+     background: #332940;
      border: 1px solid #262;
      border-radius: 2px;
      box-shadow: inset 0 0 0 1px #000;
@@ -851,7 +851,7 @@ a:active img[src="/themes/console/images/i2plogo.png"] {
      min-width: 610px;
      margin-top: -14px;
      margin-bottom: 5px;
-     background: #010;
+     background: #332940;
      padding: 10px 20px 5px;
 }
 
@@ -2020,7 +2020,6 @@ input:active {
 
 input[type="text"], input[type="password"] {
      background: #000;
-     background: linear-gradient(to bottom, #000 0%, #010 100%);
      color: #e6e6e7;
      margin: 5px 10px;
      padding: 5px;
@@ -3284,7 +3283,6 @@ table#consolepass input[type="password"] {
 
 #consolepass input[name="name"], #externali2cp input[name="user"] {
      background: #000 url(/themes/console/images/buttons/user.png) 5px center no-repeat;
-     background: url(/themes/console/images/buttons/user.png) 5px center no-repeat, linear-gradient(to bottom, #000 0%, #010 100%);
      padding: 4px 5px 4px 26px !important;
      background-size: 16px 16px, 100% 100% !important;
 }
@@ -3295,7 +3293,6 @@ table#consolepass input[type="password"] {
 
 #consolepass input[name="nofilter_pw"], #externali2cp input[name="nofilter_pw"] {
      background: #000 url(/themes/console/images/buttons/password.png) 3px center no-repeat;
-     background: url(/themes/console/images/buttons/password.png) 3px center no-repeat, linear-gradient(to bottom, #000 0%, #010 100%);
      padding: 4px 5px 4px 22px !important;
      background-size: 16px 16px, 100% 100% !important;
 }
@@ -3890,7 +3887,7 @@ table#sidebarconf {
 }
 
 #sidebarconf tr:hover, .homelinkedit tr:hover {
-     background: #002000;
+     background: #332940;
 }
 
 #sidebarconf + .formaction {
@@ -4530,7 +4527,7 @@ img.unknownflag {
 }
 
 #enviro:hover td {
-     background: #010;
+     background: #332940;
      border-top: 1px inset transparent;
      border-bottom: 1px inset transparent;
      color: #ff0;
@@ -4558,10 +4555,6 @@ table#criticallogs tr:first-child {
      display: none;
 }
 
-table[id$="logs"] tr:nth-child(odd){
-     background: #010;
-}
-
 table[id$="logs"] tr:nth-child(even){
      background: #000;
 }
diff --git a/installer/resources/themes/console/dark/images/console_status_running.png b/installer/resources/themes/console/dark/images/console_status_running.png
index 6bbc5e37a..ea6dafeb7 100644
Binary files a/installer/resources/themes/console/dark/images/console_status_running.png and b/installer/resources/themes/console/dark/images/console_status_running.png differ
diff --git a/installer/resources/themes/console/dark/images/console_status_starting.png b/installer/resources/themes/console/dark/images/console_status_starting.png
index fbff23409..d0ad09eb5 100644
Binary files a/installer/resources/themes/console/dark/images/console_status_starting.png and b/installer/resources/themes/console/dark/images/console_status_starting.png differ
diff --git a/installer/resources/themes/console/dark/images/console_status_stopped.png b/installer/resources/themes/console/dark/images/console_status_stopped.png
index 0d43eb4ea..634263079 100644
Binary files a/installer/resources/themes/console/dark/images/console_status_stopped.png and b/installer/resources/themes/console/dark/images/console_status_stopped.png differ
diff --git a/installer/resources/themes/console/dark/images/favicon.ico b/installer/resources/themes/console/dark/images/favicon.ico
index 267e47b62..453b35788 100644
Binary files a/installer/resources/themes/console/dark/images/favicon.ico and b/installer/resources/themes/console/dark/images/favicon.ico differ
diff --git a/installer/resources/themes/console/dark/images/i2plogo.png b/installer/resources/themes/console/dark/images/i2plogo.png
index 4e38e0b6c..6656135f7 100644
Binary files a/installer/resources/themes/console/dark/images/i2plogo.png and b/installer/resources/themes/console/dark/images/i2plogo.png differ
diff --git a/installer/resources/themes/console/dark/images/infohelp.png b/installer/resources/themes/console/dark/images/infohelp.png
index 7ea7114b3..c4a39a6b6 100644
Binary files a/installer/resources/themes/console/dark/images/infohelp.png and b/installer/resources/themes/console/dark/images/infohelp.png differ
diff --git a/installer/resources/themes/console/dark/images/infowarn.png b/installer/resources/themes/console/dark/images/infowarn.png
index e7ddbffa4..6e6620732 100644
Binary files a/installer/resources/themes/console/dark/images/infowarn.png and b/installer/resources/themes/console/dark/images/infowarn.png differ
diff --git a/installer/resources/themes/console/dark/images/warning_dark.png b/installer/resources/themes/console/dark/images/warning_dark.png
deleted file mode 100644
index afc71a6f6..000000000
Binary files a/installer/resources/themes/console/dark/images/warning_dark.png and /dev/null differ
diff --git a/installer/resources/themes/console/dark/images/webserver.png b/installer/resources/themes/console/dark/images/webserver.png
deleted file mode 100644
index 5330c5502..000000000
Binary files a/installer/resources/themes/console/dark/images/webserver.png and /dev/null differ
diff --git a/installer/resources/themes/console/images/action_log.png b/installer/resources/themes/console/images/action_log.png
deleted file mode 100644
index 39681a4d9..000000000
Binary files a/installer/resources/themes/console/images/action_log.png and /dev/null differ
diff --git a/installer/resources/themes/console/images/buttons/create-file_.png b/installer/resources/themes/console/images/buttons/create-file_.png
deleted file mode 100644
index a9ad768c2..000000000
Binary files a/installer/resources/themes/console/images/buttons/create-file_.png and /dev/null differ
diff --git a/installer/resources/themes/console/images/cursor_zoom.png b/installer/resources/themes/console/images/cursor_zoom.png
index 8c4277f78..39447f937 100644
Binary files a/installer/resources/themes/console/images/cursor_zoom.png and b/installer/resources/themes/console/images/cursor_zoom.png differ
diff --git a/installer/resources/themes/console/images/errortriangle.png b/installer/resources/themes/console/images/errortriangle.png
index f1730ccbf..191361461 100644
Binary files a/installer/resources/themes/console/images/errortriangle.png and b/installer/resources/themes/console/images/errortriangle.png differ
diff --git a/installer/resources/themes/console/images/favicon.ico b/installer/resources/themes/console/images/favicon.ico
index 9d4063633..453b35788 100644
Binary files a/installer/resources/themes/console/images/favicon.ico and b/installer/resources/themes/console/images/favicon.ico differ
diff --git a/installer/resources/themes/console/images/folder.png b/installer/resources/themes/console/images/folder.png
index 784e8fa48..e0efb07c6 100644
Binary files a/installer/resources/themes/console/images/folder.png and b/installer/resources/themes/console/images/folder.png differ
diff --git a/installer/resources/themes/console/images/inbound.png b/installer/resources/themes/console/images/inbound.png
index df0083f93..9f3da0ac8 100644
Binary files a/installer/resources/themes/console/images/inbound.png and b/installer/resources/themes/console/images/inbound.png differ
diff --git a/installer/resources/themes/console/images/info/blocked_.png b/installer/resources/themes/console/images/info/blocked_.png
deleted file mode 100644
index 838112b60..000000000
Binary files a/installer/resources/themes/console/images/info/blocked_.png and /dev/null differ
diff --git a/installer/resources/themes/console/images/info/errortriangle.png b/installer/resources/themes/console/images/info/errortriangle.png
index f1730ccbf..191361461 100644
Binary files a/installer/resources/themes/console/images/info/errortriangle.png and b/installer/resources/themes/console/images/info/errortriangle.png differ
diff --git a/installer/resources/themes/console/images/info/globe.png b/installer/resources/themes/console/images/info/globe.png
deleted file mode 100644
index b2ebc9c98..000000000
Binary files a/installer/resources/themes/console/images/info/globe.png and /dev/null differ
diff --git a/installer/resources/themes/console/images/info/infohelp.png b/installer/resources/themes/console/images/info/infohelp.png
index 22f09355d..c4a39a6b6 100644
Binary files a/installer/resources/themes/console/images/info/infohelp.png and b/installer/resources/themes/console/images/info/infohelp.png differ
diff --git a/installer/resources/themes/console/images/info/infowarn.png b/installer/resources/themes/console/images/info/infowarn.png
index e5ddc8527..6e6620732 100644
Binary files a/installer/resources/themes/console/images/info/infowarn.png and b/installer/resources/themes/console/images/info/infowarn.png differ
diff --git a/installer/resources/themes/console/images/info/network_status/accepting.png b/installer/resources/themes/console/images/info/network_status/accepting.png
index 3ddd44730..355d787ec 100644
Binary files a/installer/resources/themes/console/images/info/network_status/accepting.png and b/installer/resources/themes/console/images/info/network_status/accepting.png differ
diff --git a/installer/resources/themes/console/images/info/network_status/network_clockskew.png b/installer/resources/themes/console/images/info/network_status/network_clockskew.png
index 21ae508fa..66a60f9e5 100644
Binary files a/installer/resources/themes/console/images/info/network_status/network_clockskew.png and b/installer/resources/themes/console/images/info/network_status/network_clockskew.png differ
diff --git a/installer/resources/themes/console/images/info/network_status/network_error.png b/installer/resources/themes/console/images/info/network_status/network_error.png
index 950ef865b..dfeed6625 100644
Binary files a/installer/resources/themes/console/images/info/network_status/network_error.png and b/installer/resources/themes/console/images/info/network_status/network_error.png differ
diff --git a/installer/resources/themes/console/images/info/network_status/network_firewalled.png b/installer/resources/themes/console/images/info/network_status/network_firewalled.png
index 55c393241..f85d9b25e 100644
Binary files a/installer/resources/themes/console/images/info/network_status/network_firewalled.png and b/installer/resources/themes/console/images/info/network_status/network_firewalled.png differ
diff --git a/installer/resources/themes/console/images/info/network_status/network_hidden.png b/installer/resources/themes/console/images/info/network_status/network_hidden.png
index 020f7681f..e987a40dd 100644
Binary files a/installer/resources/themes/console/images/info/network_status/network_hidden.png and b/installer/resources/themes/console/images/info/network_status/network_hidden.png differ
diff --git a/installer/resources/themes/console/images/info/network_status/network_ok.png b/installer/resources/themes/console/images/info/network_status/network_ok.png
index 8fe4c0c33..53218fec2 100644
Binary files a/installer/resources/themes/console/images/info/network_status/network_ok.png and b/installer/resources/themes/console/images/info/network_status/network_ok.png differ
diff --git a/installer/resources/themes/console/images/info/network_status/network_testing.png b/installer/resources/themes/console/images/info/network_status/network_testing.png
index 8cda4f80b..8f23de6d3 100644
Binary files a/installer/resources/themes/console/images/info/network_status/network_testing.png and b/installer/resources/themes/console/images/info/network_status/network_testing.png differ
diff --git a/installer/resources/themes/console/images/info/network_status/network_vm.png b/installer/resources/themes/console/images/info/network_status/network_vm.png
index ff0f10205..85d7937e9 100644
Binary files a/installer/resources/themes/console/images/info/network_status/network_vm.png and b/installer/resources/themes/console/images/info/network_status/network_vm.png differ
diff --git a/installer/resources/themes/console/images/info/network_status/network_warning.png b/installer/resources/themes/console/images/info/network_status/network_warning.png
index f99931054..a917c0774 100644
Binary files a/installer/resources/themes/console/images/info/network_status/network_warning.png and b/installer/resources/themes/console/images/info/network_status/network_warning.png differ
diff --git a/installer/resources/themes/console/images/info/network_status/rejecting.png b/installer/resources/themes/console/images/info/network_status/rejecting.png
index 3bdc197a7..503fb72da 100644
Binary files a/installer/resources/themes/console/images/info/network_status/rejecting.png and b/installer/resources/themes/console/images/info/network_status/rejecting.png differ
diff --git a/installer/resources/themes/console/images/info/network_status/rejecting_hidden.png b/installer/resources/themes/console/images/info/network_status/rejecting_hidden.png
index cee22ad16..530fab5f9 100644
Binary files a/installer/resources/themes/console/images/info/network_status/rejecting_hidden.png and b/installer/resources/themes/console/images/info/network_status/rejecting_hidden.png differ
diff --git a/installer/resources/themes/console/images/local_down.png b/installer/resources/themes/console/images/local_down.png
new file mode 100644
index 000000000..503fb72da
Binary files /dev/null and b/installer/resources/themes/console/images/local_down.png differ
diff --git a/installer/resources/themes/console/images/local_inprogress.png b/installer/resources/themes/console/images/local_inprogress.png
index 7a0619d28..530fab5f9 100644
Binary files a/installer/resources/themes/console/images/local_inprogress.png and b/installer/resources/themes/console/images/local_inprogress.png differ
diff --git a/installer/resources/themes/console/images/local_up.png b/installer/resources/themes/console/images/local_up.png
index 4c8029b21..355d787ec 100644
Binary files a/installer/resources/themes/console/images/local_up.png and b/installer/resources/themes/console/images/local_up.png differ
diff --git a/installer/resources/themes/console/images/magnet.png b/installer/resources/themes/console/images/magnet.png
deleted file mode 100644
index 35c0db57d..000000000
Binary files a/installer/resources/themes/console/images/magnet.png and /dev/null differ
diff --git a/installer/resources/themes/console/images/outbound.png b/installer/resources/themes/console/images/outbound.png
index a3e8722f0..06a4bc983 100644
Binary files a/installer/resources/themes/console/images/outbound.png and b/installer/resources/themes/console/images/outbound.png differ
diff --git a/installer/resources/themes/console/images/qr.png b/installer/resources/themes/console/images/qr.png
deleted file mode 100644
index a9a2b3558..000000000
Binary files a/installer/resources/themes/console/images/qr.png and /dev/null differ
diff --git a/installer/resources/themes/console/images/title_window.png b/installer/resources/themes/console/images/title_window.png
index ccde3c375..d548ecfd8 100644
Binary files a/installer/resources/themes/console/images/title_window.png and b/installer/resources/themes/console/images/title_window.png differ
diff --git a/installer/resources/themes/console/images/toolbox.png b/installer/resources/themes/console/images/toolbox.png
deleted file mode 100644
index 09507013d..000000000
Binary files a/installer/resources/themes/console/images/toolbox.png and /dev/null differ
diff --git a/installer/resources/themes/console/images/wrench_orange.png b/installer/resources/themes/console/images/wrench_orange.png
deleted file mode 100644
index f019d0b33..000000000
Binary files a/installer/resources/themes/console/images/wrench_orange.png and /dev/null differ
diff --git a/installer/resources/themes/console/light/console.css b/installer/resources/themes/console/light/console.css
index 69c9a50e3..a71f6aaaa 100644
--- a/installer/resources/themes/console/light/console.css
+++ b/installer/resources/themes/console/light/console.css
@@ -3779,7 +3779,7 @@ input, input:visited, button, button:visited {
      font-size: 9pt;
      padding: 4px 5px;
      text-decoration: none;
-     border-radius: 2px;
+     border-radius: 12px;
      opacity: 1;
      background-size: 14px auto, 100% 100% !important;
      filter: drop-shadow(0 0 1px #ccf);
@@ -5440,8 +5440,8 @@ a.viewfullentry:hover {
      font-size: 11pt !important;
      letter-spacing: 0.08em;
      word-spacing: 0.1em;
-     background:  #f6f6ff url(/themes/console/images/info/globe.png) 8px center no-repeat !important;
-     background:  url(/themes/console/images/info/globe.png) 8px center no-repeat, linear-gradient(to bottom, #fcfcff 50%, rgba(255,255,255,0.6) 50%, rgba(240,240,255,0.4)), linear-gradient(to right, #fcfcff 5%, rgba(231, 231, 255, 0.8) 25%) !important;
+     background:  #f6f6ff url(/themes/console/images/info/launch_browser.png) 8px center no-repeat !important;
+     background:  url(/themes/console/images/info/launch_browser.png) 8px center no-repeat, linear-gradient(to bottom, #fcfcff 50%, rgba(255,255,255,0.6) 50%, rgba(240,240,255,0.4)), linear-gradient(to right, #fcfcff 5%, rgba(231, 231, 255, 0.8) 25%) !important;
      background-size: 18px 18px, 100% 100%, 100% 100% !important;
      padding: 8px 5px 8px 32px;
 }
diff --git a/installer/resources/themes/console/light/images/application-icon.png b/installer/resources/themes/console/light/images/application-icon.png
deleted file mode 100644
index 974a09bde..000000000
Binary files a/installer/resources/themes/console/light/images/application-icon.png and /dev/null differ
diff --git a/installer/resources/themes/console/light/images/confirmed.png b/installer/resources/themes/console/light/images/confirmed.png
index 46c0a29e8..c4a39a6b6 100644
Binary files a/installer/resources/themes/console/light/images/confirmed.png and b/installer/resources/themes/console/light/images/confirmed.png differ
diff --git a/installer/resources/themes/console/light/images/console_status_running.png b/installer/resources/themes/console/light/images/console_status_running.png
index 6bbc5e37a..ea6dafeb7 100644
Binary files a/installer/resources/themes/console/light/images/console_status_running.png and b/installer/resources/themes/console/light/images/console_status_running.png differ
diff --git a/installer/resources/themes/console/light/images/console_status_starting.png b/installer/resources/themes/console/light/images/console_status_starting.png
index fbff23409..d0ad09eb5 100644
Binary files a/installer/resources/themes/console/light/images/console_status_starting.png and b/installer/resources/themes/console/light/images/console_status_starting.png differ
diff --git a/installer/resources/themes/console/light/images/console_status_stopped.png b/installer/resources/themes/console/light/images/console_status_stopped.png
index 0d43eb4ea..634263079 100644
Binary files a/installer/resources/themes/console/light/images/console_status_stopped.png and b/installer/resources/themes/console/light/images/console_status_stopped.png differ
diff --git a/installer/resources/themes/console/light/images/favicon.ico b/installer/resources/themes/console/light/images/favicon.ico
index 9d4063633..453b35788 100644
Binary files a/installer/resources/themes/console/light/images/favicon.ico and b/installer/resources/themes/console/light/images/favicon.ico differ
diff --git a/installer/resources/themes/console/light/images/i2plogo.png b/installer/resources/themes/console/light/images/i2plogo.png
index 26cf9e210..0bdcca14c 100644
Binary files a/installer/resources/themes/console/light/images/i2plogo.png and b/installer/resources/themes/console/light/images/i2plogo.png differ
diff --git a/installer/resources/themes/console/light/images/noise.png b/installer/resources/themes/console/light/images/noise.png
deleted file mode 100644
index 3f9e5c0b2..000000000
Binary files a/installer/resources/themes/console/light/images/noise.png and /dev/null differ
diff --git a/installer/resources/themes/console/light/images/warning.png b/installer/resources/themes/console/light/images/warning.png
index a564599be..6e6620732 100644
Binary files a/installer/resources/themes/console/light/images/warning.png and b/installer/resources/themes/console/light/images/warning.png differ
diff --git a/installer/resources/themes/snark/dark/snark.css b/installer/resources/themes/snark/dark/snark.css
index 3a0311b8a..e8056708c 100644
--- a/installer/resources/themes/snark/dark/snark.css
+++ b/installer/resources/themes/snark/dark/snark.css
@@ -393,7 +393,7 @@ tfoot th {
 }
 
 .ParentDir {
-     background: #000;
+     background: #1F1A24;
      font-size: 8pt;
      border: 1px solid #050 !important;
      border-left: 0 !important;
@@ -904,7 +904,7 @@ _:-ms-lang(x), .snarkTorrentOdd, .SnarkTorrentEven {
 }
 
 .snarkTorrentOdd, .snarkTorrentOdd:nth-child(odd) {
-     background: #000800 !important;
+     background: #1F1A24 !important;
 }
 
 .snarkTorrentOdd:nth-child(even) {
@@ -1192,8 +1192,6 @@ to {
      margin: -1px -1px -14px !important;
      display: block;
      text-align: left;
-     background: #000 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;
      border-top: 1px solid #433e47;
      padding: 8px;
      text-transform: uppercase;
@@ -1487,12 +1485,11 @@ input[size="85"] {
 }
 
 select {
-     background: #000 url(images/dropdown.png) right center no-repeat !important;
-     background: url(images/dropdown.png) right center no-repeat, linear-gradient(to bottom, #020 0%, #000 20%, #000 80%, #010 100%) !important;
+     background: #332940 url(images/dropdown.png) right center no-repeat !important;
      -moz-appearance: none;
      -webkit-appearance: none;
      appearance: none;
-     color: #433e47;
+     color: #e6e6e7;
      font-size: 8pt;
      font-weight: bold;
      padding: 4px 16px 4px 4px;
@@ -1727,7 +1724,7 @@ _:-ms-lang(x), #trackerselect tr:last-child {
 }
 
 .trackerconfig th:first-child {
-     background: url(images/delete.png) center right 8px no-repeat, linear-gradient(to bottom, #010, #000);
+     background: url(images/delete.png) center right 8px no-repeat, #1F1A24;
 }
 
 .trackerselect tr:first-child td, .addtorrentsection tr:first-child td {
@@ -1739,7 +1736,7 @@ _:-ms-lang(x), #trackerselect tr:last-child {
 }
 
 .trackerconfig tr:nth-child(odd), .snarkConfig tr:nth-child(odd) {
-     background: #000900;
+     background: #1F1A24;
 }
 
 .trackerconfig tr:last-child {
@@ -1771,7 +1768,7 @@ _:-ms-lang(x), #trackerselect tr:last-child {
 }
 
 .trackerconfig tr:nth-child(even), .snarkConfig tr:nth-child(even) {
-     background: #010;
+     background: #332940;
 }
 
 .trackerconfig input {
@@ -3247,7 +3244,7 @@ th a img {
      text-overflow: ellipsis;
      color: #bbf;
      box-shadow: 0 0 0 1px #121;
-     background: #010 url(images/button_tracker.png) left 3px center no-repeat;
+     background: #332940 url(images/button_tracker.png) left 3px center no-repeat;
      background-size: 14px auto;
 }
 
@@ -3257,7 +3254,7 @@ th a img {
 
 .info_tracker:hover {
      box-shadow: 0 0 0 1px #343;
-     background: url(images/button_tracker_hover.png) left 3px center no-repeat, linear-gradient(to bottom, #000 50%, #020 50%) !important;
+     background: url(images/button_tracker_hover.png) left 3px center no-repeat, linear-gradient(to bottom, #332940 50%, #1F1A24 50%) !important;
      background-size: 14px auto, 100% 100% !important;
 }
 
diff --git a/installer/resources/themes/snark/ubergine/images/cross.png b/installer/resources/themes/snark/ubergine/images/cross.png
deleted file mode 100644
index 33a383748..000000000
Binary files a/installer/resources/themes/snark/ubergine/images/cross.png and /dev/null differ
diff --git a/installer/resources/themes/snark/vanilla/images/noseeds.png b/installer/resources/themes/snark/vanilla/images/noseeds.png
deleted file mode 100644
index b718f9c3d..000000000
Binary files a/installer/resources/themes/snark/vanilla/images/noseeds.png and /dev/null differ
diff --git a/installer/resources/themes/susidns/dark/susidns.css b/installer/resources/themes/susidns/dark/susidns.css
index f6cbf8067..7d0473064 100644
--- a/installer/resources/themes/susidns/dark/susidns.css
+++ b/installer/resources/themes/susidns/dark/susidns.css
@@ -495,7 +495,7 @@ input[type="checkbox"]:hover, input[type="radio"]:hover, input[type="checkbox"]:
      width: 100%;
      border: 1px solid #292929;
      border-collapse: collapse;
-     background: #000900;
+     background: #332940;
 }
 
 #visualid tr:first-child td {
@@ -516,7 +516,7 @@ input[type="checkbox"]:hover, input[type="radio"]:hover, input[type="checkbox"]:
 }
 
 #visualid tr:last-child {
-     background: #000;
+     background: #1F1A24;
 }
 
 form[action="addressbook"] > p.buttons {
@@ -530,7 +530,7 @@ td > img[width="320"], td > img[src^="/imagegen"] {
      border: 1px solid #292929;
      padding: 5px;
      margin: 10px 3px;
-     background: #000;
+     background: #292929;
 }
 
 img[src="/imagegen/id?s=256&c="], img[src="/imagegen/id?s=20&c="] {
@@ -788,7 +788,7 @@ div#add, div#import {
 }
 
 input[type="submit"]:hover, input[type="reset"]:hover, input[type="submit"]:focus, input[type="reset"]:focus, .fakebutton:hover, #fakebutton:focus {
-     background: #000;
+     background: #332940;
      color: #da736b;
      border: 1px solid #da736b;
      box-shadow: inset 0 1px 1px 0 #e6e6e7;
@@ -823,9 +823,8 @@ input {
 
 input[type="submit"], input[type="reset"], .fakebutton {
      color: #e6e6e7;
-     background: #000;
-     border: 1px outset #191;
-     border-radius: 2px;
+     border: 1px outset #332940;
+     border-radius: 12px;
      margin: 5px;
      padding: 5px !important;
      font: bold 8pt "Droid Sans", "Noto Sans", Ubuntu, "Bitstream Vera Sans", "Lucida Grande", "DejaVu Sans", "Segoe UI", Verdana, Helvetica, sans-serif;
@@ -883,7 +882,6 @@ textarea[cols="70"] {
 
 input:focus, textarea:focus {
      color: #e6e6e7;
-     background: #000 !important;
      filter: drop-shadow(0 0 1px #880);
      transition: ease filter 0.3s;
      outline: none;
diff --git a/installer/resources/themes/susidns/images/how_fr.png b/installer/resources/themes/susidns/images/how_fr.png
deleted file mode 100644
index 7368830cb..000000000
Binary files a/installer/resources/themes/susidns/images/how_fr.png and /dev/null differ
diff --git a/installer/resources/themes/susimail/dark/susimail.css b/installer/resources/themes/susimail/dark/susimail.css
index 455e1b1ae..cbe271ad6 100644
--- a/installer/resources/themes/susimail/dark/susimail.css
+++ b/installer/resources/themes/susimail/dark/susimail.css
@@ -106,7 +106,7 @@ p.info, p.error {
 
 p.error {
      color: #f00;
-     background: url(/themes/console/images/info/errortriangle.png) no-repeat scroll 10px center #000;
+     background: url(/themes/console/images/info/errortriangle.png) no-repeat scroll 10px center;
      border: 1px solid #f00;
      border-radius: 2px;
      font-weight: bold;
@@ -667,7 +667,6 @@ input[type="text"]:focus, input[type="password"]:focus, textarea:focus {
 }
 
 input[name="user"] {
-     background: url(/themes/console/images/buttons/user.png) 5px center no-repeat, linear-gradient(to bottom, #000 0%, #010 100%) !important;
      padding: 5px 5px 5px 25px !important;
 }
 
@@ -676,7 +675,6 @@ input[name="user"]:focus {
 }
 
 input[name="pass"] {
-     background: url(/themes/console/images/buttons/password.png) 5px center no-repeat, linear-gradient(to bottom, #000 0%, #010 100%) !important;
      padding: 5px 5px 5px 25px !important;
 }