diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php
index c6c31191a6..42cd794ada 100755
--- a/pandora_console/include/ajax/module.php
+++ b/pandora_console/include/ajax/module.php
@@ -800,6 +800,7 @@ if (check_login()) {
 
         $table = new stdClass();
         $table->width = '100%';
+        $table->styleTable = 'border: 0;border-radius: 0;';
         $table->cellpadding = 0;
         $table->cellspacing = 0;
         $table->class = 'info_table';
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index b6faa9c8cf..84b3206bdf 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -2783,15 +2783,15 @@ function ui_toggle(
     }
 
     // Link to toggle.
-    $output = '';
-    $output .= '<a href="javascript:" id="tgl_ctrl_'.$uniqid.'">'.html_print_image(
+    $output = '<div class="white_table_graph">';
+    $output .= '<div class="white_table_graph_header" id="tgl_ctrl_'.$uniqid.'">'.html_print_image(
         $original,
         true,
         [
             'title' => $title,
             'id'    => 'image_'.$uniqid,
         ]
-    ).'&nbsp;&nbsp;<b>'.$name.'</b></a>';
+    ).'&nbsp;&nbsp;<b>'.$name.'</b></div>';
     // $output .= '<br />';
     // if (!defined("METACONSOLE"))
         // $output .= '<br />';
@@ -2820,6 +2820,7 @@ function ui_toggle(
     $output .= "	});\n";
     $output .= '/* ]]> */';
     $output .= '</script>';
+    $output .= '</div>';
 
     if (!$return) {
         echo $output;
diff --git a/pandora_console/include/styles/js/cluetip.css b/pandora_console/include/styles/js/cluetip.css
index dea766762b..233dbf3cbb 100644
--- a/pandora_console/include/styles/js/cluetip.css
+++ b/pandora_console/include/styles/js/cluetip.css
@@ -13,7 +13,7 @@
   width: 43px;
   height: 11px;
   position: absolute;
-  background-image: url(../../images/wait.gif);
+  background-image: url(../../../images/wait.gif);
 }
 .cluetip-arrows {
   display: none;
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 531eaf7b9f..2276ee5c3d 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -5166,15 +5166,22 @@ table.info_table {
   background-color: #fff;
   margin-bottom: 10px;
   border-spacing: 0;
+  border-collapse: collapse;
+  overflow: hidden;
+  border-radius: 5px;
 }
 
+table.info_table tr,
+table.info_table th,
+table.info_table td {
+  border: 1px solid #e2e2e2;
+}
 table.info_table > tbody > tr:nth-child(even) {
   background-color: #f5f5f5;
 }
 
 table.info_table tr:first-child > th {
   background-color: #fff;
-  border-top: 1px solid #e2e2e2;
   color: #000;
   text-align: left;
   vertical-align: middle;
@@ -5187,25 +5194,25 @@ table.info_table th {
   background-color: #fff;
 }
 
-table.info_table > thead > tr > th:first-child {
-  border-left: 1px solid #e2e2e2;
-}
-
-table.info_table > thead > tr > th:last-child {
-  border-right: 1px solid #e2e2e2;
-}
-
 table.info_table tr th {
   border-bottom: 1px solid #e2e2e2;
 }
 
+/* Radius top */
+table.info_table > thead > tr:first-child > th:first-child {
+  border-top-left-radius: 4px;
+}
 table.info_table > thead > tr:first-child > th:last-child {
   border-top-right-radius: 4px;
 }
 
-table.info_table > thead > tr:first-child > th:first-child {
+/* Radius bottom */
+table.info_table > tbody > tr:last-child > td:first-child {
   border-top-left-radius: 4px;
 }
+table.info_table > tbody > tr:last-child > td:last-child {
+  border-top-right-radius: 4px;
+}
 
 table.info_table > thead > tr > th,
 table.info_table > tbody > tr > th,
@@ -5219,6 +5226,10 @@ table.info_table > thead > tr > th a {
   font-size: 8.6pt;
 }
 
+table.info_table > tbody > tr {
+  border-bottom: 1px solid #e2e2e2;
+}
+
 table.info_table > tbody > tr > td {
   -moz-border-radius: 0px;
   -webkit-border-radius: 0px;
@@ -5228,23 +5239,6 @@ table.info_table > tbody > tr > td {
   padding-right: 9px;
   padding-top: 7px;
   padding-bottom: 7px;
-  border-bottom: 1px solid #e2e2e2;
-}
-
-table.info_table > tbody > tr:last-child > td:first-child {
-  border-bottom-left-radius: 4px;
-}
-
-table.info_table > tbody > tr > td:first-child {
-  border-left: 1px solid #e2e2e2;
-}
-
-table.info_table > tbody > tr:last-child > td:last-child {
-  border-bottom-right-radius: 4px;
-}
-
-table.info_table > tbody > tr > td:last-child {
-  border-right: 1px solid #e2e2e2;
 }
 
 table.info_table > tbody > tr > td > img,
@@ -5942,13 +5936,14 @@ a#qr_code_agent_view {
 }
 
 div#bullets_modules {
-  display: inline-block;
+  display: flex;
   margin-left: 2em;
 }
 
 div#bullets_modules div {
-  display: inline-block;
-  margin: 0 0.5em;
+  display: flex;
+  align-items: center;
+  margin: 0 5px;
 }
 
 .orange_background {
@@ -5986,27 +5981,22 @@ div#bullets_modules div {
   border: 1px solid #e2e2e2;
   border-radius: 5px;
   flex: 0 1 auto;
-  margin: 5px auto;
 }
 
 .agent_details_col_left {
   width: 35%;
-  min-width: 390px;
+  min-width: 470px;
 }
 .agent_details_col_right {
   width: 64%;
   min-width: 455px;
 }
-@media screen and (max-width: 1400px) {
+@media screen and (max-width: 1600px) {
   .agent_details_col {
     flex: 1 1 auto;
   }
 }
 
-.agent_details_bullets {
-  padding-bottom: 2em;
-}
-
 .buttons_agent_view {
   display: flex;
   justify-content: flex-end;
@@ -6023,7 +6013,10 @@ div#bullets_modules div {
 
 /* Agent details in agent view */
 div#status_pie path {
-  stroke-width: 15px !important;
+  stroke-width: 8px !important;
+}
+div#status_pie {
+  margin-bottom: 2em;
 }
 
 .agent_details_header {
@@ -6038,6 +6031,7 @@ div#status_pie path {
   display: flex;
   align-items: center;
   padding: 20px;
+  padding-bottom: 10px;
 }
 
 .agent_details_agent_name {
@@ -6056,13 +6050,15 @@ div#status_pie path {
 
 .agent_details_info {
   max-width: 45%;
+  overflow: hidden;
+}
+.agent_details_info span {
+  text-overflow: ellipsis;
 }
 
 .agent_details_info p {
   display: flex;
   align-items: center;
-  padding-left: 5px;
-  padding-right: 5px;
 }
 
 .agent_details_info img {
@@ -6101,6 +6097,9 @@ div#status_pie path {
   font-weight: bold;
 }
 
+.white_table_graph_header div#bullets_modules {
+  float: right;
+}
 .white_table_graph_header img,
 .white_table_graph_header span {
   vertical-align: middle;
@@ -6119,6 +6118,12 @@ div#status_pie path {
   border-bottom-right-radius: 4px;
   display: flex;
   align-items: center;
+  flex-wrap: wrap;
+}
+
+div.white_table_graph_content div.pagination {
+  width: 100%;
+  padding: 0 1em;
 }
 
 /* White tables */
@@ -6147,10 +6152,6 @@ div#status_pie path {
   padding-top: 25px;
 }
 
-.white_table tbody tr:last-child td {
-  padding-bottom: 25px;
-}
-
 .white_table tr td:first-child,
 .white_table tr th:first-child {
   padding-left: 50px;
diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php
index 86d84ec9c7..2f1346f958 100755
--- a/pandora_console/operation/agentes/estado_generalagente.php
+++ b/pandora_console/operation/agentes/estado_generalagente.php
@@ -406,8 +406,6 @@ if ($agent['url_address'] != '') {
     if ($agent['url_address'] != '') {
         $data_opcional[] = '<a href='.$agent['url_address'].'>'.$agent['url_address'].'</a>';
     }
-
-        array_push($data_opcional);
 }
 
 
@@ -418,8 +416,6 @@ if (!empty($addresses)) {
     if (!empty($addresses)) {
         $data_opcional[] = '<div style="overflow-y: scroll;">'.implode('<br>', $addresses).'</div>';
     }
-
-     array_push($data_opcional);
 }
 
 // Timezone Offset.
@@ -428,8 +424,6 @@ if ($agent['timezone_offset'] != 0) {
     if ($agent['timezone_offset'] != 0) {
         $data_opcional[] = $agent['timezone_offset'];
     }
-
-    array_push($data_opcional);
 }
 
 
diff --git a/pandora_console/operation/agentes/estado_monitores.php b/pandora_console/operation/agentes/estado_monitores.php
index a7c2cb6578..c3f9a0d433 100755
--- a/pandora_console/operation/agentes/estado_monitores.php
+++ b/pandora_console/operation/agentes/estado_monitores.php
@@ -147,44 +147,42 @@ $sort_field = get_parameter('sort_field', 'name');
 $sort = get_parameter('sort', 'up');
 
 
-echo "<h4 style='padding-top:0px !important;'>";
-
-echo ui_print_help_tip(
-    __('To see the list of modules paginated, enable this option in the Styles Configuration.'),
-    true
-);
-echo '<span>'.__('Full list of monitors').'</span>';
-echo reporting_tiny_stats(
-    $agent,
-    true,
-    'modules',
-    ':',
-    true
-);
-
 $modules_not_init = agents_monitor_notinit($id_agente);
 if (!empty($modules_not_init)) {
     echo clippy_context_help('modules_not_init');
 }
 
-echo '</h4>';
-
-
 ob_start();
 
-print_form_filter_monitors($id_agente, $status_filter_monitor, $status_text_monitor, $status_hierachy_mode);
+print_form_filter_monitors(
+    $id_agente,
+    $status_filter_monitor,
+    $status_text_monitor,
+    $status_hierachy_mode
+);
 
-echo "<div id='module_list_loading'>".html_print_image('images/spinner.gif', true).'</div>';
-echo "<div id='module_list'>".'</div>';
+echo '<div class="white_table_graph_content" id="module_list_loading">'.html_print_image('images/spinner.gif', true).'</div>';
+echo '<div class="white_table_graph_content" style="padding: 0;" id="module_list"></div>';
 
 $html_toggle = ob_get_clean();
+
 ui_toggle(
     $html_toggle,
-    __('List of modules'),
+    __('List of modules').ui_print_help_tip(
+        __('To see the list of modules paginated, enable this option in the Styles Configuration.'),
+        true
+    ).reporting_tiny_stats(
+        $agent,
+        true,
+        'modules',
+        ':',
+        true
+    ),
     'status_monitor_agent',
     false
 );
 
+
 ?>
 <script type="text/javascript">
     var sort_field = '<?php echo $sort_field; ?>';
@@ -493,7 +491,8 @@ function print_form_filter_monitors(
 ) {
     $form_text = '';
     $table = new stdClass();
-    $table->class = 'databox filters';
+    $table->class = 'info_table';
+    $table->styleTable = 'width: 100%;border-radius: 0;padding: 0;margin: 0;margin-top: -1px;';
     $table->width = '100%';
     $table->style[0] = 'font-weight: bold;';
     $table->style[2] = 'font-weight: bold;';