diff --git a/public/themes/arya-blue/theme.css b/public/themes/arya-blue/theme.css
index 0f7a4eacd..69af51fda 100644
--- a/public/themes/arya-blue/theme.css
+++ b/public/themes/arya-blue/theme.css
@@ -1730,8 +1730,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: #64B5F6;
-  background: #212529;
+  color: #212529;
+  background: #64B5F6;
   margin-left: 0.5rem;
 }
 .p-datatable .p-sortable-column:not(.p-highlight):hover {
@@ -2401,8 +2401,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: #64B5F6;
-  background: #212529;
+  color: #212529;
+  background: #64B5F6;
   margin-left: 0.5rem;
 }
 .p-treetable .p-sortable-column:not(.p-highlight):hover {
diff --git a/public/themes/arya-green/theme.css b/public/themes/arya-green/theme.css
index efac6b51b..51dbf49fd 100644
--- a/public/themes/arya-green/theme.css
+++ b/public/themes/arya-green/theme.css
@@ -1730,8 +1730,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: #81C784;
-  background: #212529;
+  color: #212529;
+  background: #81C784;
   margin-left: 0.5rem;
 }
 .p-datatable .p-sortable-column:not(.p-highlight):hover {
@@ -2401,8 +2401,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: #81C784;
-  background: #212529;
+  color: #212529;
+  background: #81C784;
   margin-left: 0.5rem;
 }
 .p-treetable .p-sortable-column:not(.p-highlight):hover {
diff --git a/public/themes/arya-orange/theme.css b/public/themes/arya-orange/theme.css
index 1aede6f6b..eb6e0b189 100644
--- a/public/themes/arya-orange/theme.css
+++ b/public/themes/arya-orange/theme.css
@@ -1730,8 +1730,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: #FFD54F;
-  background: #212529;
+  color: #212529;
+  background: #FFD54F;
   margin-left: 0.5rem;
 }
 .p-datatable .p-sortable-column:not(.p-highlight):hover {
@@ -2401,8 +2401,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: #FFD54F;
-  background: #212529;
+  color: #212529;
+  background: #FFD54F;
   margin-left: 0.5rem;
 }
 .p-treetable .p-sortable-column:not(.p-highlight):hover {
diff --git a/public/themes/arya-purple/theme.css b/public/themes/arya-purple/theme.css
index a21f93cb9..23e81322a 100644
--- a/public/themes/arya-purple/theme.css
+++ b/public/themes/arya-purple/theme.css
@@ -1730,8 +1730,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: #BA68C8;
-  background: #ffffff;
+  color: #ffffff;
+  background: #BA68C8;
   margin-left: 0.5rem;
 }
 .p-datatable .p-sortable-column:not(.p-highlight):hover {
@@ -2401,8 +2401,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: #BA68C8;
-  background: #ffffff;
+  color: #ffffff;
+  background: #BA68C8;
   margin-left: 0.5rem;
 }
 .p-treetable .p-sortable-column:not(.p-highlight):hover {
diff --git a/public/themes/bootstrap4-dark-blue/theme.css b/public/themes/bootstrap4-dark-blue/theme.css
index 33d36b090..d4ddf7352 100644
--- a/public/themes/bootstrap4-dark-blue/theme.css
+++ b/public/themes/bootstrap4-dark-blue/theme.css
@@ -1730,8 +1730,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: #8dd0ff;
-  background: #151515;
+  color: #151515;
+  background: #8dd0ff;
   margin-left: 0.5rem;
 }
 .p-datatable .p-sortable-column:not(.p-highlight):hover {
@@ -2401,8 +2401,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: #8dd0ff;
-  background: #151515;
+  color: #151515;
+  background: #8dd0ff;
   margin-left: 0.5rem;
 }
 .p-treetable .p-sortable-column:not(.p-highlight):hover {
diff --git a/public/themes/bootstrap4-dark-purple/theme.css b/public/themes/bootstrap4-dark-purple/theme.css
index 496580af2..1f151c56d 100644
--- a/public/themes/bootstrap4-dark-purple/theme.css
+++ b/public/themes/bootstrap4-dark-purple/theme.css
@@ -1730,8 +1730,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: #c298d8;
-  background: #151515;
+  color: #151515;
+  background: #c298d8;
   margin-left: 0.5rem;
 }
 .p-datatable .p-sortable-column:not(.p-highlight):hover {
@@ -2401,8 +2401,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: #c298d8;
-  background: #151515;
+  color: #151515;
+  background: #c298d8;
   margin-left: 0.5rem;
 }
 .p-treetable .p-sortable-column:not(.p-highlight):hover {
diff --git a/public/themes/bootstrap4-light-blue/theme.css b/public/themes/bootstrap4-light-blue/theme.css
index 378703a7d..648aeca52 100644
--- a/public/themes/bootstrap4-light-blue/theme.css
+++ b/public/themes/bootstrap4-light-blue/theme.css
@@ -1730,8 +1730,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: #007bff;
-  background: #ffffff;
+  color: #ffffff;
+  background: #007bff;
   margin-left: 0.5rem;
 }
 .p-datatable .p-sortable-column:not(.p-highlight):hover {
@@ -2401,8 +2401,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: #007bff;
-  background: #ffffff;
+  color: #ffffff;
+  background: #007bff;
   margin-left: 0.5rem;
 }
 .p-treetable .p-sortable-column:not(.p-highlight):hover {
diff --git a/public/themes/bootstrap4-light-purple/theme.css b/public/themes/bootstrap4-light-purple/theme.css
index 247764602..a000a24cc 100644
--- a/public/themes/bootstrap4-light-purple/theme.css
+++ b/public/themes/bootstrap4-light-purple/theme.css
@@ -1730,8 +1730,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: #883cae;
-  background: #ffffff;
+  color: #ffffff;
+  background: #883cae;
   margin-left: 0.5rem;
 }
 .p-datatable .p-sortable-column:not(.p-highlight):hover {
@@ -2401,8 +2401,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: #883cae;
-  background: #ffffff;
+  color: #ffffff;
+  background: #883cae;
   margin-left: 0.5rem;
 }
 .p-treetable .p-sortable-column:not(.p-highlight):hover {
diff --git a/public/themes/luna-amber/theme.css b/public/themes/luna-amber/theme.css
index f251a9c1b..b0e0cd881 100644
--- a/public/themes/luna-amber/theme.css
+++ b/public/themes/luna-amber/theme.css
@@ -1730,8 +1730,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: #FFE082;
-  background: #212529;
+  color: #212529;
+  background: #FFE082;
   margin-left: 0.5rem;
 }
 .p-datatable .p-sortable-column:not(.p-highlight):hover {
@@ -2401,8 +2401,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: #FFE082;
-  background: #212529;
+  color: #212529;
+  background: #FFE082;
   margin-left: 0.5rem;
 }
 .p-treetable .p-sortable-column:not(.p-highlight):hover {
diff --git a/public/themes/luna-blue/theme.css b/public/themes/luna-blue/theme.css
index fa11e2ffe..2d07233c0 100644
--- a/public/themes/luna-blue/theme.css
+++ b/public/themes/luna-blue/theme.css
@@ -1730,8 +1730,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: #81D4FA;
-  background: #212529;
+  color: #212529;
+  background: #81D4FA;
   margin-left: 0.5rem;
 }
 .p-datatable .p-sortable-column:not(.p-highlight):hover {
@@ -2401,8 +2401,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: #81D4FA;
-  background: #212529;
+  color: #212529;
+  background: #81D4FA;
   margin-left: 0.5rem;
 }
 .p-treetable .p-sortable-column:not(.p-highlight):hover {
diff --git a/public/themes/luna-green/theme.css b/public/themes/luna-green/theme.css
index 1d6db958d..de784b16b 100644
--- a/public/themes/luna-green/theme.css
+++ b/public/themes/luna-green/theme.css
@@ -1730,8 +1730,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: #C5E1A5;
-  background: #212529;
+  color: #212529;
+  background: #C5E1A5;
   margin-left: 0.5rem;
 }
 .p-datatable .p-sortable-column:not(.p-highlight):hover {
@@ -2401,8 +2401,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: #C5E1A5;
-  background: #212529;
+  color: #212529;
+  background: #C5E1A5;
   margin-left: 0.5rem;
 }
 .p-treetable .p-sortable-column:not(.p-highlight):hover {
diff --git a/public/themes/luna-pink/theme.css b/public/themes/luna-pink/theme.css
index 2a134d0fd..deb3eb9b1 100644
--- a/public/themes/luna-pink/theme.css
+++ b/public/themes/luna-pink/theme.css
@@ -1730,8 +1730,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: #F48FB1;
-  background: #212529;
+  color: #212529;
+  background: #F48FB1;
   margin-left: 0.5rem;
 }
 .p-datatable .p-sortable-column:not(.p-highlight):hover {
@@ -2401,8 +2401,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: #F48FB1;
-  background: #212529;
+  color: #212529;
+  background: #F48FB1;
   margin-left: 0.5rem;
 }
 .p-treetable .p-sortable-column:not(.p-highlight):hover {
diff --git a/public/themes/md-dark-deeppurple/theme.css b/public/themes/md-dark-deeppurple/theme.css
index ea3ddbbd0..4987d563c 100644
--- a/public/themes/md-dark-deeppurple/theme.css
+++ b/public/themes/md-dark-deeppurple/theme.css
@@ -1742,8 +1742,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: rgba(206, 147, 216, 0.16);
-  background: #CE93D8;
+  color: #CE93D8;
+  background: rgba(206, 147, 216, 0.16);
   margin-left: 0.5rem;
 }
 .p-datatable .p-sortable-column:not(.p-highlight):hover {
@@ -2413,8 +2413,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: rgba(206, 147, 216, 0.16);
-  background: #CE93D8;
+  color: #CE93D8;
+  background: rgba(206, 147, 216, 0.16);
   margin-left: 0.5rem;
 }
 .p-treetable .p-sortable-column:not(.p-highlight):hover {
diff --git a/public/themes/md-dark-indigo/theme.css b/public/themes/md-dark-indigo/theme.css
index 5b20771c2..d67eb3db0 100644
--- a/public/themes/md-dark-indigo/theme.css
+++ b/public/themes/md-dark-indigo/theme.css
@@ -1742,8 +1742,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: rgba(159, 168, 218, 0.16);
-  background: #9FA8DA;
+  color: #9FA8DA;
+  background: rgba(159, 168, 218, 0.16);
   margin-left: 0.5rem;
 }
 .p-datatable .p-sortable-column:not(.p-highlight):hover {
@@ -2413,8 +2413,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: rgba(159, 168, 218, 0.16);
-  background: #9FA8DA;
+  color: #9FA8DA;
+  background: rgba(159, 168, 218, 0.16);
   margin-left: 0.5rem;
 }
 .p-treetable .p-sortable-column:not(.p-highlight):hover {
diff --git a/public/themes/md-light-deeppurple/theme.css b/public/themes/md-light-deeppurple/theme.css
index 09bb30ff3..f76d9e9e4 100644
--- a/public/themes/md-light-deeppurple/theme.css
+++ b/public/themes/md-light-deeppurple/theme.css
@@ -1742,8 +1742,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: rgba(103, 58, 183, 0.12);
-  background: #673AB7;
+  color: #673AB7;
+  background: rgba(103, 58, 183, 0.12);
   margin-left: 0.5rem;
 }
 .p-datatable .p-sortable-column:not(.p-highlight):hover {
@@ -2413,8 +2413,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: rgba(103, 58, 183, 0.12);
-  background: #673AB7;
+  color: #673AB7;
+  background: rgba(103, 58, 183, 0.12);
   margin-left: 0.5rem;
 }
 .p-treetable .p-sortable-column:not(.p-highlight):hover {
diff --git a/public/themes/md-light-indigo/theme.css b/public/themes/md-light-indigo/theme.css
index 5851356bc..1442264ca 100644
--- a/public/themes/md-light-indigo/theme.css
+++ b/public/themes/md-light-indigo/theme.css
@@ -1742,8 +1742,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: rgba(63, 81, 181, 0.12);
-  background: #3F51B5;
+  color: #3F51B5;
+  background: rgba(63, 81, 181, 0.12);
   margin-left: 0.5rem;
 }
 .p-datatable .p-sortable-column:not(.p-highlight):hover {
@@ -2413,8 +2413,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: rgba(63, 81, 181, 0.12);
-  background: #3F51B5;
+  color: #3F51B5;
+  background: rgba(63, 81, 181, 0.12);
   margin-left: 0.5rem;
 }
 .p-treetable .p-sortable-column:not(.p-highlight):hover {
diff --git a/public/themes/mdc-dark-deeppurple/theme.css b/public/themes/mdc-dark-deeppurple/theme.css
index e995e86ef..b7e47853f 100644
--- a/public/themes/mdc-dark-deeppurple/theme.css
+++ b/public/themes/mdc-dark-deeppurple/theme.css
@@ -1742,8 +1742,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: rgba(103, 58, 183, 0.16);
-  background: #673AB7;
+  color: #673AB7;
+  background: rgba(103, 58, 183, 0.16);
   margin-left: 0.5rem;
 }
 .p-datatable .p-sortable-column:not(.p-highlight):hover {
@@ -2413,8 +2413,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: rgba(103, 58, 183, 0.16);
-  background: #673AB7;
+  color: #673AB7;
+  background: rgba(103, 58, 183, 0.16);
   margin-left: 0.5rem;
 }
 .p-treetable .p-sortable-column:not(.p-highlight):hover {
diff --git a/public/themes/mdc-dark-indigo/theme.css b/public/themes/mdc-dark-indigo/theme.css
index acd9ee7c2..887b62487 100644
--- a/public/themes/mdc-dark-indigo/theme.css
+++ b/public/themes/mdc-dark-indigo/theme.css
@@ -1742,8 +1742,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: rgba(63, 81, 181, 0.16);
-  background: #3F51B5;
+  color: #3F51B5;
+  background: rgba(63, 81, 181, 0.16);
   margin-left: 0.5rem;
 }
 .p-datatable .p-sortable-column:not(.p-highlight):hover {
@@ -2413,8 +2413,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: rgba(63, 81, 181, 0.16);
-  background: #3F51B5;
+  color: #3F51B5;
+  background: rgba(63, 81, 181, 0.16);
   margin-left: 0.5rem;
 }
 .p-treetable .p-sortable-column:not(.p-highlight):hover {
diff --git a/public/themes/mdc-light-deeppurple/theme.css b/public/themes/mdc-light-deeppurple/theme.css
index 5d84a7c23..5f6fa5be1 100644
--- a/public/themes/mdc-light-deeppurple/theme.css
+++ b/public/themes/mdc-light-deeppurple/theme.css
@@ -1742,8 +1742,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: rgba(103, 58, 183, 0.12);
-  background: #673AB7;
+  color: #673AB7;
+  background: rgba(103, 58, 183, 0.12);
   margin-left: 0.5rem;
 }
 .p-datatable .p-sortable-column:not(.p-highlight):hover {
@@ -2413,8 +2413,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: rgba(103, 58, 183, 0.12);
-  background: #673AB7;
+  color: #673AB7;
+  background: rgba(103, 58, 183, 0.12);
   margin-left: 0.5rem;
 }
 .p-treetable .p-sortable-column:not(.p-highlight):hover {
diff --git a/public/themes/mdc-light-indigo/theme.css b/public/themes/mdc-light-indigo/theme.css
index 47c9a5087..2ad2646b4 100644
--- a/public/themes/mdc-light-indigo/theme.css
+++ b/public/themes/mdc-light-indigo/theme.css
@@ -1742,8 +1742,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: rgba(63, 81, 181, 0.12);
-  background: #3F51B5;
+  color: #3F51B5;
+  background: rgba(63, 81, 181, 0.12);
   margin-left: 0.5rem;
 }
 .p-datatable .p-sortable-column:not(.p-highlight):hover {
@@ -2413,8 +2413,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: rgba(63, 81, 181, 0.12);
-  background: #3F51B5;
+  color: #3F51B5;
+  background: rgba(63, 81, 181, 0.12);
   margin-left: 0.5rem;
 }
 .p-treetable .p-sortable-column:not(.p-highlight):hover {
diff --git a/public/themes/nova-accent/theme.css b/public/themes/nova-accent/theme.css
index 8349c2bef..f7d841472 100644
--- a/public/themes/nova-accent/theme.css
+++ b/public/themes/nova-accent/theme.css
@@ -1718,8 +1718,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: #e02365;
-  background: #ffffff;
+  color: #ffffff;
+  background: #e02365;
   margin-left: 0.5rem;
 }
 .p-datatable .p-sortable-column:not(.p-highlight):hover {
@@ -2389,8 +2389,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: #e02365;
-  background: #ffffff;
+  color: #ffffff;
+  background: #e02365;
   margin-left: 0.5rem;
 }
 .p-treetable .p-sortable-column:not(.p-highlight):hover {
diff --git a/public/themes/nova-alt/theme.css b/public/themes/nova-alt/theme.css
index f6a936389..5e8e13280 100644
--- a/public/themes/nova-alt/theme.css
+++ b/public/themes/nova-alt/theme.css
@@ -1730,8 +1730,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: #007ad9;
-  background: #ffffff;
+  color: #ffffff;
+  background: #007ad9;
   margin-left: 0.5rem;
 }
 .p-datatable .p-sortable-column:not(.p-highlight):hover {
@@ -2401,8 +2401,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: #007ad9;
-  background: #ffffff;
+  color: #ffffff;
+  background: #007ad9;
   margin-left: 0.5rem;
 }
 .p-treetable .p-sortable-column:not(.p-highlight):hover {
diff --git a/public/themes/nova-vue/theme.css b/public/themes/nova-vue/theme.css
index 2addbdbc4..c8b0d749b 100644
--- a/public/themes/nova-vue/theme.css
+++ b/public/themes/nova-vue/theme.css
@@ -1730,8 +1730,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: #41b883;
-  background: #ffffff;
+  color: #ffffff;
+  background: #41b883;
   margin-left: 0.5rem;
 }
 .p-datatable .p-sortable-column:not(.p-highlight):hover {
@@ -2401,8 +2401,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: #41b883;
-  background: #ffffff;
+  color: #ffffff;
+  background: #41b883;
   margin-left: 0.5rem;
 }
 .p-treetable .p-sortable-column:not(.p-highlight):hover {
diff --git a/public/themes/nova/theme.css b/public/themes/nova/theme.css
index c1042cf29..9dd92f52d 100644
--- a/public/themes/nova/theme.css
+++ b/public/themes/nova/theme.css
@@ -1730,8 +1730,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: #007ad9;
-  background: #ffffff;
+  color: #ffffff;
+  background: #007ad9;
   margin-left: 0.5rem;
 }
 .p-datatable .p-sortable-column:not(.p-highlight):hover {
@@ -2401,8 +2401,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: #007ad9;
-  background: #ffffff;
+  color: #ffffff;
+  background: #007ad9;
   margin-left: 0.5rem;
 }
 .p-treetable .p-sortable-column:not(.p-highlight):hover {
diff --git a/public/themes/rhea/theme.css b/public/themes/rhea/theme.css
index 5abfaab10..b03416cb3 100644
--- a/public/themes/rhea/theme.css
+++ b/public/themes/rhea/theme.css
@@ -1718,8 +1718,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: #AFD3C8;
-  background: #385048;
+  color: #385048;
+  background: #AFD3C8;
   margin-left: 0.5rem;
 }
 .p-datatable .p-sortable-column:not(.p-highlight):hover {
@@ -2389,8 +2389,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: #AFD3C8;
-  background: #385048;
+  color: #385048;
+  background: #AFD3C8;
   margin-left: 0.5rem;
 }
 .p-treetable .p-sortable-column:not(.p-highlight):hover {
diff --git a/public/themes/saga-blue/theme.css b/public/themes/saga-blue/theme.css
index 1754ee382..fc483fb08 100644
--- a/public/themes/saga-blue/theme.css
+++ b/public/themes/saga-blue/theme.css
@@ -1730,8 +1730,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: #2196F3;
-  background: #ffffff;
+  color: #ffffff;
+  background: #2196F3;
   margin-left: 0.5rem;
 }
 .p-datatable .p-sortable-column:not(.p-highlight):hover {
@@ -2401,8 +2401,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: #2196F3;
-  background: #ffffff;
+  color: #ffffff;
+  background: #2196F3;
   margin-left: 0.5rem;
 }
 .p-treetable .p-sortable-column:not(.p-highlight):hover {
diff --git a/public/themes/saga-green/theme.css b/public/themes/saga-green/theme.css
index 8f362ca42..f71a8f730 100644
--- a/public/themes/saga-green/theme.css
+++ b/public/themes/saga-green/theme.css
@@ -1730,8 +1730,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: #4CAF50;
-  background: #ffffff;
+  color: #ffffff;
+  background: #4CAF50;
   margin-left: 0.5rem;
 }
 .p-datatable .p-sortable-column:not(.p-highlight):hover {
@@ -2401,8 +2401,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: #4CAF50;
-  background: #ffffff;
+  color: #ffffff;
+  background: #4CAF50;
   margin-left: 0.5rem;
 }
 .p-treetable .p-sortable-column:not(.p-highlight):hover {
diff --git a/public/themes/saga-orange/theme.css b/public/themes/saga-orange/theme.css
index 6ae8c0304..1448d3f42 100644
--- a/public/themes/saga-orange/theme.css
+++ b/public/themes/saga-orange/theme.css
@@ -1730,8 +1730,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: #FFC107;
-  background: #212529;
+  color: #212529;
+  background: #FFC107;
   margin-left: 0.5rem;
 }
 .p-datatable .p-sortable-column:not(.p-highlight):hover {
@@ -2401,8 +2401,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: #FFC107;
-  background: #212529;
+  color: #212529;
+  background: #FFC107;
   margin-left: 0.5rem;
 }
 .p-treetable .p-sortable-column:not(.p-highlight):hover {
diff --git a/public/themes/vela-blue/theme.css b/public/themes/vela-blue/theme.css
index b8715c969..b824b4713 100644
--- a/public/themes/vela-blue/theme.css
+++ b/public/themes/vela-blue/theme.css
@@ -1730,8 +1730,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: #64B5F6;
-  background: #212529;
+  color: #212529;
+  background: #64B5F6;
   margin-left: 0.5rem;
 }
 .p-datatable .p-sortable-column:not(.p-highlight):hover {
@@ -2401,8 +2401,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: #64B5F6;
-  background: #212529;
+  color: #212529;
+  background: #64B5F6;
   margin-left: 0.5rem;
 }
 .p-treetable .p-sortable-column:not(.p-highlight):hover {
diff --git a/public/themes/vela-green/theme.css b/public/themes/vela-green/theme.css
index afbc61b91..e3567eb87 100644
--- a/public/themes/vela-green/theme.css
+++ b/public/themes/vela-green/theme.css
@@ -1730,8 +1730,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: #81C784;
-  background: #212529;
+  color: #212529;
+  background: #81C784;
   margin-left: 0.5rem;
 }
 .p-datatable .p-sortable-column:not(.p-highlight):hover {
@@ -2401,8 +2401,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: #81C784;
-  background: #212529;
+  color: #212529;
+  background: #81C784;
   margin-left: 0.5rem;
 }
 .p-treetable .p-sortable-column:not(.p-highlight):hover {
diff --git a/public/themes/vela-orange/theme.css b/public/themes/vela-orange/theme.css
index c853f31ce..972d74ba1 100644
--- a/public/themes/vela-orange/theme.css
+++ b/public/themes/vela-orange/theme.css
@@ -1730,8 +1730,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: #FFD54F;
-  background: #212529;
+  color: #212529;
+  background: #FFD54F;
   margin-left: 0.5rem;
 }
 .p-datatable .p-sortable-column:not(.p-highlight):hover {
@@ -2401,8 +2401,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: #FFD54F;
-  background: #212529;
+  color: #212529;
+  background: #FFD54F;
   margin-left: 0.5rem;
 }
 .p-treetable .p-sortable-column:not(.p-highlight):hover {
diff --git a/public/themes/vela-purple/theme.css b/public/themes/vela-purple/theme.css
index b1638ba6d..1a2d195f9 100644
--- a/public/themes/vela-purple/theme.css
+++ b/public/themes/vela-purple/theme.css
@@ -1730,8 +1730,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: #BA68C8;
-  background: #ffffff;
+  color: #ffffff;
+  background: #BA68C8;
   margin-left: 0.5rem;
 }
 .p-datatable .p-sortable-column:not(.p-highlight):hover {
@@ -2401,8 +2401,8 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: #BA68C8;
-  background: #ffffff;
+  color: #ffffff;
+  background: #BA68C8;
   margin-left: 0.5rem;
 }
 .p-treetable .p-sortable-column:not(.p-highlight):hover {
diff --git a/src/components/datatable/DataTable.vue b/src/components/datatable/DataTable.vue
index 09404b835..60d251352 100755
--- a/src/components/datatable/DataTable.vue
+++ b/src/components/datatable/DataTable.vue
@@ -1849,7 +1849,9 @@ export default {
 }
 
 .p-datatable .p-sortable-column .p-sortable-column-badge {
-    display: inline-block;
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
 }
 
 .p-datatable-auto-layout > .p-datatable-wrapper {