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 bb440e70f..f5618aab7 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
@@ -8824,6 +8824,10 @@ body {
   padding: 0;
   width: 100%;
   z-index: 2;
+  position: fixed;
+  height: 16px;
+  background: #202020;
+  border-top: 1px solid #171717;
 }
 
 .content-box {
@@ -8989,6 +8993,7 @@ main.page-content.col-lg-12 {
         width: 70px;
         background-color: #202020 !important;
         height: 100% !important;
+		border-right: 1px solid #171717;
       }
     }
     > nav > #mainmenu > div > {
@@ -9531,6 +9536,15 @@ label > input {
     }
   }
 }
+.fw_pass {
+  background-color: #2d6929 !important;
+  color: #FFF;
+}
+
+.fw_block {
+  background-color: #692929 !important;
+  color: #FFF;
+}
 
 /*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 dd9daf1dd..54fe046f3 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
@@ -5752,7 +5752,12 @@ body {
   font-size: 12px;
   padding: 0;
   width: 100%;
-  z-index: 2; }
+  z-index: 2;
+  position: fixed;
+  height: 16px;
+  background: #202020;
+  border-top: 1px solid #171717;
+}
 
 .content-box {
   padding: 0px 0px;
@@ -5876,6 +5881,7 @@ main.page-content.col-lg-12 {
   width:70px;
   background-color:#202020 !important;
   height:100% !important;
+  border-right: 1px solid #171717;
 }
 
 #navigation.col-sidebar-left > div > nav > #mainmenu > div > a.list-group-item {
@@ -6293,7 +6299,15 @@ label > input[type="radio"] {
 	background-color: #2a2a2a;
 	color: #ec6d12;
 }
+.fw_pass {
+  background-color: #2d6929 !important;
+  color: #FFF;
+}
 
+.fw_block {
+  background-color: #692929 !important;
+  color: #FFF;
+}
   /*additional extensions for theme-cicada*/
 
 #tab_1 #maintabs {
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 e525507be..b5f4098c6 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
@@ -8784,9 +8784,9 @@ body {
   left: 0;
   position: fixed;
   width: 100%;
-  border: none;
   z-index: 2;
   background-color: #172c38;
+  border-bottom: 1px solid #171717;
 }
 
 .page-content {
@@ -8865,6 +8865,11 @@ body {
   padding: 0;
   width: 100%;
   z-index: 2;
+  position: fixed;
+  height: 16px;
+  background: #172c38;
+  color:#FFF;
+  border-top: 1px solid #162b36;
 }
 
 .content-box {
@@ -9034,6 +9039,7 @@ main.page-content.col-lg-12 {
         width: 70px;
         background-color: #172c38 !important;
         height: 100% !important;
+		border-right: 1px solid #162b36;
       }
     }
     > nav > #mainmenu > div > {
@@ -9586,6 +9592,15 @@ label > input {
     }
   }
 }
+.fw_pass {
+  background-color: #2d6929 !important;
+  color: #FFF;
+}
+
+.fw_block {
+  background-color: #692929 !important;
+  color: #FFF;
+}
 
 /*additional extensions for theme-tukan*/
 
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 5677c811e..2c582084a 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
@@ -5696,9 +5696,10 @@ body {
   left: 0;
   position: fixed;
   width: 100%;
-  border:none;
   z-index: 2;
-  background-color:#172c38; }
+  background-color:#172c38;
+  border-bottom: 1px solid #171717;
+}
 
 .page-content {
   height: calc(100% - 52px);
@@ -5757,7 +5758,13 @@ body {
   font-size: 12px;
   padding: 0;
   width: 100%;
-  z-index: 2; }
+  z-index: 2;
+  position: fixed;
+  height: 16px;
+  background: #172c38;
+  color:#FFF;
+  border-top: 1px solid #162b36;
+}
 
 .content-box {
   padding: 0px 0px;
@@ -5882,6 +5889,7 @@ main.page-content.col-lg-12 {
   width:70px;
   background-color:#172c38 !important;
   height:100% !important;
+  border-right: 1px solid #162b36;
 }
 
 #navigation.col-sidebar-left > div > nav > #mainmenu > div > a.list-group-item {
@@ -6302,7 +6310,14 @@ label > input[type="radio"] {
 	background-color: #315a71;
 	color: #FFF;
 }
-
+.fw_pass {
+  background-color: #2d6929 !important;
+  color:#FFF;
+}
+.fw_block {
+  background-color: #692929 !important;
+  color:#FFF;
+}
   /*additional extensions for theme-tukan*/
 
 #tab_1 #maintabs {