diff --git a/pandora_console/extensions/files_repo.php b/pandora_console/extensions/files_repo.php
index 0313af90b2..656c3377c7 100644
--- a/pandora_console/extensions/files_repo.php
+++ b/pandora_console/extensions/files_repo.php
@@ -115,11 +115,11 @@ function pandora_files_repo_godmode()
     }
 
     // Header tabs.
-    $godmode['text'] = '<a href="index.php?sec=godmode/extensions&sec2=extensions/files_repo">'.html_print_image('images/setup.png', true, ['title' => __('Administration view'), 'class' => 'invert_filter']).'</a>';
+    $godmode['text'] = '<a href="index.php?sec=godmode/extensions&sec2=extensions/files_repo">'.html_print_image('images/configuration@svg.svg', true, ['title' => __('Administration view'), 'class' => 'main_menu_icon invert_filter']).'</a>';
     $godmode['godmode'] = 1;
     $godmode['active'] = 1;
 
-    $operation['text'] = '<a href="index.php?sec=extensions&sec2=extensions/files_repo">'.html_print_image('images/eye_show.png', true, ['title' => __('Operation view'), 'class' => 'invert_filter']).'</a>';
+    $operation['text'] = '<a href="index.php?sec=extensions&sec2=extensions/files_repo">'.html_print_image('images/see-details@svg.svg', true, ['title' => __('Operation view'), 'class' => 'main_menu_icon invert_filter']).'</a>';
     $operation['operation'] = 1;
 
     $onheader = [
@@ -226,10 +226,10 @@ function pandora_files_repo_operation()
     // Header tabs.
     $onheader = [];
     if (check_acl($config['id_user'], 0, 'PM')) {
-        $godmode['text'] = '<a href="index.php?sec=godmode/extensions&sec2=extensions/files_repo">'.html_print_image('images/setup.png', true, ['title' => __('Administration view'), 'class' => 'invert_filter']).'</a>';
+        $godmode['text'] = '<a href="index.php?sec=godmode/extensions&sec2=extensions/files_repo">'.html_print_image('images/configuration@svg.svg', true, ['title' => __('Administration view'), 'class' => 'main_menu_icon invert_filter']).'</a>';
         $godmode['godmode'] = 1;
 
-        $operation['text'] = '<a href="index.php?sec=extensions&sec2=extensions/files_repo">'.html_print_image('images/eye_show.png', true, ['title' => __('Operation view'), 'class' => 'invert_filter']).'</a>';
+        $operation['text'] = '<a href="index.php?sec=extensions&sec2=extensions/files_repo">'.html_print_image('images/see-details@svg.svg', true, ['title' => __('Operation view'), 'class' => 'main_menu_icon invert_filter']).'</a>';
         $operation['operation'] = 1;
         $operation['active'] = 1;
 
diff --git a/pandora_console/extensions/files_repo/files_repo_list.php b/pandora_console/extensions/files_repo/files_repo_list.php
index 6c75218d18..2cb464eec3 100644
--- a/pandora_console/extensions/files_repo/files_repo_list.php
+++ b/pandora_console/extensions/files_repo/files_repo_list.php
@@ -133,9 +133,12 @@ if (!empty($files)) {
             );
             $data[4] .= "<a href=\"$config_url\">";
             $data[4] .= html_print_image(
-                'images/config.png',
+                'images/edit.svg',
                 true,
-                ['title' => __('Edit')]
+                [
+                    'title' => __('Edit'),
+                    'class' => 'main_menu_icon invert_filter',
+                ]
             );
             // Edit image
             $data[4] .= '</a>';
@@ -145,11 +148,11 @@ if (!empty($files)) {
             );
             $data[4] .= " <a href=\"$delete_url\" onClick=\"if (!confirm('".__('Are you sure?')."')) return false;\">";
             $data[4] .= html_print_image(
-                'images/cross.png',
+                'images/delete.svg',
                 true,
                 [
                     'title' => __('Delete'),
-                    'class' => 'invert_filter',
+                    'class' => 'main_menu_icon invert_filter',
                 ]
             );
             // Delete image
diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php
index 81526eb129..40f6c3a382 100644
--- a/pandora_console/general/header.php
+++ b/pandora_console/general/header.php
@@ -117,6 +117,7 @@ echo sprintf('<div id="header_table" class="header_table_%s">', $menuTypeClass);
                 }
             }
 
+            $search_bar .= '<div id="result_order" class="result_order"></div>';
             $search_bar .= '<input id="keywords" name="keywords"';
             if (!isset($config['search_keywords'])) {
                 $search_bar .= "value='".__('Enter keywords to search')."'";
@@ -126,15 +127,11 @@ echo sprintf('<div id="header_table" class="header_table_%s">', $menuTypeClass);
                 $search_bar .= "value='".$config['search_keywords']."'";
             }
 
-            $search_bar .= 'type="search" onfocus="javascript: if (fieldKeyWordEmpty) $(\'#keywords\').val(\'\');"
-                    onkeyup="showinterpreter()" class="search_input"/>';
+            $search_bar .= 'type="search" onfocus="javascript: if (fieldKeyWordEmpty) $(\'#keywords\').val(\'\');" onkeyup="showinterpreter()" class="search_input"/>';
 
-
-            $search_bar .= '<div id="result_order" class="result_order"></div>';
             // $search_bar .= 'onClick="javascript: document.quicksearch.submit()"';
             $search_bar .= "<input type='hidden' name='head_search_keywords' value='abc' />";
             $search_bar .= '</form>';
-
             $header_searchbar = '<div id="header_searchbar">'.$search_bar.'</div>';
         }
 
