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 ff0612222..7e66a68f5 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
@@ -6259,12 +6259,12 @@ a:focus {
   }
 
   &.active > a {
-    color: #fff;
-    background-color: #515151;
+    background-color: #2d2d2d;
+    color: #ec6d12;
 
     &:hover, &:focus {
-      color: #fff;
-      background-color: #515151;
+      background-color: #2d2d2d;
+      color: #ec6d12;
     }
   }
 }
@@ -7038,7 +7038,7 @@ fieldset[disabled] .navbar-inverse .btn-link {
           text-decoration: none;
           color: #FFFFFF;
           background-color: #505050;
-          border: 1px solid #303030;
+          border: 1px solid #6d6c6c;
           margin-left: -1px;
           cursor: pointer;
         }
@@ -7063,7 +7063,7 @@ fieldset[disabled] .navbar-inverse .btn-link {
         a {
           &:hover, &:focus {
             color: #FFFFFF;
-            background-color: #515151;
+            background-color: #ec6d12;
             border-color: #303030;
           }
         }
@@ -7071,7 +7071,7 @@ fieldset[disabled] .navbar-inverse .btn-link {
         span {
           &:hover, &:focus {
             color: #FFFFFF;
-            background-color: #515151;
+            background-color: #ec6d12;
             border-color: #303030;
           }
         }
@@ -7082,14 +7082,14 @@ fieldset[disabled] .navbar-inverse .btn-link {
       a {
         z-index: 2;
         color: #FFFFFF;
-        background-color: #515151;
+        background-color: #ec6d12;
         border-color: #1d1d1d;
         cursor: default;
 
         &:hover, &:focus {
           z-index: 2;
           color: #FFFFFF;
-          background-color: #515151;
+          background-color: #ec6d12;
           border-color: #1d1d1d;
           cursor: default;
         }
@@ -7098,14 +7098,14 @@ fieldset[disabled] .navbar-inverse .btn-link {
       span {
         z-index: 2;
         color: #FFFFFF;
-        background-color: #515151;
+        background-color: #ec6d12;
         border-color: #1d1d1d;
         cursor: default;
 
         &:hover, &:focus {
           z-index: 2;
           color: #FFFFFF;
-          background-color: #515151;
+          background-color: #ec6d12;
           border-color: #1d1d1d;
           cursor: default;
         }
@@ -7677,7 +7677,7 @@ a.thumbnail {
 }
 
 .progress-bar-info {
-  background-color: #CF5203;
+  background-color: #ec6d12;
 }
 
 .progress-striped .progress-bar-info {
@@ -8723,8 +8723,8 @@ button.close {
 
   .table-hover > tbody > tr:hover > {
     td, th {
-      background-color: #262626;
-      color: #515151;
+      background-color: #c35d12;
+      color: #fff;
     }
   }
 }
@@ -10428,12 +10428,12 @@ label > input {
 }
 
 .fw_block {
-  background-color: #683232 !important;
+  background-color: #712017 !important;
   color: #FFF;
 }
 
 .fw_nat {
-  background-color: #575757 !important;
+  background-color: #174471 !important;
   color: #FFF;
 }
 
@@ -10703,7 +10703,3 @@ h2 {
     color: #fff !important;
   }
 }
-
-label:hover {
-  background-color: #ec6d12;
-}
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 f6d9b0ce4..b8708595d 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
@@ -3646,8 +3646,8 @@ tbody.collapse.in {
   .nav-pills > li > a {
     border-radius: 0; }
   .nav-pills > li.active > a, .nav-pills > li.active > a:hover, .nav-pills > li.active > a:focus {
-    color: #fff;
-    background-color: #515151; }
+    background-color: #2d2d2d;
+    color: #ec6d12; }
 
 .nav-stacked > li {
   float: none; }
@@ -4095,7 +4095,7 @@ tbody.collapse.in {
       text-decoration: none;
       color: #FFFFFF;
       background-color: #505050;
-      border: 1px solid #303030;
+      border: 1px solid #6d6c6c;
       margin-left: -1px;
 	  cursor: pointer; }
 
@@ -4112,7 +4112,7 @@ tbody.collapse.in {
   .pagination > li > span:hover,
   .pagination > li > span:focus {
     color: #FFFFFF;
-    background-color: #515151;
+    background-color: #ec6d12;
     border-color: #303030; }
 
   .pagination > .active > a, .pagination > .active > a:hover, .pagination > .active > a:focus,
@@ -4121,7 +4121,7 @@ tbody.collapse.in {
   .pagination > .active > span:focus {
     z-index: 2;
     color: #FFFFFF;
-    background-color: #515151;
+    background-color: #ec6d12;
     border-color: #1d1d1d;
     cursor: default; }
 
@@ -4489,7 +4489,7 @@ a.thumbnail.active {
     background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); }
 
 .progress-bar-info {
-  background-color: #CF5203; }
+  background-color: #ec6d12; }
   .progress-striped .progress-bar-info {
     background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
     background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
@@ -5090,8 +5090,8 @@ button.close {
   background-color: inherit; }
 .modal-body .table-hover > tbody > tr:hover > td,
 .modal-body .table-hover > tbody > tr:hover > th {
-  background-color: #262626;
-  color:#515151; }
+  background-color: #c35d12;
+  color: #fff; }
 
 .modal-footer {
   padding: 5px;
@@ -6340,12 +6340,12 @@ label > input[type="radio"] {
 }
 
 .fw_block {
-  background-color: #683232 !important;
+  background-color: #712017 !important;
   color: #FFF;
 }
 
 .fw_nat {
-  background-color: #575757 !important;
+  background-color: #174471 !important;
   color: #FFF;
 }
 
@@ -6539,6 +6539,3 @@ input[type="checkbox"].checkbox-switch:checked + i::before, input[type="checkbox
 h2.text-center ,h2.text-primary {
   color:#fff !important;
 }
-label:hover {
-background-color: #ec6d12;
-}