diff --git a/installer/resources/themes/susimail/dark/susimail.css b/installer/resources/themes/susimail/dark/susimail.css
index 8816328ec4..455e1b1aeb 100644
--- a/installer/resources/themes/susimail/dark/susimail.css
+++ b/installer/resources/themes/susimail/dark/susimail.css
@@ -58,7 +58,7 @@ hr {
      color: #494;
      background: #494;
      height: 1px;
-     border: 0px solid #494;
+     border: 0px solid #332940;
      width: 100%;
      margin: 5px 0;
      text-align: center;
@@ -95,11 +95,11 @@ p.text {
 p.info, p.error {
      color:#ee9;
      display: block !important;
-     border: 1px solid #494;
+     border: 1px solid #332940;
      margin: 20px 20px 0 !important;
      padding: 15px 10px 15px 45px;
-     background: #000 url(/themes/console/dark/images/infohelp.png) 10px center no-repeat;
-     background: url(/themes/console/dark/images/infohelp.png) 10px center no-repeat, linear-gradient(to right, #000 0%, #001500 65%, #001800 90%);
+     background: #1F1A24 url(/themes/console/dark/images/infohelp.png) 10px center no-repeat;
+     /*background: url(/themes/console/dark/images/infohelp.png) 10px center no-repeat, linear-gradient(to right, #000 0%, #001500 65%, #001800 90%);*/
      text-align: left;
      border-radius: 2px;
 }
@@ -145,7 +145,7 @@ div.topbuttons {
      margin-bottom: -4px;
      margin-top: -1px;
      margin: -1px -1px -4px -1px;
-     border-bottom: 1px solid #494;
+     border-bottom: 1px solid #332940;
 }
 
 .iframed .topbuttons {
@@ -178,7 +178,7 @@ td[colspan="9"] hr {
 }
 
 .mailbody {
-/*     display: block !important; */
+     background: 1F1A24;
      padding: 0 10px !important;
 }
 
@@ -227,7 +227,7 @@ table#mailbox {
 }
 
 table#mailbox td[colspan="5"], table#mailbox td[colspan="4"] {
-     border-top: 1px solid #494 !important;
+     border-top: 1px solid #332940 !important;
      padding: 6px 0 2px !important;
 }
 
@@ -274,9 +274,9 @@ table#mailbox tr[class^="list"]:hover {
      overflow: hidden;
 }
 
-#message_full td {
+/*#message_full td {
      background: #000;
-}
+}*/
 
 input.optbox {
      opacity: 0.8;
@@ -333,11 +333,11 @@ td {
 }
 
 tr.list0 {
-     background-color: #000800;
+     background-color: #1F1A24;
 }
 
 tr.list1 {
-     background-color: #010;
+     background-color: #1F1A24;
 }
 
 /* mailbox display finessing */
@@ -352,8 +352,8 @@ tr.list0:hover td, tr.list1:hover td {
 }
 
 tr.list0:hover, tr.list1:hover, tr.list0:hover a, tr.list1:hover a {
-     background: #002000;
-     color: #f60;
+     background: #332940;
+     color: #e6e6e7;
 }
 
 tr.list0:hover td:nth-child(3) a, tr.list1:hover td:nth-child(3) a, #mailbox td:nth-child(3) a:focus, #mailbox td:nth-child(3) a:focus {
@@ -439,7 +439,6 @@ table.noborder {
 
 td:first-child {
      font-weight: bold;
-     background: #332940;
 }
 
 pre {
@@ -472,8 +471,8 @@ th {
      background: #000000 url(../../console/dark/images/header.png) repeat scroll center center;
      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;
      padding: 7px;
-     border-bottom: 1px solid #494;
-     border-top: 1px solid #494;
+     border-bottom: 1px solid #332940;
+     border-top: 1px solid #332940;
 }
 
 form {
@@ -495,7 +494,6 @@ form table {
 textarea {
      background: #000;
      color: #ee9;
-     border: 1px solid #494;
      border-radius: 2px;
      padding: 5px;
 }
@@ -519,15 +517,12 @@ td#attachedfile {
 table#mailhead {
      font-size: 9pt;
      font-weight: bold;
-     border-bottom: 1px solid #494;
-     border-top: 1px solid #494;
-     background: #010;
      width: 100%;
-     background: #010;
+     background: #332940;
 }
 
 #mailhead td {
-     background: #010;
+     background: #1F1A24;
 }
 
 #mailhead td:first-child {
@@ -567,7 +562,7 @@ input {
      text-align: left;
      padding: 2px 2px 3px !important;
      border-radius: 2px;
-     border: 1px solid #494;
+     border: 1px solid #332940;
      color: #494;
      margin: 3px;
      font: bold 9pt "Droid Sans", "Noto Sans", Ubuntu, "Bitstream Vera Sans", "Lucida Grande", "DejaVu Sans", Lato, "Segoe UI", Verdana, Helvetica, sans-serif;
@@ -658,8 +653,8 @@ input[type="text"], input[type="password"], textarea {
      background: #000;
      cursor: text;
      padding: 4px !important;
-     border: 1px solid #363;
-     background: linear-gradient(to bottom, #000 0%, #010 100%) !important;
+     border: 1px solid #332940;
+     /*background: linear-gradient(to bottom, #000 0%, #010 100%) !important;*/
      box-shadow: inset 0 0 3px 3px #000;
      font-size: 9pt;
 }
@@ -715,6 +710,8 @@ input[type="submit"], input[type="reset"], select, button { /* webkit/blink fix
 .notifications {
      text-align: center;
      padding: 0 0 20px;
+     position: absolute;
+     bottom: -2.5%;
 }
 
 #dologin {
@@ -839,7 +836,7 @@ div#composemail {
 }
 
 h3#config {
-     border: 1px solid #494;
+     border: 1px solid #332940;
      padding: 5px;
      margin: 3px auto 18px auto;
      width: 400px;
@@ -872,13 +869,13 @@ p.mailbody {
 
 tr.mailbody:nth-child(n+3), tr.mailbody:nth-child(n+3) td {
      background: #010;
-     border-top: 1px solid #494;
+     border-top: 1px solid #332940;
      padding: 5px;
 }
 
-tr.mailbody:last-child td {
+/*tr.mailbody:last-child td {
      border-bottom: 1px solid #494;
-}
+}*/
 
 div.attached {
      margin: 0 -1px -1px;
@@ -888,7 +885,7 @@ div.attached {
 }
 
 .attached img {
-     border: 1px solid #494;
+     border: 1px solid #332940;
      border-radius: 2px;
      padding: 2px;
      background: #010;
@@ -973,14 +970,14 @@ table#pagenav td:last-child {
 
 div#prefsave { /* config page button positioning */
      margin: 20px 0 0;
-     border-top: 1px solid #494;
+     border-top: 1px solid #332940;
      padding: 10px 0 10px;
 }
 
 .iframed #prefsave {
      margin-bottom: 0;
      padding-top: 15px;
-     border-bottom: 1px solid #494;
+     border-bottom: 1px solid #332940;
 }
 
 #prefsave input[type="submit"] {
@@ -994,11 +991,11 @@ table#mailbox {
 
 div#prefsave {
      padding-bottom: 5px;
-     border-bottom: 1px solid #494;
+     border-bottom: 1px solid #332940;
 }
 
 .iframed .page {
-     border-bottom: 1px solid #494;
+     border-bottom: 1px solid #332940;
 }
 }
 
diff --git a/installer/resources/themes/susimail/light/susimail.css b/installer/resources/themes/susimail/light/susimail.css
index e1f749c8e8..43608a447c 100644
--- a/installer/resources/themes/susimail/light/susimail.css
+++ b/installer/resources/themes/susimail/light/susimail.css
@@ -514,7 +514,7 @@ input[type="submit"], input[type="reset"] {
      padding: 4px 5px;
      text-decoration: none;
      text-shadow: 0 1px 1px #fff;
-     border-radius: 2px;
+     border-radius: 15px;
      opacity: 1;
      background-size: 14px auto, 100% 100% !important;
      filter: drop-shadow(0 0 1px rgba(180, 180, 255, 0.6));
@@ -678,14 +678,12 @@ input.show:hover {
 }
 
 input.markall {
-     background: #eee url(/themes/susimail/images/all.png) no-repeat 6px center;
-     background: url(/themes/susimail/images/all.png) no-repeat 6px center, linear-gradient(to bottom, #fff, #efefff);
+     background: #eee url(images/book.png) no-repeat 6px center;
      padding: 5px 7px 5px 24px;
 }
 
 input.markall:hover {
-     background: #fff url(/themes/susimail/images/all.png) no-repeat 6px center;
-     background: url(/themes/susimail/images/all.png) no-repeat 6px center, linear-gradient(to bottom, #eee, #fff);
+     background: #fff url(images/book.png) no-repeat 6px center;
 }
 
 input.new {