diff --git a/pandora_console/godmode/setup/links.php b/pandora_console/godmode/setup/links.php
index f1a5e9fca2..7bd589fe27 100644
--- a/pandora_console/godmode/setup/links.php
+++ b/pandora_console/godmode/setup/links.php
@@ -25,7 +25,20 @@ if (! check_acl($config['id_user'], 0, 'PM') && ! is_user_admin($config['id_user
 }
 
 // Header
-ui_print_page_header(__('Link management'), 'images/extensions.png', false, '', true, '');
+ui_print_standard_header(
+    __('Admin tools'),
+    'images/extensions.png',
+    false,
+    '',
+    true,
+    [],
+    [
+        [
+            'link'  => '',
+            'label' => __('Link management'),
+        ],
+    ]
+);
 
 
 if (isset($_POST['create'])) {
@@ -98,7 +111,7 @@ if ((isset($_GET['form_add'])) or (isset($_GET['form_edit']))) {
         $link = '';
     }
 
-    echo '<table class="databox filters" cellpadding="4" cellspacing="4" width="100%">';
+    echo '<table class="databox filters filter-table-adv max_floating_element_size" cellpadding="4" cellspacing="4" width="100%">';
     echo '<form name="ilink" method="post" action="index.php?sec=gsetup&sec2=godmode/setup/links">';
     if ($creation_mode == 1) {
         echo "<input type='hidden' name='create' value='1'>";
@@ -112,17 +125,42 @@ if ((isset($_GET['form_add'])) or (isset($_GET['form_edit']))) {
     }
 
     echo "'>";
-    echo '<tr>
-	<td class="datos">'.__('Link name').'</td>
-	<td class="datos"><input type="text" class="text_input" name="name" size="50" value="'.$nombre.'"></td>';
-    echo '</tr><tr>
-	<td class="datos2">'.__('Link').'</td>
-	<td class="datos2">
-	<input type="text" class="text_input" name="link" size="50" value="'.$link.'"></td>';
-    echo '</tr>';
+    echo '<tr>';
+    echo '<td class="w50p">';
+    echo html_print_label_input_block(
+        __('Link name'),
+        html_print_input_text(
+            'name',
+            $nombre,
+            '',
+            50,
+            255,
+            true,
+            false,
+            true,
+            '',
+            'text_input'
+        )
+    );
+    echo '</td>';
+    echo '<td class="w50p">';
+    echo html_print_label_input_block(
+        __('Link'),
+        html_print_input_text(
+            'link',
+            $link,
+            '',
+            50,
+            255,
+            true,
+            false,
+            true,
+            '',
+            'text_input'
+        )
+    );
+    echo '</td></tr>';
     echo '</table>';
-    echo "<table width='100%'>";
-    echo "<tr><td align='right'>";
     if (isset($_GET['form_add']) === true) {
         $actionForPerform = __('Create');
         $iconForPerform = 'wand';
@@ -131,16 +169,14 @@ if ((isset($_GET['form_add'])) or (isset($_GET['form_edit']))) {
         $iconForPerform = 'update';
     }
 
-    html_print_div(
-        [
-            'class'   => 'action-buttons',
-            'content' => html_print_submit_button(
-                $actionForPerform,
-                'crtbutton',
-                false,
-                [ 'icon' => $iconForPerform ]
-            ),
-        ],
+    html_print_action_buttons(
+        html_print_submit_button(
+            $actionForPerform,
+            'crtbutton',
+            false,
+            [ 'icon' => $iconForPerform ],
+            true
+        )
     );
 
     echo '</form></td></tr></table>';
@@ -185,16 +221,14 @@ if ((isset($_GET['form_add'])) or (isset($_GET['form_edit']))) {
     echo "<tr><td align='right'>";
     echo "<form method='post' action='index.php?sec=gsetup&sec2=godmode/setup/links&form_add=1'>";
 
-    html_print_div(
-        [
-            'class'   => 'action-buttons',
-            'content' => html_print_submit_button(
-                __('Add'),
-                'form_add',
-                false,
-                [ 'icon' => 'wand' ]
-            ),
-        ],
+    html_print_action_buttons(
+        html_print_submit_button(
+            __('Add'),
+            'form_add',
+            false,
+            [ 'icon' => 'wand' ],
+            true
+        )
     );
 
     echo '</form></table>';
diff --git a/pandora_console/include/class/Diagnostics.class.php b/pandora_console/include/class/Diagnostics.class.php
index 02bec5060d..f7a660f2c4 100644
--- a/pandora_console/include/class/Diagnostics.class.php
+++ b/pandora_console/include/class/Diagnostics.class.php
@@ -155,13 +155,19 @@ class Diagnostics extends Wizard
         ];
 
         // Header.
-        ui_print_page_header(
-            __('%s Diagnostic tool', $this->product_name),
+        ui_print_standard_header(
+            __('Admin tools'),
             'images/gm_massive_operations.png',
             false,
             '',
             true,
-            $header_buttons
+            $header_buttons,
+            [
+                [
+                    'link'  => '',
+                    'label' => __('%s Diagnostic tool', $this->product_name),
+                ],
+            ]
         );
 
         // Print all Methods Diagnostic Info.
@@ -1569,7 +1575,7 @@ class Diagnostics extends Wizard
                         [
                             'id'                  => $tableId,
                             'class'               => 'info_table caption_table',
-                            'style'               => 'width: 100%',
+                            'style'               => 'width: 99%',
                             'columns'             => $columns,
                             'column_names'        => $columnNames,
                             'ajax_data'           => [
diff --git a/pandora_console/include/styles/diagnostics.css b/pandora_console/include/styles/diagnostics.css
index 6591adabff..706038cbd0 100644
--- a/pandora_console/include/styles/diagnostics.css
+++ b/pandora_console/include/styles/diagnostics.css
@@ -8,8 +8,8 @@
   text-align: center;
   font-size: 1.5em;
   font-weight: bolder;
-  color: #fff;
-  background: #282828;
+  color: #000;
+  background: var(--secondary-color);
   padding: 8px;
 }
 
diff --git a/pandora_console/include/styles/omnishell.css b/pandora_console/include/styles/omnishell.css
index 03810e9a89..7d97fdd866 100644
--- a/pandora_console/include/styles/omnishell.css
+++ b/pandora_console/include/styles/omnishell.css
@@ -489,14 +489,6 @@ li > .select2-selection {
   padding: 0px !important;
 }
 
-.box-flat {
-  margin: 20px;
-}
-
-.mrgn_20px {
-  margin: 20px !important;
-}
-
 .omnishell_results_wrapper {
   max-width: 100% !important;
 }
@@ -547,10 +539,6 @@ ul.datatable_filter > li > div.action-buttons > button {
   height: auto !important;
 }
 
-.action_buttons_right_content {
-  padding-left: 20px;
-}
-
 #image-1,
 #image-2 {
   padding-left: 0px !important;
@@ -560,10 +548,6 @@ ul.datatable_filter > li > div.action-buttons > button {
   margin-bottom: 10px !important;
 }
 
-.dataTables_length {
-  margin-bottom: 50px !important;
-}
-
 .item_status_tree_view {
   position: initial;
 }