diff --git a/misc/theme-cicada/Makefile b/misc/theme-cicada/Makefile
index df29e7f2e..0bacaefee 100644
--- a/misc/theme-cicada/Makefile
+++ b/misc/theme-cicada/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		theme-cicada
-PLUGIN_VERSION=		1.6
+PLUGIN_VERSION=		1.7
 PLUGIN_REVISION=	1
 PLUGIN_COMMENT=		The cicada theme - grey/orange
 PLUGIN_MAINTAINER=	rene@team-rebellion.net
diff --git a/misc/theme-cicada/src/opnsense/www/themes/cicada/assets/stylesheets/main.scss b/misc/theme-cicada/src/opnsense/www/themes/cicada/assets/stylesheets/main.scss
index 8f41405ba..bce7fd71d 100644
--- a/misc/theme-cicada/src/opnsense/www/themes/cicada/assets/stylesheets/main.scss
+++ b/misc/theme-cicada/src/opnsense/www/themes/cicada/assets/stylesheets/main.scss
@@ -237,10 +237,9 @@ optgroup {
 }
 
 table {
-  border-collapse: none;
   border-spacing: 0;
-  color: #FFFFFF;
   background-color: #3e3e3e;
+  color: #FFF;
 }
 
 td, th {
@@ -2585,14 +2584,12 @@ th {
     }
     thead > tr > th {
       vertical-align: bottom;
-      border-bottom: 1px solid #bababa4d;
     }
     caption + thead > tr:first-child > {
       th, td {
         border-top: 0;
         font-family: 'SourceSansProSemibold';
         font-weight: normal;
-        border-bottom: 1px solid #515151;
       }
     }
     colgroup + thead > tr:first-child > {
@@ -5908,7 +5905,6 @@ a:focus {
   overflow-x: visible;
   padding-right: 20px;
   padding-left: 20px;
-  border-top: 1px solid transparent;
   box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1);
   -webkit-overflow-scrolling: touch;
   &:before {
@@ -6207,9 +6203,6 @@ a:focus {
   }
 }
 
-.navbar-default {
-  background-color: transparent;
-  border-color: none;
   .navbar-brand {
     color: #F7F7F7;
     &:hover, &:focus {
@@ -6279,7 +6272,6 @@ a:focus {
       }
     }
   }
-}
 
 @media (max-width: 767px) {
   .navbar-default .navbar-nav .open .dropdown-menu > {
@@ -8819,13 +8811,12 @@ body {
 
 .page-foot {
   bottom: 0;
-  border: none;
   font-size: 12px;
   padding: 0;
   width: 100%;
   z-index: 2;
   position: fixed;
-  height: 16px;
+  height: 20px;
   background: #202020;
   border-top: 1px solid #171717;
 }
@@ -9533,13 +9524,11 @@ label > input {
   }
 }
 .fw_pass {
-  background-color: #2d6929 !important;
-  color: #FFF;
+  background-color: #365a38 !important;
 }
 
 .fw_block {
-  background-color: #692929 !important;
-  color: #FFF;
+  background-color: #5a3636 !important;
 }
 
 /*additional extensions for theme-cicada*/
diff --git a/misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/main.css b/misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/main.css
index ee2c4df0b..725e8acad 100644
--- a/misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/main.css
+++ b/misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/main.css
@@ -206,10 +206,9 @@ optgroup {
   font-weight: bold; }
 
 table {
-  border-collapse: none;
   border-spacing: 0;
-  color: #FFFFFF;
-  background-color: #3e3e3e; }
+  background-color: #3e3e3e;
+  color: #FFF; }
 
 td,
 th {
@@ -2037,8 +2036,7 @@ th {
     vertical-align: top;
 	border-top:1px solid #303030; }
   .table > thead > tr > th {
-    vertical-align: bottom;
-    border-bottom: 1px solid #bababa4d; }
+    vertical-align: bottom;  }
   .table > caption + thead > tr:first-child > th,
   .table > caption + thead > tr:first-child > td,
   .table > colgroup + thead > tr:first-child > th,
@@ -2047,8 +2045,7 @@ th {
   .table > thead:first-child > tr:first-child > td {
     border-top: 0;
     font-family: 'SourceSansProSemibold';
-    font-weight: normal;
-	border-bottom: 1px solid #515151; }
+    font-weight: normal;}
   .table > tbody + tbody {
     border-top: 2px solid #eee; }
   .table .table {
@@ -3703,7 +3700,6 @@ tbody.collapse.in {
   overflow-x: visible;
   padding-right: 20px;
   padding-left: 20px;
-  border-top: 1px solid transparent;
   box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1);
   -webkit-overflow-scrolling: touch; }
   .navbar-collapse:before, .navbar-collapse:after {
@@ -3912,10 +3908,7 @@ tbody.collapse.in {
       .navbar-text.navbar-right:last-child {
         margin-right: 0; } }
 
-.navbar-default {
-  background-color: transparent;
-  border-color: none; }
-  .navbar-default .navbar-brand {
+.navbar-default .navbar-brand {
     color: #F7F7F7; }
     .navbar-default .navbar-brand:hover, .navbar-default .navbar-brand:focus {
       color: #dedede;
@@ -5748,13 +5741,12 @@ body {
 
 .page-foot {
   bottom: 0;
-  border:none;
   font-size: 12px;
   padding: 0;
   width: 100%;
   z-index: 2;
   position: fixed;
-  height: 16px;
+  height: 20px;
   background: #202020;
   border-top: 1px solid #171717;
 }
@@ -6296,12 +6288,12 @@ label > input[type="radio"] {
 	color: #ec6d12;
 }
 .fw_pass {
-  background-color: #2d6929 !important;
+  background-color: #365a38 !important;
   color: #FFF;
 }
 
 .fw_block {
-  background-color: #692929 !important;
+  background-color: #5a3636 !important;
   color: #FFF;
 }
   /*additional extensions for theme-cicada*/
diff --git a/misc/theme-tukan/Makefile b/misc/theme-tukan/Makefile
index c59f8acb7..6e63e80d9 100644
--- a/misc/theme-tukan/Makefile
+++ b/misc/theme-tukan/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		theme-tukan
-PLUGIN_VERSION=		1.5
+PLUGIN_VERSION=		1.6
 PLUGIN_COMMENT=		The tukan theme - blue/white
 PLUGIN_MAINTAINER=	rene@team-rebellion.net
 
diff --git a/misc/theme-tukan/src/opnsense/www/themes/tukan/assets/stylesheets/main.scss b/misc/theme-tukan/src/opnsense/www/themes/tukan/assets/stylesheets/main.scss
index 9b88c9d6c..38780357e 100644
--- a/misc/theme-tukan/src/opnsense/www/themes/tukan/assets/stylesheets/main.scss
+++ b/misc/theme-tukan/src/opnsense/www/themes/tukan/assets/stylesheets/main.scss
@@ -1165,7 +1165,6 @@ body {
   font-size: 14px;
   line-height: 1.428571429;
   color: #000;
-  background-color: none;
 }
 
 input, button, select, textarea {
@@ -2584,7 +2583,6 @@ th {
     }
     thead > tr > th {
       vertical-align: bottom;
-      border-bottom: 1px solid #bababa4d;
     }
     caption + thead > tr:first-child > {
       th, td {
@@ -8772,7 +8770,6 @@ body {
   font-family: 'SourceSansProRegular';
   touch-action: manipulation;
   min-width: 320px;
-  background-color: none;
 }
 
 .widget-sort-handle {
@@ -8812,7 +8809,6 @@ body {
     -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3);
     box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3);
   }
-  background: #FFF;
   padding-bottom: 15px;
   padding-top: 20px;
   color: #000;
@@ -8835,7 +8831,6 @@ body {
 }
 
 .page-content-main {
-  background: #FFFFFF;
   min-height: calc(100% - 64px);
   padding: 15px 0 73px;
 }
@@ -8860,13 +8855,12 @@ body {
 
 .page-foot {
   bottom: 0;
-  border: none;
   font-size: 12px;
   padding: 0;
   width: 100%;
   z-index: 2;
   position: fixed;
-  height: 16px;
+  height: 20px;
   background: #172c38;
   color:#FFF;
   border-top: 1px solid #162b36;
diff --git a/misc/theme-tukan/src/opnsense/www/themes/tukan/build/css/main.css b/misc/theme-tukan/src/opnsense/www/themes/tukan/build/css/main.css
index 167ce2152..34febfeb9 100644
--- a/misc/theme-tukan/src/opnsense/www/themes/tukan/build/css/main.css
+++ b/misc/theme-tukan/src/opnsense/www/themes/tukan/build/css/main.css
@@ -925,7 +925,7 @@ body {
   font-size: 14px;
   line-height: 1.428571429;
   color: #000;
-  background-color: none; }
+}
 
 input,
 button,
@@ -2036,8 +2036,7 @@ th {
     vertical-align: top;
 	border-top: 1px solid #e3e3e3; }
   .table > thead > tr > th {
-    vertical-align: bottom;
-    border-bottom: 1px solid #bababa4d; }
+    vertical-align: bottom;  }
   .table > caption + thead > tr:first-child > th,
   .table > caption + thead > tr:first-child > td,
   .table > colgroup + thead > tr:first-child > th,
@@ -5686,7 +5685,7 @@ html, body {
 body {
   touch-action: manipulation;
   min-width: 320px;
-  background-color:none; }
+}
 
 .widget-sort-handle {
   touch-action: none; }
@@ -5721,7 +5720,6 @@ body {
   box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30); }
 
 .page-content-head, .content-box-head {
-  background: #FFF;
   padding-bottom: 15px;
   padding-top: 20px;
   color:#000;}
@@ -5732,7 +5730,6 @@ body {
     margin: 0; }
 
 .page-content-main {
-  background: #FFFFFF;
   min-height: calc(100% - 64px);
   padding: 15px 0 73px; }
 
@@ -5754,13 +5751,12 @@ body {
 
 .page-foot {
   bottom: 0;
-  border:none;
   font-size: 12px;
   padding: 0;
   width: 100%;
   z-index: 2;
   position: fixed;
-  height: 16px;
+  height: 20px;
   background: #172c38;
   color:#FFF;
   border-top: 1px solid #162b36;