diff --git a/pandora_console/godmode/agentes/fields_manager.php b/pandora_console/godmode/agentes/fields_manager.php
index ed5f2dcd68..aed5bc69a3 100644
--- a/pandora_console/godmode/agentes/fields_manager.php
+++ b/pandora_console/godmode/agentes/fields_manager.php
@@ -174,7 +174,7 @@ foreach ($fields as $field) {
     $data[1] = $field['name'];
 
     $data[2] = html_print_image(
-        ((bool) $field['display_on_front'] === true) ? 'images/validate.svg' : 'images/icono_stop.png',
+        ((bool) $field['display_on_front'] === true) ? 'images/validate.svg' : 'images/fail@svg.svg',
         true,
         ['class' => 'main_menu_icon invert_filter']
     );
diff --git a/pandora_console/godmode/agentes/inventory_manager.php b/pandora_console/godmode/agentes/inventory_manager.php
index b8d8014545..42984caeda 100644
--- a/pandora_console/godmode/agentes/inventory_manager.php
+++ b/pandora_console/godmode/agentes/inventory_manager.php
@@ -235,7 +235,7 @@ if (db_get_num_rows($sql) == 0) {
         if ($id_policy) {
             $policy = policies_get_policy($id_policy);
             $data[0] = '<a href="index.php?sec=gmodules&sec2='.ENTERPRISE_DIR.'/godmode/policies/policies&id='.$id_policy.'">';
-            $data[0] .= html_print_image('images/policies_mc.png', true, ['border' => '0', 'title' => $policy['name']]);
+            $data[0] .= html_print_image('images/policy@svg.svg', true, ['border' => '0', 'title' => $policy['name'], 'class' => 'main_menu_icon invert_filter']);
             $data[0] .= '</a>';
         } else {
             $data[0] = '';
@@ -247,15 +247,15 @@ if (db_get_num_rows($sql) == 0) {
         $data[4] = human_time_description_raw($row['interval']);
         // Delete module
         $data[5] = '<a href="index.php?sec=estado&sec2=godmode/agentes/configurar_agente&tab=inventory&id_agente='.$id_agente.'&delete_inventory_module='.$row['id_agent_module_inventory'].'" onClick="if (!confirm(\''.__('Are you sure?').'\')) return false;">';
-        $data[5] .= html_print_image('images/cross.png', true, ['border' => '0', 'title' => __('Delete'), 'class' => 'invert_filter']);
+        $data[5] .= html_print_image('images/delete.svg', true, ['border' => '0', 'title' => __('Delete'), 'class' => 'main_menu_icon invert_filter']);
         $data[5] .= '</b></a>&nbsp;&nbsp;';
         // Update module
         $data[5] .= '<a href="index.php?sec=estado&sec2=godmode/agentes/configurar_agente&tab=inventory&id_agente='.$id_agente.'&load_inventory_module='.$row['id_module_inventory'].'">';
-        $data[5] .= html_print_image('images/config.png', true, ['border' => '0', 'title' => __('Update'), 'class' => 'invert_filter']);
+        $data[5] .= html_print_image('images/edit.svg', true, ['border' => '0', 'title' => __('Update'), 'class' => 'main_menu_icon invert_filter']);
         $data[5] .= '</b></a>&nbsp;&nbsp;';
         // Force refresh module
         $data[5] .= '<a href="index.php?sec=estado&sec2=godmode/agentes/configurar_agente&tab=inventory&id_agente='.$id_agente.'&force_inventory_module='.$row['id_agent_module_inventory'].'">';
-        $data[5] .= html_print_image('images/target.png', true, ['border' => '0', 'title' => __('Force'), 'class' => 'invert_filter']).'</b></a>';
+        $data[5] .= html_print_image('images/change-active.svg', true, ['border' => '0', 'title' => __('Force'), 'class' => 'main_menu_icon invert_filter']).'</b></a>';
         array_push($table->data, $data);
     }
 
diff --git a/pandora_console/godmode/agentes/module_manager_editor_common.php b/pandora_console/godmode/agentes/module_manager_editor_common.php
index 085afcb455..2cceb5fa34 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_common.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_common.php
@@ -290,7 +290,7 @@ $table_simple->rowclass['captions_module_n_type'] = 'field_half_width pdd_t_10px
 $table_simple->rowclass['module_n_type'] = 'field_half_width';
 $table_simple->data['captions_module_n_type'][0] = html_print_input_hidden('id_module_type_hidden', $id_module_type, true);
 $table_simple->data['captions_module_n_type'][0] .= __('Module group');
-$table_simple->data['captions_module_n_type'][1] = __('Type').ui_print_help_icon($help_type, true, '', 'images/help_green.png', '', 'module_type_help');
+$table_simple->data['captions_module_n_type'][1] = __('Type').ui_print_help_icon($help_type, true, '', '', '', 'module_type_help');
 // Module group and Type.
 $table_simple->rowclass['module_n_type'] = 'field_half_width';
 $table_simple->data['module_n_type'][0] .= html_print_select_from_sql(
@@ -1437,7 +1437,7 @@ if (isset($module_macros)) {
             $table_macros->data[$macro_count][2] = __('Value');
             $table_macros->data[$macro_count][3] = html_print_input_text('module_macro_values[]', $macro_value, '', 50, 60, true, $disabledBecauseInPolicy, false, '', $classdisabledBecauseInPolicy);
             if (!$disabledBecauseInPolicy) {
-                $table_macros->data[$macro_count][4] = '<a href="javascript: delete_macro('.$macro_count.');">'.html_print_image('images/cross.png', true, ['class' => 'invert_filter']).'</a>';
+                $table_macros->data[$macro_count][4] = '<a href="javascript: delete_macro('.$macro_count.');">'.html_print_image('images/delete.svg', true, ['class' => 'main_menu_icon invert_filter']).'</a>';
             }
 
             $macro_count++;
@@ -1446,7 +1446,7 @@ if (isset($module_macros)) {
 }
 
 if (!$disabledBecauseInPolicy) {
-    $table_macros->data[$macro_count][0] = '<span>'.__('Custom macros').'</span> <a href="javascript:add_macro();">'.html_print_image('images/add.png', true, ['class' => 'invert_filter']).'</a>';
+    $table_macros->data[$macro_count][0] = '<span>'.__('Custom macros').'</span> <a href="javascript:add_macro();">'.html_print_image('images/fail@svg.svg', true, ['style' => 'rotate:45deg', 'class' => 'main_menu_icon invert_filter']).'</a>';
 
     $table_macros->colspan[$macro_count][0] = 5;
 }
@@ -1535,14 +1535,15 @@ $table_relations->data[-1][1] = '';
 $table_relations->data[-1][2] = '';
 $table_relations->data[-1][3] = '<a id="disable_updates_button" class="alpha50" href="">';
 $table_relations->data[-1][3] .= html_print_image(
-    'images/lock_mc.png',
-    true
+    'images/policy@svg.svg',
+    true,
+    ['class' => 'main_menu_icon invert_filter']
 ).'</a>';
 $table_relations->data[-1][4] = '<a id="delete_relation_button" href="">';
 $table_relations->data[-1][4] .= html_print_image(
-    'images/cross.png',
+    'images/delete.svg',
     true,
-    ['class' => 'invert_filter']
+    ['class' => 'main_menu_icon invert_filter']
 ).'</a>';
 
 
@@ -1598,15 +1599,15 @@ if ($id_agent_module) {
         $table_relations->data[$relations_count][2] = ($module_relation['type'] === 'direct') ? __('Direct') : __('Failover');
         // Lock relationship updates.
         $table_relations->data[$relations_count][3] = '<a id="disable_updates_button" class="'.$disabled_update_class.'"href="javascript: change_lock_relation('.$relations_count.', '.$module_relation['id'].');">'.html_print_image(
-            'images/lock_mc.png',
+            'images/policy@svg.svg',
             true,
-            ['class' => 'invert_filter']
+            ['class' => 'main_menu_icon invert_filter']
         ).'</a>';
         // Delete relationship.
         $table_relations->data[$relations_count][4] = '<a id="delete_relation_button" href="javascript: delete_relation('.$relations_count.', '.$module_relation['id'].');">'.html_print_image(
-            'images/cross.png',
+            'images/delete.svg',
             true,
-            ['class' => 'invert_filter']
+            ['class' => 'main_menu_icon invert_filter']
         ).'</a>';
         $relations_count++;
     }
@@ -2035,7 +2036,7 @@ function change_modules_autocomplete_input () {
     var id_agent = parseInt($("#hidden-autocomplete_id_agent").val());
     var module_autocomplete = $("#module_autocomplete");
     var load_icon = '<?php html_print_image('images/spinner.gif', false); ?>';
-    var error_icon = '<?php html_print_image('images/error_red.png', false); ?>';
+    var error_icon = '<?php html_print_image('images/error-red@svg.svg', false, ['class' => 'main_menu_icon invert_filter']); ?>';
     if (!module_autocomplete.hasClass('working')) {
         module_autocomplete.addClass('working');
         module_autocomplete.html(load_icon);
@@ -2086,8 +2087,8 @@ function add_new_relation () {
     var button = $("#button-add_relation");
     var iconPlaceholder = $("#add_relation_status");
     var load_icon = '<?php html_print_image('images/spinner.gif', false, ['style' => 'vertical-align:middle;']); ?>';
-    var suc_icon = '<?php html_print_image('images/ok.png', false, ['style' => 'vertical-align:middle;']); ?>';
-    var error_icon = '<?php html_print_image('images/error_red.png', false, ['style' => 'vertical-align:middle;']); ?>';
+    var suc_icon = '<?php html_print_image('images/validate.svg', false, ['class' => 'main_menu_icon invert_filter', 'style' => 'vertical-align:middle;']); ?>';
+    var error_icon = '<?php html_print_image('images/error-red@svg.svg', false, ['class' => 'main_menu_icon invert_filter', 'style' => 'vertical-align:middle;']); ?>';
 
     if (!button.hasClass('working')) {
         button.addClass('working');
@@ -2129,12 +2130,12 @@ function add_new_relation () {
                                     '<td id="module_relations-' + relationsCount + '-2">' + relation_type + '</td>' +
                                     '<td id="module_relations-' + relationsCount + '-3" class="w10p center">' +
                                         '<a id="disable_updates_button" class="alpha50" href="javascript: change_lock_relation(' + relationsCount + ', ' + data + ');">' +
-                                            '<?php echo html_print_image('images/lock_mc.png', true, ['class' => 'invert_filter']); ?>' +
+                                            '<?php echo html_print_image('images/policy@svg.svg', true, ['class' => 'main_menu_icon invert_filter']); ?>' +
                                         '</a>' +
                                     '</td>' +
                                     '<td id="module_relations-' + relationsCount + '-4" class="w10p center">' +
                                         '<a id="delete_relation_button" href="javascript: delete_relation(' + relationsCount + ', ' + data +  ');">' +
-                                            '<?php echo html_print_image('images/cross.png', true, ['class' => 'invert_filter']); ?>' +
+                                            '<?php echo html_print_image('images/delete.svg', true, ['class' => 'main_menu_icon invert_filter']); ?>' +
                                         '</a>' +
                                     '</td>' +
                                 '</tr>';
diff --git a/pandora_console/godmode/agentes/planned_downtime.editor.php b/pandora_console/godmode/agentes/planned_downtime.editor.php
index 32fdcac6be..f3bea0aa78 100644
--- a/pandora_console/godmode/agentes/planned_downtime.editor.php
+++ b/pandora_console/godmode/agentes/planned_downtime.editor.php
@@ -1452,7 +1452,7 @@ $table->data['module'][1] = "
                 <td class='cell_delete_button' style='text-align: right; width:10%;' id=''>".'<a class="link_delete"
                         onclick="if(!confirm(\''.__('Are you sure?').'\')) return false;"
                         href="">'.html_print_image(
-                            'images/cross.png',
+                            'images/delete.svg',
                             true,
                             [
                                 'border' => '0',
diff --git a/pandora_console/godmode/alerts/alert_commands.php b/pandora_console/godmode/alerts/alert_commands.php
index 696882e133..9b22483f5c 100644
--- a/pandora_console/godmode/alerts/alert_commands.php
+++ b/pandora_console/godmode/alerts/alert_commands.php
@@ -809,10 +809,10 @@ foreach ($commands as $command) {
         if (is_user_admin($config['id_user']) === true) {
                     $data['action'] = '<span class="inline_flex">';
             $data['action'] .= '<a href="index.php?sec='.$sec.'&sec2=godmode/alerts/alert_commands&amp;copy_command=1&id='.$command['id'].'&pure='.$pure.'&offset='.$offset.'"
-            onClick="if (!confirm(\''.__('Are you sure?').'\')) return false;">'.html_print_image('images/copy.png', true, ['class' => 'invert_filter']).'</a>';
+            onClick="if (!confirm(\''.__('Are you sure?').'\')) return false;">'.html_print_image('images/copy.svg', true, ['class' => 'main_menu_icon invert_filter']).'</a>';
 
             $data['action'] .= '<a href="index.php?sec='.$sec.'&sec2=godmode/alerts/alert_commands&delete_command=1&id='.$command['id'].'&pure='.$pure.'&offset='.$offset_delete.'"
-			onClick="if (!confirm(\''.__('Are you sure?').'\')) return false;">'.html_print_image('images/cross.png', true, ['class' => 'invert_filter']).'</a>';
+			onClick="if (!confirm(\''.__('Are you sure?').'\')) return false;">'.html_print_image('images/delete.svg', true, ['class' => 'main_menu_icon invert_filter']).'</a>';
             $data['action'] .= '</span>';
         }
     }
diff --git a/pandora_console/godmode/alerts/alert_list.list.php b/pandora_console/godmode/alerts/alert_list.list.php
index 854905343a..45003b2bc0 100644
--- a/pandora_console/godmode/alerts/alert_list.list.php
+++ b/pandora_console/godmode/alerts/alert_list.list.php
@@ -766,7 +766,7 @@ foreach ($simple_alerts as $alert) {
             $data[3] .= '</form>';
             $data[3] .= html_print_input_image(
                 'update_action',
-                'images/config.png',
+                'images/edit.svg',
                 1,
                 'padding:0px;',
                 true,
@@ -1053,7 +1053,7 @@ foreach ($simple_alerts as $alert) {
         $data[4] .= '<form class="view_alert_form display_in" method="post" action="index.php?sec=galertas&sec2=godmode/alerts/alert_view">';
         $data[4] .= html_print_input_image(
             'view_alert',
-            'images/operation.png',
+            'images/details.svg',
             1,
             '',
             true,
diff --git a/pandora_console/godmode/alerts/alert_list.php b/pandora_console/godmode/alerts/alert_list.php
index 4d23bb8d6f..55f786c3c2 100644
--- a/pandora_console/godmode/alerts/alert_list.php
+++ b/pandora_console/godmode/alerts/alert_list.php
@@ -478,17 +478,17 @@ if ($standbyoff_alert) {
 
 
 $searchFlag = true;
-if (!is_metaconsole()) {
+if (is_metaconsole() === false) {
     // The tabs will be shown only with manage alerts permissions
     if (check_acl($config['id_user'], 0, 'LW') || check_acl($config['id_user'], 0, 'LM')) {
         $buttons = [
             'list'    => [
                 'active' => false,
-                'text'   => '<a href="index.php?sec=galertas&sec2=godmode/alerts/alert_list&tab=list&pure='.$pure.'">'.html_print_image('images/list.png', true, ['title' => __('List alerts'), 'class' => 'invert_filter']).'</a>',
+                'text'   => '<a href="index.php?sec=galertas&sec2=godmode/alerts/alert_list&tab=list&pure='.$pure.'">'.html_print_image('images/load@svg.svg', true, ['title' => __('List alerts'), 'class' => 'main_menu_icon invert_filter']).'</a>',
             ],
             'builder' => [
                 'active' => false,
-                'text'   => '<a href="index.php?sec=galertas&sec2=godmode/alerts/alert_list&tab=builder&pure='.$pure.'">'.html_print_image('images/pencil.png', true, ['title' => __('Builder alert'), 'class' => 'invert_filter']).'</a>',
+                'text'   => '<a href="index.php?sec=galertas&sec2=godmode/alerts/alert_list&tab=builder&pure='.$pure.'">'.html_print_image('images/edit.svg', true, ['title' => __('Builder alert'), 'class' => 'main_menu_icon invert_filter']).'</a>',
             ],
         ];
 
@@ -497,7 +497,7 @@ if (!is_metaconsole()) {
         $buttons = '';
     }
 
-    if ($tab == 'list') {
+    if ($tab === 'list') {
         ui_print_standard_header(
             __('Alerts'),
             'images/gm_alerts.png',
diff --git a/pandora_console/godmode/alerts/alert_templates.php b/pandora_console/godmode/alerts/alert_templates.php
index fbe2835354..23d94b094d 100644
--- a/pandora_console/godmode/alerts/alert_templates.php
+++ b/pandora_console/godmode/alerts/alert_templates.php
@@ -450,7 +450,7 @@ foreach ($templates as $template) {
         $data[4] .= html_print_input_hidden('source_id', $template['id'], true);
         $data[4] .= html_print_input_image(
             'dup',
-            'images/copy.png',
+            'images/copy.svg',
             1,
             '',
             true,
diff --git a/pandora_console/godmode/events/event_edit_filter.php b/pandora_console/godmode/events/event_edit_filter.php
index d2a8e6bbef..a1c9638a48 100644
--- a/pandora_console/godmode/events/event_edit_filter.php
+++ b/pandora_console/godmode/events/event_edit_filter.php
@@ -778,7 +778,7 @@ $table->data[12][0] = html_print_label_input_block(
 if (!is_metaconsole()) {
     $table->data[12][1] = html_print_label_input_block(
         __('Module search'),
-        '<div class="w100p">'.html_print_autocomplete_modules(
+        '<div class="w100p module-search">'.html_print_autocomplete_modules(
             'module_search',
             $text_module,
             false,
diff --git a/pandora_console/godmode/events/event_filter.php b/pandora_console/godmode/events/event_filter.php
index b9c611c99a..9a2c9df9f6 100644
--- a/pandora_console/godmode/events/event_filter.php
+++ b/pandora_console/godmode/events/event_filter.php
@@ -186,7 +186,7 @@ foreach ($filters as $filter) {
     ) {
         $table->cellclass[][6] = 'table_action_buttons';
         $data[6] = "<a onclick='if(confirm(\"".__('Are you sure?')."\")) return true; else return false;'href='index.php?sec=geventos&sec2=godmode/events/events&section=filter&delete=1&id=".$filter['id_filter'].'&offset=0&pure='.$config['pure']."'>".html_print_image(
-            'images/cross.png',
+            'images/delete.svg',
             true,
             [
                 'title' => __('Delete'),
diff --git a/pandora_console/godmode/extensions.php b/pandora_console/godmode/extensions.php
index 8faef70d3e..69c5e59b8b 100644
--- a/pandora_console/godmode/extensions.php
+++ b/pandora_console/godmode/extensions.php
@@ -295,7 +295,8 @@ foreach ($extensions as $file => $extension) {
             $data[] = html_print_menu_button(
                 [
                     'href'    => 'index.php?sec=godmode/extensions&amp;sec2=godmode/extensions&enterprise='.(int) $extension['enterprise'].'&delete='.$file,
-                    'image'   => 'images/cross.png',
+                    'image'   => 'images/delete.svg',
+                    'class'   => 'main_menu_icon invert_filter',
                     'title'   => __('Delete'),
                     'onClick' => 'if (!confirm(\''.__('Are you sure?').'\')) return false;',
                 ],
diff --git a/pandora_console/godmode/gis_maps/configure_gis_map.php b/pandora_console/godmode/gis_maps/configure_gis_map.php
index 2df8d06c6e..92e9e043b3 100644
--- a/pandora_console/godmode/gis_maps/configure_gis_map.php
+++ b/pandora_console/godmode/gis_maps/configure_gis_map.php
@@ -698,7 +698,7 @@ echo '</form>';
             <td><a id="delete_row" href="none">
             <?php
             html_print_image(
-                'images/cross.png',
+                'images/delete.svg',
                 false,
                 [
                     'alt'   => '',
@@ -1005,7 +1005,7 @@ function getAgentRow (layerId, agentId, agentAlias) {
     var $deleteCol = $("<td />");
 
     var $agentAlias = $("<span class=\"agent_alias\" data-agent-id=\"" + agentId + "\">" + agentAlias + "</span>");
-    var $removeBtn = $('<a class="delete_row" href="javascript:" <?php echo html_print_image('images/cross.png', false, ['class' => 'invert_filter']); ?> </a>');
+    var $removeBtn = $('<a class="delete_row" href="javascript:" <?php echo html_print_image('images/delete.svg', false, ['class' => 'invert_filter']); ?> </a>');
 
     $removeBtn.click(function (event) {
         var $layerRow = $("tr#layer_row_" + layerId);
@@ -1061,7 +1061,7 @@ function getGroupRow (layerId, groupId, groupName, agentId, agentAlias) {
         + "<i>" + agentAlias + "</i>"
         + ")"
         + "</span>");
-    var $removeBtn = $('<a class="delete_row" href="javascript:;"><?php echo html_print_image('images/cross.png', true, ['class' => 'invert_filter']); ?></a>');
+    var $removeBtn = $('<a class="delete_row" href="javascript:;"><?php echo html_print_image('images/delete.svg', true, ['class' => 'invert_filter']); ?></a>');
 
     $removeBtn.click(function (event) {
         var $layerRow = $("tr#layer_row_" + layerId);
@@ -1139,8 +1139,8 @@ function getLayerRow (layerId, layerData) {
     var $layerName = $("<span class=\"layer_name\">" + layerData.name + "</span>");
     var $sortUpBtn = $("<a class=\"up_arrow\" href=\"javascript:;\" />");
     var $sortDownBtn = $("<a class=\"down_arrow\" href=\"javascript:;\" />");
-    var $editBtn = $('<a class="edit_layer" href="javascript:;"><?php echo html_print_image('images/config.png', true, ['class' => 'invert_filter']); ?></a>');
-    var $removeBtn = $('<a class="delete_row" href="javascript:;"><?php echo html_print_image('images/cross.png', true, ['class' => 'invert_filter']); ?></a>');
+    var $editBtn = $('<a class="edit_layer" href="javascript:;"><?php echo html_print_image('images/edit.svg', true, ['class' => 'invert_filter']); ?></a>');
+    var $removeBtn = $('<a class="delete_row" href="javascript:;"><?php echo html_print_image('images/delete.svg', true, ['class' => 'invert_filter']); ?></a>');
 
     $sortUpBtn.click(moveLayerRowUpOnClick);
     $sortDownBtn.click(moveLayerRowDownOnClick);
diff --git a/pandora_console/godmode/massive/massive_operations.php b/pandora_console/godmode/massive/massive_operations.php
index d2e11b8c89..100b3eb933 100755
--- a/pandora_console/godmode/massive/massive_operations.php
+++ b/pandora_console/godmode/massive/massive_operations.php
@@ -216,7 +216,7 @@ if ($option == '') {
 
 $alertstab = [
     'text'   => '<a href="'.$url.'&tab=massive_alerts">'.html_print_image(
-        'images/bell.png',
+        'images/alert@svg.svg',
         true,
         [
             'title' => __('Alerts operations'),
@@ -228,7 +228,7 @@ $alertstab = [
 
 $userstab = [
     'text'   => '<a href="'.$url.'&tab=massive_users">'.html_print_image(
-        'images/user.png',
+        'images/user.svg',
         true,
         [
             'title' => __('Users operations'),
@@ -240,7 +240,7 @@ $userstab = [
 
 $agentstab = [
     'text'   => '<a href="'.$url.'&tab=massive_agents">'.html_print_image(
-        'images/agent.png',
+        'images/agents@svg.svg',
         true,
         [
             'title' => __('Agents operations'),
@@ -252,7 +252,7 @@ $agentstab = [
 
 $modulestab = [
     'text'   => '<a href="'.$url.'&tab=massive_modules">'.html_print_image(
-        'images/module.png',
+        'images/modules@svg.svg',
         true,
         [
             'title' => __('Modules operations'),
@@ -264,7 +264,7 @@ $modulestab = [
 
 $pluginstab = [
     'text'   => '<a href="'.$url.'&tab=massive_plugins">'.html_print_image(
-        'images/plugin.png',
+        'images/plugins@svg.svg',
         true,
         [
             'title' => __('Plugins operations'),
diff --git a/pandora_console/godmode/module_library/module_library_view.php b/pandora_console/godmode/module_library/module_library_view.php
index aeab26be20..aea7681f3b 100644
--- a/pandora_console/godmode/module_library/module_library_view.php
+++ b/pandora_console/godmode/module_library/module_library_view.php
@@ -45,18 +45,18 @@ if (! check_acl($config['id_user'], 0, 'AR')) {
 if (check_acl($config['id_user'], 0, 'PM') && enterprise_installed()) {
     $buttons['setup'] = [
         'active' => false,
-        'text'   => '<a href="index.php?sec=general&sec2=godmode/setup/setup&amp;section=module_library">'.html_print_image('images/gm_setup.png', true, ['title' => __('Setup'), 'class' => 'invert_filter']).'</a>',
+        'text'   => '<a href="index.php?sec=general&sec2=godmode/setup/setup&amp;section=module_library">'.html_print_image('images/configuration@svg.svg', true, ['title' => __('Setup'), 'class' => 'main_menu_icon invert_filter']).'</a>',
     ];
 }
 
 $buttons['categories'] = [
     'active' => false,
-    'text'   => '<a href="index.php?sec=gmodule_library&sec2=godmode/module_library/module_library_view&tab=categories">'.html_print_image('images/list.png', true, ['title' => __('Categories'), 'class' => 'invert_filter']).'</a>',
+    'text'   => '<a href="index.php?sec=gmodule_library&sec2=godmode/module_library/module_library_view&tab=categories">'.html_print_image('images/logs@svg.svg', true, ['title' => __('Categories'), 'class' => 'main_menu_icon invert_filter']).'</a>',
 ];
 
 $buttons['view'] = [
     'active' => false,
-    'text'   => '<a href="index.php?sec=gmodule_library&sec2=godmode/module_library/module_library_view">'.html_print_image('images/eye_show.png', true, ['title' => __('View'), 'class' => 'invert_filter']).'</a>',
+    'text'   => '<a href="index.php?sec=gmodule_library&sec2=godmode/module_library/module_library_view">'.html_print_image('images/see-details@svg.svg', true, ['title' => __('View'), 'class' => 'main_menu_icon invert_filter']).'</a>',
 ];
 
 
diff --git a/pandora_console/godmode/modules/manage_network_components_form_wizard.php b/pandora_console/godmode/modules/manage_network_components_form_wizard.php
index 0c9f894ba1..190ff655ff 100644
--- a/pandora_console/godmode/modules/manage_network_components_form_wizard.php
+++ b/pandora_console/godmode/modules/manage_network_components_form_wizard.php
@@ -104,7 +104,7 @@ function generateExtraFields($extra_fields, $protocol)
             'class'   => 'float-right',
             'style'   => $cntFields <= 1 ? 'opacity: 0.5;' : '',
             'content' => html_print_image(
-                'images/cross.png',
+                'images/delete.svg',
                 true,
                 [
                     'title'   => __('Remove last macro oid'),
diff --git a/pandora_console/godmode/modules/manage_network_templates.php b/pandora_console/godmode/modules/manage_network_templates.php
index 4f1c949e9f..2940716ee5 100644
--- a/pandora_console/godmode/modules/manage_network_templates.php
+++ b/pandora_console/godmode/modules/manage_network_templates.php
@@ -266,7 +266,7 @@ foreach ($result as $row) {
     $table->cellclass[][3] = 'table_action_buttons';
     $data[3] = html_print_input_image(
         'delete_profile',
-        'images/cross.png',
+        'images/delete.svg',
         $row['id_np'],
         '',
         true,
@@ -286,7 +286,7 @@ foreach ($result as $row) {
             'class' => 'invert_filter',
         ]
     );
-    $data[3] = '<a href="index.php?sec=gmodules&sec2=godmode/modules/manage_network_templates'.'&delete_profile=1&delete_profile='.$row['id_np'].'" '.'onclick="if (!confirm(\''.__('Are you sure?').'\')) return false;">'.html_print_image('images/cross.png', true, ['title' => __('Delete'), 'class' => 'invert_filter']).'</a>';
+    $data[3] = '<a href="index.php?sec=gmodules&sec2=godmode/modules/manage_network_templates'.'&delete_profile=1&delete_profile='.$row['id_np'].'" '.'onclick="if (!confirm(\''.__('Are you sure?').'\')) return false;">'.html_print_image('images/delete.svg', true, ['title' => __('Delete'), 'class' => 'invert_filter']).'</a>';
     $data[3] .= '<a onclick="blockResubmit($(this))" href="index.php?sec=gmodules&sec2=godmode/modules/manage_network_templates'.'&export_profile='.$row['id_np'].'">'.html_print_image('images/csv.png', true, ['title' => __('Export to CSV'), 'class' => 'invert_filter']).'</a>';
 
     array_push($table->data, $data);
diff --git a/pandora_console/godmode/netflow/nf_edit.php b/pandora_console/godmode/netflow/nf_edit.php
index e384cc1541..b267b40254 100644
--- a/pandora_console/godmode/netflow/nf_edit.php
+++ b/pandora_console/godmode/netflow/nf_edit.php
@@ -191,7 +191,7 @@ foreach ($filters as $filter) {
     if (check_acl_restricted_all($config['id_user'], $filter['id_group'], 'AW')) {
         $table->cellclass[][3] = 'table_action_buttons';
         $data[3] = "<a onclick='if(confirm(\"".__('Are you sure?')."\")) return true; else return false;' 
-            href='".$config['homeurl'].'index.php?sec=netf&sec2=godmode/netflow/nf_edit&delete=1&id='.$filter['id_sg']."&offset=0&pure=$pure'>".html_print_image('images/cross.png', true, ['title' => __('Delete'), 'class' => 'invert_filter']).'</a>';
+            href='".$config['homeurl'].'index.php?sec=netf&sec2=godmode/netflow/nf_edit&delete=1&id='.$filter['id_sg']."&offset=0&pure=$pure'>".html_print_image('images/delete.svg', true, ['title' => __('Delete'), 'class' => 'invert_filter']).'</a>';
     }
 
     array_push($table->data, $data);
diff --git a/pandora_console/godmode/netflow/nf_item_list.php b/pandora_console/godmode/netflow/nf_item_list.php
index d7a267aed6..2c36456a52 100644
--- a/pandora_console/godmode/netflow/nf_item_list.php
+++ b/pandora_console/godmode/netflow/nf_item_list.php
@@ -30,7 +30,7 @@ $buttons['report_items']['active'] = true;
 $buttons['report_items']['text'] = '<a href="'.$config['homeurl'].'index.php?sec=netf&sec2=godmode/netflow/nf_item_list&id='.$id.'">'.html_print_image('images/god6.png', true, ['title' => __('Report items')]).'</a>';
 
 $buttons['edit_report']['active'] = false;
-$buttons['edit_report']['text'] = '<a href="'.$config['homeurl'].'index.php?sec=netf&sec2=godmode/netflow/nf_report_form&id='.$id.'">'.html_print_image('images/config.png', true, ['title' => __('Edit report')]).'</a>';
+$buttons['edit_report']['text'] = '<a href="'.$config['homeurl'].'index.php?sec=netf&sec2=godmode/netflow/nf_report_form&id='.$id.'">'.html_print_image('images/edit.svg', true, ['title' => __('Edit report')]).'</a>';
 
 // Header
 if (! defined('METACONSOLE')) {
@@ -260,7 +260,7 @@ foreach ($reports_item as $item) {
     }
 
     $data[5] = "<a onclick='if(confirm(\"".__('Are you sure?')."\")) return true; else return false;' 
-		href='".$config['homeurl'].'index.php?sec=netf&sec2=godmode/netflow/nf_item_list&delete=1&id_rc='.$item['id_rc'].'&id='.$id."&offset=0'>".html_print_image('images/cross.png', true, ['title' => __('Delete'), 'class' => 'invert_filter']).'</a>'.html_print_checkbox_extended('delete_multiple[]', $item['id_rc'], false, false, '', 'class="check_delete"', true);
+		href='".$config['homeurl'].'index.php?sec=netf&sec2=godmode/netflow/nf_item_list&delete=1&id_rc='.$item['id_rc'].'&id='.$id."&offset=0'>".html_print_image('images/delete.svg', true, ['title' => __('Delete'), 'class' => 'invert_filter']).'</a>'.html_print_checkbox_extended('delete_multiple[]', $item['id_rc'], false, false, '', 'class="check_delete"', true);
 
     array_push($table->data, $data);
 }
diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
index 6002d19cfe..c28bfca6ee 100755
--- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php
+++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
@@ -4272,7 +4272,7 @@ function print_SLA_list($width, $action, $idItem=null)
                         echo '</td>';
                         echo '<td class="sla_list_action_col center">';
                         echo '<a href="javascript: deleteSLARow('.$item['id'].');">';
-                        echo html_print_image('images/cross.png', true, ['class' => 'invert_filter']);
+                        echo html_print_image('images/delete.svg', true, ['class' => 'invert_filter']);
                         echo '</a>';
                         echo '</td>';
                         echo '</tr>';
@@ -4313,7 +4313,7 @@ function print_SLA_list($width, $action, $idItem=null)
                                 <a class="delete_button" href="javascript: deleteSLARow(0);">
                                     <?php
                                     html_print_image(
-                                        'images/cross.png',
+                                        'images/delete.svg',
                                         false,
                                         ['class' => 'invert_filter']
                                     );
@@ -4739,7 +4739,7 @@ function print_General_list($width, $action, $idItem=null, $type='general')
                                     <td>'.printSmallFont($nameAgentFailover).$server_name_element.'</td>
                                     <td>'.printSmallFont($nameModuleFailover).'</td>
                                     <td class="center">
-                                        <a href="javascript: deleteGeneralRow('.$item['id'].');">'.html_print_image('images/cross.png', true, ['class' => 'invert_filter']).'</a>
+                                        <a href="javascript: deleteGeneralRow('.$item['id'].');">'.html_print_image('images/delete.svg', true, ['class' => 'invert_filter']).'</a>
                                     </td>
                                 </tr>';
                             } else {
@@ -4747,7 +4747,7 @@ function print_General_list($width, $action, $idItem=null, $type='general')
                                     <td>'.printSmallFont($nameAgent).$server_name_element.'</td>
                                     <td>'.printSmallFont($nameModule).'</td>
                                     <td class="center">
-                                        <a href="javascript: deleteGeneralRow('.$item['id'].');">'.html_print_image('images/cross.png', true, ['class' => 'invert_filter']).'</a>
+                                        <a href="javascript: deleteGeneralRow('.$item['id'].');">'.html_print_image('images/delete.svg', true, ['class' => 'invert_filter']).'</a>
                                     </td>
                                 </tr>';
                             }
@@ -4757,7 +4757,7 @@ function print_General_list($width, $action, $idItem=null, $type='general')
 								<td>'.printSmallFont($nameModule).'</td>
 								<td>'.printSmallFont($operation[$item['operation']]).'</td>
 								<td class="center">
-									<a href="javascript: deleteGeneralRow('.$item['id'].');">'.html_print_image('images/cross.png', true, ['class' => 'invert_filter']).'</a>
+									<a href="javascript: deleteGeneralRow('.$item['id'].');">'.html_print_image('images/delete.svg', true, ['class' => 'invert_filter']).'</a>
 								</td>
 							</tr>';
                         }
@@ -4795,7 +4795,7 @@ function print_General_list($width, $action, $idItem=null, $type='general')
                                 <a class="delete_button" href="javascript: deleteGeneralRow(0);">
                                     <?php
                                     html_print_image(
-                                        'images/cross.png',
+                                        'images/delete.svg',
                                         false,
                                         ['class' => 'invert_filter']
                                     );
diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php
index a4f688ab05..a0e25d0e04 100755
--- a/pandora_console/godmode/reporting/reporting_builder.php
+++ b/pandora_console/godmode/reporting/reporting_builder.php
@@ -3680,21 +3680,21 @@ $buttons = [
             true,
             [
                 'title' => __('Reports list'),
-                'class' => 'invert_filter',
+                'class' => 'main_menu_icon invert_filter',
             ]
         ).'</a>',
     ],
     'main'         => [
         'active' => false,
-        'text'   => '<a href="'.$urlB.'&tab=main&action=edit&id_report='.$idReport.'&pure='.$pure.'">'.html_print_image('images/op_reporting.png', true, ['title' => __('Main data'), 'class' => 'invert_filter']).'</a>',
+        'text'   => '<a href="'.$urlB.'&tab=main&action=edit&id_report='.$idReport.'&pure='.$pure.'">'.html_print_image('images/op_reporting.png', true, ['title' => __('Main data'), 'class' => 'main_menu_icon invert_filter']).'</a>',
     ],
     'list_items'   => [
         'active' => false,
-        'text'   => '<a href="'.$urlB.'&tab=list_items&action=edit&id_report='.$idReport.'&pure='.$pure.'">'.html_print_image('images/list.png', true, ['title' => __('List items'), 'class' => 'invert_filter']).'</a>',
+        'text'   => '<a href="'.$urlB.'&tab=list_items&action=edit&id_report='.$idReport.'&pure='.$pure.'">'.html_print_image('images/logs@svg.svg', true, ['title' => __('List items'), 'class' => 'main_menu_icon invert_filter']).'</a>',
     ],
     'item_editor'  => [
         'active' => false,
-        'text'   => '<a href="'.$urlB.'&tab=item_editor&action=new&id_report='.$idReport.'&pure='.$pure.'">'.html_print_image('images/pencil.png', true, ['title' => __('Item editor'), 'class' => 'invert_filter']).'</a>',
+        'text'   => '<a href="'.$urlB.'&tab=item_editor&action=new&id_report='.$idReport.'&pure='.$pure.'">'.html_print_image('images/edit.svg', true, ['title' => __('Item editor'), 'class' => 'main_menu_icon invert_filter']).'</a>',
     ],
 ];
 
@@ -3708,11 +3708,11 @@ if ($enterpriseEnable) {
 $buttons['view'] = [
     'active' => false,
     'text'   => '<a href="index.php?sec=reporting&sec2=operation/reporting/reporting_viewer&id='.$idReport.'&pure='.$pure.'">'.html_print_image(
-        'images/eye.png',
+        'images/see-details@svg.svg',
         true,
         [
             'title' => __('View report'),
-            'class' => 'invert_filter',
+            'class' => 'main_menu_icon invert_filter',
         ]
     ).'</a>',
 ];
@@ -3727,7 +3727,7 @@ if ($idReport != 0) {
     $buttons = [
         'main' => [
             'active' => true,
-            'text'   => '<a href="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&pure='.$pure.'">'.html_print_image('images/report_list.png', true, ['title' => __('Reports list'), 'class' => 'invert_filter']).'</a>',
+            'text'   => '<a href="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&pure='.$pure.'">'.html_print_image('images/report_list.png', true, ['title' => __('Reports list'), 'class' => 'main_menu_icon invert_filter']).'</a>',
         ],
     ];
     $textReportName = __('Create Custom Report');
diff --git a/pandora_console/godmode/setup/gis.php b/pandora_console/godmode/setup/gis.php
index 671b9b71db..57edc19f5c 100755
--- a/pandora_console/godmode/setup/gis.php
+++ b/pandora_console/godmode/setup/gis.php
@@ -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/cross.png', 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']).'</a>',
         ];
         $table->cellclass[][2] = 'table_action_buttons';
     }
diff --git a/pandora_console/godmode/setup/links.php b/pandora_console/godmode/setup/links.php
index 7bd589fe27..b11bd3539f 100644
--- a/pandora_console/godmode/setup/links.php
+++ b/pandora_console/godmode/setup/links.php
@@ -208,7 +208,7 @@ if ((isset($_GET['form_add'])) or (isset($_GET['form_edit']))) {
 
             echo "<tr><td class='$tdcolor'><b><a href='index.php?sec=gsetup&sec2=godmode/setup/links&form_edit=1&id_link=".$row['id_link']."'>".$row['name'].'</a></b></td>';
             echo '<td class="'.$tdcolor.' table_action_buttons"><a href="index.php?sec=gsetup&sec2=godmode/setup/links&id_link='.$row['id_link'].'&borrar='.$row['id_link'].'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">'.html_print_image(
-                'images/cross.png',
+                'images/delete.svg',
                 true,
                 ['class' => 'invert_filter']
             ).'</a></td></tr>';
diff --git a/pandora_console/godmode/setup/news.php b/pandora_console/godmode/setup/news.php
index efbf574779..ee4b47d930 100644
--- a/pandora_console/godmode/setup/news.php
+++ b/pandora_console/godmode/setup/news.php
@@ -373,7 +373,7 @@ if ((isset($_GET['form_add'])) || (isset($_GET['form_edit']))) {
                 echo "<td class='$tdcolor'>".__('No').'</b></td>';
             }
 
-            echo '<td class="'.$tdcolor.' table_action_buttons"><a href="index.php?sec=gsetup&sec2=godmode/setup/news&id_news='.$row['id_news'].'&borrar='.$row['id_news'].'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">'.html_print_image('images/cross.png', true, ['border' => '0', 'class' => 'invert_filter']).'</a></td></tr>';
+            echo '<td class="'.$tdcolor.' table_action_buttons"><a href="index.php?sec=gsetup&sec2=godmode/setup/news&id_news='.$row['id_news'].'&borrar='.$row['id_news'].'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">'.html_print_image('images/delete.svg', true, ['border' => '0', 'class' => 'invert_filter']).'</a></td></tr>';
         }
 
         echo '</table>';
diff --git a/pandora_console/godmode/setup/setup_general.php b/pandora_console/godmode/setup/setup_general.php
index fc169f91a2..d19d3587c6 100644
--- a/pandora_console/godmode/setup/setup_general.php
+++ b/pandora_console/godmode/setup/setup_general.php
@@ -292,11 +292,11 @@ $table->data[$i][1] = html_print_input_text_extended(
     true
 );
 $table->data[$i][1] .= '<a id="change_timezone">'.html_print_image(
-    'images/pencil.png',
+    'images/edit.svg',
     true,
     [
         'title' => __('Change timezone'),
-        'class' => 'invert_filter',
+        'class' => 'main_menu_icon invert_filter',
     ]
 ).'</a>';
 $table->data[$i][1] .= '&nbsp;&nbsp;'.html_print_select(
@@ -423,9 +423,9 @@ $table_ichanges = '<table>
         <tr>
             <td>'.$select_out.'</td>
             <td>
-                <a href="javascript:">'.html_print_image('images/darrowright.png', true, ['id' => 'right_iblacklist', 'alt' => __('Push selected modules into blacklist'), 'title' => __('Push selected modules into blacklist'), 'class' => 'invert_filter']).'</a>
+                <a href="javascript:">'.html_print_image('images/arrow@svg.svg', true, ['style' => 'rotate: 180deg;', 'id' => 'right_iblacklist', 'alt' => __('Push selected modules into blacklist'), 'title' => __('Push selected modules into blacklist'), 'class' => 'main_menu_icon invert_filter']).'</a>
                 <br><br>
-                <a href="javascript:">'.html_print_image('images/darrowleft.png', true, ['id' => 'left_iblacklist', 'alt' => __('Pop selected modules out of blacklist'), 'title' => __('Pop selected modules out of blacklist'), 'class' => 'invert_filter']).'</a>
+                <a href="javascript:">'.html_print_image('images/arrow@svg.svg', true, ['style' => 'rotate: 0', 'id' => 'left_iblacklist', 'alt' => __('Pop selected modules out of blacklist'), 'title' => __('Pop selected modules out of blacklist'), 'class' => 'main_menu_icon invert_filter']).'</a>
             </td>
             <td>'.$select_in.'</td>
         </tr>
diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php
index 73b2511b2b..5fb042fe66 100755
--- a/pandora_console/godmode/setup/setup_visuals.php
+++ b/pandora_console/godmode/setup/setup_visuals.php
@@ -1626,11 +1626,11 @@ if ($config['csv_divider'] != ';' && $config['csv_divider'] != ',' && $config['c
         true
     );
     $table_other->data[$row][1] .= '<a id="csv_divider_custom" onclick="javascript: edit_csv_divider();">'.html_print_image(
-        'images/list.png',
+        'images/logs@svg.svg',
         true,
         [
             'id'    => 'select',
-            'class' => 'invert_filter',
+            'class' => 'main_menu_icon invert_filter',
         ]
     ).'</a>';
 } else {
@@ -1646,11 +1646,11 @@ if ($config['csv_divider'] != ';' && $config['csv_divider'] != ',' && $config['c
         false
     );
     $table_other->data[$row][1] .= '<a id="csv_divider_custom" onclick="javascript: edit_csv_divider();">'.html_print_image(
-        'images/pencil.png',
+        'images/edit.svg',
         true,
         [
             'id'    => 'pencil',
-            'class' => 'invert_filter',
+            'class' => 'main_menu_icon invert_filter',
         ]
     ).'</a>';
 }
@@ -1777,7 +1777,7 @@ function edit_csv_divider () {
         $("#text-csv_divider").val(value);
     }
     else {
-        $("#csv_divider_custom img").attr("src", "images/pencil.png");
+        $("#csv_divider_custom img").attr("src", "images/edit.svg");
         $("#csv_divider_custom img").attr("id", "pencil");
         $("#text-csv_divider").replaceWith("<select id='csv_divider' name='csv_divider'>");
         var o = new Option(";", ";");
diff --git a/pandora_console/godmode/setup/snmp_wizard.php b/pandora_console/godmode/setup/snmp_wizard.php
index e788b408cd..62558dbc87 100644
--- a/pandora_console/godmode/setup/snmp_wizard.php
+++ b/pandora_console/godmode/setup/snmp_wizard.php
@@ -107,7 +107,7 @@ html_print_table($table);
 
 function cell_op($oid='')
 {
-    return '<img class="loading invisible" src="'.'images/spinner.gif'.'" />'.'<a class="button_edit_snmp" href="javascript: edit_snmp(\''.$oid.'\');">'.html_print_image('images/cog.png', true, ['class' => 'invert_filter', 'title' => __('Edit')]).'</a>'.'<a class="delete_button_snmp" href="javascript: delete_snmp(\''.$oid.'\');">'.html_print_image('images/cross.png', true, ['title' => __('Delete'), 'class' => 'invert_filter']).'</a>';
+    return '<img class="loading invisible" src="'.'images/spinner.gif'.'" />'.'<a class="button_edit_snmp" href="javascript: edit_snmp(\''.$oid.'\');">'.html_print_image('images/cog.png', true, ['class' => 'invert_filter', 'title' => __('Edit')]).'</a>'.'<a class="delete_button_snmp" href="javascript: delete_snmp(\''.$oid.'\');">'.html_print_image('images/delete.svg', true, ['title' => __('Delete'), 'class' => 'invert_filter']).'</a>';
 }
 
 
diff --git a/pandora_console/godmode/snmpconsole/snmp_alert.php b/pandora_console/godmode/snmpconsole/snmp_alert.php
index 6ad576198f..72e695eb71 100755
--- a/pandora_console/godmode/snmpconsole/snmp_alert.php
+++ b/pandora_console/godmode/snmpconsole/snmp_alert.php
@@ -1943,7 +1943,7 @@ if ($create_alert || $update_alert) {
                 $data[1] .= '<tr>';
                 $data[1] .= '<td>'.alerts_get_alert_action_name($action['alert_type']).'</td>';
                 $data[1] .= '<td> <a href="index.php?sec=snmpconsole&sec2=godmode/snmpconsole/snmp_alert&delete_action=1&action_id='.$action['id'].'" onClick="javascript:return confirm(\''.__('Are you sure?').'\')">'.html_print_image(
-                    'images/cross.png',
+                    'images/delete.svg',
                     true,
                     [
                         'border' => '0',
@@ -1978,11 +1978,12 @@ if ($create_alert || $update_alert) {
                             $row['id_as']
                         ),
                         'content' => html_print_image(
-                            'images/copy.png',
+                            'images/copy.svg',
                             true,
                             [
                                 'alt'   => __('Duplicate'),
                                 'title' => __('Duplicate'),
+                                'class' => 'main_menu_icon invert_filter',
                             ]
                         ),
                     ],
@@ -1995,11 +1996,12 @@ if ($create_alert || $update_alert) {
                             $row['id_as']
                         ),
                         'content' => html_print_image(
-                            'images/config.png',
+                            'images/edit.svg',
                             true,
                             [
                                 'alt'    => __('Update'),
                                 'border' => 0,
+                                'class'  => 'main_menu_icon invert_filter',
                             ]
                         ),
                     ],
@@ -2025,7 +2027,7 @@ if ($create_alert || $update_alert) {
                     [
                         'href'    => 'javascript: ',
                         'content' => html_print_image(
-                            'images/cross.png',
+                            'images/delete.svg',
                             true,
                             [
                                 'title' => __('Delete action'),
diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php
index b396e41e4f..bb1c5d1c73 100644
--- a/pandora_console/godmode/users/configure_user.php
+++ b/pandora_console/godmode/users/configure_user.php
@@ -1888,7 +1888,7 @@ echo '</div>';
 // This is an image generated for JS.
 $delete_image = html_print_input_image(
     'del',
-    'images/cross.png',
+    'images/delete.svg',
     1,
     '',
     true,
diff --git a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
index 9372ffe144..781ec7e536 100644
--- a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
+++ b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
@@ -673,11 +673,11 @@ class DiscoveryTaskList extends HTML
 
                         $data[0] .= ');" >';
                         $data[0] .= html_print_image(
-                            'images/target.png',
+                            'images/change-active.svg',
                             true,
                             [
                                 'title' => __('Force'),
-                                'class' => 'invert_filter',
+                                'class' => 'main_menu_icon invert_filter',
                             ]
                         );
                         $data[0] .= '</span>';
@@ -731,11 +731,11 @@ class DiscoveryTaskList extends HTML
                     case DISCOVERY_CLOUD_AZURE_COMPUTE:
                         // Discovery Applications MySQL.
                         $data[6] = html_print_image(
-                            'images/plugin.png',
+                            'images/plugin@svg.svg',
                             true,
                             [
                                 'title' => __('Discovery Cloud Azure Compute'),
-                                'class' => 'invert_filter',
+                                'class' => 'main_menu_icon invert_filter',
                             ]
                         ).'&nbsp;&nbsp;';
                         $data[6] .= __('Cloud.Azure.Compute');
@@ -744,11 +744,11 @@ class DiscoveryTaskList extends HTML
                     case DISCOVERY_CLOUD_AWS_EC2:
                         // Discovery Applications MySQL.
                         $data[6] = html_print_image(
-                            'images/plugin.png',
+                            'images/plugin@svg.svg',
                             true,
                             [
                                 'title' => __('Discovery Cloud AWS EC2'),
-                                'class' => 'invert_filter',
+                                'class' => 'main_menu_icon invert_filter',
                             ]
                         ).'&nbsp;&nbsp;';
                         $data[6] .= __('Cloud.AWS.EC2');
@@ -757,11 +757,11 @@ class DiscoveryTaskList extends HTML
                     case DISCOVERY_CLOUD_AWS_RDS:
                         // Discovery Cloud RDS.
                         $data[6] = html_print_image(
-                            'images/op_network.png',
+                            'images/cluster@os.svg',
                             true,
                             [
                                 'title' => __('Discovery Cloud RDS'),
-                                'class' => 'invert_filter',
+                                'class' => 'main_menu_icon invert_filter',
                             ]
                         ).'&nbsp;&nbsp;';
                         $data[6] .= __('Discovery.Cloud.Aws.RDS');
@@ -770,11 +770,11 @@ class DiscoveryTaskList extends HTML
                     case DISCOVERY_CLOUD_AWS_S3:
                         // Discovery Cloud S3.
                         $data[6] = html_print_image(
-                            'images/op_network.png',
+                            'images/cluster@os.svg',
                             true,
                             [
                                 'title' => __('Discovery Cloud S3'),
-                                'class' => 'invert_filter',
+                                'class' => 'main_menu_icon invert_filter',
                             ]
                         ).'&nbsp;&nbsp;';
                         $data[6] .= __('Discovery.Cloud.Aws.S3');
@@ -783,11 +783,11 @@ class DiscoveryTaskList extends HTML
                     case DISCOVERY_APP_MYSQL:
                         // Discovery Applications MySQL.
                         $data[6] = html_print_image(
-                            'images/op_network.png',
+                            'images/cluster@os.svg',
                             true,
                             [
                                 'title' => __('Discovery Applications MySQL'),
-                                'class' => 'invert_filter',
+                                'class' => 'main_menu_icon invert_filter',
                             ]
                         ).'&nbsp;&nbsp;';
                         $data[6] .= __('Discovery.App.MySQL');
@@ -796,11 +796,11 @@ class DiscoveryTaskList extends HTML
                     case DISCOVERY_APP_ORACLE:
                         // Discovery Applications Oracle.
                         $data[6] = html_print_image(
-                            'images/op_network.png',
+                            'images/cluster@os.svg',
                             true,
                             [
                                 'title' => __('Discovery Applications Oracle'),
-                                'class' => 'invert_filter',
+                                'class' => 'main_menu_icon invert_filter',
                             ]
                         ).'&nbsp;&nbsp;';
                         $data[6] .= __('Discovery.App.Oracle');
@@ -809,11 +809,11 @@ class DiscoveryTaskList extends HTML
                     case DISCOVERY_APP_DB2:
                         // Discovery Applications DB2.
                         $data[6] = html_print_image(
-                            'images/op_network.png',
+                            'images/cluster@os.svg',
                             true,
                             [
                                 'title' => __('Discovery Applications DB2'),
-                                'class' => 'invert_filter',
+                                'class' => 'main_menu_icon invert_filter',
                             ]
                         ).'&nbsp;&nbsp;';
                         $data[6] .= __('Discovery.App.DB2');
@@ -823,7 +823,7 @@ class DiscoveryTaskList extends HTML
                         // Internal deployment task.
                         $no_operations = true;
                         $data[6] = html_print_image(
-                            'images/deploy.png',
+                            'images/osx-terminal@groups.svg',
                             true,
                             ['title' => __('Agent deployment')]
                         ).'&nbsp;&nbsp;';
@@ -833,7 +833,7 @@ class DiscoveryTaskList extends HTML
                     case DISCOVERY_APP_MICROSOFT_SQL_SERVER:
                         // Discovery Applications Oracle.
                         $data[6] = html_print_image(
-                            'images/network.png',
+                            'images/cluster@os.svg',
                             true,
                             ['title' => __('Discovery Applications Microsoft SQL Server')]
                         ).'&nbsp;&nbsp;';
@@ -845,20 +845,20 @@ class DiscoveryTaskList extends HTML
                         if ($task['id_recon_script'] == 0) {
                             // Discovery NetScan.
                             $data[6] = html_print_image(
-                                'images/op_network.png',
+                                'images/cluster@os.svg',
                                 true,
                                 [
                                     'title' => __('Discovery NetScan'),
-                                    'class' => 'invert_filter',
+                                    'class' => 'main_menu_icon invert_filter',
                                 ]
                             ).'&nbsp;&nbsp;';
                             $data[6] .= __('Discovery.NetScan');
                         } else {
                             // APP or external script recon task.
                             $data[6] = html_print_image(
-                                'images/plugin.png',
+                                'images/plugin@svg.svg',
                                 true,
-                                ['class' => 'invert_filter']
+                                ['class' => 'main_menu_icon invert_filter']
                             ).'&nbsp;&nbsp;';
                             $data[6] .= $recon_script_name;
                         }
@@ -911,7 +911,7 @@ class DiscoveryTaskList extends HTML
                                 true,
                                 [
                                     'title' => __('Review results'),
-                                    'class' => 'invert_filter',
+                                    'class' => 'main_menu_icon invert_filter',
                                 ]
                             );
                             $data[9] .= '</a>';
@@ -919,11 +919,11 @@ class DiscoveryTaskList extends HTML
 
                         $data[9] .= '<a href="#" onclick="progress_task_list('.$task['id_rt'].',\''.$task['name'].'\')">';
                         $data[9] .= html_print_image(
-                            'images/operation.png',
+                            'images/details.svg',
                             true,
                             [
                                 'title' => __('View summary'),
-                                'class' => 'invert_filter',
+                                'class' => 'main_menu_icon invert_filter',
                             ]
                         );
                         $data[9] .= '</a>';
@@ -940,11 +940,11 @@ class DiscoveryTaskList extends HTML
                         if (check_acl($config['id_user'], 0, 'MR')) {
                             $data[9] .= '<a href="#" onclick="show_map('.$task['id_rt'].',\''.$task['name'].'\')">';
                             $data[9] .= html_print_image(
-                                'images/dynamic_network_icon.png',
+                                'images/web@groups.svg',
                                 true,
                                 [
                                     'title' => __('View map'),
-                                    'class' => 'invert_filter',
+                                    'class' => 'main_menu_icon invert_filter',
                                 ]
                             );
                             $data[9] .= '</a>';
@@ -965,32 +965,32 @@ class DiscoveryTaskList extends HTML
                                         $tipam_task_id
                                     )
                                 ).'">'.html_print_image(
-                                    'images/config.png',
+                                    'images/edit.svg',
                                     true,
                                     [
                                         'title' => __('Edit task'),
-                                        'class' => 'invert_filter',
+                                        'class' => 'main_menu_icon invert_filter',
                                     ]
                                 ).'</a>';
                                 $data[9] .= '<a href="'.ui_get_full_url(
                                     'index.php?sec=gextensions&sec2=enterprise/tools/ipam/ipam&action=delete&id='.$tipam_task_id
                                 ).'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">'.html_print_image(
-                                    'images/cross.png',
+                                    'images/delete.svg',
                                     true,
                                     [
                                         'title' => __('Delete task'),
-                                        'class' => 'invert_filter',
+                                        'class' => 'main_menu_icon invert_filter',
                                     ]
                                 ).'</a>';
                             } else {
                                 $data[9] .= '<a href="'.ui_get_full_url(
                                     'index.php?sec=gservers&sec2=godmode/servers/discovery&wiz=tasklist&delete=1&task='.$task['id_rt']
                                 ).'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">'.html_print_image(
-                                    'images/cross.png',
+                                    'images/delete.svg',
                                     true,
                                     [
                                         'title' => __('Delete task'),
-                                        'class' => 'invert_filter',
+                                        'class' => 'main_menu_icon invert_filter',
                                     ]
                                 ).'</a>';
                             }
@@ -1003,21 +1003,21 @@ class DiscoveryTaskList extends HTML
                                     $task['id_rt']
                                 )
                             ).'">'.html_print_image(
-                                'images/config.png',
+                                'images/edit.svg',
                                 true,
                                 [
                                     'title' => __('Edit task'),
-                                    'class' => 'invert_filter',
+                                    'class' => 'main_menu_icon invert_filter',
                                 ]
                             ).'</a>';
                             $data[9] .= '<a href="'.ui_get_full_url(
                                 'index.php?sec=gservers&sec2=godmode/servers/discovery&wiz=tasklist&delete=1&task='.$task['id_rt']
                             ).'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">'.html_print_image(
-                                'images/cross.png',
+                                'images/delete.svg',
                                 true,
                                 [
                                     'title' => __('Delete task'),
-                                    'class' => 'invert_filter',
+                                    'class' => 'main_menu_icon invert_filter',
                                 ]
                             ).'</a>';
                         }
diff --git a/pandora_console/images/file-csv-primary-color.svg b/pandora_console/images/file-csv-primary-color.svg
new file mode 100644
index 0000000000..51afb11235
--- /dev/null
+++ b/pandora_console/images/file-csv-primary-color.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg  viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 61.2 (89653) - https://sketch.com -->
+    <title>Dark / 20 / file-csv@svg</title>
+    <desc>Created with Sketch.</desc>
+    <g id="Dark-/-20-/-file-csv" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Group" fill="#14524f">
+            <path d="M14,0 L20,6 L20,18 C20,19.1045695 19.1045695,20 18,20 L18,20 L2,20 C0.8954305,20 0,19.1045695 0,18 L0,18 L0,2 C0,0.8954305 0.8954305,0 2,0 L2,0 L14,0 Z M3.51944167,13 C2.19341974,13 1,13.9742896 1,15.5033829 C1,17.0324763 2.15154536,18 3.5333998,18 C4.9222333,18 5.63409771,17.1069012 5.8225324,16.3694181 L4.9222333,16.105548 C4.78963111,16.5520974 4.3778664,17.0866035 3.5333998,17.0866035 C2.73778664,17.0866035 1.99800598,16.5250338 1.99800598,15.5033829 C1.99800598,14.4140731 2.77966102,13.8998647 3.51944167,13.8998647 C4.3778664,13.8998647 4.76171486,14.4073072 4.88035892,14.8673884 L5.78763709,14.5899865 C5.59222333,13.811908 4.88733799,13 3.51944167,13 Z M8.18145563,13 C7.24626122,13 6.45762712,13.6495264 6.45762712,14.5020298 C6.45762712,15.2259811 6.9670987,15.7198917 7.7557328,15.8755074 L8.44666002,16.0108254 C8.83050847,16.0852503 9.04685942,16.3017591 9.04685942,16.579161 C9.04685942,16.917456 8.76071785,17.1677943 8.2442672,17.1677943 C7.54636092,17.1677943 7.20438684,16.7415426 7.16251246,16.2679296 L6.26919242,16.4979702 C6.34596211,17.1813261 6.92522433,18 8.23728814,18 C9.3888335,18 10.0239282,17.255751 10.0239282,16.5182679 C10.0239282,15.8416779 9.54237288,15.2733424 8.64207378,15.1041949 L7.95114656,14.9756428 C7.58823529,14.9079838 7.41375872,14.6982409 7.41375872,14.4343708 C7.41375872,14.1163735 7.72083749,13.8254398 8.1884347,13.8254398 C8.81655035,13.8254398 9.03988036,14.2381597 9.0887338,14.5020298 L9.95413759,14.2449256 C9.84247258,13.7036536 9.38185444,13 8.18145563,13 Z M11.3988036,13.1014885 L10.3449651,13.1014885 L12.1734796,17.8985115 L13.1645065,17.8985115 L15,13.1014885 L13.9810568,13.1014885 L12.6899302,16.6671177 L11.3988036,13.1014885 Z M14,2 L14,7 L19,7 L14,2 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/pandora_console/images/nodes@svg.svg b/pandora_console/images/nodes@svg.svg
new file mode 100644
index 0000000000..b97a133d73
--- /dev/null
+++ b/pandora_console/images/nodes@svg.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: sketchtool 61.2 (101010) - https://sketch.com -->
+    <title>A4F45784-4263-40A4-A100-0ADD2A4AF526@svg</title>
+    <desc>Created with sketchtool.</desc>
+    <g id="Mockups" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Mockup---Inventory-v2" transform="translate(-330.000000, -482.000000)">
+            <g id="Base-operations" transform="translate(310.000000, 462.000000)">
+                <g id="Contenido" transform="translate(20.000000, 20.000000)">
+                    <g id="Title">
+                        <g id="Node" transform="translate(0.000000, 1.000000)">
+                            <path d="M11.0005809,0.577602729 L17.0215369,4.05330429 C17.6403998,4.41055362 18.0216446,5.07084166 18.0216446,5.78541725 L18.0216446,12.2084379 C18.0216446,12.9225447 17.6408956,13.5824738 17.0226732,13.9398945 L10.9867915,17.429494 C10.3751132,17.7831311 9.62223302,17.7877875 9.00622741,17.4417433 L3.00985488,14.073251 C2.37954726,13.7191726 1.98939037,13.0524969 1.98939037,12.3295452 L1.98939037,5.78462237 C1.98939037,5.07047279 2.37018458,4.41051094 2.98846546,4.05310589 L8.99976366,0.578199219 C9.61866686,0.220434425 10.3814645,0.220207018 11.0005809,0.577602729 Z" id="Polygon" stroke="#3F3F3F" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
+                            <polyline id="Path-28" stroke="#3F3F3F" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" points="3 4 10 9 10 17.6651764"></polyline>
+                            <circle id="Oval" fill="#3F3F3F" cx="10" cy="9" r="3"></circle>
+                            <circle id="Oval" fill="#3F3F3F" cx="3" cy="4" r="3"></circle>
+                            <circle id="Oval" fill="#3F3F3F" cx="17" cy="4" r="3"></circle>
+                        </g>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/pandora_console/images/refresh@svg.svg b/pandora_console/images/refresh@svg.svg
new file mode 100644
index 0000000000..bead6c6a97
--- /dev/null
+++ b/pandora_console/images/refresh@svg.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="12px" viewBox="0 0 12 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: sketchtool 61.2 (101010) - https://sketch.com -->
+    <title>312C8F68-5915-4989-BCE0-E39966548B2E@svg</title>
+    <desc>Created with sketchtool.</desc>
+    <g id="Mockups" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
+        <g id="Mockup---Module-2-default-open" transform="translate(-1857.000000, -3735.000000)" stroke="#3F3F3F" stroke-width="2">
+            <g id="Barra-inferior" transform="translate(0.000000, 3710.000000)">
+                <g id="Acciones" transform="translate(1507.000000, 10.000000)">
+                    <g id="Principal-por-defecto" transform="translate(269.000000, 0.000000)">
+                        <g id="Icons/Elements/update-white" transform="translate(82.000000, 16.000000)">
+                            <polyline id="Path-10" points="10.0005064 0 10.0005064 2.98289013 7 2.98289013"></polyline>
+                            <path d="M0.000657169914,8.00835862 C0.790778884,9.26397417 2.12630154,9.92782378 4.00722512,9.99990745 C6.76864887,9.99990745 9.00722512,7.76136573 9.00722512,4.99998457 C9.00722512,2.23860342 6.76864887,6.16977954e-05 4.00722512,6.16977954e-05 C2.36730125,6.16977954e-05 0.911775413,0.789551382 0,2.00918391" id="Oval" transform="translate(4.503613, 4.999985) scale(-1, -1) translate(-4.503613, -4.999985) "></path>
+                        </g>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php
index 052f105eda..ca6d948117 100755
--- a/pandora_console/include/ajax/module.php
+++ b/pandora_console/include/ajax/module.php
@@ -248,7 +248,7 @@ if (check_login()) {
             false,
             false
         );
-        $formtable->data[0][3] = "<a href='javascript: show_module_detail_dialog(".$module_id.', '.$agentId.', "'.$server_name.'", 0, -1,"'.modules_get_agentmodule_name($module_id)."\")'>".html_print_image('images/refresh.png', true, ['style' => 'vertical-align: middle;', 'border' => '0', 'class' => 'invert_filter' ]).'</a>';
+        $formtable->data[0][3] = "<a href='javascript: show_module_detail_dialog(".$module_id.', '.$agentId.', "'.$server_name.'", 0, -1,"'.modules_get_agentmodule_name($module_id)."\")'>".html_print_image('images/refresh@svg.svg', true, ['style' => 'vertical-align: middle;', 'border' => '0', 'class' => 'main_menu_icon invert_filter' ]).'</a>';
         $formtable->rowspan[0][3] = 2;
         $formtable->cellstyle[0][3] = 'vertical-align: middle;';
 
@@ -1279,14 +1279,14 @@ if (check_login()) {
                         $linkCaption = __('Refresh');
                     }
 
-                    $moduleActionButtons[] = html_print_button(
-                        $linkCaption,
-                        'additional_action_for_'.$idAgenteModulo,
-                        false,
-                        'window.location.assign("index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$id_agente.'&amp;id_agente_modulo='.$module['id_agente_modulo'].'&amp;refr=60'.$addedLinkParams.'")',
+                    $moduleActionButtons[] = html_print_anchor(
                         [
-                            'mode'  => 'link',
-                            'style' => 'justify-content: flex-end;',
+                            'href'    => 'index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$id_agente.'&amp;id_agente_modulo='.$module['id_agente_modulo'].'&amp;refr=60'.$addedLinkParams.'"',
+                            'content' => html_print_image(
+                                'images/go-back@svg.svg',
+                                true,
+                                [ 'class' => 'main_menu_icon' ]
+                            ),
                         ],
                         true
                     );
@@ -1296,14 +1296,14 @@ if (check_login()) {
             if ((bool) check_acl($config['id_user'], $id_grupo, 'AW') === true
                 && $cluster_view === false
             ) {
-                $moduleActionButtons[] = html_print_button(
-                    __('Edit'),
-                    'edit_module_'.$idAgenteModulo,
-                    false,
-                    'window.location.assign("index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente&amp;id_agente='.$id_agente.'&amp;tab=module&amp;id_agent_module='.$module['id_agente_modulo'].'&amp;edit_module='.$module['id_modulo'].'")',
+                $moduleActionButtons[] = html_print_anchor(
                     [
-                        'mode'  => 'link',
-                        'style' => 'justify-content: flex-end;',
+                        'href'    => 'index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente&amp;id_agente='.$id_agente.'&amp;tab=module&amp;id_agent_module='.$module['id_agente_modulo'].'&amp;edit_module='.$module['id_modulo'].'"',
+                        'content' => html_print_image(
+                            'images/edit.svg',
+                            true,
+                            [ 'class' => 'main_menu_icon' ]
+                        ),
                     ],
                     true
                 );
diff --git a/pandora_console/include/class/CalendarManager.class.php b/pandora_console/include/class/CalendarManager.class.php
index 033e8986bd..d2411e8263 100644
--- a/pandora_console/include/class/CalendarManager.class.php
+++ b/pandora_console/include/class/CalendarManager.class.php
@@ -155,11 +155,11 @@ class CalendarManager
             'text'   => '<a href="'.ui_get_full_url(
                 $this->url.'&tab_calendar=list'
             ).'&pure='.(int) $config['pure'].'">'.html_print_image(
-                'images/list.png',
+                'images/logs@svg.svg',
                 true,
                 [
                     'title' => __('Alert calendar list'),
-                    'class' => 'invert_filter',
+                    'class' => 'main_menu_icon invert_filter',
                 ]
             ).'</a>',
         ];
@@ -177,11 +177,11 @@ class CalendarManager
                 'text'   => '<a href="'.ui_get_full_url(
                     $this->url.'&tab_calendar=list&op=edit&id='.$id
                 ).'&pure='.(int) $config['pure'].'">'.html_print_image(
-                    'images/pencil.png',
+                    'images/edit.svg',
                     true,
                     [
                         'title' => __('Edit calendar'),
-                        'class' => 'invert_filter',
+                        'class' => 'main_menu_icon invert_filter',
                     ]
                 ).'</a>',
             ];
@@ -195,7 +195,7 @@ class CalendarManager
                     true,
                     [
                         'title' => __('Alert special days'),
-                        'class' => 'invert_filter',
+                        'class' => 'main_menu_icon invert_filter',
                     ]
                 ).'</a>',
             ];
@@ -697,7 +697,7 @@ class CalendarManager
                                 );
                                 $tmp->options .= '">';
                                 $tmp->options .= html_print_image(
-                                    'images/config.png',
+                                    'images/edit.svg',
                                     true,
                                     [
                                         'title' => __('Edit'),
@@ -731,7 +731,7 @@ class CalendarManager
                                 );
                                 $tmp->options .= '">';
                                 $tmp->options .= html_print_image(
-                                    'images/cross.png',
+                                    'images/delete.svg',
                                     true,
                                     [
                                         'title' => __('Delete'),
diff --git a/pandora_console/include/class/Diagnostics.class.php b/pandora_console/include/class/Diagnostics.class.php
index f7a660f2c4..aeb5a46400 100644
--- a/pandora_console/include/class/Diagnostics.class.php
+++ b/pandora_console/include/class/Diagnostics.class.php
@@ -139,11 +139,11 @@ class Diagnostics extends Wizard
 
         $pdf_url = $this->url.'&pdf=true';
         $pdf_img = html_print_image(
-            'images/pdf.png',
+            'images/file-pdf.svg',
             true,
             [
                 'title'   => __('Export to PDF'),
-                'class'   => 'invert_filter',
+                'class'   => 'main_menu_icon invert_filter',
                 'onclick' => 'blockResubmit($(this))',
             ]
         );
diff --git a/pandora_console/include/class/EventSound.class.php b/pandora_console/include/class/EventSound.class.php
index 283d99d296..41e54cc4ff 100644
--- a/pandora_console/include/class/EventSound.class.php
+++ b/pandora_console/include/class/EventSound.class.php
@@ -182,22 +182,22 @@ class EventSound extends HTML
         $tabs = [
             'list'    => [
                 'text'   => '<a href="'.$base_url.'">'.html_print_image(
-                    'images/eye_show.png',
+                    'images/see-details@svg.svg',
                     true,
                     [
                         'title' => __('Sounds'),
-                        'class' => 'invert_filter',
+                        'class' => 'main_menu_icon invert_filter',
                     ]
                 ).'</a>',
                 'active' => (bool) ($tab != 'add'),
             ],
             'options' => [
                 'text'   => '<a href="'.$setup_url.'">'.html_print_image(
-                    'images/pen.png',
+                    'images/edit.svg',
                     true,
                     [
                         'title' => __('Create'),
-                        'class' => 'invert_filter',
+                        'class' => 'main_menu_icon invert_filter',
                     ]
                 ).'</a>',
                 'active' => (bool) ($tab == 'add'),
@@ -445,7 +445,7 @@ class EventSound extends HTML
                 true,
                 [
                     'title' => $action,
-                    'class' => 'invert_filter',
+                    'class' => 'main_menu_icon invert_filter',
                 ]
             );
             $options .= '</a>';
diff --git a/pandora_console/include/class/NetworkMap.class.php b/pandora_console/include/class/NetworkMap.class.php
index 701eb4ecfb..2f073fed3a 100644
--- a/pandora_console/include/class/NetworkMap.class.php
+++ b/pandora_console/include/class/NetworkMap.class.php
@@ -3246,7 +3246,7 @@ class NetworkMap
         $table->data['template_row']['edit'] = '';
 
         $table->data['template_row']['edit'] .= '<span class="edit_icon_correct" style="display: none">'.html_print_image('images/pixel_green.png', true, ['class' => 'main_menu_icon']).'</span><span class="edit_icon_fail" style="display: none" >'.html_print_image('images/dot_red.png', true).'</span><span class="edit_icon_progress" style="display: none">'.html_print_image('images/spinner.gif', true).'</span>';
-        // <span class="edit_icon"><a class="edit_icon_link" title="'.__('Update').'" href="#">'.html_print_image('images/config.png', true, ['class' => 'invert_filter']).'</a></span>';
+        // <span class="edit_icon"><a class="edit_icon_link" title="'.__('Update').'" href="#">'.html_print_image('images/edit.svg', true, ['class' => 'invert_filter']).'</a></span>';
         $table->data['template_row']['edit'] .= '<a class="delete_icon" href="#">'.html_print_image('images/delete.svg', true, ['class' => 'main_menu_icon invert_filter', 'style' => 'padding: 10px']).'</a>';
 
         $table->colspan['no_relations']['0'] = 5;
diff --git a/pandora_console/include/class/SatelliteAgent.class.php b/pandora_console/include/class/SatelliteAgent.class.php
index aa86f25e81..18a4806bb5 100644
--- a/pandora_console/include/class/SatelliteAgent.class.php
+++ b/pandora_console/include/class/SatelliteAgent.class.php
@@ -401,7 +401,7 @@ class SatelliteAgent extends HTML
 
                         if ($disable === false) {
                             $tmp->actions .= html_print_image(
-                                ($delete === true) ? 'images/add.png' : 'images/cross.png',
+                                ($delete === true) ? 'images/add.png' : 'images/delete.svg',
                                 true,
                                 [
                                     'border'  => '0',
diff --git a/pandora_console/include/class/SatelliteCollection.class.php b/pandora_console/include/class/SatelliteCollection.class.php
index d94756603a..a8af32d3b6 100644
--- a/pandora_console/include/class/SatelliteCollection.class.php
+++ b/pandora_console/include/class/SatelliteCollection.class.php
@@ -236,7 +236,7 @@ class SatelliteCollection extends HTML
 
                         $tmp->actions = '';
                         $tmp->actions .= html_print_image(
-                            ($delete === 0) ? 'images/add.png' : 'images/cross.png',
+                            ($delete === 0) ? 'images/add.png' : 'images/delete.svg',
                             true,
                             [
                                 'border'  => '0',
diff --git a/pandora_console/include/class/TreeService.class.php b/pandora_console/include/class/TreeService.class.php
index 69b06fd684..bfb1556202 100644
--- a/pandora_console/include/class/TreeService.class.php
+++ b/pandora_console/include/class/TreeService.class.php
@@ -424,21 +424,21 @@ class TreeService extends Tree
 
                     switch ($item->agent()->lastStatus()) {
                         case AGENT_STATUS_NORMAL:
-                            $tmp['statusImageHTML'] = '<img src="'.ui_get_full_url('images/status_sets/default/agent_ok_ball.png').'" data-title="NORMAL status." data-use_title_for_force_title="1" class="forced_title" alt="NORMAL status." />';
+                            $tmp['statusImageHTML'] = html_print_div(['class' => 'tree-service-status', 'style' => 'background-color: #82b92e', 'title' => __('Normal status') ], true);
                         break;
 
                         case AGENT_STATUS_CRITICAL:
                         case AGENT_STATUS_ALERT_FIRED:
-                            $tmp['statusImageHTML'] = '<img src="'.ui_get_full_url('images/status_sets/default/agent_critical_ball.png').'" data-title="CRITICAL status." data-use_title_for_force_title="1" class="forced_title" alt="CRITICAL status." />';
+                            $tmp['statusImageHTML'] = html_print_div(['class' => 'tree-service-status', 'style' => 'background-color: #e63c52', 'title' => __('Critical status') ], true);
                         break;
 
                         case AGENT_STATUS_WARNING:
-                            $tmp['statusImageHTML'] = '<img src="'.ui_get_full_url('images/status_sets/default/agent_warning_ball.png').'" data-title="WARNING status." data-use_title_for_force_title="1" class="forced_title" alt="WARNING status." />';
+                            $tmp['statusImageHTML'] = html_print_div(['class' => 'tree-service-status', 'style' => 'background-color: #f3b200', 'title' => __('Warning status') ], true);
                         break;
 
                         case AGENT_STATUS_UNKNOWN:
                         default:
-                            $tmp['statusImageHTML'] = '<img src="'.ui_get_full_url('images/status_sets/default/agent_no_data_ball.png').'" data-title="UNKNOWN status." data-use_title_for_force_title="1" class="forced_title" alt="UNKNOWN status." />';
+                            $tmp['statusImageHTML'] = html_print_div(['class' => 'tree-service-status', 'style' => 'background-color: #B2B2B2', 'title' => __('Unknown status') ], true);
                         break;
                     }
 
@@ -634,36 +634,20 @@ class TreeService extends Tree
                     $tmp['rootID'] = $this->rootID;
                     switch ($item->service()->lastStatus()) {
                         case SERVICE_STATUS_NORMAL:
-                            $tmp['statusImageHTML'] = '<img src="';
-                            $tmp['statusImageHTML'] .= ui_get_full_url(
-                                'images/status_sets/default/agent_ok_ball.png'
-                            );
-                            $tmp['statusImageHTML'] .= '" data-title="NORMAL status." data-use_title_for_force_title="1" class="forced_title" alt="NORMAL status." />';
+                            $tmp['statusImageHTML'] = html_print_div(['class' => 'tree-service-status', 'style' => 'background-color: #82b92e', 'title' => __('Normal status') ], true);
                         break;
 
                         case SERVICE_STATUS_CRITICAL:
-                            $tmp['statusImageHTML'] = '<img src="';
-                            $tmp['statusImageHTML'] .= ui_get_full_url(
-                                'images/status_sets/default/agent_critical_ball.png'
-                            );
-                            $tmp['statusImageHTML'] .= '" data-title="CRITICAL status." data-use_title_for_force_title="1" class="forced_title" alt="CRITICAL status." />';
+                            $tmp['statusImageHTML'] = html_print_div(['class' => 'tree-service-status', 'style' => 'background-color: #e63c52', 'title' => __('Critical status') ], true);
                         break;
 
                         case SERVICE_STATUS_WARNING:
-                            $tmp['statusImageHTML'] = '<img src="';
-                            $tmp['statusImageHTML'] .= ui_get_full_url(
-                                'images/status_sets/default/agent_warning_ball.png'
-                            );
-                            $tmp['statusImageHTML'] .= '" data-title="WARNING status." data-use_title_for_force_title="1" class="forced_title" alt="WARNING status." />';
+                            $tmp['statusImageHTML'] = html_print_div(['class' => 'tree-service-status', 'style' => 'background-color: #f3b200', 'title' => __('Warning status') ], true);
                         break;
 
                         case SERVICE_STATUS_UNKNOWN:
                         default:
-                            $tmp['statusImageHTML'] = '<img src="';
-                            $tmp['statusImageHTML'] .= ui_get_full_url(
-                                'images/status_sets/default/agent_no_data_ball.png'
-                            );
-                            $tmp['statusImageHTML'] .= '" data-title="UNKNOWN status." data-use_title_for_force_title="1" class="forced_title" alt="UNKNOWN status." />';
+                            $tmp['statusImageHTML'] = html_print_div(['class' => 'tree-service-status', 'style' => 'background-color: #B2B2B2', 'title' => __('Unknown status') ], true);
                         break;
                     }
                 break;
diff --git a/pandora_console/include/functions_container.php b/pandora_console/include/functions_container.php
index e9d034f431..9137a7fa3a 100644
--- a/pandora_console/include/functions_container.php
+++ b/pandora_console/include/functions_container.php
@@ -180,7 +180,7 @@ function folder_table($graphs)
 
         if (($report_w || $report_m) && users_can_manage_group_all($access)) {
             $data[4] = '<a href="index.php?sec=reporting&sec2=godmode/reporting/graph_builder&edit_graph=1&id='.$graph['id_graph'].'">'.html_print_image(
-                'images/config.png',
+                'images/edit.svg',
                 true,
                 ['class' => 'invert_filter']
             ).'</a>';
@@ -188,7 +188,7 @@ function folder_table($graphs)
             $data[4] .= '&nbsp;';
 
             $data[4] .= '<a href="index.php?sec=reporting&sec2=godmode/reporting/graphs&delete_graph=1&id='.$graph['id_graph'].'" onClick="if (!confirm(\''.__('Are you sure?').'\'))
-					return false;">'.html_print_image('images/cross.png', true, ['alt' => __('Delete'), 'title' => __('Delete'), 'class' => 'invert_filter']).'</a>'.html_print_checkbox_extended('delete_multiple[]', $graph['id_graph'], false, false, '', 'class="check_delete mrgn_lft_2px"', true);
+					return false;">'.html_print_image('images/delete.svg', true, ['alt' => __('Delete'), 'title' => __('Delete'), 'class' => 'invert_filter']).'</a>'.html_print_checkbox_extended('delete_multiple[]', $graph['id_graph'], false, false, '', 'class="check_delete mrgn_lft_2px"', true);
         }
 
         array_push($table->data, $data);
diff --git a/pandora_console/include/functions_cron.php b/pandora_console/include/functions_cron.php
index 62333f00b8..462c5459b4 100644
--- a/pandora_console/include/functions_cron.php
+++ b/pandora_console/include/functions_cron.php
@@ -532,11 +532,11 @@ function cron_list_table()
                                     $task['id']
                                 ),
                                 'content' => html_print_image(
-                                    'images/target.png',
+                                    'images/change-active.svg',
                                     true,
                                     [
                                         'title' => __('Force run'),
-                                        'class' => 'invert_filter',
+                                        'class' => 'main_menu_icon invert_filter',
                                     ]
                                 ),
                             ],
@@ -570,11 +570,11 @@ function cron_list_table()
                                     $task['id']
                                 ),
                                 'content' => html_print_image(
-                                    'images/target.png',
+                                    'images/change-active.svg',
                                     true,
                                     [
                                         'title' => __('Force run'),
-                                        'class' => 'invert_filter',
+                                        'class' => 'main_menu_icon invert_filter',
                                     ]
                                 ),
                             ],
@@ -625,11 +625,11 @@ function cron_list_table()
                                     $task['id']
                                 ),
                                 'content' => html_print_image(
-                                    'images/target.png',
+                                    'images/change-active.svg',
                                     true,
                                     [
                                         'title' => __('Force run'),
-                                        'class' => 'invert_filter',
+                                        'class' => 'main_menu_icon invert_filter',
                                     ]
                                 ),
                             ],
@@ -717,11 +717,11 @@ function cron_list_table()
                                     $task['id']
                                 ),
                                 'content' => html_print_image(
-                                    'images/target.png',
+                                    'images/change-active.svg',
                                     true,
                                     [
                                         'title' => __('Force run'),
-                                        'class' => 'invert_filter',
+                                        'class' => 'main_menu_icon invert_filter',
                                     ]
                                 ),
                             ],
@@ -753,11 +753,11 @@ function cron_list_table()
                                     $task['id']
                                 ),
                                 'content' => html_print_image(
-                                    'images/target.png',
+                                    'images/change-active.svg',
                                     true,
                                     [
                                         'title' => __('Force run'),
-                                        'class' => 'invert_filter',
+                                        'class' => 'main_menu_icon invert_filter',
                                     ]
                                 ),
                             ],
@@ -799,11 +799,11 @@ function cron_list_table()
                                     $task['id']
                                 ),
                                 'content' => html_print_image(
-                                    'images/target.png',
+                                    'images/change-active.svg',
                                     true,
                                     [
                                         'title' => __('Force run'),
-                                        'class' => 'invert_filter',
+                                        'class' => 'main_menu_icon invert_filter',
                                     ]
                                 ),
                             ],
@@ -841,11 +841,11 @@ function cron_list_table()
                                     $task['id']
                                 ),
                                 'content' => html_print_image(
-                                    'images/target.png',
+                                    'images/change-active.svg',
                                     true,
                                     [
                                         'title' => __('Force run'),
-                                        'class' => 'invert_filter',
+                                        'class' => 'main_menu_icon invert_filter',
                                     ]
                                 ),
                             ],
@@ -875,11 +875,11 @@ function cron_list_table()
                                     $task['id']
                                 ),
                                 'content' => html_print_image(
-                                    'images/target.png',
+                                    'images/change-active.svg',
                                     true,
                                     [
                                         'title' => __('Force run'),
-                                        'class' => 'invert_filter',
+                                        'class' => 'main_menu_icon invert_filter',
                                     ]
                                 ),
                             ],
@@ -915,11 +915,11 @@ function cron_list_table()
                     $data[7]  = '<a href="'.$url;
                     $data[7] .= 'edit_task=1&id='.$task['id'].'">';
                     $data[7] .= html_print_image(
-                        'images/config.png',
+                        'images/edit.svg',
                         true,
                         [
                             'title' => __('Edit'),
-                            'class' => 'invert_filter',
+                            'class' => 'main_menu_icon invert_filter',
                         ]
                     );
                     $data[7] .= '</a>';
@@ -929,11 +929,11 @@ function cron_list_table()
                     $data[7] .= '<a href="'.$url;
                     $data[7] .= 'delete_task=1&id_user_task='.$task['id'].'">';
                     $data[7] .= html_print_image(
-                        'images/cross.png',
+                        'images/delete.svg',
                         true,
                         [
                             'title' => __('Delete'),
-                            'class' => 'invert_filter',
+                            'class' => 'main_menu_icon invert_filter',
                         ]
                     );
                     $data[7] .= '</a>';
@@ -943,11 +943,11 @@ function cron_list_table()
                     $data[7] = '<a href="'.$url;
                     $data[7] .= 'edit_task=1&id='.$task['id'].'">';
                     $data[7] .= html_print_image(
-                        'images/config.png',
+                        'images/edit.svg',
                         true,
                         [
                             'title' => __('Edit'),
-                            'class' => 'invert_filter',
+                            'class' => 'main_menu_icon invert_filter',
                         ]
                     );
                     $data[7] .= '</a>';
@@ -957,11 +957,11 @@ function cron_list_table()
                     $data[7] .= '<a href="'.$url;
                     $data[7] .= 'delete_task=1&id_user_task='.$task['id'].'">';
                     $data[7] .= html_print_image(
-                        'images/cross.png',
+                        'images/delete.svg',
                         true,
                         [
                             'title' => __('Delete'),
-                            'class' => 'invert_filter',
+                            'class' => 'main_menu_icon invert_filter',
                         ]
                     );
                     $data[7] .= '</a>';
@@ -982,7 +982,7 @@ function cron_list_table()
                             true,
                             [
                                 'title' => ((bool) $task['enabled'] === true) ? __('Disable task') : __('Enable task'),
-                                'class' => 'invert_filter',
+                                'class' => 'main_menu_icon invert_filter',
                             ]
                         ),
                     ],
diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index f779b7121e..1c6740efff 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -3453,7 +3453,7 @@ function events_page_responses($event)
             __('Update'),
             'status_button',
             false,
-            'event_change_status(\''.$event['similar_ids'].'\','.$event['server_id'].');',
+            'event_change_status("'.$event['similar_ids'].'",'.$event['server_id'].');',
             [
                 'icon' => 'next',
                 'mode' => 'link',
@@ -3484,7 +3484,7 @@ function events_page_responses($event)
             __('Add comment'),
             'comment_button',
             false,
-            '$(\'#link_comments\').trigger(\'click\');',
+            '$("#link_comments").trigger("click");',
             [
                 'icon' => 'next',
                 'mode' => 'link',
@@ -3511,7 +3511,7 @@ function events_page_responses($event)
             __('Delete event'),
             'delete_button',
             false,
-            'if(!confirm(\''.__('Are you sure?').'\')) { return false; } this.form.submit();',
+            'if(!confirm("'.__('Are you sure?').'")) { return false; } this.form.submit();',
             [
                 'icon' => 'cancel',
                 'mode' => 'link',
@@ -4260,7 +4260,7 @@ function events_page_details($event, $server_id=0)
             __('View custom fields'),
             'custom_button',
             false,
-            '$(\'#link_custom_fields\').trigger(\'click\');',
+            '$("#link_custom_fields").trigger("click");',
             [ 'mode' => 'link' ],
             true
         );
@@ -5172,7 +5172,7 @@ function events_page_comments($event, $ajax=false, $groupedComments=[])
             __('Add comment'),
             'comment_button',
             false,
-            'event_comment(\''.base64_encode(json_encode($event)).'\');',
+            'event_comment("'.base64_encode(json_encode($event)).'");',
             [
                 'icon' => 'next',
                 'mode' => 'mini secondary',
@@ -5779,7 +5779,7 @@ function get_row_response_action(
         __('Execute again'),
         'btn_str',
         false,
-        'perform_response(\''.base64_encode(json_encode($event_response)).'\','.$response_id.',\''.trim($index).'\')',
+        'perform_response("'.base64_encode(json_encode($event_response)).'",'.$response_id.',"'.trim($index).'")',
         [
             'icon' => 'next',
             'mode' => 'mini secondary',
diff --git a/pandora_console/include/functions_gis.php b/pandora_console/include/functions_gis.php
index 4dedff553a..48d42d43c5 100644
--- a/pandora_console/include/functions_gis.php
+++ b/pandora_console/include/functions_gis.php
@@ -1585,7 +1585,7 @@ function gis_add_conection_maps_in_form($map_connection_list)
                 <tr class="row_0">
                     <td>'.html_print_input_text('map_connection_name_'.$mapConnection['id_conection'], $mapConnectionRowDB['conection_name'], '', 20, 40, true, true).'</td>
                     <td>'.$radioButton.'</td>
-                    <td><a id="delete_row" href="javascript: deleteConnectionMap(\''.$mapConnection['id_conection'].'\')">'.html_print_image('images/cross.png', true, ['alt' => '', 'class' => 'invert_filter']).'</a></td>
+                    <td><a id="delete_row" href="javascript: deleteConnectionMap(\''.$mapConnection['id_conection'].'\')">'.html_print_image('images/delete.svg', true, ['alt' => '', 'class' => 'invert_filter']).'</a></td>
                 </tr>
             </tbody>
             <script type="text/javascript">
diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index 5b16cbabd6..01d8172633 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -4565,6 +4565,12 @@ function html_print_image(
     // Dont use safe_input here or the performance will dead.
     $style = '';
 
+    if (empty($options) === false && isset($options['class']) === true) {
+        $options['class'] .= ' main_menu_icon';
+    } else {
+        $options['class'] = 'main_menu_icon invert_filter';
+    }
+
     if (!empty($options)) {
         // Deprecated or value-less attributes.
         if (isset($options['align'])) {
diff --git a/pandora_console/include/functions_integriaims.php b/pandora_console/include/functions_integriaims.php
index 50795b70af..ff30e799e5 100644
--- a/pandora_console/include/functions_integriaims.php
+++ b/pandora_console/include/functions_integriaims.php
@@ -39,9 +39,9 @@ function integriaims_tabs($active_tab, $view=false)
 
     $url_tabs = ui_get_full_url('index.php?sec=incident&sec2=operation/incidents/');
 
-    $setup_tab['text'] = '<a href="'.ui_get_full_url('index.php?sec=general&sec2=godmode/setup/setup&section=integria').'">'.html_print_image('images/setup.png', true, ['title' => __('Configure Integria IMS'), 'class' => 'invert_filter']).'</a>';
-    $list_tab['text'] = '<a href="'.$url_tabs.'list_integriaims_incidents">'.html_print_image('images/list.png', true, ['title' => __('Ticket list'), 'class' => 'invert_filter']).'</a>';
-    $create_tab['text'] = '<a href="'.$url_tabs.'configure_integriaims_incident">'.html_print_image('images/pencil.png', true, ['title' => __('New ticket'), 'class' => 'invert_filter']).'</a>';
+    $setup_tab['text'] = '<a href="'.ui_get_full_url('index.php?sec=general&sec2=godmode/setup/setup&section=integria').'">'.html_print_image('images/configuration@svg.svg', true, ['title' => __('Configure Integria IMS'), 'class' => 'main_menu_icon invert_filter']).'</a>';
+    $list_tab['text'] = '<a href="'.$url_tabs.'list_integriaims_incidents">'.html_print_image('images/logs@svg.svg', true, ['title' => __('Ticket list'), 'class' => 'main_menu_icon invert_filter']).'</a>';
+    $create_tab['text'] = '<a href="'.$url_tabs.'configure_integriaims_incident">'.html_print_image('images/edit.svg', true, ['title' => __('New ticket'), 'class' => 'main_menu_icon invert_filter']).'</a>';
 
     switch ($active_tab) {
         case 'setup_tab':
@@ -70,8 +70,8 @@ function integriaims_tabs($active_tab, $view=false)
     }
 
     if ($view) {
-        $create_tab['text'] = '<a href="'.$url_tabs.'configure_integriaims_incident&incident_id='.$view.'">'.html_print_image('images/pencil.png', true, ['title' => __('Edit ticket'), 'class' => 'invert_filter']).'</a>';
-        $view_tab['text'] = '<a href="'.$url_tabs.'dashboard_detail_integriaims_incident&incident_id='.$view.'">'.html_print_image('images/operation.png', true, ['title' => __('View ticket'), 'class' => 'invert_filter']).'</a>';
+        $create_tab['text'] = '<a href="'.$url_tabs.'configure_integriaims_incident&incident_id='.$view.'">'.html_print_image('images/edit.svg', true, ['title' => __('Edit ticket'), 'class' => 'main_menu_icon invert_filter']).'</a>';
+        $view_tab['text'] = '<a href="'.$url_tabs.'dashboard_detail_integriaims_incident&incident_id='.$view.'">'.html_print_image('images/details.svg', true, ['title' => __('View ticket'), 'class' => 'main_menu_icon invert_filter']).'</a>';
         // When the current page is the View page.
         if (!$active_tab) {
             $view_tab['active'] = true;
diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php
index f804416a6a..dbb988782a 100755
--- a/pandora_console/include/functions_modules.php
+++ b/pandora_console/include/functions_modules.php
@@ -1019,7 +1019,7 @@ function modules_format_delete($id)
     $txt = '';
 
     if (check_acl($config['id_user'], $group, 'AW') == 1) {
-        $txt = '<a href="index.php?sec=estado&sec2=operation/agentes/datos_agente&period='.$period.'&id='.$module_id.'&delete='.$id.'">'.html_print_image('images/cross.png', true, ['border' => '0', 'class' => 'invert_filter']).'</a>';
+        $txt = '<a href="index.php?sec=estado&sec2=operation/agentes/datos_agente&period='.$period.'&id='.$module_id.'&delete='.$id.'">'.html_print_image('images/delete.svg', true, ['border' => '0', 'class' => 'invert_filter']).'</a>';
     }
 
     return $txt;
@@ -1040,7 +1040,7 @@ function modules_format_delete_string($id)
     $txt = '';
 
     if (check_acl($config['id_user'], $group, 'AW') == 1) {
-        $txt = '<a href="index.php?sec=estado&sec2=operation/agentes/datos_agente&period='.$period.'&id='.$module_id.'&delete_string='.$id.'">'.html_print_image('images/cross.png', true, ['border' => '0', 'class' => 'invert_filter']).'</a>';
+        $txt = '<a href="index.php?sec=estado&sec2=operation/agentes/datos_agente&period='.$period.'&id='.$module_id.'&delete_string='.$id.'">'.html_print_image('images/delete.svg', true, ['border' => '0', 'class' => 'invert_filter']).'</a>';
     }
 
     return $txt;
@@ -1061,7 +1061,7 @@ function modules_format_delete_log4x($id)
     $txt = '';
 
     if (check_acl($config['id_user'], $group, 'AW') == 1) {
-        $txt = '<a href="index.php?sec=estado&sec2=operation/agentes/datos_agente&period='.$period.'&id='.$module_id.'&delete_log4x='.$id.'">'.html_print_image('images/cross.png', true, ['border' => '0', 'class' => 'invert_filter']).'</a>';
+        $txt = '<a href="index.php?sec=estado&sec2=operation/agentes/datos_agente&period='.$period.'&id='.$module_id.'&delete_log4x='.$id.'">'.html_print_image('images/delete.svg', true, ['border' => '0', 'class' => 'invert_filter']).'</a>';
     }
 
     return $txt;
diff --git a/pandora_console/include/functions_notifications.php b/pandora_console/include/functions_notifications.php
index 657ce1ff35..6918bad686 100644
--- a/pandora_console/include/functions_notifications.php
+++ b/pandora_console/include/functions_notifications.php
@@ -863,18 +863,22 @@ function notifications_print_source_select_box($info_selec, $id, $source_id)
             true
         ),
         html_print_image(
-            'images/input_add.png',
+            'images/fail@svg.svg',
             true,
             [
+                'style'   => 'width: 14px;rotate: 45deg',
                 'title'   => $add_title,
+                'class'   => 'main_menu_icon invert_filter',
                 'onclick' => sprintf("add_source_dialog('%s', '%s')", $id, $source_id),
             ]
         ),
         html_print_image(
-            'images/input_delete.png',
+            'images/delete.svg',
             true,
             [
+                'style'   => 'width: 14px',
                 'title'   => $delete_title,
+                'class'   => 'main_menu_icon invert_filter',
                 'onclick' => sprintf(
                     "remove_source_elements('%s', '%s')",
                     $id,
@@ -923,29 +927,31 @@ function notifications_print_two_ways_select($info_selec, $users, $source_id)
             ''
         ),
         html_print_image(
-            'images/darrowright.png',
+            'images/arrow@svg.svg',
             true,
             [
                 'title'   => __('Add elements'),
+                'style'   => 'rotate: 90deg',
                 'onclick' => sprintf(
                     "notifications_modify_two_ways_element('%s', '%s', 'add')",
                     $users,
                     $source_id
                 ),
-                'class'   => 'invert_filter',
+                'class'   => 'main_menu_icon invert_filter',
             ]
         ),
         html_print_image(
-            'images/darrowleft.png',
+            'images/arrow@svg.svg',
             true,
             [
                 'title'   => __('Remove elements'),
+                'style'   => 'rotate: 0',
                 'onclick' => sprintf(
                     "notifications_modify_two_ways_element('%s', '%s', 'remove')",
                     $users,
                     $source_id
                 ),
-                'class'   => 'invert_filter',
+                'class'   => 'main_menu_icon invert_filter',
             ]
         ),
         html_print_select(
diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index 0c3a0a6db5..9c99d47a2a 100755
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -12169,24 +12169,11 @@ function reporting_get_stats_alerts($data, $links=false)
     $tdata[3] = html_print_div(
         [
             'title' => __('Fired alerts'),
-            'style' => 'background-color: '.COL_CRITICAL,
-            'class' => 'alert_background_state main_menu_icon invert_filter',
+            'style' => 'background-color: '.COL_ALERTFIRED,
+            'class' => 'alert_background_state main_menu_icon',
         ],
         true
     );
-    /*
-        html_print_image(
-        'images/bell_error.png',
-        true,
-        [
-            'title' => __('Fired alerts'),
-            'class' => 'invert_filter',
-        ],
-        false,
-        false,
-        false,
-        true
-    );*/
     $tdata[4] = $data['monitor_alerts_fired'] <= 0 ? '-' : $data['monitor_alerts_fired'];
     $tdata[4] = '<a style="color: '.COL_ALERTFIRED.';" class="big_data" href="'.$urls['monitor_alerts_fired'].'">'.$tdata[4].'</a>';
     $table_al->rowclass[] = '';
diff --git a/pandora_console/include/functions_snmp_browser.php b/pandora_console/include/functions_snmp_browser.php
index a43150c94e..0e51faa66c 100644
--- a/pandora_console/include/functions_snmp_browser.php
+++ b/pandora_console/include/functions_snmp_browser.php
@@ -144,7 +144,7 @@ function snmp_browser_get_html_tree(
         // Branch or leave with branches!
         if (isset($sub_level['__OID__'])) {
             $output .= "<a onfocus='javascript: this.blur();' href='javascript: snmpGet(\"".addslashes($sub_level['__OID__'])."\");'>";
-            $output .= '<img src="'.$url.'/../../images/operation.png" class="vertical_middle">';
+            $output .= '<img src="'.$url.'/../../images/details.svg" class="main_menu_icon invert_filter vertical_middle">';
             $output .= '</a>';
         }
 
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index ede1cbb165..d272ee224a 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -708,7 +708,7 @@ function ui_print_group_icon($id_group, $return=false, $path='', $style='', $lin
 
     if ($link === true) {
         if ($tactical_view === true) {
-            $output = '<a href="'.$config['homeurl'].'index.php?sec=gagente&sec2=godmode/groups/tactical&id_group='.$id_group.'">';
+            $output = '<a href="'.$config['homeurl'].'index.php?sec=gagent&sec2=godmode/groups/tactical&id_group='.$id_group.'">';
         } else {
             $output = '<a href="'.$config['homeurl'].'index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=60&amp;group_id='.$id_group.'">';
         }
@@ -728,12 +728,13 @@ function ui_print_group_icon($id_group, $return=false, $path='', $style='', $lin
             }
 
             $icon = (str_contains($icon, '.svg') === true) ? $icon : $icon.'.svg';
+
             $output .= html_print_image(
                 'images/'.$icon,
                 true,
                 [
                     'style' => $style,
-                    'class' => $class,
+                    'class' => 'main_menu_icon '.$class,
                     'alt'   => groups_get_name($id_group, true),
                     'title' => groups_get_name($id_group, true),
                 ],
@@ -839,6 +840,10 @@ function ui_print_os_icon(
         $subfolder .= '/so_big_icons';
     }
 
+    if (isset($options['class']) === false) {
+        $options['class'] = 'main_menu_icon';
+    }
+
     $no_in_meta = (is_metaconsole() === false);
 
     $icon = (string) db_get_value('icon_name', 'tconfig_os', 'id_os', (int) $id_os);
@@ -859,13 +864,29 @@ function ui_print_os_icon(
         }
     } else if ($apply_skin) {
         if ($only_src) {
-            $output = html_print_image('images/'.$subfolder.'/'.$icon, true, $options, true, $relative, $no_in_meta, true);
+            $output = html_print_image(
+                'images/'.$subfolder.'/'.$icon,
+                true,
+                $options,
+                true,
+                $relative,
+                $no_in_meta,
+                true
+            );
         } else {
             if (!isset($options['title'])) {
                 $options['title'] = $os_name;
             }
 
-            $output = html_print_image('images/'.$subfolder.'/'.$icon, true, $options, false, $relative, $no_in_meta, true);
+            $output = html_print_image(
+                'images/'.$subfolder.'/'.$icon,
+                true,
+                $options,
+                false,
+                $relative,
+                $no_in_meta,
+                true
+            );
         }
     } else {
         // $output = "<img src='images/os_icons/" . $icon . "' alt='" . $os_name . "' title='" . $os_name . "'>";
@@ -4457,7 +4478,6 @@ function ui_toggle(
         $output .= "		    }\n";
         $output .= "		});\n";
         $output .= "		$('#tgl_ctrl_".$uniqid."').click(function() {\n";
-        $output .= "				console.log('#image_".$uniqid."');";
         $output .= '			if (hide_tgl_ctrl_'.$uniqid.") {\n";
         $output .= '				hide_tgl_ctrl_'.$uniqid." = 0;\n";
         $output .= "				$('#tgl_div_".$uniqid."').css('height', 'auto');\n";
@@ -7331,7 +7351,7 @@ function ui_get_inventory_module_add_form(
     $row['hidden-input'] .= html_print_input_text('hidden-custom-field-input', '', '', 25, 40, true);
     $row['hidden-input'] .= '<span>&nbsp;</span>';
     $row['hidden-input'] .= html_print_image(
-        'images/cross.png',
+        'images/delete.svg',
         true,
         [
             'border' => '0',
@@ -7379,7 +7399,7 @@ function ui_get_inventory_module_add_form(
 
             $row['input'] .= '<span>&nbsp;</span>';
             $row['input'] .= html_print_image(
-                'images/cross.png',
+                'images/delete.svg',
                 true,
                 [
                     'border' => '0',
diff --git a/pandora_console/include/help/en/help_configure_gis_map.php b/pandora_console/include/help/en/help_configure_gis_map.php
index fe86626457..80ecb195a3 100644
--- a/pandora_console/include/help/en/help_configure_gis_map.php
+++ b/pandora_console/include/help/en/help_configure_gis_map.php
@@ -49,7 +49,7 @@ Once the selection of the connection (or connections) is done, there is a posibi
 Each map has one or more layers<sup><span class="font_75p">1</span></sup> to show the agents. Each layer can have show the agents of a <strong>group</strong> and/or a <strong>list of agents</strong>. This way it's easy to set up the agents that will be shown on each Layer.
 </p>
 <p>
-The layers can be set as <strong>visible</strong> or <strong>hidden</strong>, and select the <strong>group</strong> with the selector or add <strong>agents</strong> with the box. Once the layer is defined (it will not be completely saved until the whole map is saved) it will be moved to the left column of defined layers, where it is possible to <strong>order</strong> (<?php html_print_image('images/up.png', false, ['alt' => 'move up icon']); ?> and <?php html_print_image('images/down.png', false, ['alt' => 'move down icon']); ?>) them, <strong>delete</strong> (<?php html_print_image('images/cross.png', false, ['alt' => 'delete icon']); ?>), or <strong>edited</strong> (<?php html_print_image('images/config.png', false, ['alt' => 'edit icon']); ?>) again.
+The layers can be set as <strong>visible</strong> or <strong>hidden</strong>, and select the <strong>group</strong> with the selector or add <strong>agents</strong> with the box. Once the layer is defined (it will not be completely saved until the whole map is saved) it will be moved to the left column of defined layers, where it is possible to <strong>order</strong> (<?php html_print_image('images/up.png', false, ['alt' => 'move up icon']); ?> and <?php html_print_image('images/down.png', false, ['alt' => 'move down icon']); ?>) them, <strong>delete</strong> (<?php html_print_image('images/delete.svg', false, ['alt' => 'delete icon']); ?>), or <strong>edited</strong> (<?php html_print_image('images/edit.svg', false, ['alt' => 'edit icon']); ?>) again.
 </p>
 <hr/>
 <sup><span class="font_75p">1</span></sup> <span class="font_85p">The default map can have 0 layers as is the one used in the agent GIS view and only uses one layer with the agent name.</span>
diff --git a/pandora_console/include/help/en/help_eventview.php b/pandora_console/include/help/en/help_eventview.php
index 6f96b2f89d..84de68af07 100644
--- a/pandora_console/include/help/en/help_eventview.php
+++ b/pandora_console/include/help/en/help_eventview.php
@@ -26,7 +26,7 @@
 <div class="pdd_l_30px w150px float-left line_17px">
     <h3>Actions</h3>
     <?php html_print_image('images/ok.png', false, ['title' => 'Validate event', 'alt' => 'Validate event']); ?> - Validate event<br>
-    <?php html_print_image('images/cross.png', false, ['title' => 'Delete event', 'alt' => 'Delete event']); ?> - Delete event<br>
+    <?php html_print_image('images/delete.svg', false, ['title' => 'Delete event', 'alt' => 'Delete event']); ?> - Delete event<br>
     <?php html_print_image('images/eye.png', false, ['title' => 'Show more', 'alt' => 'Show more']); ?> - Show more<br>
     <?php html_print_image('images/hourglass.png', false, ['title' => 'In progress', 'alt' => 'In progress']); ?> - In progress    
 </div>
diff --git a/pandora_console/include/help/en/help_gis_map_builder.php b/pandora_console/include/help/en/help_gis_map_builder.php
index ef666c7183..fbe6d98ab9 100644
--- a/pandora_console/include/help/en/help_gis_map_builder.php
+++ b/pandora_console/include/help/en/help_gis_map_builder.php
@@ -22,7 +22,7 @@ Options:
 <dd>Click on the view icon to <strong>view</strong> the map.</dd>
 <dt>Default radio button</dt>
 <dd>Click on the <strong>radio button</strong> corresponding to the map you want to make the default to set the <strong>default map</strong> </dd>
-<dt><?php html_print_image('images/cross.png', false, ['alt' => 'Delete']); ?> Delete</dt>
+<dt><?php html_print_image('images/delete.svg', false, ['alt' => 'Delete']); ?> Delete</dt>
 <dd>Click on the delete icon to <strong>delete</strong> the map.</dd>
 <dt>Create Button</dt>
 <dd>Click on Create button to <strong>create</strong> a new map.</dd>
diff --git a/pandora_console/include/help/en/help_setup_gis_index.php b/pandora_console/include/help/en/help_setup_gis_index.php
index d5db84cdd7..cb92e74aa4 100644
--- a/pandora_console/include/help/en/help_setup_gis_index.php
+++ b/pandora_console/include/help/en/help_setup_gis_index.php
@@ -9,5 +9,5 @@
 This page is the place where the admin can configure <strong>connections to GIS Map Servers</strong>.
 </p>
 <p>
-Here it is possible to see the list of defined connections, <strong>edit</strong> any one of them by clicking on their name, <strong>delete</strong> any connection by clicking on the delete icon (<?php html_print_image('images/cross.png', false, ['alt' => 'delete icon']); ?>) or <strong>create</strong> new connections using the create button.
+Here it is possible to see the list of defined connections, <strong>edit</strong> any one of them by clicking on their name, <strong>delete</strong> any connection by clicking on the delete icon (<?php html_print_image('images/delete.svg', false, ['alt' => 'delete icon']); ?>) or <strong>create</strong> new connections using the create button.
 </p>
diff --git a/pandora_console/include/help/es/help_eventview.php b/pandora_console/include/help/es/help_eventview.php
index 3f422aa1e0..017ba19148 100644
--- a/pandora_console/include/help/es/help_eventview.php
+++ b/pandora_console/include/help/es/help_eventview.php
@@ -26,7 +26,7 @@
 <div class="pdd_l_30px w150px float-left line_17px">
     <h3>Acciones</h3>
     <?php html_print_image('images/ok.png', false, ['title' => 'Validate event', 'alt' => 'Validate event']); ?> - Validar evento<br>
-    <?php html_print_image('images/cross.png', false, ['title' => 'Delete event', 'alt' => 'Delete event']); ?> - Borrar evento<br>
+    <?php html_print_image('images/delete.svg', false, ['title' => 'Delete event', 'alt' => 'Delete event']); ?> - Borrar evento<br>
     <?php html_print_image('images/eye.png', false, ['title' => 'Mostrar más', 'alt' => 'Mostrar más']); ?> - Mostrar más<br>
     <?php html_print_image('images/hourglass.png', false, ['title' => 'En progreso', 'alt' => 'En progreso']); ?> - En progreso
 </div>
diff --git a/pandora_console/include/help/es/help_gis_map_builder.php b/pandora_console/include/help/es/help_gis_map_builder.php
index 5abae44f56..5a289a571f 100644
--- a/pandora_console/include/help/es/help_gis_map_builder.php
+++ b/pandora_console/include/help/es/help_gis_map_builder.php
@@ -26,7 +26,7 @@ Opciones:
 <dd>Haga click en icono de visualizar para <strong>visualizar</strong> el mapa.</dd>
 <dt>Botón radio por defecto</dt>
 <dd>Haga click en el <strong> botón radio </strong> que se corresponda con el mapa que quiere por defecto para instalar <strong>mapa por defecto</strong> </dd>
-<dt><?php html_print_image('images/cross.png', false, ['alt' => 'Delete']); ?> Eliminar</dt>
+<dt><?php html_print_image('images/delete.svg', false, ['alt' => 'Delete']); ?> Eliminar</dt>
 <dd>Haga click en el botón de eliminar para <strong>eliminar</strong> el mapa</dd>
 <dt>Crear botón </dt>
 <dd>Haga click en el Botón de Crear para <strong>crear</strong> un mapa nuevo</dd>
diff --git a/pandora_console/include/help/ja/help_configure_gis_map.php b/pandora_console/include/help/ja/help_configure_gis_map.php
index b995e2e79f..7c5e5c07b8 100644
--- a/pandora_console/include/help/ja/help_configure_gis_map.php
+++ b/pandora_console/include/help/ja/help_configure_gis_map.php
@@ -57,7 +57,7 @@ GIS マップを設定するためには、少なくとも一つ選択されて
 <p>
 レイヤは、<strong>表示</strong>、<strong>非表示</strong>の設定ができ、<strong>グループ</strong>を選択や<strong>エージェント</strong>の追加ができます。
 一度レイヤが定義されると、左側の定義済レイヤに移ります。(定義は、マップ全体が保存されるまでは保存されません。)
-ここでは、再度、<strong>順番の変更</strong> (<?php html_print_image('images/up.png', false, ['alt' => 'move up icon']); ?>、<?php html_print_image('images/down.png', false, ['alt' => 'move down icon']); ?>)、<strong>削除</strong> (<?php html_print_image('images/cross.png', false, ['alt' => 'delete icon']); ?>)、<strong>編集</strong> (<?php html_print_image('images/config.png', false, ['alt' => 'edit icon']); ?>) ができます。
+ここでは、再度、<strong>順番の変更</strong> (<?php html_print_image('images/up.png', false, ['alt' => 'move up icon']); ?>、<?php html_print_image('images/down.png', false, ['alt' => 'move down icon']); ?>)、<strong>削除</strong> (<?php html_print_image('images/delete.svg', false, ['alt' => 'delete icon']); ?>)、<strong>編集</strong> (<?php html_print_image('images/edit.svg', false, ['alt' => 'edit icon']); ?>) ができます。
 </p>
 <hr/>
 <sup><span class="font_75p">1</span></sup> <span class="font_85p">デフォルトマップでは、エージェント名で一つのレイヤしか表示しない場合は、レイヤを持たない設定も可能です。</span>
diff --git a/pandora_console/include/help/ja/help_eventview.php b/pandora_console/include/help/ja/help_eventview.php
index 6246b12f79..bda2a1a7eb 100644
--- a/pandora_console/include/help/ja/help_eventview.php
+++ b/pandora_console/include/help/ja/help_eventview.php
@@ -26,7 +26,7 @@
 <div class="pdd_l_30px w150px float-left line_17px">
     <h3>アクション</h3>
     <?php html_print_image('images/ok.png', false, ['title' => '承諾する', 'alt' => '承諾する']); ?> - 承諾する<br>
-    <?php html_print_image('images/cross.png', false, ['title' => '削除する', 'alt' => '削除する']); ?> - 削除する<br>
+    <?php html_print_image('images/delete.svg', false, ['title' => '削除する', 'alt' => '削除する']); ?> - 削除する<br>
     <?php html_print_image('images/page_lightning.png', false, ['title' => 'インシデントを作成する', 'alt' => 'インシデントを作成する']); ?> - インシデントを作成する
 </div>
 
diff --git a/pandora_console/include/help/ja/help_gis_map_builder.php b/pandora_console/include/help/ja/help_gis_map_builder.php
index 1deb2e2d0f..436bc0ee48 100644
--- a/pandora_console/include/help/ja/help_gis_map_builder.php
+++ b/pandora_console/include/help/ja/help_gis_map_builder.php
@@ -25,7 +25,7 @@
 <dd>表示アイコンをクリックすると、マップを<strong>参照</strong>できます。</dd>
 <dt>デフォルトラジオボタン</dt>
 <dd><strong>ラジオボタン</strong>をクリックすると、そのマップが<strong>デフォルトマップ</strong>に設定されます。</dd>
-<dt><?php html_print_image('images/cross.png', false, ['alt' => 'Delete']); ?> 削除</dt>
+<dt><?php html_print_image('images/delete.svg', false, ['alt' => 'Delete']); ?> 削除</dt>
 <dd>削除アイコンをクリックすると、そのマップを<strong>削除</strong>します。</dd>
 <dt>作成ボタン</dt>
 <dd>作成ボタンをクリックすると、新しいマップを<strong>作成</strong>できます。</dd>
diff --git a/pandora_console/include/help/ja/help_setup_gis_index.php b/pandora_console/include/help/ja/help_setup_gis_index.php
index 181ca6cf43..13c4eb8d9e 100644
--- a/pandora_console/include/help/ja/help_setup_gis_index.php
+++ b/pandora_console/include/help/ja/help_setup_gis_index.php
@@ -11,6 +11,6 @@
 <p>
 設定済の利用マップ定義一覧の参照できます。
 <strong>編集</strong>するにはマップ名をクリックします。
-<strong>削除</strong>するには削除アイコン(<?php html_print_image('images/cross.png', false, ['alt' => 'delete icon']); ?> )をクリックします。
+<strong>削除</strong>するには削除アイコン(<?php html_print_image('images/delete.svg', false, ['alt' => 'delete icon']); ?> )をクリックします。
 また、新たな設定を<strong>作成</strong>するには、「作成」ボタンをクリックします。
 </p>
diff --git a/pandora_console/include/javascript/pandora_events.js b/pandora_console/include/javascript/pandora_events.js
index 7f7700f6f1..e3f4040205 100644
--- a/pandora_console/include/javascript/pandora_events.js
+++ b/pandora_console/include/javascript/pandora_events.js
@@ -67,7 +67,7 @@ function show_event_dialog(event, dialog_page) {
             background: "black"
           },
           width: 710,
-          height: 600,
+          height: 650,
           autoOpen: true,
           open: function() {
             if (
@@ -628,7 +628,7 @@ function delete_event(table, id_evento, event_rep, row, server_id) {
     },
     onDeny: function() {
       button.children[0];
-      button.children[0].src = "images/cross.png";
+      button.children[0].src = "images/delete.svg";
       return;
     }
   });
diff --git a/pandora_console/include/javascript/pandora_modules.js b/pandora_console/include/javascript/pandora_modules.js
index d780b979f7..771efb460f 100644
--- a/pandora_console/include/javascript/pandora_modules.js
+++ b/pandora_console/include/javascript/pandora_modules.js
@@ -1216,7 +1216,7 @@ function delete_macro_local_component(prefix) {
 //Add a new module macro
 function add_macro() {
   var macro_count = parseInt($("#hidden-module_macro_count").val());
-  var delete_icon = '<?php html_print_image ("images/cross.png", false) ?>';
+  var delete_icon = '<?php html_print_image ("images/delete.svg", false) ?>';
 
   // Add inputs for the new macro
   $("#module_macros").append(
diff --git a/pandora_console/include/javascript/tree/TreeController.js b/pandora_console/include/javascript/tree/TreeController.js
index 49d390888e..07fe111027 100644
--- a/pandora_console/include/javascript/tree/TreeController.js
+++ b/pandora_console/include/javascript/tree/TreeController.js
@@ -637,7 +637,7 @@ var TreeController = {
           var $content = $("<div></div>");
 
           // Leaf icon
-          $leafIcon.addClass("leaf-icon invert_filter");
+          $leafIcon.addClass("leaf-icon");
 
           // Content
           $content.addClass("node-content");
@@ -657,7 +657,7 @@ var TreeController = {
                     (controller.baseURL.length > 0 ? controller.baseURL : "") +
                     "images/" +
                     element.icon +
-                    '" /></div></div>'
+                    '" class="invert_filter"/></div></div>'
                 );
               } else if (
                 typeof element.iconHTML != "undefined" &&
@@ -759,7 +759,7 @@ var TreeController = {
                         : "") +
                       'images/event.svg" /> '
                   );
-                  $eventImage.addClass("agent-alerts-fired");
+                  $eventImage.addClass("agent-alerts-fired invert_filter");
                   $eventImage
                     .click(function(e) {
                       e.preventDefault();
@@ -875,7 +875,7 @@ var TreeController = {
                 $content.append($statusImage);
               }
               var image_tooltip =
-                '<span><img class="invert_filter forced_title" data-title="' +
+                '<span class="reinvert_filter"><img class="invert_filter forced_title" data-title="' +
                 (element.title ? element.title : element.name) +
                 '" data-use_title_for_force_title="1" src="' +
                 (controller.baseURL.length > 0 ? controller.baseURL : "") +
diff --git a/pandora_console/include/javascript/tree/TreeControllerMeta.js b/pandora_console/include/javascript/tree/TreeControllerMeta.js
index ab56ab73f0..084854b5e6 100644
--- a/pandora_console/include/javascript/tree/TreeControllerMeta.js
+++ b/pandora_console/include/javascript/tree/TreeControllerMeta.js
@@ -666,7 +666,7 @@ var TreeController = {
                 var $updateicon = $(
                   '<img src="' +
                     (controller.baseURL.length > 0 ? controller.baseURL : "") +
-                    'images/config.png" class="invert_filter" style="width:18px; vertical-align: middle;"/>'
+                    'images/edit.svg" class="invert_filter" style="width:18px; vertical-align: middle;"/>'
                 );
                 var $updatebtn = $('<a href = "' + url_edit + '"></a>').append(
                   $updateicon
@@ -682,7 +682,7 @@ var TreeController = {
                 var $deleteBtn = $(
                   '<a><img src="' +
                     (controller.baseURL.length > 0 ? controller.baseURL : "") +
-                    'images/cross.png" class="invert_filter" style="width:18px; vertical-align: middle; cursor: pointer;"/></a>'
+                    'images/delete.svg" class="invert_filter" style="width:18px; vertical-align: middle; cursor: pointer;"/></a>'
                 );
                 $deleteBtn.click(function(event) {
                   var ok_function = function() {
diff --git a/pandora_console/include/lib/ClusterViewer/ClusterManager.php b/pandora_console/include/lib/ClusterViewer/ClusterManager.php
index c9739111b7..03af57fb8a 100644
--- a/pandora_console/include/lib/ClusterViewer/ClusterManager.php
+++ b/pandora_console/include/lib/ClusterViewer/ClusterManager.php
@@ -595,11 +595,11 @@ class ClusterManager
                         );
                         $tmp->options .= '">';
                         $tmp->options .= html_print_image(
-                            'images/operation.png',
+                            'images/details.svg',
                             true,
                             [
                                 'title' => __('View'),
-                                'class' => 'invert_filter',
+                                'class' => 'main_menu_icon invert_filter',
                             ]
                         );
                         $tmp->options .= '</a>';
@@ -612,11 +612,11 @@ class ClusterManager
                             );
                             $tmp->options .= '">';
                             $tmp->options .= html_print_image(
-                                'images/config.png',
+                                'images/edit.svg',
                                 true,
                                 [
                                     'title' => __('Edit'),
-                                    'class' => 'invert_filter',
+                                    'class' => 'main_menu_icon invert_filter',
                                 ]
                             );
                             $tmp->options .= '</a>';
@@ -628,11 +628,11 @@ class ClusterManager
                             );
                             $tmp->options .= '">';
                             $tmp->options .= html_print_image(
-                                'images/cross.png',
+                                'images/delete.svg',
                                 true,
                                 [
                                     'title' => __('Delete'),
-                                    'class' => 'invert_filter',
+                                    'class' => 'main_menu_icon invert_filter',
                                 ]
                             );
                             $tmp->options .= '</a>';
diff --git a/pandora_console/include/rest-api/models/VisualConsole/View.php b/pandora_console/include/rest-api/models/VisualConsole/View.php
index e8305df830..635e3aa21a 100644
--- a/pandora_console/include/rest-api/models/VisualConsole/View.php
+++ b/pandora_console/include/rest-api/models/VisualConsole/View.php
@@ -63,22 +63,25 @@ class View extends \HTML
 
         $tabs = [
             [
-                'name' => __('Label settings'),
-                'id'   => 'tab-label',
-                'href' => $url.'&tabSelected=label',
-                'img'  => 'label-settings.png',
+                'name'  => __('Label settings'),
+                'id'    => 'tab-label',
+                'href'  => $url.'&tabSelected=label',
+                'img'   => 'tag@svg.svg',
+                'class' => 'main_menu_icon invert_filter',
             ],
             [
-                'name' => __('General settings'),
-                'id'   => 'tab-general',
-                'href' => $url.'&tabSelected=general',
-                'img'  => 'general-settings.png',
+                'name'  => __('General settings'),
+                'id'    => 'tab-general',
+                'href'  => $url.'&tabSelected=general',
+                'img'   => 'configuration@svg.svg',
+                'class' => 'main_menu_icon invert_filter',
             ],
             [
-                'name' => __('Specific settings'),
-                'id'   => 'tab-specific',
-                'href' => $url.'&tabSelected=specific',
-                'img'  => 'specific-settings.png',
+                'name'  => __('Specific settings'),
+                'id'    => 'tab-specific',
+                'href'  => $url.'&tabSelected=specific',
+                'img'   => 'incremental-data@svg.svg',
+                'class' => 'main_menu_icon invert_filter',
             ],
         ];
 
@@ -91,26 +94,29 @@ class View extends \HTML
             $activetabs = 0;
             $tabs = [
                 [
-                    'name' => __('Specific settings'),
-                    'id'   => 'tab-specific',
-                    'href' => $url.'&tabSelected=specific',
-                    'img'  => 'event_responses_col.png',
+                    'name'  => __('Specific settings'),
+                    'id'    => 'tab-specific',
+                    'href'  => $url.'&tabSelected=specific',
+                    'img'   => 'responses.svg',
+                    'class' => 'main_menu_icon invert_filter',
                 ],
             ];
         } else if ($type === BOX_ITEM || $type === COLOR_CLOUD || $type === ODOMETER) {
             $activetabs = 1;
             $tabs = [
                 [
-                    'name' => __('General settings'),
-                    'id'   => 'tab-general',
-                    'href' => $url.'&tabSelected=general',
-                    'img'  => 'pencil.png',
+                    'name'  => __('General settings'),
+                    'id'    => 'tab-general',
+                    'href'  => $url.'&tabSelected=general',
+                    'img'   => 'edit.svg',
+                    'class' => 'main_menu_icon invert_filter',
                 ],
                 [
-                    'name' => __('Specific settings'),
-                    'id'   => 'tab-specific',
-                    'href' => $url.'&tabSelected=specific',
-                    'img'  => 'event_responses_col.png',
+                    'name'  => __('Specific settings'),
+                    'id'    => 'tab-specific',
+                    'href'  => $url.'&tabSelected=specific',
+                    'img'   => 'responses.svg',
+                    'class' => 'main_menu_icon invert_filter',
                 ],
             ];
         }
diff --git a/pandora_console/include/styles/events.css b/pandora_console/include/styles/events.css
index c2a4665925..02611196c4 100644
--- a/pandora_console/include/styles/events.css
+++ b/pandora_console/include/styles/events.css
@@ -173,10 +173,6 @@ fieldset {
   max-width: 10px;
 }
 
-.fixed_filter_bar:has(div > div.filter-datatable-submain > form#events_form) {
-  margin-bottom: 0px;
-}
-
 .fixed_filter_bar > div.white_table_graph_header:has(div.filter_summary) {
   padding: 5px 20px;
 }
@@ -524,3 +520,7 @@ td#save_filter_form-0-0 > input[type="radio"],
 td#save_filter_form-0-1 > input[type="radio"] {
   height: 14px;
 }
+
+.module-search > input[type="text"] {
+  margin-bottom: 6px;
+}
diff --git a/pandora_console/include/styles/menu.css b/pandora_console/include/styles/menu.css
index e5ea0e51d6..0a777074ed 100644
--- a/pandora_console/include/styles/menu.css
+++ b/pandora_console/include/styles/menu.css
@@ -695,3 +695,8 @@ ul li {
 .head_tab_unselected span {
   color: #95a3bf;
 }
+
+.logo_full {
+  width: 215px !important;
+  height: auto !important;
+}
diff --git a/pandora_console/include/styles/order_interpreter.css b/pandora_console/include/styles/order_interpreter.css
index 28366e8376..604a0141a8 100644
--- a/pandora_console/include/styles/order_interpreter.css
+++ b/pandora_console/include/styles/order_interpreter.css
@@ -11,6 +11,7 @@ div.show_result_interpreter {
   position: absolute;
   z-index: 1;
   width: 300px;
+  top: 45px;
 }
 
 .more_results {
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index c9cfeb6525..73f140bcef 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -1135,6 +1135,11 @@ div#main {
   flex-direction: column;
   height: 100%;
   margin: 25px;
+  margin-bottom: 70px;
+}
+
+div#main:has(.networkconsole) {
+  margin-bottom: 0px;
 }
 
 textarea.conf_editor {
@@ -1430,7 +1435,7 @@ div#head {
   min-width: 882px;
   background-color: #fff;
   color: #000;
-  z-index: 1;
+  z-index: 2;
 }
 
 .fixed_header {
@@ -8133,11 +8138,11 @@ div.graph div.legend table {
 .networkconsole {
   width: 100%;
   height: 100%;
-  min-height: 460px;
   position: relative;
   overflow: hidden;
   background-color: var(--secondary-color);
-  min-height: calc(100vh - 220px);
+  min-height: calc(100vh - 200px);
+  border: 1px solid #cacaca;
 }
 
 /*
@@ -10072,7 +10077,11 @@ select:focus {
 }
 
 .dataTables_length > label > select {
-  min-height: 3em;
+  min-height: 42px;
+}
+
+.dataTables_length > label {
+  font-size: 0px;
 }
 
 input[type="button"],
@@ -10873,7 +10882,6 @@ tr.bring_next_field {
 .dataTables_wrapper {
   overflow: auto;
   width: 100%;
-  margin-bottom: 25px;
 }
 
 .dataTables_wrapper .dataTables_processing {
@@ -11219,11 +11227,17 @@ table.table_modal_alternate
   border-left: 0;
 }
 
-.main_menu_icon {
+div.main_menu_icon,
+img.main_menu_icon[src$=".svg"] {
   width: 20px;
   height: 20px;
 }
 
+input.main_menu_icon[src$=".svg"] {
+  width: 22px;
+  height: 22px;
+}
+
 .header_help_icon {
   width: 16px;
   height: 16px;
diff --git a/pandora_console/include/styles/pandora_black.css b/pandora_console/include/styles/pandora_black.css
index da9f58a9de..4ff0e5b7ce 100644
--- a/pandora_console/include/styles/pandora_black.css
+++ b/pandora_console/include/styles/pandora_black.css
@@ -74,7 +74,6 @@ div#head {
 .menu_full_classic #menu_tabs {
   height: 49px;
   border-bottom: 1px solid #82b92e;
-  padding-bottom: 2px;
 }
 
 .menu_full_collapsed #menu_tabs {
@@ -426,6 +425,9 @@ a.pandora_pagination {
   color: #fff;
 }
 
+span.reinvert_filter {
+  filter: invert(1);
+}
 /* firts_task.css */
 .new_task,
 div.new_task,
@@ -449,7 +451,11 @@ div.new_task > div {
 }
 
 /* tree.css */
-.node-content:hover {
+.tree-node div.node-content {
+  background-color: #444;
+}
+
+.tree-node div.node-content:hover {
   background-color: #222;
 }
 
@@ -768,6 +774,11 @@ form ul.form_flex {
   filter: invert(100%);
 }
 
+.info_table .invert_filter,
+.info_table .labels {
+  filter: invert(100%);
+}
+
 .graph_conteiner_inside,
 .container_table,
 .second_background,
@@ -1063,10 +1074,6 @@ div.integria_details_description textarea {
 }
 
 .networkconsole {
-  width: 100%;
-  height: 100%;
-  position: relative;
-  overflow: hidden;
   background-color: #111;
 }
 
@@ -1406,11 +1413,6 @@ p.trademark-copyright {
   overflow: auto;
 }
 
-.action_buttons_background_mask {
-  background-color: #222;
-  border-top: 1px solid #82b92e;
-}
-
 button.buttonButton,
 button.submitButton {
   box-shadow: 0px 3px 6px #111;
@@ -1501,3 +1503,7 @@ div.white_box.white_box_opened.no_border {
 table.filter-table-adv td > div label {
   color: white !important;
 }
+
+#principal_action_buttons {
+  background: #111111;
+}
diff --git a/pandora_console/include/styles/tables.css b/pandora_console/include/styles/tables.css
index af6508027d..1aeaa479e7 100644
--- a/pandora_console/include/styles/tables.css
+++ b/pandora_console/include/styles/tables.css
@@ -138,7 +138,7 @@
 .info_table > thead > tr > th,
 .info_table > thead > tr > th * {
   /*border-bottom: 1px solid #e2e2e2;*/
-  font-family: "lato-bolder";
+  font-family: "lato-bold";
   font-style: normal;
   text-rendering: optimizeLegibility;
   -webkit-font-smoothing: antialiased;
@@ -353,23 +353,40 @@ a.pandora_pagination.current:hover {
 
 /* CSV button datatables */
 .dt-button.buttons-csv.buttons-html5 {
-  background-image: url(../../images/file-csv.svg);
-  background-position: center center;
+  background-image: url(../../images/file-csv-primary-color.svg);
+  background-size: 22px;
+  background-position: 48px center;
   background-repeat: no-repeat;
-  color: #000;
-  border: none;
-  cursor: pointer;
-  display: inline;
-  padding: 7pt;
-  margin-left: 10px;
   background-color: transparent;
-}
-.dt-button.buttons-csv.buttons-html5 span {
-  font-size: 0;
+  color: var(--primary-color);
+  font-size: 20px;
+  height: 42px;
+  /* height: 32px; */
+  width: 80px;
+  margin-left: 10px;
+
+  display: flex;
+  justify-content: space-between;
+  flex-direction: row;
+  align-items: center;
+  box-shadow: 0px 3px 6px #c7c7c7;
+  border: 2px solid var(--primary-color);
+  border-radius: 8px;
+  padding: 0 10px;
+  cursor: pointer;
 }
 
-.dt-buttons {
-  margin-top: 3pt;
+.dt-button.buttons-csv.buttons-html5:hover {
+  color: #1d7873 !important;
+  border: 2px solid #1d7873 !important;
+}
+
+.dt-button.buttons-csv.buttons-html5:before {
+  content: "csv";
+}
+
+.dt-button.buttons-csv.buttons-html5 span {
+  font-size: 0;
 }
 
 .dt-button.buttons-csv.buttons-html5:active,
@@ -688,7 +705,7 @@ table.events-filters-create
   > div
   > div
   > .ui-autocomplete-input {
-  width: 94%;
+  width: 100%;
 }
 
 table.events-filters-create > tbody > tr > td > div.flex-row > div {
diff --git a/pandora_console/include/styles/tree.css b/pandora_console/include/styles/tree.css
index 61ad75716d..4c552e5e6d 100644
--- a/pandora_console/include/styles/tree.css
+++ b/pandora_console/include/styles/tree.css
@@ -1,6 +1,6 @@
 .tree-root {
   margin-top: 0px;
-  margin-bottom: 0px;
+  margin-bottom: 40px;
 }
 
 .tree-node.tree-node-header {
@@ -8,12 +8,6 @@
   flex-direction: row;
   flex-wrap: wrap;
   align-items: center;
-  /*
-  width: calc(100% - 24px);
-  border: 1px solid #eaeaea;
-  border-radius: 4px;
-  background-color: #fff;
-  */
   margin-bottom: 8px;
 }
 
@@ -392,6 +386,24 @@ div#tree-controller-recipient {
 .tree-node > .node-content > .agent-alerts-fired {
   float: left;
   position: relative;
-  left: 26px;
+  left: 13px;
   top: -5px;
 }
+
+.tree-node > .node-content > div.tree-service-status {
+  width: 7px;
+  height: 20px;
+  margin-left: 0;
+  border-radius: 5px;
+}
+
+.tree-node > .node-content.node-service > div.tree-service-status {
+  width: 7px;
+  height: 20px;
+  margin-left: 5px;
+  border-radius: 5px;
+}
+
+.tree-node .node-icon.node-status {
+  border: 0;
+}
diff --git a/pandora_console/include/styles/visual_maps.css b/pandora_console/include/styles/visual_maps.css
index 8a0af9160b..835c0767b9 100644
--- a/pandora_console/include/styles/visual_maps.css
+++ b/pandora_console/include/styles/visual_maps.css
@@ -142,7 +142,7 @@ div#edit-controls input.sub[disabled] {
 
 input.delete_min,
 button.delete_min {
-  background: url(../../images/cross.png) no-repeat center;
+  background: url(../../images/delete.svg) no-repeat center;
 }
 input.delete_min[disabled],
 button.delete_min[disabled] {
@@ -154,7 +154,7 @@ button.delete_min_white {
 }
 input.delete_min_white[disabled],
 button.delete_min_white[disabled] {
-  background: url(../../images/cross.png) no-repeat center;
+  background: url(../../images/delete.svg) no-repeat center;
 }
 
 input.graph_min,
@@ -297,7 +297,7 @@ button.camera_min_white[disabled] {
 
 input.config_min,
 button.config_min {
-  background: url(../../images/config.png) no-repeat center;
+  background: url(../../images/edit.svg) no-repeat center;
 }
 input.config_min[disabled],
 button.config_min[disabled] {
@@ -309,7 +309,7 @@ button.config_min_white {
 }
 input.config_min_white[disabled],
 button.config_min_white[disabled] {
-  background: url(../../images/config.png) no-repeat center;
+  background: url(../../images/edit.svg) no-repeat center;
 }
 
 input.label_min,
diff --git a/pandora_console/operation/agentes/alerts_status.php b/pandora_console/operation/agentes/alerts_status.php
index 418e52e8a8..1378351614 100755
--- a/pandora_console/operation/agentes/alerts_status.php
+++ b/pandora_console/operation/agentes/alerts_status.php
@@ -371,11 +371,12 @@ if ($agent_view_page === true) {
         [
             'id'                  => 'alerts_status_datatable',
             'class'               => 'info_table',
-            'style'               => 'width: 100%',
+            'style'               => 'width: 99%',
             'columns'             => $columns,
             'column_names'        => $column_names,
             'no_sortable_columns' => $no_sortable_columns,
             'ajax_url'            => 'include/ajax/alert_list.ajax',
+            'dom_elements'        => 'pfrti',
             'ajax_data'           => [
                 'get_agent_alerts_datatable' => 1,
                 'id_agent'                   => $idAgent,
@@ -406,6 +407,7 @@ if ($agent_view_page === true) {
                     ],
                 ],
                 'no_toggle' => true,
+                'class'     => 'flex',
             ],
         ]
     );
@@ -545,7 +547,7 @@ function alerts_table_controls() {
     
     $(document).ready ( function () {
         alerts_table_controls();
-        $('#submit-alert_validate').on('click', function () {
+        $('#button-alert_validate').on('click', function () {
             validateAlerts();
         });
     });
diff --git a/pandora_console/operation/agentes/estado_agente.php b/pandora_console/operation/agentes/estado_agente.php
index c6a1e43b5c..1841bd7f6e 100644
--- a/pandora_console/operation/agentes/estado_agente.php
+++ b/pandora_console/operation/agentes/estado_agente.php
@@ -1028,7 +1028,7 @@ $tableAgents->size[1] = '14%';
 
 $tableAgents->head[2] = '<span>'.__('OS').'</span>';
 $tableAgents->head[2] .= ui_get_sorting_arrows($url_up_os, $url_down_os, $selectOsUp, $selectOsDown);
-$tableAgents->size[2] = '7%';
+$tableAgents->size[2] = '5%';
 
 $tableAgents->head[3] = '<span>'.__('Interval').'</span>';
 $tableAgents->head[3] .= ui_get_sorting_arrows($url_up_interval, $url_down_interval, $selectIntervalUp, $selectIntervalDown);
@@ -1054,16 +1054,12 @@ $tableAgents->head[9] = '<span>'.__('Last contact').'</span>';
 $tableAgents->head[9] .= ui_get_sorting_arrows($url_up_last, $url_down_last, $selectLastContactUp, $selectLastContactDown);
 $tableAgents->size[9] = '7%';
 
-$tableAgents->head[10] = '<span>'.__('Last status change').'</span>';
+$tableAgents->head[10] = '<span>'.__('L.S change').'</span>';
 $tableAgents->head[10] .= ui_get_sorting_arrows($url_up_last_status_change, $url_down_last_status_change, $selectLastStatusChangeUp, $selectLastStatusChangeDown);
-$tableAgents->size[10] = '10%';
+$tableAgents->size[10] = '8%';
 
-$tableAgents->head[11] = '<span>'.__('Remote').'</span>';
-$tableAgents->head[11] .= ui_get_sorting_arrows($url_up_remote, $url_down_remote, $selectRemoteUp, $selectRemoteDown);
-$tableAgents->size[11] = '7%';
-
-$tableAgents->head[12] = '<span>'.__('Op').'</span>';
-$tableAgents->size[12] = '4%';
+$tableAgents->head[11] = '<span>'.__('Op').'</span>';
+$tableAgents->size[11] = '6%';
 
 $tableAgents->align = [];
 
@@ -1076,10 +1072,10 @@ $tableAgents->align[7] = 'left';
 $tableAgents->align[8] = 'left';
 $tableAgents->align[9] = 'left';
 $tableAgents->align[10] = 'left';
-$tableAgents->align[11] = 'left';
 
 $tableAgents->style = [];
 $tableAgents->data = [];
+$tableAgents->cellclass = [];
 
 $rowPair = true;
 $iterator = 0;
@@ -1198,6 +1194,21 @@ foreach ($agents as $agent) {
         $agent['agent_version']
     );
 
+    if (enterprise_installed()) {
+        enterprise_include_once('include/functions_config_agents.php');
+        if (enterprise_hook('config_agents_has_remote_configuration', [$agent['id_agente']])) {
+            $data[5] .= '<a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=remote_configuration&id_agente='.$agent['id_agente'].'&disk_conf=1">'.html_print_image(
+                'images/remote-configuration@svg.svg',
+                true,
+                [
+                    'align' => 'middle',
+                    'title' => __('Remote config'),
+                    'class' => 'invert_filter main_menu_icon',
+                ]
+            ).'</a>';
+        }
+    }
+
     $data[6] = reporting_tiny_stats($agent, true, 'modules', ':', $strict_user);
 
     $data[7] = $status_img;
@@ -1216,24 +1227,9 @@ foreach ($agents as $agent) {
         'status'        => -1,
     ];
 
-    $data[11] = '';
-    if (enterprise_installed()) {
-        enterprise_include_once('include/functions_config_agents.php');
-        if (enterprise_hook('config_agents_has_remote_configuration', [$agent['id_agente']])) {
-            $data[11] = '<a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=remote_configuration&id_agente='.$agent['id_agente'].'&disk_conf=1">'.html_print_image(
-                'images/remote-configuration@svg.svg',
-                true,
-                [
-                    'align' => 'middle',
-                    'title' => __('Remote config'),
-                    'class' => 'invert_filter main_menu_icon',
-                ]
-            ).'</a>';
-        }
-    }
-
     $fb64 = base64_encode(json_encode($agent_event_filter));
-    $data[12] = '<a href="index.php?sec=eventos&sec2=operation/events/events&fb64='.$fb64.'">'.html_print_image(
+    $tableAgents->cellclass[][11] = 'table_action_buttons';
+    $data[11] = '<a href="index.php?sec=eventos&sec2=operation/events/events&fb64='.$fb64.'">'.html_print_image(
         'images/event.svg',
         true,
         [
@@ -1257,7 +1253,7 @@ foreach ($agents as $agent) {
             $url = 'index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente&amp;id_agente='.$agent['id_agente'];
         }
 
-        $data[12] .= '<a href="'.$url.'">'.html_print_image(
+        $data[11] .= '<a href="'.$url.'">'.html_print_image(
             'images/edit.svg',
             true,
             [
diff --git a/pandora_console/operation/agentes/estado_monitores.php b/pandora_console/operation/agentes/estado_monitores.php
index 0d04a3b6f0..57f06fd940 100755
--- a/pandora_console/operation/agentes/estado_monitores.php
+++ b/pandora_console/operation/agentes/estado_monitores.php
@@ -542,7 +542,7 @@ function print_form_filter_monitors(
 
     $form_text = '';
     $table = new stdClass();
-    $table->class = 'filter_table';
+    $table->class = 'filter-table-adv';
     $table->id = 'module_filter_agent_view';
     $table->styleTable = 'border-radius: 0;padding: 0;margin: 0 0 10px;';
     $table->width = '100%';
diff --git a/pandora_console/operation/gis_maps/gis_map.php b/pandora_console/operation/gis_maps/gis_map.php
index 0e044d37cb..4a9f56dd7a 100644
--- a/pandora_console/operation/gis_maps/gis_map.php
+++ b/pandora_console/operation/gis_maps/gis_map.php
@@ -187,7 +187,7 @@ if ($maps !== false) {
             }
 
             $table->cellclass[]['op'] = 'table_action_buttons';
-            $data['op'] = '<a href="index.php?sec=godgismaps&amp;sec2=godmode/gis_maps/configure_gis_map&map_id='.$map['id_tgis_map'].'&amp;action=edit_map">'.html_print_image('images/config.png', true, ['title' => __('Edit')]).'</a>'.'<a href="index.php?sec=godgismaps&amp;sec2=operation/gis_maps/gis_map&amp;map_id='.$map['id_tgis_map'].'&amp;action=delete_map" onclick="return confirmDelete();">'.html_print_image('images/cross.png', true, ['title' => __('Delete'), 'class' => 'invert_filter']).'</a>';
+            $data['op'] = '<a href="index.php?sec=godgismaps&amp;sec2=godmode/gis_maps/configure_gis_map&map_id='.$map['id_tgis_map'].'&amp;action=edit_map">'.html_print_image('images/edit.svg', true, ['title' => __('Edit')]).'</a>'.'<a href="index.php?sec=godgismaps&amp;sec2=operation/gis_maps/gis_map&amp;map_id='.$map['id_tgis_map'].'&amp;action=delete_map" onclick="return confirmDelete();">'.html_print_image('images/delete.svg', true, ['title' => __('Delete'), 'class' => 'invert_filter']).'</a>';
         }
 
         array_push($table->data, $data);
diff --git a/pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php b/pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php
index b6d8c83b82..88cc174665 100644
--- a/pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php
+++ b/pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php
@@ -195,7 +195,7 @@ foreach ($files as $key => $value) {
     $table_files->data[$i][4] = $value[13];
     $table_files->data[$i][5] .= '<a id="link_delete_file" href="'.ui_get_full_url('index.php?sec=incident&sec2=operation/incidents/dashboard_detail_integriaims_incident&incident_id='.$incident_id.'&delete_file='.$value[0]).'"
                                 onClick="javascript:if (!confirm(\''.__('Are you sure?').'\')) return false;">';
-    $table_files->data[$i][5] .= html_print_image('images/cross.png', true, ['title' => __('Delete'), 'class' => 'invert_filter']);
+    $table_files->data[$i][5] .= html_print_image('images/delete.svg', true, ['title' => __('Delete'), 'class' => 'invert_filter']);
 
 
     $table_files->data[$i][5] .= '</a>';
diff --git a/pandora_console/operation/incidents/list_integriaims_incidents.php b/pandora_console/operation/incidents/list_integriaims_incidents.php
index 71dd1df064..ce68e941fb 100644
--- a/pandora_console/operation/incidents/list_integriaims_incidents.php
+++ b/pandora_console/operation/incidents/list_integriaims_incidents.php
@@ -547,12 +547,12 @@ foreach ($incidents_paginated as $key => $value) {
     $table->data[$i][8] = '';
     $table->cellclass[$i][8] = 'table_action_buttons';
     $table->data[$i][8] .= '<a href="'.ui_get_full_url('index.php?sec=incident&sec2=operation/incidents/configure_integriaims_incident&incident_id='.$array_get_incidents[$key][0]).'">';
-    $table->data[$i][8] .= html_print_image('images/config.png', true, ['title' => __('Edit')]);
+    $table->data[$i][8] .= html_print_image('images/edit.svg', true, ['title' => __('Edit')]);
     $table->data[$i][8] .= '</a>';
 
     $table->data[$i][8] .= '<a id="link_delete_incident" href="'.ui_get_full_url('index.php?sec=incident&sec2=operation/incidents/list_integriaims_incidents&delete_incident='.$array_get_incidents[$key][0]).'"        
     onClick="javascript:if (!confirm(\''.__('Are you sure?').'\')) return false;">';
-    $table->data[$i][8] .= html_print_image('images/cross.png', true, ['title' => __('Delete'), 'class' => 'invert_filter']);
+    $table->data[$i][8] .= html_print_image('images/delete.svg', true, ['title' => __('Delete'), 'class' => 'invert_filter']);
     $table->data[$i][8] .= '</a>';
 
     $i++;
diff --git a/pandora_console/operation/netflow/nf_live_view.php b/pandora_console/operation/netflow/nf_live_view.php
index 628b874728..f5ee650fb0 100644
--- a/pandora_console/operation/netflow/nf_live_view.php
+++ b/pandora_console/operation/netflow/nf_live_view.php
@@ -336,7 +336,7 @@ if (is_metaconsole()) {
         '50'            => '50',
         $max_aggregates => $max_aggregates,
     ];
-    echo '<td>'.html_print_select($max_values, 'max_aggregates', $max_aggregates, '', '', 0, true).'<a id="max_values" href="#" onclick="javascript: edit_max_value();">'.html_print_image('images/pencil.png', true, ['id' => 'pencil']).'</a>';
+    echo '<td>'.html_print_select($max_values, 'max_aggregates', $max_aggregates, '', '', 0, true).'<a id="max_values" href="#" onclick="javascript: edit_max_value();">'.html_print_image('images/edit.svg', true, ['id' => 'pencil', 'class' => 'main_menu_icon invert_filter']).'</a>';
     echo '</td>';
 
     echo '<td><b>'.__('Aggregate by').'</b></td>';
@@ -545,14 +545,14 @@ if (is_metaconsole()) {
 <script type="text/javascript">
     function edit_max_value () {
         if ($("#max_values img").attr("id") == "pencil") {
-            $("#max_values img").attr("src", "images/default_list.png");
+            $("#max_values img").attr("src", "images/logs@svg.svg");
             $("#max_values img").attr("id", "select");
             var value = $("#max_aggregates").val();
             $("#max_aggregates").replaceWith("<input id='max_aggregates' name='max_aggregates' type='text'>");
             $("#max_aggregates").val(value);
         }
         else {
-            $("#max_values img").attr("src", "images/pencil.png");
+            $("#max_values img").attr("src", "images/edit.svg");
             $("#max_values img").attr("id", "pencil");
             $("#max_aggregates").replaceWith("<select id='max_aggregates' name='max_aggregates'>");
             var o = new Option("2", 2);
diff --git a/pandora_console/operation/reporting/reporting_viewer.php b/pandora_console/operation/reporting/reporting_viewer.php
index 26e16c7f37..de1c8dc0cb 100755
--- a/pandora_console/operation/reporting/reporting_viewer.php
+++ b/pandora_console/operation/reporting/reporting_viewer.php
@@ -116,7 +116,7 @@ $options['list_reports'] = [
         true,
         [
             'title' => __('Report list'),
-            'class' => 'invert_filter',
+            'class' => 'main_menu_icon invert_filter',
         ]
     ).'</a>',
 ];
@@ -136,25 +136,25 @@ if (check_acl_restricted_all($config['id_user'], $report_group, 'RW')) {
         true,
         [
             'title' => __('Main data'),
-            'class' => 'invert_filter',
+            'class' => 'main_menu_icon invert_filter',
         ]
     ).'</a>';
 
     $options['list_items']['text'] = '<a href="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=edit&id_report='.$id_report.'&pure='.$pure.'">'.html_print_image(
-        'images/list.png',
+        'images/logs@svg.svg',
         true,
         [
             'title' => __('List items'),
-            'class' => 'invert_filter',
+            'class' => 'main_menu_icon invert_filter',
         ]
     ).'</a>';
 
     $options['item_editor']['text'] = '<a href="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=item_editor&action=new&id_report='.$id_report.'&pure='.$pure.'">'.html_print_image(
-        'images/pencil.png',
+        'images/edit.svg',
         true,
         [
             'title' => __('Item editor'),
-            'class' => 'invert_filter',
+            'class' => 'main_menu_icon invert_filter',
         ]
     ).'</a>';
 
@@ -170,7 +170,7 @@ $options['view'] = [
         true,
         [
             'title' => __('View report'),
-            'class' => 'invert_filter',
+            'class' => 'main_menu_icon invert_filter',
 
         ]
     ).'</a>',
@@ -183,7 +183,7 @@ if (!defined('METACONSOLE')) {
             true,
             [
                 'title' => __('Full screen mode'),
-                'class' => 'invert_filter',
+                'class' => 'main_menu_icon invert_filter',
             ]
         ).'</a>';
     } else {
@@ -192,7 +192,7 @@ if (!defined('METACONSOLE')) {
             true,
             [
                 'title' => __('Back to normal mode'),
-                'class' => 'invert_filter',
+                'class' => 'main_menu_icon invert_filter',
             ]
         ).'</a>';
 
diff --git a/pandora_console/operation/search_agents.php b/pandora_console/operation/search_agents.php
index eb1c21af14..89363f792a 100755
--- a/pandora_console/operation/search_agents.php
+++ b/pandora_console/operation/search_agents.php
@@ -34,7 +34,7 @@ if (!$agents || !$searchAgents) {
     $table->cellpadding = 4;
     $table->cellspacing = 4;
     $table->width = '98%';
-    $table->class = 'databox';
+    $table->class = 'info_table';
 
     $table->head = [];
 
@@ -136,6 +136,8 @@ if (!$agents || !$searchAgents) {
             ).'</a>';
         }
 
+        $table->cellclass[][9] = 'table_action_buttons';
+
         array_push(
             $table->data,
             [
@@ -154,15 +156,29 @@ if (!$agents || !$searchAgents) {
     }
 
     echo '<br />';
-    if (!$only_count) {
-        ui_pagination($totalAgents);
-    }
 
     html_print_table($table);
     unset($table);
     if (!$only_count) {
-        ui_pagination($totalAgents);
+        $tablePagination = ui_pagination(
+            $totalAgents,
+            false,
+            0,
+            0,
+            true,
+            'offset',
+            false
+        );
     }
+
+    html_print_action_buttons(
+        '',
+        [
+            'type'          => 'data_table',
+            'class'         => 'fixed_action_buttons',
+            'right_content' => $tablePagination,
+        ]
+    );
 }
 
 if ($only_count) {
diff --git a/pandora_console/operation/search_modules.php b/pandora_console/operation/search_modules.php
index 17b37d7d4e..29c6fb7fcb 100644
--- a/pandora_console/operation/search_modules.php
+++ b/pandora_console/operation/search_modules.php
@@ -26,7 +26,7 @@ if (!$modules || !$searchModules) {
     $table->cellpadding = 4;
     $table->cellspacing = 4;
     $table->width = '98%';
-    $table->class = 'databox';
+    $table->class = 'info_table';
 
     $table->head = [];
     $table->head[0] = __('Module').' <a href="index.php?search_category=modules&keywords='.$config['search_keywords'].'&head_search_keywords=abc&offset='.$offset.'&sort_field=module_name&sort=up">'.html_print_image('images/sort_up.png', true, ['style' => $selectModuleNameUp]).'</a><a href="index.php?search_category=modules&keywords='.$config['search_keywords'].'&head_search_keywords=abc&offset='.$offset.'&sort_field=module_name&sort=down">'.html_print_image('images/sort_down.png', true, ['style' => $selectModuleNameDown]).'</a>';
@@ -72,6 +72,7 @@ if (!$modules || !$searchModules) {
         'web_content_string'
     );
 
+    $i = 0;
     foreach ($modules as $module) {
         $module['datos'] = modules_get_last_value($module['id_agente_modulo']);
         $module['module_name'] = $module['nombre'];
@@ -162,6 +163,7 @@ if (!$modules || !$searchModules) {
         }
 
         $graphCell = '';
+        $table->cellclass[$i][5] = 'table_action_buttons';
         if ($module['history_data'] == 1) {
             $graph_type = return_graphtype($module['id_tipo_modulo']);
 
@@ -204,12 +206,13 @@ if (!$modules || !$searchModules) {
 
         $group_agent = agents_get_agent_group($module['id_agente']);
 
+        $table->cellclass[$i][8] = 'table_action_buttons';
         if (check_acl($config['id_user'], $group_agent, 'AW')) {
             $edit_module = 'aaa';
 
             $url_edit = 'index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente='.$module['id_agente'].'&tab=module&id_agent_module='.$module['id_agente_modulo'].'&edit_module=1';
 
-            $edit_module = '<a href="'.$url_edit.'">'.html_print_image('images/config.png', true).'</a>';
+            $edit_module = '<a href="'.$url_edit.'">'.html_print_image('images/edit.svg', true).'</a>';
         } else {
             $edit_module = '';
         }
@@ -229,11 +232,29 @@ if (!$modules || !$searchModules) {
                 $edit_module,
             ]
         );
+
+        $i++;
     }
 
     echo '<br />';
-    ui_pagination($totalModules);
     html_print_table($table);
     unset($table);
-    ui_pagination($totalModules);
+    $tablePagination = ui_pagination(
+        $totalModules,
+        false,
+        0,
+        0,
+        true,
+        'offset',
+        false
+    );
+
+    html_print_action_buttons(
+        '',
+        [
+            'type'          => 'data_table',
+            'class'         => 'fixed_action_buttons',
+            'right_content' => $tablePagination,
+        ]
+    );
 }
diff --git a/pandora_console/operation/search_results.php b/pandora_console/operation/search_results.php
index 650bda0c36..331d70150a 100644
--- a/pandora_console/operation/search_results.php
+++ b/pandora_console/operation/search_results.php
@@ -189,13 +189,19 @@ $onheader = [
     'policies' => $policies_tab,
 ];
 
-ui_print_page_header(
+ui_print_standard_header(
     __('Search').': "'.$config['search_keywords'].'"',
     'images/zoom_mc.png',
     false,
     '',
     false,
-    $onheader
+    $onheader,
+    [
+        [
+            'link'  => '',
+            'label' => __('Search'),
+        ],
+    ]
 );
 
 $only_count = false;
diff --git a/pandora_console/operation/users/user_edit.php b/pandora_console/operation/users/user_edit.php
index e9e5a3a028..da3ed994c9 100644
--- a/pandora_console/operation/users/user_edit.php
+++ b/pandora_console/operation/users/user_edit.php
@@ -339,10 +339,10 @@ $user_id .= html_print_anchor(
             base64_encode(__('Your API Token is:').'<br><span class="font_12pt bolder">'.users_get_API_token($config['id_user']).'</span><br>'.__('Please, avoid share this string with others.')),
         ),
         'content' => html_print_image(
-            'images/eye_show.png',
+            'images/see-details@svg.svg',
             true,
             [
-                'class' => 'renew_api_token_image clickable',
+                'class' => 'main_menu_icon renew_api_token_image clickable',
                 'title' => __('Show API Token'),
             ]
         ),
diff --git a/pandora_console/views/calendar/special_days.php b/pandora_console/views/calendar/special_days.php
index 905a057f05..fdf98d28b1 100644
--- a/pandora_console/views/calendar/special_days.php
+++ b/pandora_console/views/calendar/special_days.php
@@ -449,7 +449,7 @@ for ($month = 1; $month <= 12; $month++) {
                         $cal_table->data[$cal_line][$week] .= '<a href="'.$url.'&op=edit&id='.$special_day['id'].'" title=';
                         $cal_table->data[$cal_line][$week] .= __('Edit');
                         $cal_table->data[$cal_line][$week] .= '>'.html_print_image(
-                            'images/config.png',
+                            'images/edit.svg',
                             true,
                             ['class' => 'invert_filter']
                         ).'</a> &nbsp;';
@@ -461,7 +461,7 @@ for ($month = 1; $month <= 12; $month++) {
                         $cal_table->data[$cal_line][$week] .= __('Remove');
                         $cal_table->data[$cal_line][$week] .= '">';
                         $cal_table->data[$cal_line][$week] .= html_print_image(
-                            'images/cross.png',
+                            'images/delete.svg',
                             true,
                             ['class' => 'invert_filter']
                         ).'</a>';
diff --git a/pandora_console/views/cluster/edit.php b/pandora_console/views/cluster/edit.php
index 393951f470..525d159bab 100644
--- a/pandora_console/views/cluster/edit.php
+++ b/pandora_console/views/cluster/edit.php
@@ -62,11 +62,11 @@ $buttons = [];
 
 $main_page = '<a href="'.$wizard->parentUrl.'">';
 $main_page .= html_print_image(
-    'images/list.png',
+    'images/logs@svg.svg',
     true,
     [
         'title' => __('Cluster list'),
-        'class' => 'invert_filter',
+        'class' => 'main_menu_icon invert_filter',
     ]
 );
 $main_page .= '</a>';
@@ -82,11 +82,11 @@ if ($cluster !== null) {
     if ($cluster->id() !== null) {
         $view = '<a href="'.$wizard->parentUrl.'&op=view&id='.$cluster->id().'">';
         $view .= html_print_image(
-            'images/operation.png',
+            'images/details.svg',
             true,
             [
                 'title' => __('View this cluster'),
-                'class' => 'invert_filter',
+                'class' => 'main_menu_icon invert_filter',
             ]
         );
         $view .= '</a>';
diff --git a/pandora_console/views/cluster/view.php b/pandora_console/views/cluster/view.php
index b27fadc519..775ca3e30a 100644
--- a/pandora_console/views/cluster/view.php
+++ b/pandora_console/views/cluster/view.php
@@ -55,22 +55,22 @@ $html->prepareBreadcrum($bc);
 // Header.
 $main_page = '<a href="'.$model->url.'">';
 $main_page .= html_print_image(
-    'images/list.png',
+    'images/logs@svg.svg',
     true,
     [
         'title' => __('Cluster list'),
-        'class' => 'invert_filter',
+        'class' => 'main_menu_icon invert_filter',
     ]
 );
 $main_page .= '</a>';
 
 $edit = '<a href="'.$model->url.'&op=update&id='.$cluster->id().'">';
 $edit .= html_print_image(
-    'images/setup.png',
+    'images/configuration@svg.svg',
     true,
     [
         'title' => __('Edit this cluster'),
-        'class' => 'invert_filter',
+        'class' => 'main_menu_icon invert_filter',
     ]
 );
 $edit .= '</a>';
@@ -184,7 +184,7 @@ if ($in_planned_downtime && !$cluster->agent()->disabled() && !$cluster->agent()
     $agent_name .= '&nbsp;'.ui_print_help_tip(
         __('Agent in scheduled downtime'),
         true,
-        'images/minireloj-16.png'
+        'images/clock.svg'
     ).'</em>';
 }
 
@@ -216,12 +216,12 @@ $table_agent_header .= '<div class="icono_right">'.$status_img.'</div>';
 $table_agent_header .= '&nbsp;&nbsp;';
 $table_agent_header .= '<a href="'.$model->url.'&op=force&id='.$cluster->id();
 $table_agent_header .= '">'.html_print_image(
-    'images/target.png',
+    'images/change-active.svg',
     true,
     [
         'title' => __('Force cluster status calculation'),
         'alt'   => '',
-        'class' => 'invert_filter',
+        'class' => 'main_menu_icon invert_filter',
 
     ]
 ).'</a>';
@@ -266,11 +266,11 @@ foreach ($addresses as $k => $add) {
 
 if (empty($address) === false) {
     $table_agent_ip = '<p>'.html_print_image(
-        'images/world.png',
+        'images/web@groups.svg',
         true,
         [
             'title' => __('IP address'),
-            'class' => 'invert_filter',
+            'class' => 'main_menu_icon invert_filter',
         ]
     );
     $table_agent_ip .= '<span class="align-top inline">';
@@ -279,11 +279,11 @@ if (empty($address) === false) {
 }
 
 $table_agent_description = '<p>'.html_print_image(
-    'images/list.png',
+    'images/logs@svg.svg',
     true,
     [
         'title' => __('Description'),
-        'class' => 'invert_filter',
+        'class' => 'main_menu_icon invert_filter',
     ]
 );
 $table_agent_description .= '<span class="align-top inline">';