From edbc9d8f6b224c1d9da4418aa0b8027d70c4a9b0 Mon Sep 17 00:00:00 2001
From: Jose Gonzalez <jose.gonzalez@pandorafms.com>
Date: Thu, 9 Mar 2023 23:31:40 +0100
Subject: [PATCH] Icons review

---
 pandora_console/extensions/files_repo.php     |  8 +-
 .../extensions/files_repo/files_repo_list.php | 11 ++-
 .../godmode/agentes/inventory_manager.php     |  8 +-
 .../agentes/module_manager_editor_common.php  | 33 +++++----
 .../godmode/alerts/alert_commands.php         |  4 +-
 .../godmode/alerts/alert_list.list.php        |  2 +-
 pandora_console/godmode/alerts/alert_list.php |  8 +-
 .../godmode/alerts/alert_templates.php        |  2 +-
 pandora_console/godmode/extensions.php        |  3 +-
 .../module_library/module_library_view.php    |  6 +-
 .../godmode/reporting/reporting_builder.php   | 14 ++--
 .../godmode/setup/setup_general.php           |  8 +-
 .../godmode/setup/setup_visuals.php           | 10 +--
 .../godmode/snmpconsole/snmp_alert.php        |  6 +-
 .../wizards/DiscoveryTaskList.class.php       | 74 +++++++++----------
 .../include/class/CalendarManager.class.php   | 10 +--
 .../include/class/Diagnostics.class.php       |  4 +-
 .../include/class/EventSound.class.php        | 10 +--
 pandora_console/include/functions_cron.php    | 50 ++++++-------
 .../include/functions_integriaims.php         | 10 +--
 .../include/functions_notifications.php       | 18 +++--
 .../include/functions_snmp_browser.php        |  2 +-
 .../lib/ClusterViewer/ClusterManager.php      | 12 +--
 .../rest-api/models/VisualConsole/View.php    | 54 ++++++++------
 .../operation/netflow/nf_live_view.php        |  6 +-
 .../operation/reporting/reporting_viewer.php  | 18 ++---
 pandora_console/operation/users/user_edit.php |  4 +-
 pandora_console/views/cluster/edit.php        |  8 +-
 pandora_console/views/cluster/view.php        | 22 +++---
 29 files changed, 222 insertions(+), 203 deletions(-)

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/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/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..f844d2c18d 100644
--- a/pandora_console/godmode/alerts/alert_list.list.php
+++ b/pandora_console/godmode/alerts/alert_list.list.php
@@ -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/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/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/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/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/snmpconsole/snmp_alert.php b/pandora_console/godmode/snmpconsole/snmp_alert.php
index 6ad576198f..e42fe82df1 100755
--- a/pandora_console/godmode/snmpconsole/snmp_alert.php
+++ b/pandora_console/godmode/snmpconsole/snmp_alert.php
@@ -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',
                             ]
                         ),
                     ],
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/include/class/CalendarManager.class.php b/pandora_console/include/class/CalendarManager.class.php
index 033e8986bd..78ab62e92c 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>',
             ];
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/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_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_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_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/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/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/users/user_edit.php b/pandora_console/operation/users/user_edit.php
index 51423748dc..a66ebe3459 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/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">';