diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 0d5d315415..807e691033 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -14044,6 +14044,7 @@ button.disabled {
 
 .white_table_graph > div {
   background-color: transparent;
+  border-radius: 8px;
 }
 
 .link-bold {
diff --git a/pandora_console/include/styles/pandora_black.css b/pandora_console/include/styles/pandora_black.css
index f6c8724f2b..92026df33f 100644
--- a/pandora_console/include/styles/pandora_black.css
+++ b/pandora_console/include/styles/pandora_black.css
@@ -77,7 +77,6 @@ table
 div#head,
 #menu_tab li.nomn_high,
 #menu_tab li.nomn_high span,
-.white_table_graph_header,
 .white-box-content,
 fieldset,
 .databox.filters,
@@ -267,6 +266,7 @@ h4,
 .info_table > thead > tr > th,
 .info_table > thead > tr > th a,
 .info_table > thead > tr > th > span,
+th,
 form.discovery label,
 .edit_user_labels,
 .input_label,
@@ -1132,17 +1132,15 @@ select,
 }
 
 .white_table_graph_header {
-  border: 1px solid #707070;
-  background-color: var(--secondary-color) !important;
   color: var(--text-color) !important;
   border-radius: 0;
 }
 
 .white_table_graph {
-  background-color: #111 !important;
+  background-color: var(--secondary-color) !important;
 }
 table.databox {
-  border-color: #707070;
+  border-color: var(--border-color);
   background-color: var(--secondary-color) !important;
   color: var(--text-color) !important;
 }
@@ -1514,7 +1512,7 @@ span.select2-dropdown.select2-dropdown--below {
 }
 
 div.white_table_graph {
-  border-radius: 0;
+  border-radius: 8px;
 }
 
 div.white_box_opened[style*="height: 0px"],
@@ -1598,7 +1596,6 @@ a.autorefresh_txt,
 .white_box,
 .white-box-content {
   border: 0px;
-  background-color: var(--secondary-color) !important;
   color: var(--text-color) !important;
 }
 
@@ -1623,8 +1620,7 @@ a.pandora_pagination,
   border: 1px solid #2b2b2b !important;
 }
 
-.white_box,
-.white-box-content {
+.white_box {
   border: 1px solid #333;
 }
 
@@ -1638,11 +1634,7 @@ a.pandora_pagination,
 }
 
 .box-flat {
-  border: 1px solid #333;
-}
-
-.white_table_graph_header {
-  border: 1px solid #333;
+  border: 1px solid var(--border-color);
 }
 
 .info_table > tbody > tr > td {
@@ -2008,3 +2000,11 @@ div.show_result_interpreter {
   border: 1px solid var(--border-color);
   border-top: 0;
 }
+
+th {
+  border-bottom: 1px solid var(--border-color);
+}
+
+.white_table_graph.fixed_filter_bar {
+  border-radius: 8px;
+}