diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php
index 0c89430122..e1e462a823 100755
--- a/pandora_console/general/login_page.php
+++ b/pandora_console/general/login_page.php
@@ -30,7 +30,7 @@ require_once __DIR__.'/../include/functions_html.php';
 echo '<style>
         :root {';
 if ($config['style'] === 'pandora') {
-    echo '--login-background-color: rgba(255, 255, 255, 0.2);';
+    echo '--login-background-color: rgba(255, 255, 255, 0.4);';
     echo '--login-label-color: #545454;';
     echo '--login-text-color: #000;';
     $style_theme = 'white-theme';
@@ -213,7 +213,7 @@ echo '<div class="login_page">';
 if (is_metaconsole() === true) {
     if (!isset($config['custom_logo_login'])) {
         html_print_image(
-            'enterprise/images/custom_logo_login/login_logo.png',
+            'enterprise/images/custom_logo_login/Pandora-FMS-1.png',
             false,
             [
                 'class'  => 'login_logo',
@@ -238,13 +238,13 @@ if (is_metaconsole() === true) {
     }
 } else if (file_exists(ENTERPRISE_DIR.'/load_enterprise.php')) {
     if (!isset($config['custom_logo_login'])) {
-        html_print_image(ui_get_full_url('enterprise/images/custom_logo_login/login_logo_v7.png'), false, ['class' => 'login_logo', 'alt' => 'logo', 'border' => 0, 'title' => $logo_title], false, true);
+        html_print_image(ui_get_full_url('enterprise/images/custom_logo_login/Pandora-FMS-1.png'), false, ['class' => 'login_logo', 'alt' => 'logo', 'border' => 0, 'title' => $logo_title], false, true);
     } else {
         html_print_image(ui_get_full_url('enterprise/images/custom_logo_login/'.$config['custom_logo_login']), false, ['class' => 'login_logo', 'alt' => 'logo', 'border' => 0, 'title' => $logo_title], false, true);
     }
 } else {
     if (empty($config['custom_logo_login']) === true) {
-        html_print_image(ui_get_full_url('images/custom_logo_login/pandora_logo.png'), false, ['class' => 'login_logo', 'alt' => 'logo', 'border' => 0, 'title' => $logo_title], false, true);
+        html_print_image(ui_get_full_url('images/custom_logo_login/Pandora-FMS-1.png'), false, ['class' => 'login_logo', 'alt' => 'logo', 'border' => 0, 'title' => $logo_title], false, true);
     } else {
         html_print_image(ui_get_full_url('images/custom_logo_login/').$config['custom_logo_login'], false, ['class' => 'login_logo', 'alt' => 'logo', 'border' => 0, 'title' => $logo_title], false, true);
     }
@@ -472,17 +472,19 @@ html_print_csrf_hidden();
     echo '<div class ="img_banner_login">';
 if (file_exists(ENTERPRISE_DIR.'/load_enterprise.php')) {
     if (empty($config['custom_splash_login']) === false && $config['custom_splash_login'] !== 'default') {
-        html_print_image(
-            'enterprise/images/custom_splash_login/'.$config['custom_splash_login'],
-            false,
-            [
-                'class'  => 'splash-logo',
-                'alt'    => 'splash',
-                'border' => 0,
-            ],
-            false,
-            false
-        );
+        if ($config['custom_splash_login'] !== 'none.png') {
+            html_print_image(
+                'enterprise/images/custom_splash_login/'.$config['custom_splash_login'],
+                false,
+                [
+                    'class'  => 'splash-logo',
+                    'alt'    => 'splash',
+                    'border' => 0,
+                ],
+                false,
+                false
+            );
+        }
     } else {
         echo '
                 <div class="loginimg-container">
diff --git a/pandora_console/godmode/agentes/configure_field.php b/pandora_console/godmode/agentes/configure_field.php
index 3e38e5af2b..33aac95ccf 100755
--- a/pandora_console/godmode/agentes/configure_field.php
+++ b/pandora_console/godmode/agentes/configure_field.php
@@ -57,14 +57,33 @@ if ($id_field) {
     $combo_values = $field['combo_values'] ? $field['combo_values'] : '';
     $is_combo_enable = $config['is_combo_enable'];
     $is_link_enabled = $field['is_link_enabled'];
-    ui_print_page_header(__('Update agent custom field'), 'images/custom_field.png', false, '', true, '');
+    $header_title = __('Update agent custom field');
 } else {
-    ui_print_page_header(__('Create agent custom field'), 'images/custom_field.png', false, '', true, '');
+    $header_title = __('Create agent custom field');
 }
 
-$table = new stdClass();
-$table->class = 'databox';
-$table->id = 'configure_field';
+ui_print_standard_header(
+    $header_title,
+    'images/custom_field.png',
+    false,
+    '',
+    true,
+    [],
+    [
+        [
+            'link'  => 'index.php?sec=gagente&sec2=godmode/agentes/fields_manager',
+            'label' => __('Resources'),
+        ],
+        [
+            'link'  => 'index.php?sec=gagente&sec2=godmode/agentes/fields_manager',
+            'label' => __('Custom field'),
+        ],
+        [
+            'link'  => '',
+            'label' => __('Edit'),
+        ],
+    ]
+);
 
 echo "<div id='message_set_password'  title='".__('Agent Custom Fields Information')."' class='invisible'>";
 echo "<p class='center bolder'>".__('You cannot set the Password type until you clear the combo values and click on update button.').'</p>';
@@ -82,80 +101,96 @@ echo "<div id='message_no_set_combo'  title='".__('Agent Custom Fields Informati
 echo "<p class='center bolder'>".__('If you select Passord type the Enabled combo will be disabled.').'</p>';
 echo '</div>';
 
+$table = new stdClass();
+$table->class = 'databox filter-table-adv';
+$table->id = 'configure_field';
+$table->width = '100%';
+$table->size = [];
+$table->size[0] = '50%';
+$table->size[1] = '50%';
 
 $table->data = [];
 
-$table->data[0][0] = __('Name');
-$table->data[1][0] = html_print_input_text(
-    'name',
-    $name,
-    '',
-    35,
-    100,
-    true
+$table->data[0][0] = html_print_label_input_block(
+    __('Name'),
+    html_print_input_text(
+        'name',
+        $name,
+        '',
+        35,
+        100,
+        true
+    )
 );
 
-$table->data[2][0] = __('Pass type').ui_print_help_tip(
-    __('The fields with pass type enabled will be displayed like html input type pass in html'),
-    true
-);
-$table->data[2][1] = __('Display on front').ui_print_help_tip(
-    __('The fields with display on front enabled will be displayed into the agent details'),
-    true
-);
-$table->data[2][2] = __('Link type');
-
-$table->data[3][0] = html_print_checkbox_switch(
-    'is_password_type',
-    1,
-    $is_password_type,
-    true
-);
-$table->data[3][1] = html_print_checkbox_switch(
-    'display_on_front',
-    1,
-    $display_on_front,
-    true
-);
-$table->data[3][2] = html_print_checkbox_switch_extended(
-    'is_link_enabled',
-    1,
-    $is_link_enabled,
-    false,
-    '',
-    '',
-    true
-);
-$table->data[4][0] = __('Enabled combo');
-$table->data[5][0] = html_print_checkbox_switch_extended(
-    'is_combo_enable',
-    0,
-    $config['is_combo_enable'],
-    false,
-    '',
-    '',
-    true
+$table->data[0][1] = html_print_label_input_block(
+    __('Display on front').ui_print_help_tip(
+        __('The fields with display on front enabled will be displayed into the agent details'),
+        true
+    ),
+    html_print_checkbox_switch(
+        'display_on_front',
+        1,
+        $display_on_front,
+        true
+    )
 );
 
-
-$table->cellstyle[4][1] = 'display: none;';
-$table->cellstyle[5][1] = 'display: none;';
-
-$table->data[4][1] = __('Combo values').ui_print_help_tip(
-    __('Set values separated by comma'),
-    true
-);
-$table->data[5][1] = html_print_textarea(
-    'combo_values',
-    3,
-    65,
-    io_safe_output($combo_values),
-    '',
-    true
+$table->data[1][0] = html_print_label_input_block(
+    __('Link type'),
+    html_print_checkbox_switch_extended(
+        'is_link_enabled',
+        1,
+        $is_link_enabled,
+        false,
+        '',
+        '',
+        true
+    )
 );
 
+$table->data[2][0] = html_print_label_input_block(
+    __('Pass type').ui_print_help_tip(
+        __('The fields with pass type enabled will be displayed like html input type pass in html'),
+        true
+    ),
+    html_print_checkbox_switch(
+        'is_password_type',
+        1,
+        $is_password_type,
+        true
+    )
+);
 
-echo '<form name="field" method="post" action="index.php?sec=gagente&sec2=godmode/agentes/fields_manager">';
+$table->data[2][1] = html_print_label_input_block(
+    __('Enabled combo'),
+    html_print_checkbox_switch_extended(
+        'is_combo_enable',
+        0,
+        $config['is_combo_enable'],
+        false,
+        '',
+        '',
+        true
+    )
+);
+
+$table->data[3][0] = html_print_label_input_block(
+    __('Combo values').ui_print_help_tip(
+        __('Set values separated by comma'),
+        true
+    ),
+    html_print_textarea(
+        'combo_values',
+        3,
+        65,
+        io_safe_output($combo_values),
+        '',
+        true
+    )
+);
+
+echo '<form class="max_floating_element_size" name="field" method="post" action="index.php?sec=gagente&sec2=godmode/agentes/fields_manager">';
 html_print_table($table);
 
 if ($id_field > 0) {
@@ -194,65 +229,65 @@ echo '</form>';
 <script>
 $(document).ready (function () {
     if($('input[type=hidden][name=update_field]').val() == 1 && $('#textarea_combo_values').val() != ''){
+        console.log('entra2');
         $('input[type=checkbox][name=is_combo_enable]').prop('checked', true);
-        $('#configure_field-4').show();
+        $('#configure_field-3').show();
+
         $('input[type=checkbox][name=is_password_type]').change(function (e) {
             dialog_message("#message_set_password");
             $('input[type=checkbox][name=is_password_type]').prop('checked', false);
             $('input[type=checkbox][name=is_combo_enable]').prop('checked', true);
-            $('#configure_field-4').show();
+            $('#configure_field-3').show();
             e.preventDefault();
-    });
-    $('input[type=checkbox][name=is_combo_enable]').change(function (e) {
-        if($('#textarea_combo_values').val() != '' &&  $('input[type=checkbox][name=is_combo_enable]').prop('checked', true)){
-            dialog_message("#message_set_combo");
-            $('input[type=checkbox][name=is_combo_enable]').prop('checked', true);
-            $('#configure_field-4').show();
-            e.preventDefault();
-        }
-    });
+        });
+
+        $('input[type=checkbox][name=is_combo_enable]').change(function (e) {
+            if($('#textarea_combo_values').val() != '' &&  $('input[type=checkbox][name=is_combo_enable]').prop('checked', true)){
+                dialog_message("#message_set_combo");
+                $('input[type=checkbox][name=is_combo_enable]').prop('checked', true);
+                $('#configure_field-3').show();
+                e.preventDefault();
+            }
+        });
+    } else {
+        console.log('entra');
+        $('#configure_field-3').hide();
     }
    
     if ($('input[type=checkbox][name=is_link_enabled]').is(":checked") === true) {
-        $('#configure_field-1').hide();
-        $('#configure_field-3').hide();
+        $('#configure_field-2').hide();
     } else {
-        $('#configure_field-1').show();
-        $('#configure_field-3').show();
+        $('#configure_field-2').show();
     }
 
     $('input[type=checkbox][name=is_link_enabled]').change(function () {
         if( $(this).is(":checked") ){
-            $('#configure_field-1').hide();
+            $('#configure_field-2').hide();
             $('#configure_field-3').hide();
         } else{
-            $('#configure_field-1').show();
+            $('#configure_field-2').show();
             $('#configure_field-3').show();
         }
     });
     
     $('input[type=checkbox][name=is_combo_enable]').change(function () {
         if( $(this).is(":checked") ){
-          $('#configure_field-4').show();
+          $('#configure_field-3').show();
           dialog_message("#message_no_set_password");
           $('#configure_field-1').hide();
-          $('#configure_field-5').hide();
         }
         else{
-          $('#configure_field-4').hide();
+          $('#configure_field-3').hide();
           $('#configure_field-1').show();
-          $('#configure_field-5').show();
         }
     });
     $('input[type=checkbox][name=is_password_type]').change(function () {
         if( $(this).is(":checked")){
             dialog_message("#message_no_set_combo");
             $('#configure_field-3').hide();
-            $('#configure_field-5').hide();
         }
         else{
             $('#configure_field-3').show();
-            $('#configure_field-5').show();
         }
     });
 });
diff --git a/pandora_console/godmode/alerts/configure_alert_template.php b/pandora_console/godmode/alerts/configure_alert_template.php
index a1fbde81fa..211b314ea2 100644
--- a/pandora_console/godmode/alerts/configure_alert_template.php
+++ b/pandora_console/godmode/alerts/configure_alert_template.php
@@ -704,6 +704,19 @@ if ($step == 2) {
         )
     );
 
+    $usr_groups = implode(
+        ',',
+        array_keys(users_get_groups($config['id_user'], 'LM', true))
+    );
+
+    $sql_query = sprintf(
+        'SELECT id, name
+        FROM talert_actions
+        WHERE id_group IN (%s)
+        ORDER BY name',
+        $usr_groups
+    );
+
     $table->data[2][1] = html_print_label_input_block(
         __('Default action').ui_print_help_tip(
             __('Unless they\'re left blank, the fields from the action will override those set on the template.'),
@@ -801,19 +814,6 @@ if ($step == 2) {
         )
     );
 
-    $usr_groups = implode(
-        ',',
-        array_keys(users_get_groups($config['id_user'], 'LM', true))
-    );
-
-    $sql_query = sprintf(
-        'SELECT id, name
-        FROM talert_actions
-        WHERE id_group IN (%s)
-        ORDER BY name',
-        $usr_groups
-    );
-
     $table->data[5][0] = html_print_label_input_block(
         __('Condition type'),
         html_print_select(
diff --git a/pandora_console/godmode/groups/group_list.php b/pandora_console/godmode/groups/group_list.php
index 2d3faf11db..c998be494a 100644
--- a/pandora_console/godmode/groups/group_list.php
+++ b/pandora_console/godmode/groups/group_list.php
@@ -445,7 +445,7 @@ if ($is_management_allowed === true
             if ($aviable_name === true) {
                 $values = [
                     'nombre'      => $name,
-                    'icon'        => empty($icon) ? '' : substr($icon, 0, -4),
+                    'icon'        => $icon,
                     'parent'      => $id_parent,
                     'disabled'    => $alerts_disabled,
                     'custom_id'   => $custom_id,
@@ -513,7 +513,7 @@ if ($is_management_allowed === true && $update_group === true) {
             if ($aviable_name === true) {
                 $values = [
                     'nombre'      => $name,
-                    'icon'        => empty($icon) ? '' : substr($icon, 0, -4),
+                    'icon'        => $icon,
                     'parent'      => ($id_parent == -1) ? 0 : $id_parent,
                     'disabled'    => !$alerts_enabled,
                     'custom_id'   => $custom_id,
@@ -741,12 +741,11 @@ if ($is_management_allowed === true
 
 // Credential store is loaded previously in this document to avoid
 // process group tree - list forms.
+ui_print_spinner(__('Loading'));
 if ($tab == 'tree') {
     /*
      * Group tree view.
      */
-
-    ui_print_spinner(__('Loading'));
     echo "<div id='tree-controller-recipient'></div>";
 } else {
     /*
@@ -986,7 +985,7 @@ if ($tab == 'tree') {
             true,
             'offset',
             false,
-            'pagination-bottom'
+            ''
         );
     } else {
         ui_print_info_message(
@@ -1038,6 +1037,7 @@ $tab = 'group_edition';
 
 <script type="text/javascript">
     var treeController = TreeController.getController();
+    treeController.meta = <?php echo (is_metaconsole() === true) ? 1 : 0; ?>;
 
     if (typeof treeController.recipient != 'undefined' && treeController.recipient.length > 0)
             treeController.recipient.empty();
diff --git a/pandora_console/godmode/modules/manage_network_templates.php b/pandora_console/godmode/modules/manage_network_templates.php
index 2940716ee5..4af3f8f7db 100644
--- a/pandora_console/godmode/modules/manage_network_templates.php
+++ b/pandora_console/godmode/modules/manage_network_templates.php
@@ -297,7 +297,7 @@ if (!empty($table->data)) {
     html_print_input_hidden('multiple_delete', 1);
     ui_pagination($count_network_templates, false, $offset);
     html_print_table($table);
-    ui_pagination($count_network_templates, false, $offset, 0, false, 'offset', true, 'pagination-bottom');
+    ui_pagination($count_network_templates, false, $offset, 0, false, 'offset', true, '');
     echo "<div class='pdd_l_5px right'>";
     html_print_submit_button(__('Delete'), 'delete_btn', false, 'class="sub delete"');
     echo '</div>';
diff --git a/pandora_console/godmode/reporting/graphs.php b/pandora_console/godmode/reporting/graphs.php
index 69c203bfb9..ddbbd5bf3e 100644
--- a/pandora_console/godmode/reporting/graphs.php
+++ b/pandora_console/godmode/reporting/graphs.php
@@ -445,7 +445,7 @@ if (!empty($graphs)) {
             echo "<form method='post' action='index.php?sec=reporting&sec2=godmode/reporting/graphs'>";
             html_print_input_hidden('multiple_delete', 1);
             html_print_table($table);
-            ui_pagination(count($graphs), false, 0, 0, false, 'offset', true, 'pagination-bottom');
+            ui_pagination(count($graphs), false, 0, 0, false, 'offset', true, '');
             echo "<div class='right'>";
             html_print_submit_button(__('Delete'), 'delete_btn', false, 'class="sub delete"');
             echo '</form>';
diff --git a/pandora_console/godmode/reporting/visual_console_builder.data.php b/pandora_console/godmode/reporting/visual_console_builder.data.php
index a27eb6ff67..e2a50b4474 100644
--- a/pandora_console/godmode/reporting/visual_console_builder.data.php
+++ b/pandora_console/godmode/reporting/visual_console_builder.data.php
@@ -137,8 +137,6 @@ echo $formHidden;
 $table = new stdClass();
 $table->width = '100%';
 
-
-
 $table->class = 'databox filter-table-adv';
 $table->size = [];
 $table->size[0] = '50%';
diff --git a/pandora_console/godmode/reporting/visual_console_builder.php b/pandora_console/godmode/reporting/visual_console_builder.php
index dfc73b8f67..e543623553 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.php
+++ b/pandora_console/godmode/reporting/visual_console_builder.php
@@ -63,7 +63,7 @@ if (empty($idVisualConsole) === true) {
     $idVisualConsole = get_parameter('id', 0);
 }
 
-if (!defined('METACONSOLE')) {
+if (is_metaconsole() === false) {
     $action_name_parameter = 'action';
 } else {
     $action_name_parameter = 'action2';
@@ -93,7 +93,6 @@ $activeTab = get_parameterBetweenListValues(
     'data'
 );
 
-
 // Visual console creation tab and actions.
 if (empty($idVisualConsole)) {
     $visualConsole = null;
@@ -137,7 +136,6 @@ $refr = (int) get_parameter('refr', $config['vc_refr']);
 
 $id_layout = 0;
 
-
 // Save/Update data in DB
 global $statusProcessInDB;
 if (empty($statusProcessInDB)) {
@@ -798,14 +796,18 @@ if (!defined('METACONSOLE')) {
 $hash = User::generatePublicHash();
 
 $buttons = [];
-
 $buttons['consoles_list'] = [
     'active' => false,
     'text'   => '<a href="index.php?sec=network&sec2=godmode/reporting/map_builder&refr='.$refr.'">'.html_print_image('images/logs@svg.svg', true, ['title' => __('Visual consoles list'), 'class' => 'main_menu_icon invert_filter']).'</a>',
 ];
 $buttons['public_link'] = [
     'active' => false,
-    'text'   => '<a href="'.ui_get_full_url('operation/visual_console/public_console.php?hash='.$hash.'&refr='.$refr.'&id_layout='.$idVisualConsole.'&id_user='.$config['id_user']).'">'.html_print_image('images/item-icon.svg', true, ['title' => __('Show link to public Visual Console'), 'class' => 'main_menu_icon invert_filter']).'</a>',
+    'text'   => '<a href="'.ui_get_full_url(
+        'operation/visual_console/public_console.php?hash='.$hash.'&refr='.$refr.'&id_layout='.$idVisualConsole.'&id_user='.$config['id_user'],
+        false,
+        false,
+        false
+    ).'">'.html_print_image('images/item-icon.svg', true, ['title' => __('Show link to public Visual Console'), 'class' => 'main_menu_icon invert_filter']).'</a>',
 ];
 $buttons['data'] = [
     'active' => false,
diff --git a/pandora_console/godmode/setup/gis.php b/pandora_console/godmode/setup/gis.php
index 57edc19f5c..3838345360 100755
--- a/pandora_console/godmode/setup/gis.php
+++ b/pandora_console/godmode/setup/gis.php
@@ -65,7 +65,7 @@ switch ($action) {
 
 $table = new stdClass();
 $table->class = 'info_table';
-$table->width = '98%';
+$table->width = '100%';
 $table->head[0] = __('Map connection name');
 $table->head[1] = __('Group');
 $table->head[3] = __('Delete');
@@ -84,7 +84,7 @@ if ($mapsConnections !== false) {
             '<a href="index.php?sec=gsetup&sec2=godmode/setup/gis_step_2&amp;action=edit_connection_map&amp;id_connection_map='.$mapsConnection['id_tmap_connection'].'">'.$mapsConnection['conection_name'].'</a>',
             ui_print_group_icon($mapsConnection['group_id'], true),
             '<a href="index.php?sec=gsetup&sec2=godmode/setup/setup&amp;section=gis&amp;id_connection_map='.$mapsConnection['id_tmap_connection'].'&amp;action=delete_connection"
-				onClick="javascript: if (!confirm(\''.__('Do you wan delete this connection?').'\')) return false;">'.html_print_image('images/delete.svg', true, ['class' => 'invert_filter']).'</a>',
+				onClick="javascript: if (!confirm(\''.__('Do you wan delete this connection?').'\')) return false;">'.html_print_image('images/delete.svg', true, ['class' => 'invert_filter main_menu_icon']).'</a>',
         ];
         $table->cellclass[][2] = 'table_action_buttons';
     }
@@ -95,6 +95,14 @@ html_print_table($table);
 echo '<div class="action-buttons" style="width: '.$table->width.'">';
 echo '<form action="index.php?sec=gsetup&sec2=godmode/setup/gis_step_2" method="post">';
 html_print_input_hidden('action', 'create_connection_map');
-html_print_submit_button(__('Create'), '', false, 'class="sub next"');
+html_print_action_buttons(
+    html_print_submit_button(
+        __('Create'),
+        '',
+        false,
+        ['icon' => 'wand'],
+        true
+    )
+);
 echo '</form>';
 echo '</div>';
diff --git a/pandora_console/godmode/setup/os.list.php b/pandora_console/godmode/setup/os.list.php
index 7ec091e04b..0322fe79f1 100644
--- a/pandora_console/godmode/setup/os.list.php
+++ b/pandora_console/godmode/setup/os.list.php
@@ -146,17 +146,41 @@ foreach ($osList as $os) {
     $table->data[] = $data;
 }
 
+$tablePagination = '';
 if (isset($data) === true) {
     html_print_table($table);
-    ui_pagination($count_osList, ui_get_url_refresh(['message' => false]), $offset, 0, false, 'offset', true, 'pagination-bottom');
+    $tablePagination = ui_pagination(
+        $count_osList,
+        ui_get_url_refresh(['message' => false]),
+        $offset,
+        0,
+        true,
+        'offset',
+        false,
+        ''
+    );
 } else {
     ui_print_info_message(['no_close' => true, 'message' => __('There are no defined operating systems') ]);
 }
 
+$buttons = '';
 if (is_metaconsole() === true) {
-    echo '<form method="post" action="index.php?sec=advanced&sec2=advanced/component_management&tab=os_manage&tab2=builder">';
-        echo "<div style='text-align:right;width:".$table->width."'>";
-            html_print_submit_button(__('Create OS'), '', false, 'class="sub next"');
-        echo '</div>';
-    echo '</form>';
+    $buttons .= '<form method="post" action="index.php?sec=advanced&sec2=advanced/component_management&tab=os_manage&tab2=builder">';
+    $buttons .= html_print_submit_button(
+        __('Create OS'),
+        '',
+        false,
+        ['icon' => 'next'],
+        true
+    );
+    $buttons .= '</form>';
 }
+
+html_print_action_buttons(
+    $buttons,
+    [
+        'type'          => 'data_table',
+        'class'         => 'fixed_action_buttons',
+        'right_content' => $tablePagination,
+    ]
+);
diff --git a/pandora_console/godmode/setup/setup_integria.php b/pandora_console/godmode/setup/setup_integria.php
index 9b4770471c..f96391c233 100644
--- a/pandora_console/godmode/setup/setup_integria.php
+++ b/pandora_console/godmode/setup/setup_integria.php
@@ -386,120 +386,132 @@ $table_alert_settings->data = [];
 $table_alert_settings->width = '100%';
 $table_alert_settings->styleTable = 'margin-bottom: 10px;';
 $table_alert_settings->id = 'integria-cr-settings-setup';
-$table_alert_settings->class = 'databox filters';
-$table_alert_settings->size['name'] = '30%';
-$table_alert_settings->style['name'] = 'font-weight: bold';
+$table_alert_settings->class = 'databox filters filter-table-adv';
+$table_alert_settings->size[0] = '50%';
+$table_alert_settings->size[1] = '50%';
 
 // Alert incident title.
 $row = [];
-$row['name'] = __('Title');
-$row['control'] = html_print_input_text(
-    'incident_title',
-    $config['incident_title'],
-    __('Name'),
-    50,
-    100,
-    true,
-    false,
-    false
+$row[0] = html_print_label_input_block(
+    __('Title'),
+    html_print_input_text(
+        'incident_title',
+        $config['incident_title'],
+        __('Name'),
+        50,
+        100,
+        true,
+        false,
+        false
+    )
 );
-$table_alert_settings->data['custom_response_incident_title'] = $row;
 
 // Alert incident description.
-$row = [];
-$row['name'] = __('Ticket body');
-$row['control'] = html_print_textarea(
-    'incident_content',
-    7,
-    25,
-    $config['incident_content'],
-    '',
-    true
+$row[1] = html_print_label_input_block(
+    __('Ticket body'),
+    html_print_textarea(
+        'incident_content',
+        3,
+        25,
+        $config['incident_content'],
+        '',
+        true
+    )
 );
-$table_alert_settings->data['custom_response_incident_content'] = $row;
+$table_alert_settings->data[0] = $row;
 
 // Alert default group.
 $row = [];
-$row['name'] = __('Group');
-$row['control'] = html_print_select(
-    $integria_group_values,
-    'default_group',
-    $config['default_group'],
-    '',
-    __('Select'),
-    0,
-    true,
-    false,
-    true,
-    '',
-    false
+$row[0] = html_print_label_input_block(
+    __('Group'),
+    html_print_select(
+        $integria_group_values,
+        'default_group',
+        $config['default_group'],
+        '',
+        __('Select'),
+        0,
+        true,
+        false,
+        true,
+        '',
+        false
+    )
 );
-$table_alert_settings->data['custom_response_def_group'] = $row;
 
 // Alert default criticity.
-$row = [];
-$row['name'] = __('Priority');
-$row['control'] = html_print_select(
-    $integria_criticity_values,
-    'default_criticity',
-    $config['default_criticity'],
-    '',
-    __('Select'),
-    0,
-    true,
-    false,
-    true,
-    '',
-    false
+$row[1] = html_print_label_input_block(
+    __('Priority'),
+    html_print_select(
+        $integria_criticity_values,
+        'default_criticity',
+        $config['default_criticity'],
+        '',
+        __('Select'),
+        0,
+        true,
+        false,
+        true,
+        '',
+        false
+    )
 );
-$table_alert_settings->data['custom_response_def_criticity'] = $row;
+$table_alert_settings->data[1] = $row;
 
 // Alert default owner.
 $row = [];
-$row['name'] = __('Owner');
-$row['control'] = html_print_autocomplete_users_from_integria(
-    'default_owner',
-    $config['default_owner'],
-    true
+$row[0] = html_print_label_input_block(
+    __('Owner'),
+    html_print_autocomplete_users_from_integria(
+        'default_owner',
+        $config['default_owner'],
+        true,
+        '30',
+        false,
+        false,
+        'w100p'
+    ),
+    ['div_class' => 'inline']
 );
 
-$table_alert_settings->data['custom_response_def_owner'] = $row;
-
 // Alert default incident type.
-$row = [];
-$row['name'] = __('Type');
-$row['control'] = html_print_select(
-    $integria_types_values,
-    'incident_type',
-    $config['incident_type'],
-    '',
-    __('Select'),
-    0,
-    true,
-    false,
-    true,
-    '',
-    false
+$row[1] = html_print_label_input_block(
+    __('Type'),
+    html_print_select(
+        $integria_types_values,
+        'incident_type',
+        $config['incident_type'],
+        '',
+        __('Select'),
+        0,
+        true,
+        false,
+        true,
+        '',
+        false
+    )
 );
-$table_alert_settings->data['custom_response_incident_type'] = $row;
+$table_alert_settings->data[2] = $row;
 
 // Alert default incident status.
 $row = [];
-$row['name'] = __('Status');
-$row['control'] = html_print_select(
-    $integria_status_values,
-    'incident_status',
-    $config['incident_status'],
-    '',
-    __('Select'),
-    0,
-    true,
-    false,
-    true,
-    '',
-    false
+$row[0] = html_print_label_input_block(
+    __('Status'),
+    html_print_select(
+        $integria_status_values,
+        'incident_status',
+        $config['incident_status'],
+        '',
+        __('Select'),
+        0,
+        true,
+        false,
+        true,
+        '',
+        false
+    )
 );
-$table_alert_settings->data['custom_response_incident_status'] = $row;
+$table_alert_settings->data[3] = $row;
 
 // Custom response settings.
 $table_cr_settings = new StdClass();
@@ -507,121 +519,133 @@ $table_cr_settings->data = [];
 $table_cr_settings->width = '100%';
 $table_cr_settings->styleTable = 'margin-bottom: 10px;';
 $table_cr_settings->id = 'integria-cr-settings-setup';
-$table_cr_settings->class = 'databox filters';
-$table_cr_settings->size['name'] = '30%';
-$table_cr_settings->style['name'] = 'font-weight: bold';
+$table_cr_settings->class = 'databox filters filter-table-adv';
+$table_cr_settings->size[0] = '50%';
+$table_cr_settings->size[1] = '50%';
 
 // Custom response incident title.
 $row = [];
-$row['name'] = __('Title');
-$row['control'] = html_print_input_text(
-    'cr_incident_title',
-    $config['cr_incident_title'],
-    __('Name'),
-    50,
-    100,
-    true,
-    false,
-    false
+$row[0] = html_print_label_input_block(
+    __('Title'),
+    html_print_input_text(
+        'cr_incident_title',
+        $config['cr_incident_title'],
+        __('Name'),
+        50,
+        100,
+        true,
+        false,
+        false
+    )
 );
-$table_cr_settings->data['custom_response_incident_title'] = $row;
 
 // Custom response incident description.
-$row = [];
-$row['name'] = __('Ticket body');
-$row['control'] = html_print_textarea(
-    'cr_incident_content',
-    7,
-    25,
-    $config['cr_incident_content'],
-    '',
-    true
+$row[1] = html_print_label_input_block(
+    __('Ticket body'),
+    html_print_textarea(
+        'cr_incident_content',
+        3,
+        25,
+        $config['cr_incident_content'],
+        '',
+        true
+    )
 );
 
-$table_cr_settings->data['custom_response_incident_content'] = $row;
+$table_cr_settings->data[0] = $row;
 
 // Custom response default group.
 $row = [];
-$row['name'] = __('Group');
-$row['control'] = html_print_select(
-    $integria_group_values,
-    'cr_default_group',
-    $config['cr_default_group'],
-    '',
-    __('Select'),
-    0,
-    true,
-    false,
-    true,
-    '',
-    false
+$row[0] = html_print_label_input_block(
+    __('Group'),
+    html_print_select(
+        $integria_group_values,
+        'cr_default_group',
+        $config['cr_default_group'],
+        '',
+        __('Select'),
+        0,
+        true,
+        false,
+        true,
+        '',
+        false
+    )
 );
-$table_cr_settings->data['custom_response_def_group'] = $row;
 
 // Custom response default criticity.
-$row = [];
-$row['name'] = __('Priority');
-$row['control'] = html_print_select(
-    $integria_criticity_values,
-    'cr_default_criticity',
-    $config['cr_default_criticity'],
-    '',
-    __('Select'),
-    0,
-    true,
-    false,
-    true,
-    '',
-    false
+$row[1] = html_print_label_input_block(
+    __('Priority'),
+    html_print_select(
+        $integria_criticity_values,
+        'cr_default_criticity',
+        $config['cr_default_criticity'],
+        '',
+        __('Select'),
+        0,
+        true,
+        false,
+        true,
+        '',
+        false
+    )
 );
-$table_cr_settings->data['custom_response_def_criticity'] = $row;
+$table_cr_settings->data[1] = $row;
 
 // Custom response default owner.
 $row = [];
-$row['name'] = __('Owner');
-$row['control'] = html_print_autocomplete_users_from_integria(
-    'cr_default_owner',
-    $config['cr_default_owner'],
-    true
+$row[0] = html_print_label_input_block(
+    __('Owner'),
+    html_print_autocomplete_users_from_integria(
+        'cr_default_owner',
+        $config['cr_default_owner'],
+        true,
+        '30',
+        false,
+        false,
+        'w100p'
+    ),
+    ['div_class' => 'inline']
 );
 
-$table_cr_settings->data['custom_response_def_owner'] = $row;
-
 // Custom response default incident type.
-$row = [];
-$row['name'] = __('Type');
-$row['control'] = html_print_select(
-    $integria_types_values,
-    'cr_incident_type',
-    $config['cr_incident_type'],
-    '',
-    __('Select'),
-    0,
-    true,
-    false,
-    true,
-    '',
-    false
+$row[1] = html_print_label_input_block(
+    __('Type'),
+    html_print_select(
+        $integria_types_values,
+        'cr_incident_type',
+        $config['cr_incident_type'],
+        '',
+        __('Select'),
+        0,
+        true,
+        false,
+        true,
+        '',
+        false
+    )
 );
-$table_cr_settings->data['custom_response_incident_type'] = $row;
+$table_cr_settings->data[2] = $row;
 
 // Custom response default incident status.
 $row = [];
-$row['name'] = __('Status');
-$row['control'] = html_print_select(
-    $integria_status_values,
-    'cr_incident_status',
-    $config['cr_incident_status'],
-    '',
-    __('Select'),
-    0,
-    true,
-    false,
-    true,
-    '',
-    false
+$row[0] = html_print_label_input_block(
+    __('Status'),
+    html_print_select(
+        $integria_status_values,
+        'cr_incident_status',
+        $config['cr_incident_status'],
+        '',
+        __('Select'),
+        0,
+        true,
+        false,
+        true,
+        '',
+        false
+    )
 );
-$table_cr_settings->data['custom_response_incident_status'] = $row;
+$table_cr_settings->data[3] = $row;
 
 // Test.
 $row = [];
@@ -682,7 +706,7 @@ echo '</div>';
 if ($has_connection != false) {
     // Form alert default settings.
     echo '<div id="form_alert_settings">';
-    echo '<fieldset>';
+    echo '<fieldset class="mrgn_top_15px">';
     echo '<legend>'.__('Alert default values').'&nbsp'.ui_print_help_icon('alert_macros', true).'</legend>';
 
     html_print_table($table_alert_settings);
@@ -692,7 +716,7 @@ if ($has_connection != false) {
 
     // Form custom response default settings.
     echo '<div id="form_custom_response_settings">';
-    echo '<fieldset>';
+    echo '<fieldset class="mrgn_top_15px">';
     echo '<legend>'.__('Event custom response default values').'&nbsp'.ui_print_help_icon('alert_macros', true).'</legend>';
 
     html_print_table($table_cr_settings);
diff --git a/pandora_console/godmode/update_manager/update_manager.history.php b/pandora_console/godmode/update_manager/update_manager.history.php
index 84e1d57897..e4350a3902 100644
--- a/pandora_console/godmode/update_manager/update_manager.history.php
+++ b/pandora_console/godmode/update_manager/update_manager.history.php
@@ -50,7 +50,7 @@ try {
         [
             'id'                  => $tableId,
             'class'               => 'info_table',
-            'style'               => 'width: 100%',
+            'style'               => 'width: 99%',
             'columns'             => $columns,
             'column_names'        => $column_names,
             'ajax_url'            => 'include/ajax/update_manager',
@@ -66,12 +66,13 @@ try {
                     [
                         'label' => __('Free search'),
                         'type'  => 'text',
-                        'class' => 'mw250px',
+                        'class' => 'w400px',
                         'id'    => 'free_search',
                         'name'  => 'free_search',
                     ],
                 ],
             ],
+            'filter_main_class'   => 'box-flat white_table_graph fixed_filter_bar ',
         ]
     );
 } catch (Exception $e) {
diff --git a/pandora_console/godmode/update_manager/update_manager.setup.php b/pandora_console/godmode/update_manager/update_manager.setup.php
index e3ca9f4958..d0faaa92f6 100644
--- a/pandora_console/godmode/update_manager/update_manager.setup.php
+++ b/pandora_console/godmode/update_manager/update_manager.setup.php
@@ -256,133 +256,158 @@ if ((bool) is_metaconsole() === true) {
     );
 }
 
-echo '<form method="post" action="'.$action.'">';
+echo '<form method="post" action="'.$action.'" class="max_floating_element_size">';
 html_print_input_hidden('update_config', 1);
 
 $table = new stdClass();
 $table->width = '100%';
-$table->class = 'databox filters';
-
-$i = 0;
-$table->style[$i] = 'font-weight: bolder;width:250px';
+$table->class = 'databox filters filter-table-adv';
+$table->size[0] = '50%';
+$table->size[1] = '50%';
 
 $url_update_manager = update_manager_get_url();
 
-$table->data[$i][0] = __('Warp Update URL');
-$table->data[$i++][1] = html_print_input_text(
-    'url_update_manager',
-    $url_update_manager,
-    __('URL update manager'),
-    80,
-    255,
-    true,
-    true
+$table->data[0][0] = html_print_label_input_block(
+    __('Warp Update URL'),
+    html_print_input_text(
+        'url_update_manager',
+        $url_update_manager,
+        __('URL update manager'),
+        80,
+        255,
+        true,
+        true
+    )
 );
 
-$table->data[$i][0] = __('Use secured Warp Update');
-$table->data[$i++][1] = html_print_input(
-    [
-        'type'  => 'switch',
-        'name'  => 'secure_update_manager',
-        'value' => ($secure_update_manager ?? 1),
-    ]
+$table->data[0][1] = html_print_label_input_block(
+    __('Use secured Warp Update'),
+    html_print_input(
+        [
+            'type'  => 'switch',
+            'name'  => 'secure_update_manager',
+            'value' => ($secure_update_manager ?? 1),
+        ]
+    )
 );
 
-$table->data[$i][0] = __('Proxy server');
-$table->data[$i++][1] = html_print_input_text(
-    'update_manager_proxy_server',
-    $update_manager_proxy_server,
+$table->data[1][0] = html_print_label_input_block(
     __('Proxy server'),
-    80,
-    60,
-    true
+    html_print_input_text(
+        'update_manager_proxy_server',
+        $update_manager_proxy_server,
+        __('Proxy server'),
+        80,
+        60,
+        true
+    )
 );
 
-$table->data[$i][0] = __('Proxy port');
-$table->data[$i++][1] = html_print_input_text(
-    'update_manager_proxy_port',
-    $update_manager_proxy_port,
+$table->data[1][1] = html_print_label_input_block(
     __('Proxy port'),
-    80,
-    60,
-    true
+    html_print_input_text(
+        'update_manager_proxy_port',
+        $update_manager_proxy_port,
+        __('Proxy port'),
+        80,
+        60,
+        true
+    )
 );
 
-$table->data[$i][0] = __('Proxy user');
-$table->data[$i++][1] = html_print_input_text(
-    'update_manager_proxy_user',
-    $update_manager_proxy_user,
+$table->data[2][0] = html_print_label_input_block(
     __('Proxy user'),
-    80,
-    60,
-    true
+    html_print_input_text(
+        'update_manager_proxy_user',
+        $update_manager_proxy_user,
+        __('Proxy user'),
+        80,
+        60,
+        true
+    )
 );
 
-$table->data[$i][0] = __('Proxy password');
-$table->data[$i++][1] = html_print_input_password(
-    'update_manager_proxy_password',
-    $update_manager_proxy_password,
+$table->data[2][1] = html_print_label_input_block(
     __('Proxy password'),
-    80,
-    60,
-    true
+    html_print_input_password(
+        'update_manager_proxy_password',
+        $update_manager_proxy_password,
+        __('Proxy password'),
+        80,
+        60,
+        true
+    )
 );
 
-$table->data[$i][0] = __('Allow no-consecutive patches');
-$table->data[$i++][1] = html_print_switch(
-    [
-        'name'   => 'allow_offline_patches',
-        'value'  => $allow_offline_patches,
-        'return' => true,
-    ]
+$table->data[3][0] = html_print_label_input_block(
+    __('Allow no-consecutive patches'),
+    html_print_switch(
+        [
+            'name'   => 'allow_offline_patches',
+            'value'  => $allow_offline_patches,
+            'return' => true,
+        ]
+    )
 );
 
-$table->data[$i][0] = __('Limit to LTS updates');
-$table->data[$i++][1] = html_print_switch(
-    [
-        'name'   => 'lts_updates',
-        'value'  => $lts_updates,
-        'return' => true,
-    ]
+$table->data[3][1] = html_print_label_input_block(
+    __('Limit to LTS updates'),
+    html_print_switch(
+        [
+            'name'   => 'lts_updates',
+            'value'  => $lts_updates,
+            'return' => true,
+        ]
+    )
 );
 
-
-$table->data[$i][0] = __('Registration ID');
-$table->data[$i++][1] = '<i>'.($config['pandora_uid'] ?? __('Not registred yet')).'</i>';
+$table->data[4][0] = html_print_label_input_block(
+    __('Registration ID'),
+    '<i>'.($config['pandora_uid'] ?? __('Not registred yet')).'</i>'
+);
 
 if (update_manager_verify_registration() === true && users_is_admin()) {
-    $table->data[$i][0] = __('Cancel registration');
-    $table->data[$i][1] = '<a href="';
+    $url = '<a href="';
     if ((bool) is_metaconsole() === true) {
-        $table->data[$i][1] .= ui_get_full_url(
+        $url .= ui_get_full_url(
             'index.php?sec=advanced&sec2=advanced/metasetup&pure=0&tab=update_manager_setup&um_disconnect_console=1'
         );
     } else {
-        $table->data[$i][1] .= ui_get_full_url(
+        $url .= ui_get_full_url(
             'index.php?sec=messages&sec2=godmode/update_manager/update_manager&tab=setup&um_disconnect_console=1'
         );
     }
 
-    $table->data[$i++][1] .= '" onclick="if(confirm(\'Are you sure?\')) {return true;} else { return false; }">'.__('Unregister').'</a>';
+    $url .= '" onclick="if(confirm(\'Are you sure?\')) {return true;} else { return false; }">'.__('Unregister').'</a>';
+
+    $table->data[4][1] = html_print_label_input_block(
+        __('Cancel registration'),
+        $url
+    );
 }
 
 if (license_free()) {
     $config['identification_reminder'] = isset($config['identification_reminder']) ? $config['identification_reminder'] : 1;
-    $table->data[$i][0] = __('%s community reminder', get_product_name()).ui_print_help_tip(__('Every 8 days, a message is displayed to admin users to remember to register this %s instance', get_product_name()), true);
-    $table->data[$i][1] = __('Yes').'&nbsp;&nbsp;&nbsp;'.html_print_radio_button('identification_reminder', 1, '', $config['identification_reminder'], true).'&nbsp;&nbsp;';
-    $table->data[$i++][1] .= __('No').'&nbsp;&nbsp;&nbsp;'.html_print_radio_button('identification_reminder', 0, '', $config['identification_reminder'], true);
+
+    $table->data[4][1] = html_print_label_input_block(
+        __('%s community reminder', get_product_name()).ui_print_help_tip(__('Every 8 days, a message is displayed to admin users to remember to register this %s instance', get_product_name()), true),
+        '<div class="inline-radio-button">
+        '.__('Yes').html_print_radio_button('realtimestats', 1, '', $config['realtimestats'], true).'&nbsp;&nbsp;
+        '.__('No').html_print_radio_button('realtimestats', 0, '', $config['realtimestats'], true).'</div>'
+    );
 }
 
 html_print_input_hidden('action_update_url_update_manager', 1);
 html_print_input_hidden('update_config', 1);
 html_print_table($table);
 
-echo '<div class="action-buttons" style="width: '.$table->width.'">';
-html_print_submit_button(
-    __('Update'),
-    'update_button',
-    false,
-    'class="sub upd"'
+html_print_action_buttons(
+    html_print_submit_button(
+        __('Update'),
+        'update_button',
+        false,
+        ['icon' => 'wand'],
+        true
+    )
 );
-echo '</div>';
 echo '</form>';
diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php
index dff6666611..751bca96a9 100644
--- a/pandora_console/godmode/users/configure_user.php
+++ b/pandora_console/godmode/users/configure_user.php
@@ -393,6 +393,7 @@ if ($create_user === true) {
     $values['default_event_filter'] = (int) get_parameter('default_event_filter');
     $values['default_custom_view'] = (int) get_parameter('default_custom_view');
     $values['time_autorefresh'] = (int) get_parameter('time_autorefresh', 0);
+    $values['show_tips_startup'] = (int) get_parameter_switch('show_tips_startup');
     $dashboard = get_parameter('dashboard', '');
     $visual_console = get_parameter('visual_console', '');
 
diff --git a/pandora_console/images/custom_logo_login/Pandora-FMS-1.png b/pandora_console/images/custom_logo_login/Pandora-FMS-1.png
new file mode 100644
index 0000000000..91b80c7b73
Binary files /dev/null and b/pandora_console/images/custom_logo_login/Pandora-FMS-1.png differ
diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php
index 30b84be44f..e079369b3a 100755
--- a/pandora_console/include/ajax/module.php
+++ b/pandora_console/include/ajax/module.php
@@ -1390,7 +1390,7 @@ if (check_login()) {
                     false,
                     'offset',
                     true,
-                    'pagination-bottom',
+                    '',
                     'pagination_list_modules(offset_param)',
                     [
                         'count'  => '',
@@ -1692,6 +1692,18 @@ if (check_login()) {
             $where = 'tagente_modulo.nombre LIKE "%%'.$search.'%%" AND ';
         }
 
+        if (str_contains($status, '6') === true) {
+            $expl = explode(',', $status);
+            $exist = array_search('6', $expl);
+            if (isset($exist) === true) {
+                unset($expl[$exist]);
+            }
+
+            array_push($expl, '1', '2');
+
+            $status = implode(',', $expl);
+        }
+
         $where .= sprintf(
             'tagente_estado.estado IN (%s)
             AND tagente_modulo.delete_pending = 0',
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index 571a572b22..1f0a7692ac 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -2565,7 +2565,7 @@ function config_process_config()
     }
 
     if (!isset($config['custom_logo_login'])) {
-        config_update_value('custom_logo_login', 'login_logo_v7.png');
+        config_update_value('custom_logo_login', 'Pandora-FMS-1.png');
     }
 
     if (!isset($config['custom_splash_login'])) {
@@ -2629,7 +2629,7 @@ function config_process_config()
     }
 
     if (!isset($config['background_opacity'])) {
-        config_update_value('background_opacity', 30);
+        config_update_value('background_opacity', 20);
     }
 
     if (!isset($config['meta_background_opacity'])) {
@@ -2649,7 +2649,7 @@ function config_process_config()
     }
 
     if (!isset($config['meta_custom_logo_login'])) {
-        config_update_value('meta_custom_logo_login', 'pandora_logo.png');
+        config_update_value('meta_custom_logo_login', 'Pandora-FMS-1.png');
     }
 
     if (!isset($config['meta_custom_splash_login'])) {
diff --git a/pandora_console/include/functions_filemanager.php b/pandora_console/include/functions_filemanager.php
index 0012804398..66f60967c7 100644
--- a/pandora_console/include/functions_filemanager.php
+++ b/pandora_console/include/functions_filemanager.php
@@ -626,7 +626,7 @@ function filemanager_file_explorer(
         $table->width = '100%';
         $table->id = 'table_filemanager';
 
-        $table->class = (is_metaconsole() === true) ? 'databox_tactical' : 'info_table';
+        $table->class = 'info_table';
         $table->title = '<span>'.__('Index of %s', $relative_directory).'</span>';
         $table->colspan = [];
         $table->data = [];
@@ -751,7 +751,7 @@ function filemanager_file_explorer(
                 && ($readOnly === false)
             ) {
                 $data[4] .= '<form method="post" action="'.$url.'" style="">';
-                $data[4] .= '<input type="image" style="margin-top: 2px;height:21px" class="invert_filter" src="images/delete.svg" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">';
+                $data[4] .= '<input type="image" style="margin-top: 2px;height:21px" class="invert_filter main_menu_icon" src="../../images/delete.svg" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">';
                 $data[4] .= html_print_input_hidden('filename', $fileinfo['realpath'], true);
                 $data[4] .= html_print_input_hidden('hash', md5($fileinfo['realpath'].$config['server_unique_identifier']), true);
                 $data[4] .= html_print_input_hidden('delete_file', 1, true);
@@ -896,7 +896,7 @@ function filemanager_file_explorer(
                 $uploadFileElements .= html_print_input_hidden('upload_file', 1, true);
             }
 
-            $uploadFileElements .= html_print_submit_button(__('Go'), 'go', false, [ 'class' => 'submitButton', 'style' => 'float:right', 'icon' => 'next'], true);
+            $uploadFileElements .= html_print_submit_button(__('Go'), 'go', false, [ 'class' => 'submitButton', 'style' => 'float:right; margin-top: 10px;', 'icon' => 'next'], true);
             $uploadFileElements .= html_print_input_hidden('real_directory', $real_directory, true);
             $uploadFileElements .= html_print_input_hidden('directory', $relative_directory, true);
             $uploadFileElements .= html_print_input_hidden('hash', md5($real_directory.$relative_directory.$config['server_unique_identifier']), true);
diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index 49db1aea24..a1b12f1ff3 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -4788,13 +4788,16 @@ function html_print_input_file($name, $return=false, $options=false)
         if (isset($options['accept']) === true) {
             $output .= ' accept="'.$options['accept'].'"';
         }
+
+        $label = '';
+        if (isset($options['label']) === true) {
+            $label = $options['label'];
+        }
     }
 
     // Close input.
     $output .= '/>';
-    if (is_metaconsole() === false) {
-        $output .= ($options['caption'] ?? __('Select a file'));
-    }
+    $output .= ($options['caption'] ?? __('Select a file'));
 
     $output .= '</label>';
     $output .= '<span class="inputFileSpan" id="span-'.$name.'">&nbsp;</span>';
diff --git a/pandora_console/include/functions_menu.php b/pandora_console/include/functions_menu.php
index 14c43a5c14..1e8dfca576 100644
--- a/pandora_console/include/functions_menu.php
+++ b/pandora_console/include/functions_menu.php
@@ -68,6 +68,11 @@ function menu_print_menu(&$menu)
         $sec2 = 'godmode/alerts/alert_commands';
     } else if ($sec2 === 'enterprise/godmode/setup/edit_skin') {
         $sec2 = 'enterprise/godmode/setup/setup_skins';
+    } else if ($sec2 === 'operation/gis_maps/render_view') {
+        $map_id = (int) get_parameter('map_id');
+        if (empty($map_id) === false) {
+            $sec2 .= '&map_id='.$map_id;
+        }
     } else if ($sec2 === 'godmode/servers/discovery') {
         $wiz = (string) get_parameter('wiz');
         $sec2 = 'godmode/servers/discovery&wiz='.$wiz;
diff --git a/pandora_console/include/functions_treeview.php b/pandora_console/include/functions_treeview.php
index f2323fd13c..0b212eb8aa 100755
--- a/pandora_console/include/functions_treeview.php
+++ b/pandora_console/include/functions_treeview.php
@@ -946,6 +946,20 @@ function treeview_printTable($id_agente, $server_data=[], $no_head=false)
             function widthGraph () {
                 var parentWidth = $('.max-graph-tree-view').parent().width();
                 $('.max-graph-tree-view').children().width(parentWidth + 5);
+                
+                $('<input>').attr({
+                    type: 'hidden',
+                    id: 'graph-counter',
+                    value: 1
+                }).appendTo('#container');
+
+                
+                if ($('#graph-counter').val() == 1) {
+                    $('.max-graph-tree-view div.flot-x-axis').css('inset', '-25px').css('margin-top', '10px').css('margin-left', '10px');
+                    $('.max-graph-tree-view canvas.flot-base').css('height', '85px');
+                    $('#graph-counter').val(2);
+                }
+
             }
 
         </script>";
diff --git a/pandora_console/include/javascript/tree/TreeController.js b/pandora_console/include/javascript/tree/TreeController.js
index 07fe111027..5282cf58e4 100644
--- a/pandora_console/include/javascript/tree/TreeController.js
+++ b/pandora_console/include/javascript/tree/TreeController.js
@@ -652,10 +652,15 @@ var TreeController = {
                 typeof element.icon != "undefined" &&
                 element.icon.length > 0
               ) {
+                console.log("a");
+                console.log(controller);
                 $content.append(
                   '<div class="node-icon"><div class="node-icon-container"><img src="' +
                     (controller.baseURL.length > 0 ? controller.baseURL : "") +
-                    "images/" +
+                    (treeController.meta != undefined &&
+                    treeController.meta == 1
+                      ? "../../images/"
+                      : "images/") +
                     element.icon +
                     '" class="invert_filter"/></div></div>'
                 );
@@ -679,7 +684,10 @@ var TreeController = {
                 var $deleteBtn = $(
                   '<a style="float: right; margin-top: 5px;"><img src="' +
                     (controller.baseURL.length > 0 ? controller.baseURL : "") +
-                    'images/delete.svg" class="main_menu_icon invert_filter" style="width:18px; padding: 0 5px;"/></a>'
+                    (controller.meta != undefined && controller.meta == 1
+                      ? "../../images/"
+                      : "images/") +
+                    'delete.svg" class="main_menu_icon invert_filter" style="width:18px; padding: 0 5px;"/></a>'
                 );
                 $deleteBtn.click(function(event) {
                   var ok_function = function() {
@@ -703,7 +711,10 @@ var TreeController = {
                 var $updateicon = $(
                   '<img src="' +
                     (controller.baseURL.length > 0 ? controller.baseURL : "") +
-                    'images/edit.svg" class="main_menu_icon invert_filter" style="width:18px; padding: 0 5px;"/>'
+                    (controller.meta != undefined && controller.meta == 1
+                      ? "../../images/"
+                      : "images/") +
+                    'edit.svg" class="main_menu_icon invert_filter" style="width:18px; padding: 0 5px;"/>'
                 );
                 var $updatebtn = $(
                   '<a style="float: right; margin-top: 5px;" href = "' +
diff --git a/pandora_console/include/lib/Dashboard/Manager.php b/pandora_console/include/lib/Dashboard/Manager.php
index db8235681a..6e2f9a00d8 100644
--- a/pandora_console/include/lib/Dashboard/Manager.php
+++ b/pandora_console/include/lib/Dashboard/Manager.php
@@ -474,7 +474,7 @@ class Manager implements PublicLogin
                 "SELECT *
                 FROM tdashboard
                 WHERE id = %d
-                AND (id_group IN (%s) AND id_user = '') OR id_user = '%s'",
+                AND ((id_group IN (%s) AND id_user = '') OR id_user = '%s')",
                 $this->dashboardId,
                 $this->stringGroups,
                 $config['id_user']
@@ -1047,6 +1047,7 @@ class Manager implements PublicLogin
                     'hash'           => self::generatePublicHash(),
                     'publicLink'     => $this->publicLink,
                     'dashboardGroup' => $this->dashboardFields['id_group'],
+                    'dashboardUser'  => $this->dashboardFields['id_user'],
                 ]
             );
         } else {
diff --git a/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php b/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php
index 2944663135..53d996607c 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php
@@ -269,7 +269,6 @@ class ModulesByStatus extends Widget
                 'selected'   => $status_selected,
                 'return'     => true,
                 'multiple'   => true,
-                'class'      => 'overflow-hidden',
                 'size'       => count($status_fields),
                 'select_all' => false,
                 'required'   => true,
@@ -488,6 +487,18 @@ class ModulesByStatus extends Widget
             $where = 'tagente_modulo.nombre LIKE "%%'.$search.'%%" AND ';
         }
 
+        if (str_contains($status, '6') === true) {
+            $expl = explode(',', $status);
+            $exist = array_search('6', $expl);
+            if (isset($exist) === true) {
+                unset($expl[$exist]);
+            }
+
+            array_push($expl, '1', '2');
+
+            $status = implode(',', $expl);
+        }
+
         $where .= sprintf(
             'tagente_estado.estado IN (%s)
             AND tagente_modulo.delete_pending = 0',
diff --git a/pandora_console/include/styles/login.css b/pandora_console/include/styles/login.css
index c08d4a0908..4a4ae6f037 100644
--- a/pandora_console/include/styles/login.css
+++ b/pandora_console/include/styles/login.css
@@ -68,7 +68,7 @@ div#login_f {
 
 #ver_num {
   width: 100%;
-  color: #dddddd;
+  color: #fff;
   text-align: center;
   font-weight: 350;
   font-size: 10px;
diff --git a/pandora_console/include/styles/menu.css b/pandora_console/include/styles/menu.css
index 9038aee34b..037d6361c0 100644
--- a/pandora_console/include/styles/menu.css
+++ b/pandora_console/include/styles/menu.css
@@ -530,15 +530,6 @@ ul li {
   width: 35px;
 }
 
-/* Menu height: 601px, 720px, 735px */
-@media screen and (max-height: 750px) {
-  .menu li,
-  .menu li a,
-  .menu li div {
-    min-height: 28px;
-  }
-}
-
 @media screen and (max-height: 750px) {
   .operation {
     padding-top: 10px;
diff --git a/pandora_console/operation/agentes/interface_view.functions.php b/pandora_console/operation/agentes/interface_view.functions.php
index 27e4e0a3e9..6c8d746053 100644
--- a/pandora_console/operation/agentes/interface_view.functions.php
+++ b/pandora_console/operation/agentes/interface_view.functions.php
@@ -791,7 +791,7 @@ function print_table(
         html_print_table($table);
 
         if (count($selected_interfaces) > $config['block_size']) {
-            ui_pagination(count($selected_interfaces), false, $pagination_index, 0, false, 'offset', true, 'pagination-bottom');
+            ui_pagination(count($selected_interfaces), false, $pagination_index, 0, false, 'offset', true, '');
         }
     } else {
             ui_print_info_message(['no_close' => true, 'message' => __('No search parameters')]);
diff --git a/pandora_console/operation/gis_maps/gis_map.php b/pandora_console/operation/gis_maps/gis_map.php
index 4a9f56dd7a..5c615bef61 100644
--- a/pandora_console/operation/gis_maps/gis_map.php
+++ b/pandora_console/operation/gis_maps/gis_map.php
@@ -21,23 +21,35 @@ global $config;
 
 require_once 'include/functions_gis.php';
 
-// ui_require_javascript_file('openlayers.pandora');
 $buttons['gis_maps_list'] = [
     'active' => true,
     'text'   => '<a href="index.php?sec=godgismaps&sec2=operation/gis_maps/gis_map">'.html_print_image(
-        'images/list.png',
+        'images/logs@svg.svg',
         true,
-        ['title' => __('GIS Maps list')]
+        [
+            'title' => __('GIS Maps list'),
+            'class' => 'main_menu_icon invert_filter',
+        ]
     ).'</a>',
 ];
 
-ui_print_page_header(
+ui_print_standard_header(
     __('GIS Maps'),
     'images/op_gis.png',
     false,
     '',
     false,
-    $buttons
+    $buttons,
+    [
+        [
+            'link'  => '',
+            'label' => __('Topology maps'),
+        ],
+        [
+            'link'  => '',
+            'label' => __('GIS Maps'),
+        ],
+    ]
 );
 
 $own_info = get_user_info($config['id_user']);
diff --git a/pandora_console/operation/gis_maps/render_view.php b/pandora_console/operation/gis_maps/render_view.php
index 6ecb1ed6a4..5db4c1ea41 100644
--- a/pandora_console/operation/gis_maps/render_view.php
+++ b/pandora_console/operation/gis_maps/render_view.php
@@ -116,33 +116,34 @@ $controls = [
 
 $layers = gis_get_layers($idMap);
 
-// Render map
+// Render map.
 $has_management_acl = check_acl_restricted_all($config['id_user'], $map['group_id'], 'MW')
     || check_acl_restricted_all($config['id_user'], $map['group_id'], 'MM');
 
 $buttons = [];
 
 $buttons['gis_maps_list'] = [
-    'text' => '<a href="index.php?sec=godgismaps&sec2=operation/gis_maps/gis_map">'.html_print_image(
-        'images/list.png',
+    'active' => false,
+    'text'   => '<a href="index.php?sec=godgismaps&sec2=operation/gis_maps/gis_map">'.html_print_image(
+        'images/logs@svg.svg',
         true,
         [
             'title' => __('GIS Maps list'),
-            'class' => 'invert_filter',
+            'class' => 'main_menu_icon invert_filter',
         ]
     ).'</a>',
 ];
 if ($config['pure'] == 0) {
-    $buttons[]['text'] = '<a href="index.php?sec=gismaps&amp;sec2=operation/gis_maps/render_view&amp;map_id='.$idMap.'&amp;refr='.((int) get_parameter('refr', 0)).'&amp;pure=1">'.html_print_image('images/full_screen.png', true, ['title' => __('Full screen mode'), 'class' => 'invert_filter']).'</a>';
+    $buttons[]['text'] = '<a href="index.php?sec=gismaps&amp;sec2=operation/gis_maps/render_view&amp;map_id='.$idMap.'&amp;refr='.((int) get_parameter('refr', 0)).'&amp;pure=1">'.html_print_image('images/fullscreen@svg.svg', true, ['title' => __('Full screen mode'), 'class' => 'main_menu_icon invert_filter']).'</a>';
 } else {
-    $buttons[]['text'] = '<a href="index.php?sec=gismaps&amp;sec2=operation/gis_maps/render_view&amp;map_id='.$idMap.'&amp;refr='.((int) get_parameter('refr', 0)).'">'.html_print_image('images/normalscreen.png', true, ['title' => __('Back to normal mode'), 'class' => 'invert_filter']).'</a>';
+    $buttons[]['text'] = '<a href="index.php?sec=gismaps&amp;sec2=operation/gis_maps/render_view&amp;map_id='.$idMap.'&amp;refr='.((int) get_parameter('refr', 0)).'">'.html_print_image('images/exit_fullscreen@svg.svg', true, ['title' => __('Back to normal mode'), 'class' => 'main_menu_icon invert_filter']).'</a>';
 }
 
-if ($has_management_acl) {
+if ($has_management_acl === true) {
     $hash = md5($config['dbpass'].$idMap.$config['id_user']);
     $buttons['public_link']['text'] = '<a href="'.ui_get_full_url(
         'operation/gis_maps/public_console.php?hash='.$hash.'&map_id='.$idMap.'&id_user='.$config['id_user']
-    ).'" target="_blank">'.html_print_image('images/camera_mc.png', true, ['title' => __('Show link to public GIS map'), 'class' => 'invert_filter']).'</a>';
+    ).'" target="_blank">'.html_print_image('images/item-icon.svg', true, ['title' => __('Show link to public GIS map'), 'class' => 'main_menu_icon invert_filter']).'</a>';
 }
 
 $times = [
@@ -170,17 +171,27 @@ $status = [
 $buttons[]['text'] = "<div class='mrgn_top_6px'>".__('Filter by status').': '.html_print_select($status, 'show_status', 'all', 'changeShowStatus(this.value);', '', 0, true, false, false).'</div>';
 
 if ($has_management_acl) {
-    $buttons['setup']['text'] = '<a href="index.php?sec=godgismaps&sec2=godmode/gis_maps/configure_gis_map&action=edit_map&map_id='.$idMap.'">'.html_print_image('images/setup.png', true, ['title' => __('Setup'), 'class' => 'invert_filter']).'</a>';
+    $buttons['setup']['text'] = '<a href="index.php?sec=godgismaps&sec2=godmode/gis_maps/configure_gis_map&action=edit_map&map_id='.$idMap.'">'.html_print_image('images/configuration@svg.svg', true, ['title' => __('Setup'), 'class' => 'main_menu_icon invert_filter']).'</a>';
     $buttons['setup']['godmode'] = 1;
 }
 
-ui_print_page_header(
+ui_print_standard_header(
     __('Map').' &raquo; '.__('Map').'&nbsp;'.$map['map_name'],
     'images/op_gis.png',
     false,
-    'render_view_tab',
+    '',
     false,
-    $buttons
+    $buttons,
+    [
+        [
+            'link'  => '',
+            'label' => __('Topology maps'),
+        ],
+        [
+            'link'  => '',
+            'label' => __('GIS Maps'),
+        ],
+    ]
 );
 
 $map_inline_style = 'width: 100%; min-height:500px; height: calc(100vh - 80px);';
diff --git a/pandora_console/operation/incidents/list_integriaims_incidents.php b/pandora_console/operation/incidents/list_integriaims_incidents.php
index f28c7a271d..c179ecef86 100644
--- a/pandora_console/operation/incidents/list_integriaims_incidents.php
+++ b/pandora_console/operation/incidents/list_integriaims_incidents.php
@@ -643,7 +643,7 @@ if (empty($table->data) === true) {
         true,
         'offset',
         false,
-        'pagination-bottom'
+        ''
     );
 }
 
diff --git a/pandora_console/operation/menu.php b/pandora_console/operation/menu.php
index b9e2d2d714..11472b54a1 100644
--- a/pandora_console/operation/menu.php
+++ b/pandora_console/operation/menu.php
@@ -411,7 +411,7 @@ if ($access_console_node === true) {
         // INI GIS Maps.
         if ($config['activate_gis']) {
             $sub['gismaps']['text'] = __('GIS Maps');
-            $sub['gismaps']['id'] = 'GIS Maps';
+            $sub['gismaps']['id'] = 'GIS_Maps';
             $sub['gismaps']['type'] = 'direct';
             $sub['gismaps']['subtype'] = 'nolink';
             $sub2 = [];
diff --git a/pandora_console/operation/visual_console/view.php b/pandora_console/operation/visual_console/view.php
index fde52505d1..6c3214b95a 100644
--- a/pandora_console/operation/visual_console/view.php
+++ b/pandora_console/operation/visual_console/view.php
@@ -141,12 +141,15 @@ if ($aclWrite === true || $aclManage === true) {
         'edit'
     );
 
-    $baseUrl = 'index.php?sec=network&sec2=godmode/reporting/visual_console_builder&action='.$action;
+    $baseUrl = 'index.php?sec=network&sec2=godmode/reporting/visual_console_builder&'.((is_metaconsole() === true) ? 'action2' : 'action').'='.$action;
 
     $hash = md5($config['dbpass'].$visualConsoleId.$config['id_user']);
 
     $options['public_link']['text'] = '<a href="'.ui_get_full_url(
-        'operation/visual_console/public_console.php?hash='.$hash.'&id_layout='.$visualConsoleId.'&refr='.$refr.'&id_user='.$config['id_user']
+        'operation/visual_console/public_console.php?hash='.$hash.'&id_layout='.$visualConsoleId.'&refr='.$refr.'&id_user='.$config['id_user'],
+        false,
+        false,
+        false
     ).'" target="_blank">'.html_print_image(
         'images/item-icon.svg',
         true,
diff --git a/pandora_console/views/dashboard/header.php b/pandora_console/views/dashboard/header.php
index 26f588b5ea..b8e4cadb17 100644
--- a/pandora_console/views/dashboard/header.php
+++ b/pandora_console/views/dashboard/header.php
@@ -260,7 +260,7 @@ if (isset($config['public_dashboard']) === true
         }
     }
 } else {
-    if (check_acl_restricted_all($config['id_user'], $dashboardGroup, 'RW') === 0) {
+    if ($dashboardUser !== $config['id_user'] && check_acl_restricted_all($config['id_user'], $dashboardGroup, 'RW') === 0) {
         $buttons = [
             'back_to_dashboard_list' => $back_to_dashboard_list,
             'fullscreen'             => $fullscreen,
diff --git a/pandora_console/views/dashboard/list.php b/pandora_console/views/dashboard/list.php
index da902709b8..ef86f50d5b 100644
--- a/pandora_console/views/dashboard/list.php
+++ b/pandora_console/views/dashboard/list.php
@@ -212,7 +212,7 @@ if (empty($dashboards) === true) {
         true,
         'offset',
         false,
-        'pagination-bottom'
+        ''
     );
 }