diff --git a/misc/theme-cicada/Makefile b/misc/theme-cicada/Makefile
index df96e90ab..82eb949af 100644
--- a/misc/theme-cicada/Makefile
+++ b/misc/theme-cicada/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		theme-cicada
-PLUGIN_VERSION=		1.13
+PLUGIN_VERSION=		1.14
 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 c2aab33b0..51b2741f1 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
@@ -1550,11 +1550,11 @@ a.text-warning:hover {
 }
 
 .text-danger {
-  color: #EF3B25 !important;
+  color: #DB4829 !important;
 }
 
 a.text-danger:hover {
-  color: #ec2121;
+  color: #E44C2C;
 }
 
 .bg-primary {
@@ -4909,19 +4909,19 @@ fieldset[disabled] .btn-warning {
 
 .btn-danger {
   color: #fff;
-  background-color: #F05050;
-  border-color: #ee3939;
+  background-color: #DB4829;
+  border-color: #1d1d1d;
   &:hover, &:focus, &:active, &.active {
     color: #fff;
-    background-color: #ec2121;
-    border-color: #d71212;
+    background-color: none;
+    border-color: #DB4829;
   }
 }
 
 .open > .btn-danger.dropdown-toggle {
   color: #fff;
-  background-color: #ec2121;
-  border-color: #d71212;
+  background-color: none;
+  border-color: #DB4829;
 }
 
 .btn-danger {
@@ -9583,7 +9583,7 @@ label > input {
 }
 
 .fw_block {
-  background-color: #5a3636 !important;
+  background-color: #DB4829 !important;
   color: #FFF;
 }
 
@@ -9717,4 +9717,4 @@ h3 {
 #chart, #chart_intf_in, #chart_intf_out, #chart_top_ports, #chart_top_sources, #traffic_graph_widget_chart_in, #traffic_graph_widget_chart_out {
   background-color: #292929;
   border: 1px solid #515151;
-}
+}
\ No newline at end of file
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 38847158f..60f54a3a8 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
@@ -1143,10 +1143,10 @@ a.text-warning:hover {
   color: #ec971f; }
 
 .text-danger {
-  color: #EF3B25 !important; }
+  color: #DB4829 !important; }
 
 a.text-danger:hover {
-  color: #ec2121; }
+  color: #E44C2C; }
 
 .bg-primary {
   color: #fff; }
@@ -3048,12 +3048,12 @@ select[multiple].input-lg,
 
 .btn-danger {
   color: #fff;
-  background-color: #F05050;
-  border-color: #ee3939; }
+  background-color: #DB4829;
+  border-color: #1d1d1d; }
   .btn-danger:hover, .btn-danger:focus, .btn-danger:active, .btn-danger.active, .open > .btn-danger.dropdown-toggle {
     color: #fff;
-    background-color: #ec2121;
-    border-color: #d71212; }
+    background-color: none;
+    border-color: #DB4829; }
   .btn-danger:active, .btn-danger.active, .open > .btn-danger.dropdown-toggle {
     background-image: none; }
   .btn-danger.disabled, .btn-danger.disabled:hover, .btn-danger.disabled:focus, .btn-danger.disabled:active, .btn-danger.disabled.active, .btn-danger[disabled], .btn-danger[disabled]:hover, .btn-danger[disabled]:focus, .btn-danger[disabled]:active, .btn-danger[disabled].active, fieldset[disabled] .btn-danger, fieldset[disabled] .btn-danger:hover, fieldset[disabled] .btn-danger:focus, fieldset[disabled] .btn-danger:active, fieldset[disabled] .btn-danger.active {
@@ -6315,7 +6315,7 @@ label > input[type="radio"] {
 }
 
 .fw_block {
-  background-color: #5a3636 !important;
+  background-color: #DB4829 !important;
   color: #FFF;
 }
   /*additional extensions for theme-cicada*/
diff --git a/misc/theme-tukan/Makefile b/misc/theme-tukan/Makefile
index c79b07ab0..c2c48daa2 100644
--- a/misc/theme-tukan/Makefile
+++ b/misc/theme-tukan/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		theme-tukan
-PLUGIN_VERSION=		1.12
+PLUGIN_VERSION=		1.13
 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 b628337d4..a6eeb02d5 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
@@ -1548,8 +1548,12 @@ a.text-warning:hover {
   color: #ec971f;
 }
 
-.text-danger, a.text-danger:hover {
-  color: #DA4829;
+.text-danger {
+  color: #CB4326;
+}
+
+a.text-danger:hover {
+  color: #D8482A;
 }
 
 .bg-primary {
@@ -4844,19 +4848,19 @@ fieldset[disabled] .btn-info {
 
 .btn-warning {
   color: #fff;
-  background-color: #DE7313;
-  border-color: #1d1d1d;
+  background-color: #FF7E25;
+  border-color: #1b4257;
   &:hover, &:focus, &:active, &.active {
     color: #fff;
-    background-color: #b85904;
-    border-color: #1d1d1d;
+    background-color: #EC7726;
+    border-color: #1b4257;
   }
 }
 
 .open > .btn-warning.dropdown-toggle {
   color: #fff;
-  background-color: #b85904;
-  border-color: #1d1d1d;
+  background-color: #EC7726;
+  border-color: #1b4257;
 }
 
 .btn-warning {
@@ -4904,19 +4908,19 @@ fieldset[disabled] .btn-warning {
 
 .btn-danger {
   color: #fff;
-  background-color: #F05050;
-  border-color: #ee3939;
+  background-color: #CB4326;
+  border-color: #1B4257;
   &:hover, &:focus, &:active, &.active {
     color: #fff;
-    background-color: #ec2121;
-    border-color: #d71212;
+    background-color: #B63B21;
+    border-color: #1B4257;
   }
 }
 
 .open > .btn-danger.dropdown-toggle {
   color: #fff;
-  background-color: #ec2121;
-  border-color: #d71212;
+  background-color: #B63B21;
+  border-color: #1B4257;
 }
 
 .btn-danger {
@@ -9594,7 +9598,7 @@ label > input {
 }
 
 .fw_block {
-  background-color: #5f2929 !important;
+  background-color: #CB4326 !important;
   color: #FFF;
 }
 
@@ -9636,7 +9640,7 @@ textarea#update_status {
 
 .fa-times-circle::before {
   content: "\f057";
-  color: #DA4829;
+  color: #CB4326;
 }
 
 .fa-question-circle::before {
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 e24ed8f93..30bb04704 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
@@ -1143,10 +1143,10 @@ a.text-warning:hover {
   color: #ec971f; }
 
 .text-danger {
-  color: #DA4829; }
+  color: #CB4326; }
 
 a.text-danger:hover {
-  color: #DA4829; }
+  color: #D8482A; }
 
 .bg-primary {
   color: #fff; }
@@ -3018,12 +3018,12 @@ select[multiple].input-lg,
 
 .btn-warning {
   color: #fff;
-  background-color: #DE7313;
-  border-color: #1d1d1d; }
+  background-color: #FF7E25;
+  border-color: #1b4257; }
   .btn-warning:hover, .btn-warning:focus, .btn-warning:active, .btn-warning.active, .open > .btn-warning.dropdown-toggle {
     color: #fff;
-    background-color: #b85904;
-    border-color: #1d1d1d; }
+    background-color: #EC7726;
+    border-color: #1b4257; }
 
   .btn-warning:active, .btn-warning.active, .open > .btn-warning.dropdown-toggle {
     background-image: none; }
@@ -3037,12 +3037,12 @@ select[multiple].input-lg,
 
 .btn-danger {
   color: #fff;
-  background-color: #F05050;
-  border-color: #ee3939; }
+  background-color: #CB4326;
+  border-color: #1B4257; }
   .btn-danger:hover, .btn-danger:focus, .btn-danger:active, .btn-danger.active, .open > .btn-danger.dropdown-toggle {
     color: #fff;
-    background-color: #ec2121;
-    border-color: #d71212; }
+    background-color: #B63B21;
+    border-color: #1B4257; }
   .btn-danger:active, .btn-danger.active, .open > .btn-danger.dropdown-toggle {
     background-image: none; }
   .btn-danger.disabled, .btn-danger.disabled:hover, .btn-danger.disabled:focus, .btn-danger.disabled:active, .btn-danger.disabled.active, .btn-danger[disabled], .btn-danger[disabled]:hover, .btn-danger[disabled]:focus, .btn-danger[disabled]:active, .btn-danger[disabled].active, fieldset[disabled] .btn-danger, fieldset[disabled] .btn-danger:hover, fieldset[disabled] .btn-danger:focus, fieldset[disabled] .btn-danger:active, fieldset[disabled] .btn-danger.active {
@@ -6313,7 +6313,7 @@ label > input[type="radio"] {
   color:#FFF;
 }
 .fw_block {
-  background-color: #5f2929 !important;
+  background-color: #CB4326 !important;
   color:#FFF;
 }
   /*additional extensions for theme-tukan*/
@@ -6347,7 +6347,7 @@ textarea#update_status, textarea#update_status:hover {
 
 .fa-times-circle::before {
   content: "\f057";
-  color: #DA4829;
+  color: #CB4326;
 }
 
 .fa-question-circle::before {