diff --git a/pandora_console/include/ajax/agent.php b/pandora_console/include/ajax/agent.php
index f0884dea7f..a6189abe1e 100644
--- a/pandora_console/include/ajax/agent.php
+++ b/pandora_console/include/ajax/agent.php
@@ -486,50 +486,48 @@ if ((int) $load_filter_modal === 1) {
     $table = new StdClass;
     $table->id = 'load_filter_form';
     $table->width = '100%';
-    $table->cellspacing = 4;
-    $table->cellpadding = 4;
-    $table->class = 'databox';
-    if (is_metaconsole()) {
-        $table->cellspacing = 0;
-        $table->cellpadding = 0;
-        $table->class = 'databox filters';
-    }
-
-    $table->styleTable = 'font-weight: bold; color: #555; text-align:left;';
-    $filter_id_width = '200px';
-    if (is_metaconsole()) {
-        $filter_id_width = '150px';
-    }
+    $table->class = 'filter-table-adv';
 
     $data = [];
     $table->rowid[3] = 'update_filter_row1';
-    $data[0] = __('Load filter').$jump;
-    $data[0] .= html_print_select(
-        $filters,
-        'filter_id',
-        $current,
-        '',
-        __('None'),
-        0,
-        true,
-        false,
-        true,
-        '',
-        false,
-        'margin-left:5px; width:'.$filter_id_width.';'
+    $data[0] = html_print_label_input_block(
+        __('Load filter'),
+        html_print_select(
+            $filters,
+            'filter_id',
+            $current,
+            '',
+            __('None'),
+            0,
+            true,
+            false,
+            true,
+            '',
+            false
+        )
     );
 
-    $data[1] = html_print_submit_button(
-        __('Load filter'),
-        'load_filter',
-        false,
-        'class="sub upd"',
-        true
-    );
-    $data[1] .= html_print_input_hidden('load_filter', 1, true);
     $table->data[] = $data;
     $table->rowclass[] = '';
+
     html_print_table($table);
+    html_print_div(
+        [
+            'class'   => 'action-buttons',
+            'content' => html_print_submit_button(
+                __('Load filter'),
+                'srcbutton',
+                false,
+                [
+                    'icon' => 'search',
+                    'mode' => 'mini',
+                ],
+                true
+            ),
+        ],
+        false
+    );
+    echo html_print_input_hidden('load_filter', 1, true);
     echo '</form>';
     echo '</div>';
     ?>
@@ -562,52 +560,44 @@ if ($save_filter_modal) {
         $table = new StdClass;
         $table->id = 'save_filter_form';
         $table->width = '100%';
-        $table->cellspacing = 4;
-        $table->cellpadding = 4;
-        $table->class = 'databox';
-
-        if (is_metaconsole() === true) {
-            $table->class = 'databox filters';
-            $table->cellspacing = 0;
-            $table->cellpadding = 0;
-        }
-
-        $table->styleTable = 'font-weight: bold; text-align:left;';
-
-        if (is_metaconsole() === true) {
-            $table->style[0] = 'width: 50%; width:50%;';
-        }
-
+        $table->size = [];
+        $table->size[0] = '50%';
+        $table->size[1] = '50%';
+        $table->class = 'filter-table-adv';
         $data = [];
+
         $table->rowid[0] = 'update_save_selector';
-        $data[0] = html_print_radio_button(
-            'filter_mode',
-            'new',
-            '',
-            true,
-            true
-        ).__('New filter').'';
+        $data[0][0] = html_print_label_input_block(
+            __('New filter'),
+            html_print_radio_button(
+                'filter_mode',
+                'new',
+                '',
+                true,
+                true
+            )
+        );
 
-        $data[1] = html_print_radio_button(
-            'filter_mode',
-            'update',
-            '',
-            false,
-            true
-        ).__('Update/delete filter').'';
+        $data[0][1] = html_print_label_input_block(
+            __('Update/delete filter'),
+            html_print_radio_button(
+                'filter_mode',
+                'update',
+                '',
+                false,
+                true
+            )
+        );
 
-        $table->data[] = $data;
-        $table->rowclass[] = '';
-
-        $data = [];
         $table->rowid[1] = 'save_filter_row1';
-        $data[0] = __('Filter name').$jump;
-        $data[0] .= html_print_input_text('id_name', '', '', 15, 255, true);
+        $data[1][0] = html_print_label_input_block(
+            __('Filter name'),
+            html_print_input_text('id_name', '', '', 15, 255, true)
+        );
 
+        $labelInput = __('Filter group');
         if (is_metaconsole() === true) {
-            $data[1] = __('Save in Group').$jump;
-        } else {
-            $data[1] = __('Filter group').$jump;
+            $labelInput = __('Save in Group');
         }
 
         $user_groups_array = users_get_groups_for_select(
@@ -617,32 +607,26 @@ if ($save_filter_modal) {
             true
         );
 
-        $data[1] .= html_print_select(
-            $user_groups_array,
-            'id_group_filter_dialog',
-            $id_group_filter,
-            '',
-            '',
-            0,
-            true,
-            false,
-            false,
-            'w130'
+        $data[1][1] = html_print_label_input_block(
+            $labelInput,
+            html_print_select(
+                $user_groups_array,
+                'id_group_filter_dialog',
+                $id_group_filter,
+                '',
+                '',
+                0,
+                true,
+                false,
+                false
+            ),
+            ['div_class' => 'filter-group-dialog']
         );
 
-        $table->data[] = $data;
-        $table->rowclass[] = '';
-
-        $data = [];
         $table->rowid[2] = 'save_filter_row2';
 
         $table->data[] = $data;
         $table->rowclass[] = '';
-
-        $data = [];
-        $table->rowid[3] = 'update_filter_row1';
-        $data[0] = __('Filter').$jump;
-
         $user_groups = users_get_groups(
             $config['id_user'],
             'AW',
@@ -664,45 +648,73 @@ if ($save_filter_modal) {
             }
         }
 
-        $data[0] .= html_print_select(
-            $_filters_update,
-            'overwrite_filter',
-            '',
-            '',
-            '',
-            0,
+        $data[2][0] = html_print_label_input_block(
+            __('Filter'),
+            html_print_select(
+                $_filters_update,
+                'overwrite_filter',
+                '',
+                '',
+                '',
+                0,
+                true
+            )
+        );
+
+        $table->data = $data;
+
+        html_print_table($table);
+        html_print_div(
+            [
+                'id'      => 'submit-save_filter',
+                'class'   => 'action-buttons',
+                'content' => html_print_submit_button(
+                    __('Save current filter'),
+                    'srcbutton',
+                    false,
+                    [
+                        'icon'    => 'search',
+                        'mode'    => 'mini',
+                        'onclick' => 'save_new_filter();',
+                    ],
+                    true
+                ),
+            ],
+            false
+        );
+
+        $input_actions = html_print_submit_button(
+            __('Delete filter'),
+            'delete_filter',
+            false,
+            [
+                'icon'    => 'delete',
+                'mode'    => 'mini',
+                'onclick' => 'save_delete_filter();',
+            ],
             true
         );
 
-        $table->data[] = $data;
-        $table->rowclass[] = '';
+        $input_actions .= html_print_submit_button(
+            __('Update filter'),
+            'srcbutton',
+            false,
+            [
+                'icon'    => 'update',
+                'mode'    => 'mini',
+                'onclick' => 'save_update_filter();',
+            ],
+            true
+        );
 
-        html_print_table($table);
-        echo '<div id="update_delete_row"><br>';
-            echo html_print_submit_button(
-                __('Update filter'),
-                'update_filter',
-                false,
-                'class="sub upd" onclick="save_update_filter();"',
-                true
-            );
-            echo html_print_submit_button(
-                __('Delete filter'),
-                'delete_filter',
-                false,
-                'class="sub delete float-right" onclick="save_delete_filter();"',
-                true
-            );
-        echo '</div>';
-        echo '<div><br>';
-            echo html_print_submit_button(
-                __('Save current filter'),
-                'save_filter',
-                false,
-                'class="sub upd float-right" onclick="save_new_filter();"',
-                true
-            );
-        echo '</div>';
+        html_print_div(
+            [
+                'id'      => 'update_filter_row',
+                'class'   => 'action-buttons',
+                'content' => $input_actions,
+            ],
+            false
+        );
     } else {
         include 'general/noaccess.php';
     }
@@ -712,32 +724,34 @@ if ($save_filter_modal) {
 <script type="text/javascript">
 
 function show_save_filter() {
-    $('#save_filter_row1').show();
-    $('#save_filter_row2').show();
-    $('#update_filter_row1').hide();
+    $('#save_filter_row2').hide();
+    $('#update_filter_row').hide();
     $('#update_delete_row').hide();
+    $('.filter-group-dialog').show();
     // Filter save mode selector
     $("[name='filter_mode']").click(function() {
         if ($(this).val() == 'new') {
-            $('#save_filter_row1').show();
-            $('#save_filter_row2').show();
+            $('#save_filter_row2').hide();
             $('#submit-save_filter').show();
-            $('#update_filter_row1').hide();
+            $('#update_filter_row').hide();
             $('#update_delete_row').hide();
+            $('.filter-group-dialog').show();
         }
         else {
-            $('#save_filter_row1').hide();
-            $('#save_filter_row2').hide();
-            $('#update_filter_row1').show();
+            $('#save_filter_row2').show();
+            $('#update_filter_row').show();
             $('#submit-save_filter').hide();
             $('#update_delete_row').show();
+            $('.filter-group-dialog').hide();
         }
     });
     $("#save-filter-select").dialog({
         resizable: true,
         draggable: true,
         modal: false,
-        closeOnEscape: true
+        closeOnEscape: true,
+        width: 450,
+        height: 350
     });
 }
 
diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php
index 6cff09f98e..086741d052 100755
--- a/pandora_console/include/ajax/module.php
+++ b/pandora_console/include/ajax/module.php
@@ -1962,7 +1962,8 @@ if (check_login()) {
                     true,
                     false,
                     false
-                )
+                ),
+                ['div_class' => 'filter-group-dialog']
             );
 
             $table->rowid[2] = 'save_filter_row2';
@@ -2056,6 +2057,7 @@ if (check_login()) {
         $('#save_filter_row2').hide();
         $('#update_filter_row').hide();
         $('#update_delete_row').hide();
+        $('.filter-group-dialog').show();
         // Filter save mode selector
         $("[name='filter_mode']").click(function() {
             if ($(this).val() == 'new') {
@@ -2063,12 +2065,14 @@ if (check_login()) {
                 $('#submit-save_filter').show();
                 $('#update_filter_row').hide();
                 $('#update_delete_row').hide();
+                $('.filter-group-dialog').show();
             }
             else {
                 $('#save_filter_row2').show();
                 $('#update_filter_row').show();
                 $('#submit-save_filter').hide();
                 $('#update_delete_row').show();
+                $('.filter-group-dialog').hide();
             }
         });
         $("#save-filter-select").dialog({
diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index ea263c8db8..7a4dd26be8 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -3448,7 +3448,7 @@ function html_print_action_buttons(mixed $content, array $parameters=[], bool $r
             'id'      => ($parameters['id'] ?? 'principal_action_buttons'),
             'class'   => 'action-buttons '.$typeClass.' '.($parameters['class'] ?? ''),
             'content' => $content,
-            'style'   => 'z-index: 100',
+            'style'   => 'z-index: 1',
         ],
         $return
     );
@@ -6777,9 +6777,7 @@ function html_print_label_input_block(
     $calbackFn,
     ?array $options=[]
 ):string {
-    $div_class = '';
     $label_class = '';
-    $div_id = '';
 
     $divAttributes = [];
 
@@ -6812,5 +6810,22 @@ function html_print_label_input_block(
 
     $output .= '</div>';
 
+    return $output;
+}
+
+
+function html_print_go_top()
+{
+    $output = '</div>';
+    $output .= '<div onclick="topFunction()" id="top_btn" title="Go to top">';
+    $output .= '<svg viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">';
+    $output .= '<title>Dark / 20 / arrow@svg</title>';
+    $output .= '<desc>Created with Sketch.</desc>';
+    $output .= '<g id="Dark-/-20-/-arrow" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">';
+    $output .= '<path d="M3.41005051,6.39052429 C3.91472805,5.90987901 4.70885153,5.8729063 5.25805922,6.27960615 L5.38994949,6.39052429 L10,10.78 L14.6100505,6.39052429 C15.1147281,5.90987901 15.9088515,5.8729063 16.4580592,6.27960615 L16.5899495,6.39052429 C17.094627,6.87116957 17.1334484,7.62747765 16.7064135,8.15053259 L16.5899495,8.27614237 L10.9899495,13.6094757 C10.4852719,14.090121 9.69114847,14.1270937 9.14194078,13.7203939 L9.01005051,13.6094757 L3.41005051,8.27614237 C2.8633165,7.75544332 2.8633165,6.91122335 3.41005051,6.39052429 Z" id="Path-8" fill="#14524f" fill-rule="nonzero" transform="translate(10.000000, 10.000000) rotate(90.000000) translate(-10.000000, -10.000000) "></path>';
+    $output .= '</g>';
+    $output .= '</svg>';
+    $output .= '</div>';
+
     return $output;
 }
\ No newline at end of file
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 7862ad4b37..1e4556965b 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -1503,7 +1503,7 @@ function ui_print_help_icon(
     $help_id,
     $return=false,
     $home_url='',
-    $image='images/help_green.png',
+    $image='images/info@svg.svg',
     $is_relative=false,
     $id=''
 ) {
@@ -1533,7 +1533,7 @@ function ui_print_help_icon(
         $image,
         true,
         [
-            'class'   => 'img_help',
+            'class'   => 'img_help main_menu_icon',
             'title'   => __('Help'),
             'onclick' => "open_help ('".ui_get_full_url($help_handler)."')",
             'id'      => $id,
@@ -6990,7 +6990,7 @@ function ui_query_result_editor($name='default')
                 __('Execute query'),
                 'execute_query',
                 false,
-                'class="sub next"',
+                ['icon' => 'next'],
                 true
             ),
         ],
diff --git a/pandora_console/include/javascript/ace/ace.js b/pandora_console/include/javascript/ace/ace.js
index 5d5f87a6ad..7a43408925 100644
--- a/pandora_console/include/javascript/ace/ace.js
+++ b/pandora_console/include/javascript/ace/ace.js
@@ -20949,7 +20949,6 @@ ace.define(
     bottom: 0;\
     left: 0;\
     cursor: default;\
-    z-index: 4;\
     -ms-user-select: none;\
     -moz-user-select: none;\
     -webkit-user-select: none;\
diff --git a/pandora_console/include/javascript/pandora.js b/pandora_console/include/javascript/pandora.js
index 07c90b6355..968d0b006b 100644
--- a/pandora_console/include/javascript/pandora.js
+++ b/pandora_console/include/javascript/pandora.js
@@ -2367,3 +2367,35 @@ function observerInputPassword(name) {
     observer.observe(input, { attributes: true });
   });
 }
+
+function scrollFunction() {
+  if (
+    document.body.scrollTop > 400 ||
+    document.documentElement.scrollTop > 400
+  ) {
+    if (document.getElementById("top_btn")) {
+      document.getElementById("top_btn").style.display = "block";
+    }
+  } else {
+    if (document.getElementById("top_btn")) {
+      document.getElementById("top_btn").style.display = "none";
+    }
+  }
+}
+
+// When the user clicks on the button, scroll to the top of the document.
+function topFunction() {
+  /*
+   * Safari.
+   * document.body.scrollTop = 0;
+   * For Chrome, Firefox, IE and Opera.
+   * document.documentElement.scrollTop = 0;
+   */
+
+  $("HTML, BODY").animate(
+    {
+      scrollTop: 0
+    },
+    500
+  );
+}
diff --git a/pandora_console/include/styles/discovery.css b/pandora_console/include/styles/discovery.css
index 93147f726f..04879e9eda 100644
--- a/pandora_console/include/styles/discovery.css
+++ b/pandora_console/include/styles/discovery.css
@@ -113,7 +113,7 @@ div.arrow_box:before {
 #menu_tab_frame_view_bc {
   display: flex;
   justify-content: space-between;
-  border-bottom: 2px solid #14524f;
+  border-bottom: 2px solid var(--primary-color);
   max-height: 70px;
   min-height: 55px;
   width: 100%;
@@ -150,15 +150,15 @@ span.breadcrumb_link {
 }
 
 .breadcrumb_link.selected {
-  color: #14524f;
+  color: var(--primary-color);
 }
 
 .breadcrumb_link.selected:hover {
-  color: #14524f;
+  color: var(--primary-color);
   text-decoration: none;
 }
 .breadcrumb_link:hover {
-  color: #14524f;
+  color: var(--primary-color);
   text-decoration: none;
 }
 
diff --git a/pandora_console/include/styles/login.css b/pandora_console/include/styles/login.css
index 7c97edefd9..33361436f0 100644
--- a/pandora_console/include/styles/login.css
+++ b/pandora_console/include/styles/login.css
@@ -740,7 +740,7 @@ button.submitButton {
   line-height: 24px;
   box-shadow: 0px 3px 6px #c7c7c7;
   color: #fff;
-  border: 2px solid #14524f;
+  border: 2px solid var(--primary-color);
   border-radius: 8px;
   padding: 0 10px;
   cursor: pointer;
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index e18e0a5c7d..c4e10cbe33 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -27,6 +27,11 @@
  * ============================================================================
  */
 
+:root {
+  --primary-color: #14524f;
+  --secondary-color: #ffffff;
+}
+
 /*
  * ---------------------------------------------------------------------
  * - GENERAL STYLES 												-
@@ -1390,7 +1395,7 @@ div#menu_container {
 div#menu {
   width: 45px;
   float: left;
-  z-index: 2000;
+  z-index: 2;
   position: absolute;
 }
 
@@ -1405,7 +1410,7 @@ div#head {
   min-width: 882px;
   background-color: #fff;
   color: #000;
-  z-index: 1111;
+  z-index: 1;
 }
 
 .fixed_header {
@@ -1762,7 +1767,7 @@ div.title_line {
 #menu_tab_frame_view_bc {
   position: sticky;
   top: 59px;
-  z-index: 1000;
+  z-index: 1;
   display: flex;
   align-items: flex-end;
   justify-content: space-between;
@@ -1811,7 +1816,7 @@ div.title_line {
 }
 
 .breadcrumb_active {
-  color: #14524f;
+  color: var(--primary-color);
   font-size: 10pt;
 }
 
@@ -2058,22 +2063,6 @@ table.databox {
   border-bottom-right-radius: 4px;
 }
 
-.databox.data > thead > tr:first-child > th:first-child {
-  border-left: 1px solid #e2e2e2;
-  border-top-left-radius: 4px;
-  border-color: #373737;
-}
-
-.databox.data > thead > tr:first-child > th:last-child {
-  border-right: 1px solid #e2e2e2;
-  border-top-right-radius: 4px;
-  border-color: #373737;
-}
-
-.databox.data {
-  border: none;
-}
-
 .tabletitle {
   color: #333;
 }
@@ -2774,7 +2763,10 @@ td.cellBig {
   position: fixed;
   top: 120px;
   right: 10px;
-  z-index: 100;
+}
+
+.info_box_container:not(.info_box_information) {
+  z-index: 1;
 }
 
 .info_box_container.info_box_information {
@@ -3844,13 +3836,13 @@ div.div_groups_status {
 }
 
 #menu_tab li:hover {
-  box-shadow: inset 0px 4px #14524f;
+  box-shadow: inset 0px 4px var(--primary-color);
 }
 
 #menu_tab li.nomn_high,
 #menu_tab li.nomn_high span {
   color: #fff;
-  box-shadow: inset 0px 4px #14524f;
+  box-shadow: inset 0px 4px var(--primary-color);
   background-color: #fff;
 }
 
@@ -5128,19 +5120,22 @@ input:checked + .p-slider:before {
   right: 4px;
   border: none;
   outline: none;
-  background: url("../../images/to_top_menu.png") no-repeat center;
-  background-color: #82b92e;
-  width: 27px;
-  height: 27px;
+  transform: rotate(90deg);
+  background-color: #fff;
+  border: 2px solid var(--primary-color);
+  width: 25px;
+  height: 25px;
   cursor: pointer;
   border-radius: 5px;
   z-index: 10;
 }
 
 #top_btn:hover {
-  background: url("../../images/to_top_menu_hover.png") no-repeat center;
-  background-color: #fff;
-  border: 2px solid #82b92e;
+  background-color: var(--primary-color);
+}
+
+#top_btn:hover > svg > g {
+  filter: brightness(0) invert(1);
 }
 
 /* New white rounded boxes */
@@ -9956,8 +9951,8 @@ div#err_msg_centralised {
   font-size: 12px !important;
   padding: 5.5pt 20pt;
   cursor: pointer;
-  color: #14524f !important;
-  border: 2px solid #14524f;
+  color: var(--primary-color) !important;
+  border: 2px solid var(--primary-color);
   box-shadow: none;
   border-radius: 50px;
   align-self: baseline;
@@ -10039,7 +10034,7 @@ input[type="button"],
 input[type="submit"] {
   width: 175px;
   height: 45px;
-  background-color: #14524f;
+  background-color: var(--primary-color);
   box-shadow: 0px 3px 6px #c7c7c7;
   letter-spacing: 0px;
   color: #ffffff;
@@ -10065,8 +10060,8 @@ input[type="submit"].secondary {
   width: 175px;
   height: 45px;
   background-color: #ffffff;
-  border: 2px solid #14524f;
-  color: #14524f;
+  border: 2px solid var(--primary-color);
+  color: var(--primary-color);
 }
 
 input[type="button"].secondary:hover,
@@ -10098,7 +10093,7 @@ button.submitButton {
   line-height: 24px;
   box-shadow: 0px 3px 6px #c7c7c7;
   color: #fff;
-  border: 2px solid #14524f;
+  border: 2px solid var(--primary-color);
   border-radius: 8px;
   padding: 0 10px;
   cursor: pointer;
@@ -10108,7 +10103,7 @@ button.submitButton {
 button.buttonButton.mini,
 button.submitButton.mini {
   height: 32px;
-  border: 2px solid #14524f;
+  border: 2px solid var(--primary-color);
 }
 
 button.buttonButton > div.mini,
@@ -10121,8 +10116,8 @@ button.buttonButton:not(.secondary):not(.link),
 button.submitButton:not(.secondary):not(.link) {
   background: linear-gradient(
     90deg,
-    #14524f 0%,
-    #14524f 49%,
+    var(--primary-color) 0%,
+    var(--primary-color) 49%,
     #1d7873 50%,
     #1d7873 100%
   );
@@ -10300,14 +10295,14 @@ button.submitButton.link-create-item {
 button.buttonButton.secondary,
 button.submitButton.secondary {
   background-color: #fff;
-  color: #14524f;
-  border: 2px solid #14524f;
+  color: var(--primary-color);
+  border: 2px solid var(--primary-color);
   box-shadow: none;
 }
 
 button.buttonButton.secondary > div,
 button.submitButton.secondary > div {
-  background-color: #14524f !important;
+  background-color: var(--primary-color) !important;
 }
 
 button.buttonButton.secondary:hover,
@@ -10335,7 +10330,7 @@ button.submitButton.secondary:active > div {
 button.buttonButton.link,
 button.submitButton.link {
   background-color: rgba(0, 0, 0, 0);
-  color: #14524f;
+  color: var(--primary-color);
   border: 0;
   box-shadow: none;
   justify-content: flex-start;
@@ -10344,7 +10339,7 @@ button.submitButton.link {
 
 button.buttonButton.link > div,
 button.submitButton.link > div {
-  background-color: #14524f !important;
+  background-color: var(--primary-color) !important;
 }
 
 button.buttonButton.link:hover,
@@ -10517,9 +10512,9 @@ button.ui-button-text-only.ui-widget.sub {
 }
 
 button.ui-button.ui-widget.submit-next {
-  background-color: #14524f;
+  background-color: var(--primary-color);
   color: #fff;
-  border: 1px solid #14524f;
+  border: 1px solid var(--primary-color);
 }
 
 button.ui-button.ui-widget.submit-next:hover {
@@ -10534,7 +10529,7 @@ button.ui-button.ui-widget.submit-next:active {
 
 button.ui-button.ui-widget.submit-cancel {
   background-color: #fff;
-  color: #14524f;
+  color: var(--primary-color);
   border: 0;
   box-shadow: none;
 }
@@ -11245,11 +11240,11 @@ span.subsection_header_title.secondary {
   font-size: 15px !important;
   margin-bottom: 5px;
   margin-left: 9px;
-  color: #14524f;
+  color: var(--primary-color);
 }
 
 .table-about h2 span {
-  color: #14524f;
+  color: var(--primary-color);
   font-size: large;
   font-weight: bolder;
 }
diff --git a/pandora_console/include/styles/tables.css b/pandora_console/include/styles/tables.css
index aa4aa05ca2..d7cab7390a 100644
--- a/pandora_console/include/styles/tables.css
+++ b/pandora_console/include/styles/tables.css
@@ -307,12 +307,6 @@ table.dataTable.info_table.no-footer {
   border-bottom: none;
 }
 
-table.dataTable thead th,
-table.dataTable tfoot th {
-  font-size: 11pt;
-  font-weight: inherit !important;
-}
-
 /* Datatables pagination */
 .dataTables_paginate.paging_simple_numbers {
   margin: 2em 0;
@@ -357,7 +351,7 @@ a.pandora_pagination:hover {
 a.pandora_pagination.current,
 a.pandora_pagination.current:hover {
   color: #fff;
-  background-color: #14524f;
+  background-color: var(--primary-color);
 }
 
 /* CSV button datatables */
@@ -492,7 +486,7 @@ a.pandora_pagination.current:hover {
 .section_table_title {
   flex: 0 1 auto;
   font-size: 15px;
-  color: #14524f;
+  color: var(--primary-color);
   font-weight: bold;
   margin: 4px 0 7px;
 }
@@ -502,7 +496,7 @@ a.pandora_pagination.current:hover {
   width: 14px;
   border-radius: 15px;
   height: 3px;
-  background-color: #14524f;
+  background-color: var(--primary-color);
   margin-top: -4px;
   /*box-shadow: inset 1px 1px 1px 1px #1d7873;*/
 }
diff --git a/pandora_console/index.php b/pandora_console/index.php
index c78c4704a2..78de0734b4 100755
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -248,6 +248,8 @@ echo '</head>'."\n";
 require_once 'include/functions_themes.php';
 ob_start('ui_process_page_body');
 
+ui_require_javascript_file('pandora');
+
 $config['remote_addr'] = $_SERVER['REMOTE_ADDR'];
 
 $sec2 = get_parameter_get('sec2');
@@ -1176,8 +1178,7 @@ if ($config['pure'] == 0) {
     echo '<div id="menu">';
 
     include 'general/main_menu.php';
-    echo '</div>';
-    echo '<button onclick="topFunction()" id="top_btn" title="Go to top"></button>';
+    echo html_print_go_top();
 } else {
     echo '<div id="main_pure">';
     // Require menu only to build structure to use it in ACLs.
@@ -1548,33 +1549,6 @@ require 'include/php_to_js_values.php';
         $('.action_buttons_right_content').attr('style', 'left: '+($('#menu_full').width())+'px;');
     }
 
-    function scrollFunction() {
-        if (document.body.scrollTop > 400 || document.documentElement.scrollTop > 400) {
-            if (document.getElementById("top_btn")) {
-                document.getElementById("top_btn").style.display = "block";
-            }
-        } else {
-            if (document.getElementById("top_btn")) {
-                document.getElementById("top_btn").style.display = "none";
-            }
-        }
-    }
-
-    // When the user clicks on the button, scroll to the top of the document.
-    function topFunction() {
-
-        /*
-         * Safari.
-         * document.body.scrollTop = 0;
-         * For Chrome, Firefox, IE and Opera.
-         * document.documentElement.scrollTop = 0; 
-         */
-
-        $("HTML, BODY").animate({
-            scrollTop: 0
-        }, 500);
-    }
-
     function first_time_identification() {
         jQuery.post("ajax.php", {
                 "page": "general/register",
diff --git a/pandora_console/operation/agentes/estado_agente.php b/pandora_console/operation/agentes/estado_agente.php
index cb8b546946..6e7908ae47 100644
--- a/pandora_console/operation/agentes/estado_agente.php
+++ b/pandora_console/operation/agentes/estado_agente.php
@@ -362,42 +362,37 @@ $table->data['search_fields'][1] = html_print_label_input_block(
     )
 );
 
-/*
-    $table->data[1][0] = __('Operating System').'&nbsp;';
-
-    $pre_fields = db_get_all_rows_sql(
+$pre_fields = db_get_all_rows_sql(
     'select distinct(tagente.id_os),tconfig_os.name from tagente,tconfig_os where tagente.id_os = tconfig_os.id_os'
-    );
-    $fields = [];
-
-    foreach ($pre_fields as $key => $value) {
+);
+$fields = [];
+foreach ($pre_fields as $key => $value) {
     $fields[$value['id_os']] = $value['name'];
-    }
+}
 
-    $table->data[1][0] .= html_print_select($fields, 'os', $os, '', 'All', 0, true);
+$table->data[1][0] = html_print_label_input_block(
+    __('Operating System'),
+    html_print_select($fields, 'os', $os, '', 'All', 0, true)
+);
 
-    $table->data[1][1] = __('Policies').'&nbsp;';
-
-    $pre_fields = policies_get_policies(false, ['id', 'name']);
-    $fields = [];
-
-    foreach ($pre_fields as $value) {
+$pre_fields = policies_get_policies(false, ['id', 'name']);
+$fields = [];
+foreach ($pre_fields as $value) {
     $fields[$value['id']] = $value['name'];
-    }
+}
 
-    $table->data[1][1] .= html_print_select($fields, 'policies[]', $policies, '', 'All', 0, true, true);
+$table->data[1][1] = html_print_label_input_block(
+    __('Policies'),
+    html_print_select($fields, 'policies[]', $policies, '', 'All', 0, true, true)
+);
 
-    $table->data[1][2] = __('Search in custom fields').'&nbsp;'.'&nbsp;'.'&nbsp;';
-    $table->data[1][2] .= html_print_input_text('search_custom', $search_custom, '', 15, 255, true);
-
-
-    $custom_fields = db_get_all_fields_in_table('tagent_custom_fields');
-    if ($custom_fields === false) {
+$custom_fields = db_get_all_fields_in_table('tagent_custom_fields');
+if ($custom_fields === false) {
     $custom_fields = [];
-    }
+}
 
-    $div_custom_fields = '<div class="flex-row">';
-    foreach ($custom_fields as $custom_field) {
+$div_custom_fields = '<div class="flex-row">';
+foreach ($custom_fields as $custom_field) {
     $custom_field_value = '';
     if (empty($ag_custom_fields) === false) {
         $custom_field_value = $ag_custom_fields[$custom_field['id_field']];
@@ -426,11 +421,10 @@ $table->data['search_fields'][1] = html_print_label_input_block(
         'div-input'
     );
     $div_custom_fields .= '</div></div>';
-    }
+}
 
-    $table->colspan[2][0] = 7;
-    $table->cellstyle[2][0] = 'padding-left: 10px;';
-    $table->data[2][0] = ui_toggle(
+$table->colspan[2][0] = 2;
+$table->data[2][0] = ui_toggle(
     $div_custom_fields,
     __('Agent custom fields'),
     '',
@@ -440,54 +434,50 @@ $table->data['search_fields'][1] = html_print_label_input_block(
     '',
     'white-box-content',
     'white_table_graph'
-    );
+);
 
 
-    $table->colspan[4][0] = 4;
-    $table->cellstyle[4][0] = 'padding-top: 0px;';
-    $table->data[4][0] = html_print_button(
+
+$buttons = html_print_submit_button(
+    __('Filter'),
+    'srcbutton',
+    false,
+    [
+        'icon' => 'search',
+        'mode' => 'mini',
+    ],
+    true
+);
+
+$buttons .= html_print_button(
     __('Load filter'),
     'load-filter',
     false,
     '',
-    'class="float-left margin-right-2 sub config"',
+    [
+        'icon' => 'load',
+        'mode' => 'mini secondary',
+    ],
     true
-    );
+);
 
-    $table->cellstyle[4][0] .= 'padding-top: 0px;';
-    $table->data[4][0] .= html_print_button(
+$buttons .= html_print_button(
     __('Manage filter'),
     'save-filter',
     false,
     '',
-    'class="float-left margin-right-2 sub wand"',
+    [
+        'icon' => 'wand',
+        'mode' => 'mini secondary',
+    ],
     true
-    );
-
-    $table->cellstyle[4][2] = 'padding-top: 0px;';
-    $table->data[4][2] = html_print_submit_button(
-    __('Search'),
-    'srcbutton',
-    '',
-    ['class' => 'sub search'],
-    true
-    );
-*/
+);
 
 $searchForm .= html_print_table($table, true);
 $searchForm .= html_print_div(
     [
         'class'   => 'action-buttons',
-        'content' => html_print_submit_button(
-            __('Filter'),
-            'srcbutton',
-            false,
-            [
-                'icon' => 'search',
-                'mode' => 'mini',
-            ],
-            true
-        ),
+        'content' => $buttons,
     ],
     true
 );
@@ -1079,7 +1069,7 @@ $tableAgents->head[10] .= ui_get_sorting_arrows($url_up_last_status_change, $url
 $tableAgents->size[10] = '10%';
 
 $tableAgents->head[11] = '<span>'.__('Agent events').'</span>';
-$tableAgents->head[11] = '4%';
+$tableAgents->size[11] = '4%';
 
 $tableAgents->align = [];
 
@@ -1200,7 +1190,7 @@ foreach ($agents as $agent) {
 
     $data[1] = '<span class="'.$custom_font_size.'">'.ui_print_truncate_text($agent['description'], 'description', false, true, true, '[&hellip;]').'</span>';
 
-    $data[12] = '';
+    $data[2] = '';
 
     if (enterprise_installed()) {
         enterprise_include_once('include/functions_config_agents.php');
@@ -1279,9 +1269,6 @@ foreach ($agents as $agent) {
         ]
     ).'</a>';
 
-    // This old code was returning "never" on agents without modules, BAD !!
-    // And does not print outdated agents in red. WRONG !!!!
-    // $data[7] = ui_print_timestamp ($agent_info["last_contact"], true);
     array_push($tableAgents->data, $data);
 }
 
diff --git a/pandora_console/operation/tree.php b/pandora_console/operation/tree.php
index b141f5c091..de219486cb 100755
--- a/pandora_console/operation/tree.php
+++ b/pandora_console/operation/tree.php
@@ -288,8 +288,10 @@ $table->data['agent_row'][] = html_print_label_input_block(
 
 // Button.
 if (is_metaconsole() === true) {
-    $table->data['captions_disabled_row'][] = __('Show only disabled');
-    $table->data['inputs_disabled_row'][] = html_print_checkbox('show_disabled', $show_disabled, false, true);
+    $table->data['captions_disabled_row'][] = html_print_label_input_block(
+        __('Show only disabled'),
+        html_print_checkbox('show_disabled', $show_disabled, false, true)
+    );
 }
 
 if (is_metaconsole() === false) {