From 175d4b734161a2c95a16048fb48a59e13320249d Mon Sep 17 00:00:00 2001
From: Jose Gonzalez <jose.gonzalez@pandorafms.com>
Date: Thu, 9 Feb 2023 16:13:30 +0100
Subject: [PATCH] Fixes in Event view and other fixes

---
 .../godmode/events/event_responses.editor.php |  76 +++++---
 .../godmode/events/event_responses.list.php   |  97 ++++++----
 .../godmode/events/event_responses.php        |  38 ++--
 pandora_console/godmode/events/events.php     |  55 ++++--
 pandora_console/images/edit_columns@svg.svg   |  10 +
 .../images/exit_fullscreen@svg.svg            |   9 +
 .../{delete-v2@svg.svg => fail@svg.svg}       |   0
 pandora_console/images/filters@svg.svg        |   9 +
 pandora_console/images/fullscreen@svg.svg     |   9 +
 pandora_console/images/rrs@svg.svg            |   9 +
 pandora_console/images/sound_console@svg.svg  |   9 +
 pandora_console/include/ajax/events.php       |  34 ++--
 pandora_console/include/functions_events.php  |  74 ++++---
 pandora_console/include/functions_modules.php |  12 +-
 pandora_console/include/functions_ui.php      |  14 +-
 pandora_console/include/styles/events.css     |  26 +++
 .../include/styles/js/jquery-ui_custom.css    |   2 +-
 pandora_console/include/styles/pandora.css    |  29 ++-
 pandora_console/operation/events/events.php   | 182 +++++++++---------
 19 files changed, 445 insertions(+), 249 deletions(-)
 create mode 100644 pandora_console/images/edit_columns@svg.svg
 create mode 100644 pandora_console/images/exit_fullscreen@svg.svg
 rename pandora_console/images/{delete-v2@svg.svg => fail@svg.svg} (100%)
 create mode 100644 pandora_console/images/filters@svg.svg
 create mode 100644 pandora_console/images/fullscreen@svg.svg
 create mode 100644 pandora_console/images/rrs@svg.svg
 create mode 100644 pandora_console/images/sound_console@svg.svg

diff --git a/pandora_console/godmode/events/event_responses.editor.php b/pandora_console/godmode/events/event_responses.editor.php
index 1c02545ccd..1e85796740 100644
--- a/pandora_console/godmode/events/event_responses.editor.php
+++ b/pandora_console/godmode/events/event_responses.editor.php
@@ -1,16 +1,32 @@
 <?php
+/**
+ * Event responses editor view.
+ *
+ * @category   Events
+ * @package    Pandora FMS
+ * @subpackage Community
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2005-2023 Artica Soluciones Tecnologicas
+ * Please see http://pandorafms.org for full contribution list
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation for version 2.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * ============================================================================
+ */
 
-// Pandora FMS - http://pandorafms.com
-// ==================================================
-// Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
-// Please see http://pandorafms.org for full contribution list
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; version 2
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
+// Load global vars.
 global $config;
 
 check_login();
@@ -66,7 +82,7 @@ if ($event_response_id > 0) {
 }
 
 $table = new stdClass();
-$table->width = '100%';
+$table->styleTable = 'margin: 10px 10px 0';
 $table->class = 'databox filters';
 
 if (is_metaconsole()) {
@@ -211,23 +227,29 @@ $data[1] = html_print_checkbox_switch(
 
 $table->data[6] = $data;
 
-if ($event_response_id == 0) {
-    echo '<form method="post" action="index.php?sec=geventos&sec2=godmode/events/events&section=responses&mode=list&action=create_response&amp;pure='.$config['pure'].'">';
-    html_print_table($table);
-        echo '<div class="w100p right_align">';
-
-    html_print_submit_button(__('Create'), 'create_response_button', false, ['class' => 'sub next']);
-    echo '</div>';
-    echo '</form>';
+if ((int) $event_response_id === 0) {
+    $actionUrl = 'index.php?sec=geventos&sec2=godmode/events/events&section=responses&mode=list&action=create_response&amp;pure='.$config['pure'];
+    $buttonCaption = __('Create');
+    $buttonName = 'create_response_button';
 } else {
-    echo '<form method="post" action="index.php?sec=geventos&sec2=godmode/events/events&section=responses&mode=list&action=update_response&amp;pure='.$config['pure'].'">';
-    html_print_table($table);
-        echo '<div class="w100p right_align">';
-
-    html_print_submit_button(__('Update'), 'update_response_button', false, ['class' => 'sub next']);
-    echo '</div>';
-    echo '</form>';
+    $actionUrl = 'index.php?sec=geventos&sec2=godmode/events/events&section=responses&mode=list&action=update_response&amp;pure='.$config['pure'];
+    $buttonCaption = __('Update');
+    $buttonName = 'update_response_button';
 }
+
+echo '<form method="POST" action="'.$actionUrl.'">';
+html_print_table($table);
+html_print_action_buttons(
+    html_print_submit_button(
+        $buttonCaption,
+        $buttonName,
+        false,
+        ['icon' => 'wand'],
+        true
+    ),
+    [ 'type' => 'form_action']
+);
+echo '</form>';
 ?>
 
 <script language="javascript" type="text/javascript">
diff --git a/pandora_console/godmode/events/event_responses.list.php b/pandora_console/godmode/events/event_responses.list.php
index 2ae6361537..7f8a9a87c4 100644
--- a/pandora_console/godmode/events/event_responses.list.php
+++ b/pandora_console/godmode/events/event_responses.list.php
@@ -1,16 +1,32 @@
 <?php
+/**
+ * Event responses list view.
+ *
+ * @category   Events
+ * @package    Pandora FMS
+ * @subpackage Community
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2005-2023 Artica Soluciones Tecnologicas
+ * Please see http://pandorafms.org for full contribution list
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation for version 2.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * ============================================================================
+ */
 
-// Pandora FMS - http://pandorafms.com
-// ==================================================
-// Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
-// Please see http://pandorafms.org for full contribution list
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; version 2
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
+// Load global vars.
 global $config;
 
 require_once $config['homedir'].'/include/functions_event_responses.php';
@@ -35,8 +51,8 @@ if (empty($event_responses)) {
 }
 
 $table = new stdClass();
-$table->width = '100%';
 $table->class = 'info_table';
+$table->styleTable = 'margin: 10px 10px 0';
 $table->cellpadding = 0;
 $table->cellspacing = 0;
 
@@ -64,35 +80,50 @@ foreach ($event_responses as $response) {
     $data[1] = $response['description'];
     $data[2] = ui_print_group_icon($response['id_group'], true);
     $table->cellclass[][3] = 'table_action_buttons';
-    $data[3] = '<a href="index.php?sec=geventos&sec2=godmode/events/events&section=responses&action=delete_response&id_response='.$response['id'].'&amp;pure='.$config['pure'].'">'.html_print_image(
-        'images/cross.png',
-        true,
+    $data[3] = html_print_anchor(
         [
-            'title' => __('Delete'),
-            'class' => 'invert_filter',
-        ]
-    ).'</a>';
-    $data[3] .= '<a href="index.php?sec=geventos&sec2=godmode/events/events&section=responses&mode=editor&id_response='.$response['id'].'&amp;pure='.$config['pure'].'">'.html_print_image(
-        'images/pencil.png',
-        true,
+            'href'    => 'index.php?sec=geventos&sec2=godmode/events/events&section=responses&action=delete_response&id_response='.$response['id'].'&amp;pure='.$config['pure'],
+            'content' => html_print_image(
+                'images/delete.svg',
+                true,
+                [
+                    'title' => __('Delete'),
+                    'class' => 'invert_filter main_menu_icon',
+                ]
+            ),
+        ],
+        true
+    );
+
+    $data[3] .= html_print_anchor(
         [
-            'title' => __('Edit'),
-            'class' => 'invert_filter',
-        ]
-    ).'</a>';
+            'href'    => 'index.php?sec=geventos&sec2=godmode/events/events&section=responses&mode=editor&id_response='.$response['id'].'&amp;pure='.$config['pure'],
+            'content' => html_print_image(
+                'images/edit.svg',
+                true,
+                [
+                    'title' => __('Edit'),
+                    'class' => 'invert_filter main_menu_icon',
+                ]
+            ),
+        ],
+        true
+    );
     $table->data[] = $data;
 }
 
 html_print_table($table);
 
 
-echo '<div class="w100p right_align">';
 echo '<form method="post" action="index.php?sec=geventos&sec2=godmode/events/events&section=responses&mode=editor&amp;pure='.$config['pure'].'">';
-html_print_submit_button(
-    __('Create response'),
-    'create_response_button',
-    false,
-    ['class' => 'sub next']
+html_print_action_buttons(
+    html_print_submit_button(
+        __('Create response'),
+        'create_response_button',
+        false,
+        ['icon' => 'wand'],
+        true
+    ),
+    ['type' => 'form_action']
 );
 echo '</form>';
-echo '</div>';
diff --git a/pandora_console/godmode/events/event_responses.php b/pandora_console/godmode/events/event_responses.php
index f8e6963d1a..7b92829395 100644
--- a/pandora_console/godmode/events/event_responses.php
+++ b/pandora_console/godmode/events/event_responses.php
@@ -1,16 +1,32 @@
 <?php
+/**
+ * Event responses view handler.
+ *
+ * @category   Events
+ * @package    Pandora FMS
+ * @subpackage Community
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2005-2023 Artica Soluciones Tecnologicas
+ * Please see http://pandorafms.org for full contribution list
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation for version 2.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * ============================================================================
+ */
 
-// Pandora FMS - http://pandorafms.com
-// ==================================================
-// Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
-// Please see http://pandorafms.org for full contribution list
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; version 2
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
+// Load global vars.
 global $config;
 
 require_once $config['homedir'].'/include/functions_event_responses.php';
diff --git a/pandora_console/godmode/events/events.php b/pandora_console/godmode/events/events.php
index 1c3177482d..236c499cce 100644
--- a/pandora_console/godmode/events/events.php
+++ b/pandora_console/godmode/events/events.php
@@ -1,17 +1,32 @@
 <?php
+/**
+ * Event configuration.
+ *
+ * @category   Events
+ * @package    Pandora FMS
+ * @subpackage Community
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2005-2023 Artica Soluciones Tecnologicas
+ * Please see http://pandorafms.org for full contribution list
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation for version 2.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * ============================================================================
+ */
 
-// Pandora FMS - http://pandorafms.com
-// ==================================================
-// Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
-// Please see http://pandorafms.org for full contribution list
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation for version 2.
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// Load global vars
+// Load global vars.
 global $config;
 
 check_login();
@@ -35,11 +50,11 @@ if (check_acl($config['id_user'], 0, 'EW') || check_acl($config['id_user'], 0, '
     $buttons['view'] = [
         'active'    => false,
         'text'      => '<a href="index.php?sec=eventos&sec2=operation/events/events&amp;pure='.$config['pure'].'">'.html_print_image(
-            'images/events_list.png',
+            'images/event.svg',
             true,
             [
                 'title' => __('Event list'),
-                'class' => 'invert_filter',
+                'class' => 'invert_filter main_menu_icon',
             ]
         ).'</a>',
         'operation' => true,
@@ -48,11 +63,11 @@ if (check_acl($config['id_user'], 0, 'EW') || check_acl($config['id_user'], 0, '
     $buttons['filter'] = [
         'active' => false,
         'text'   => '<a href="index.php?sec=eventos&sec2=godmode/events/events&amp;section=filter&amp;pure='.$config['pure'].'">'.html_print_image(
-            'images/filter_mc.png',
+            'images/filters@svg.svg',
             true,
             [
                 'title' => __('Filter list'),
-                'class' => 'invert_filter',
+                'class' => 'invert_filter main_menu_icon',
             ]
         ).'</a>',
     ];
@@ -62,11 +77,11 @@ if (check_acl($config['id_user'], 0, 'PM')) {
     $buttons['responses'] = [
         'active' => false,
         'text'   => '<a href="index.php?sec=eventos&sec2=godmode/events/events&amp;section=responses&amp;pure='.$config['pure'].'">'.html_print_image(
-            'images/event_responses.png',
+            'images/responses.svg',
             true,
             [
                 'title' => __('Event responses'),
-                'class' => 'invert_filter',
+                'class' => 'invert_filter main_menu_icon',
             ]
         ).'</a>',
     ];
@@ -74,11 +89,11 @@ if (check_acl($config['id_user'], 0, 'PM')) {
     $buttons['fields'] = [
         'active' => false,
         'text'   => '<a href="index.php?sec=eventos&sec2=godmode/events/events&amp;section=fields&amp;pure='.$config['pure'].'">'.html_print_image(
-            'images/custom_columns.png',
+            'images/edit_columns@svg.svg',
             true,
             [
                 'title' => __('Custom columns'),
-                'class' => 'invert_filter',
+                'class' => 'invert_filter main_menu_icon',
             ]
         ).'</a>',
     ];
diff --git a/pandora_console/images/edit_columns@svg.svg b/pandora_console/images/edit_columns@svg.svg
new file mode 100644
index 0000000000..2d8bf8f573
--- /dev/null
+++ b/pandora_console/images/edit_columns@svg.svg
@@ -0,0 +1,10 @@
+<?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: Sketch 61.2 (89653) - https://sketch.com -->
+    <title>Dark / 20 / edit columns@svg</title>
+    <desc>Created with Sketch.</desc>
+    <g id="Dark-/-20-/-edit-columns" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M16.0987826,9.66941612 L10.1972395,15.5708563 C9.85319528,15.9149003 9.60913485,16.3460302 9.491054,16.8181534 L9.0334282,18.6485557 C8.83446046,19.4445262 9.55554354,20.165609 10.3515145,19.9665413 L12.1819177,19.5089158 C12.6539411,19.390935 13.0850712,19.1468747 13.4292154,18.8027306 L19.3306585,12.9012905 C20.2231138,12.0088356 20.2231138,10.561871 19.3306585,9.66941612 C18.4382032,8.77686129 16.9912379,8.77686129 16.0987826,9.66941612 Z" id="Path" fill="#3F3F3F"></path>
+        <path d="M3,0 C4.0543618,0 4.91816512,0.815877791 4.99451426,1.85073766 L5,2 L5,16 C5,17.0543618 4.18412221,17.9181651 3.14926234,17.9945143 L3,18 L1,18 C0.44771525,18 0,17.5522847 0,17 C0,16.4871642 0.38604019,16.0644928 0.883378875,16.0067277 L1,16 L3,16 L3,2 L1,2 C0.44771525,2 0,1.55228475 0,1 C0,0.487164161 0.38604019,0.0644928393 0.883378875,0.00672773133 L1,0 L3,0 Z M12,0 C13.1045695,0 14,0.8954305 14,2 L14,2 L14,8.939 L12,10.939 L12,2 L8,2 L7.99938689,15.1960881 C7.80177971,15.552193 7.65054019,15.9341665 7.5508174,16.3328886 L7.1784335,17.824007 C6.48361063,17.5105569 6,16.8117551 6,16 L6,16 L6,2 C6,0.8954305 6.8954305,0 8,0 L8,0 Z M19,0 L19.1166211,0.00672773133 C19.6139598,0.0644928393 20,0.487164161 20,1 C20,1.55228475 19.5522847,2 19,2 L19,2 L17,2 L17.0006112,7.0595728 C16.2842015,7.18002395 15.5925087,7.48310158 15.0005003,7.96880855 L15,2 L15.0054857,1.85073766 C15.0818349,0.815877791 15.9456382,0 17,0 L17,0 L19,0 Z" id="Rectangle" fill="#3F3F3F"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/pandora_console/images/exit_fullscreen@svg.svg b/pandora_console/images/exit_fullscreen@svg.svg
new file mode 100644
index 0000000000..e59d3ece18
--- /dev/null
+++ b/pandora_console/images/exit_fullscreen@svg.svg
@@ -0,0 +1,9 @@
+<?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: Sketch 61.2 (89653) - https://sketch.com -->
+    <title>Dark / 20 / exit fullscreen@svg</title>
+    <desc>Created with Sketch.</desc>
+    <g id="Dark-/-20-/-exit-fullscreen" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M5,14 L5.11662113,14.0067277 C5.61395981,14.0644928 6,14.4871642 6,15 L6,15 L6,19.0029869 L5.99327227,19.119608 C5.93550716,19.6169467 5.51283584,20.0029869 5,20.0029869 L5,20.0029869 L4.88337887,19.9962592 C4.38604019,19.9384941 4,19.5158227 4,19.0029869 L4,19.0029869 L4,16 L1,16 L0.883378875,15.9932723 C0.38604019,15.9355072 0,15.5128358 0,15 C0,14.4477153 0.44771525,14 1,14 L1,14 L5,14 Z M19,14 C19.5522847,14 20,14.4477153 20,15 C20,15.5128358 19.6139598,15.9355072 19.1166211,15.9932723 L19,16 L16,16 L16,19.0029869 C16,19.5158227 15.6139598,19.9384941 15.1166211,19.9962592 L15,20.0029869 C14.4871642,20.0029869 14.0644928,19.6169467 14.0067277,19.119608 L14,19.0029869 L14,15 C14,14.4871642 14.3860402,14.0644928 14.8833789,14.0067277 L15,14 L19,14 Z M13,6 C13.5522847,6 14,6.44771525 14,7 L14,7 L14,13 C14,13.5522847 13.5522847,14 13,14 L13,14 L7,14 C6.44771525,14 6,13.5522847 6,13 L6,13 L6,7 C6,6.44771525 6.44771525,6 7,6 L7,6 Z M12,8 L8,8 L8,12 L12,12 L12,8 Z M5,0 C5.51283584,0 5.93550716,0.38604019 5.99327227,0.883378875 L6,1 L6,5.00298691 C6,5.51582275 5.61395981,5.93849407 5.11662113,5.99625918 L5,6.00298691 L1,6.00298691 C0.44771525,6.00298691 0,5.55527166 0,5.00298691 C0,4.49015107 0.38604019,4.06747975 0.883378875,4.00971464 L1,4.00298691 L4,4.00298691 L4,1 C4,0.487164161 4.38604019,0.0644928393 4.88337887,0.00672773133 L5,0 Z M14.9985065,0.00149345398 C15.5113424,0.00149345398 15.9340137,0.387533644 15.9917788,0.884872329 L15.9985065,1.00149345 L15.9985065,4.00149345 L19.0014935,4.00149345 C19.5143293,4.00149345 19.9370006,4.38753364 19.9947657,4.88487233 L20.0014935,5.00149345 C20.0014935,5.51432929 19.6154533,5.93700061 19.1181146,5.99476572 L19.0014935,6.00149345 L14.9985065,6.00149345 C14.4856707,6.00149345 14.0629994,5.61545326 14.0052343,5.11811458 L13.9985065,5.00149345 L13.9985065,1.00149345 C13.9985065,0.449208704 14.4462218,0.00149345398 14.9985065,0.00149345398 Z" id="Path-54" fill="#3F3F3F"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/pandora_console/images/delete-v2@svg.svg b/pandora_console/images/fail@svg.svg
similarity index 100%
rename from pandora_console/images/delete-v2@svg.svg
rename to pandora_console/images/fail@svg.svg
diff --git a/pandora_console/images/filters@svg.svg b/pandora_console/images/filters@svg.svg
new file mode 100644
index 0000000000..51adeb4527
--- /dev/null
+++ b/pandora_console/images/filters@svg.svg
@@ -0,0 +1,9 @@
+<?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: Sketch 61.2 (89653) - https://sketch.com -->
+    <title>Dark / 20 / filters@svg</title>
+    <desc>Created with Sketch.</desc>
+    <g id="Dark-/-20-/-filters" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M19.0615625,0 L0.93859375,0 C0.105859375,0 -0.314335937,1.01039063 0.275703125,1.60042969 L7.00000416,9 L7.00000416,16.0336332 C7.00000416,16.3395317 7.00000416,17.0296679 7.89988281,17.6430469 C8.49980469,18.0519662 9.54147135,18.7808725 11.0248828,19.8297656 C11.6414062,20.2613281 13.0000042,19.7622266 13.0000042,19 L13.0000042,9.00252151 L19.7244922,1.60042969 C20.3133203,1.0115625 19.8960156,0 19.0615625,0 Z" id="Path" fill="#3F3F3F"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/pandora_console/images/fullscreen@svg.svg b/pandora_console/images/fullscreen@svg.svg
new file mode 100644
index 0000000000..d0b80fb120
--- /dev/null
+++ b/pandora_console/images/fullscreen@svg.svg
@@ -0,0 +1,9 @@
+<?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: Sketch 61.2 (89653) - https://sketch.com -->
+    <title>Dark / 20 / fullscreen@svg</title>
+    <desc>Created with Sketch.</desc>
+    <g id="Dark-/-20-/-fullscreen" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M1,14 L1.11662113,14.0067277 C1.61395981,14.0644928 2,14.4871642 2,15 L2,15 L2,18.0029869 L5,18.0029869 L5.11662113,18.0097146 C5.61395981,18.0674797 6,18.4901511 6,19.0029869 C6,19.5552717 5.55228475,20.0029869 5,20.0029869 L5,20.0029869 L1,20.0029869 L0.883378875,19.9962592 C0.38604019,19.9384941 0,19.5158227 0,19.0029869 L0,19.0029869 L0,15 L0.00672773133,14.8833789 C0.0644928393,14.3860402 0.487164161,14 1,14 L1,14 Z M19,14 C19.5128358,14 19.9355072,14.3860402 19.9932723,14.8833789 L20,15 L20,19.0029869 C20,19.5158227 19.6139598,19.9384941 19.1166211,19.9962592 L19,20.0029869 L15,20.0029869 C14.4477153,20.0029869 14,19.5552717 14,19.0029869 C14,18.4901511 14.3860402,18.0674797 14.8833789,18.0097146 L15,18.0029869 L18,18.0029869 L18,15 C18,14.4871642 18.3860402,14.0644928 18.8833789,14.0067277 L19,14 Z M15,6 C15.5522847,6 16,6.44771525 16,7 L16,7 L16,13 C16,13.5522847 15.5522847,14 15,14 L15,14 L5,14 C4.44771525,14 4,13.5522847 4,13 L4,13 L4,7 C4,6.44771525 4.44771525,6 5,6 L5,6 Z M14,8 L6,8 L6,12 L14,12 L14,8 Z M5,0 C5.55228475,0 6,0.44771525 6,1 C6,1.51283584 5.61395981,1.93550716 5.11662113,1.99327227 L5,2 L2,2 L2,5.00298691 C2,5.51582275 1.61395981,5.93849407 1.11662113,5.99625918 L1,6.00298691 C0.487164161,6.00298691 0.0644928393,5.61694672 0.00672773133,5.11960803 L0,5.00298691 L0,1 C0,0.487164161 0.38604019,0.0644928393 0.883378875,0.00672773133 L1,0 L5,0 Z M19,0 L19.1166211,0.00672773133 C19.6139598,0.0644928393 20,0.487164161 20,1 L20,1 L20,5.00298691 L19.9932723,5.11960803 C19.9355072,5.61694672 19.5128358,6.00298691 19,6.00298691 L19,6.00298691 L18.8833789,5.99625918 C18.3860402,5.93849407 18,5.51582275 18,5.00298691 L18,5.00298691 L18,2 L15,2 L14.8833789,1.99327227 C14.3860402,1.93550716 14,1.51283584 14,1 C14,0.44771525 14.4477153,0 15,0 L15,0 L19,0 Z" id="Path-54" fill="#3F3F3F"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/pandora_console/images/rrs@svg.svg b/pandora_console/images/rrs@svg.svg
new file mode 100644
index 0000000000..988d661693
--- /dev/null
+++ b/pandora_console/images/rrs@svg.svg
@@ -0,0 +1,9 @@
+<?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: Sketch 61.2 (89653) - https://sketch.com -->
+    <title>Dark / 20 / rrss@svg</title>
+    <desc>Created with Sketch.</desc>
+    <g id="Dark-/-20-/-rrss" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M5.45067424,17.2746629 C5.45067424,18.031701 5.18571091,18.6751833 4.65578424,19.20511 C4.12585758,19.7350367 3.48237521,20 2.72533712,20 C1.96829903,20 1.32481665,19.7350367 0.794889993,19.20511 C0.264963331,18.6751833 0,18.031701 0,17.2746629 C0,16.5176248 0.264963331,15.8741424 0.794889993,15.3442158 C1.32481665,14.8142891 1.96829903,14.5493258 2.72533712,14.5493258 C3.48237521,14.5493258 4.12585758,14.8142891 4.65578424,15.3442158 C5.18571091,15.8741424 5.45067424,16.5176248 5.45067424,17.2746629 Z M12.7182399,19.020582 C12.7371658,19.2855453 12.6567305,19.5126567 12.476934,19.7019163 C12.3066004,19.9006388 12.0842205,20 11.8097942,20 L9.89354152,20 C9.65696712,20 9.45351313,19.9219304 9.28317956,19.7657913 C9.11284599,19.6096522 9.01821623,19.4132955 8.99929028,19.1767211 C8.7911048,17.0096996 7.91814526,15.157322 6.38041164,13.6195884 C4.84267802,12.0818547 2.99030045,11.2088952 0.823278921,11.0007097 C0.586704519,10.9817838 0.390347764,10.887154 0.234208659,10.7168204 C0.0780695529,10.5464869 0,10.3430329 0,10.1064585 L0,8.19020582 C0,7.91577951 0.0993612491,7.69339957 0.298083747,7.523066 C0.458954341,7.36219541 0.662408327,7.28176011 0.908445706,7.28176011 L0.979418027,7.28176011 C2.4934942,7.4047788 3.94132955,7.78566359 5.32292406,8.42441448 C6.70451857,9.06316537 7.92997398,9.92193045 8.99929028,11.0007097 C10.0780696,12.070026 10.9368346,13.2954814 11.5755855,14.6770759 C12.2143364,16.0586705 12.5952212,17.5065058 12.7182399,19.020582 Z M19.9858055,19.0489709 C20.0047315,19.3044713 19.9195647,19.5268512 19.7303052,19.7161107 C19.5599716,19.9053702 19.3423232,20 19.0773598,20 L17.0475515,20 C16.8015141,20 16.5909629,19.917199 16.4158978,19.7515969 C16.2408327,19.5859948 16.1485687,19.3849066 16.1391057,19.1483322 C16.02555,17.1137923 15.5476697,15.1809794 14.7054649,13.3498935 C13.86326,11.5188077 12.7679205,9.92902768 11.4194464,8.58055358 C10.0709723,7.23207949 8.48119233,6.13674 6.65010646,5.29453513 C4.81902058,4.45233026 2.88620771,3.96971848 0.85166785,3.84669979 C0.615093447,3.83723681 0.414005205,3.74497279 0.248403123,3.56990774 C0.0828010409,3.39484268 0,3.18902295 0,2.95244855 L0,0.92264017 C0,0.657676839 0.0946297611,0.440028389 0.283889283,0.269694819 C0.454222853,0.0993612491 0.662408327,0.0141944642 0.908445706,0.0141944642 L0.951029099,0.0141944642 C3.43032884,0.137213154 5.8031701,0.70499172 8.06955287,1.71753016 C10.3359357,2.73006861 12.3491838,4.12112609 14.1092974,5.89070263 C15.8788739,7.65081618 17.2699314,9.66406435 18.2824698,11.9304471 C19.2950083,14.1968299 19.8627868,16.5696712 19.9858055,19.0489709 Z" id="Shape" fill="#3F3F3F"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/pandora_console/images/sound_console@svg.svg b/pandora_console/images/sound_console@svg.svg
new file mode 100644
index 0000000000..1d9210aec9
--- /dev/null
+++ b/pandora_console/images/sound_console@svg.svg
@@ -0,0 +1,9 @@
+<?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: Sketch 61.2 (89653) - https://sketch.com -->
+    <title>Dark / 20 / sound console@svg</title>
+    <desc>Created with Sketch.</desc>
+    <g id="Dark-/-20-/-sound-console" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M14.0786893,0.191950562 C14.6433294,0.499936042 15,1.12950535 15,1.81818182 L15,18.1818182 C15,18.8704947 14.6433294,19.500064 14.0786893,19.8080494 C13.5140493,20.1160349 12.8383627,20.0495695 12.3333333,19.6363636 L5,14 L2,14 C0.8954305,14 1.3527075e-16,13.1045695 0,12 L0,8 C-1.3527075e-16,6.8954305 0.8954305,6 2,6 L5,6 L12.3333333,0.363636364 C12.8383627,-0.0495695183 13.5140493,-0.116034918 14.0786893,0.191950562 Z M17,7 C18.6568542,7 20,8.34314575 20,10 C20,11.6568542 18.6568542,13 17,13 L17,7 Z" id="Path-3" fill="#3F3F3F"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php
index 1bde3a807e..73767742d8 100644
--- a/pandora_console/include/ajax/events.php
+++ b/pandora_console/include/ajax/events.php
@@ -1697,32 +1697,32 @@ if ($get_extended_event) {
     // Tabs.
     $tabs = "<ul class='event_detail_tab_menu'>";
     $tabs .= "<li><a href='#extended_event_general_page' id='link_general'>".html_print_image(
-        'images/lightning_go.png',
+        'images/event.svg',
         true,
-        ['class' => 'invert_filter']
+        ['class' => 'invert_filter main_menu_icon']
     ).'<span>'.__('General').'</span></a></li>';
     if (events_has_extended_info($event['id_evento']) === true) {
         $tabs .= "<li><a href='#extended_event_related_page' id='link_related'>".html_print_image(
-            'images/zoom.png',
+            'images/details.svg',
             true,
-            ['class' => 'invert_filter']
+            ['class' => 'invert_filter main_menu_icon']
         ).'<span>'.__('Related').'</span></a></li>';
     }
 
     $tabs .= "<li><a href='#extended_event_details_page' id='link_details'>".html_print_image(
-        'images/zoom.png',
+        'images/details.svg',
         true,
-        ['class' => 'invert_filter']
+        ['class' => 'invert_filter main_menu_icon']
     ).'<span>'.__('Details').'</span></a></li>';
     $tabs .= "<li><a href='#extended_event_custom_fields_page' id='link_custom_fields'>".html_print_image(
-        'images/custom_field_col.png',
+        'images/agent-fields.svg',
         true,
-        ['class' => 'invert_filter']
+        ['class' => 'invert_filter main_menu_icon']
     ).'<span>'.__('Agent fields').'</span></a></li>';
     $tabs .= "<li><a href='#extended_event_comments_page' id='link_comments'>".html_print_image(
-        'images/pencil.png',
+        'images/edit.svg',
         true,
-        ['class' => 'invert_filter']
+        ['class' => 'invert_filter main_menu_icon']
     ).'<span>'.__('Comments').'</span></a></li>';
 
     if (!$readonly
@@ -1747,17 +1747,17 @@ if ($get_extended_event) {
         )))
     ) {
         $tabs .= "<li><a href='#extended_event_responses_page' id='link_responses'>".html_print_image(
-            'images/event_responses.png',
+            'images/responses.svg',
             true,
-            ['class' => 'invert_filter']
+            ['class' => 'invert_filter main_menu_icon']
         ).'<span>'.__('Responses').'</span></a></li>';
     }
 
     if (empty($event['custom_data']) === false) {
         $tabs .= "<li><a href='#extended_event_custom_data_page' id='link_custom_data'>".html_print_image(
-            'images/custom_field_col.png',
+            'images/custom-input@svg.svg',
             true,
-            ['class' => 'invert_filter']
+            ['class' => 'invert_filter main_menu_icon']
         ).'<span>'.__('Custom data').'</span></a></li>';
     }
 
@@ -2385,7 +2385,7 @@ if ($drawConsoleSound === true) {
                             'type'       => 'button',
                             'name'       => 'melody_sound',
                             'label'      => __('Test sound'),
-                            'attributes' => 'class="sub upd"',
+                            'attributes' => ['icon' => 'sound'],
                             'return'     => true,
                         ],
                     ],
@@ -2436,7 +2436,7 @@ if ($drawConsoleSound === true) {
                     'label'      => __('Start'),
                     'type'       => 'button',
                     'name'       => 'start-search',
-                    'attributes' => 'class="sub play"',
+                    'attributes' => [ 'icon' => 'wand' ],
                     'return'     => true,
                 ],
                 'div',
@@ -2449,7 +2449,7 @@ if ($drawConsoleSound === true) {
                     'type'       => 'button',
                     'name'       => 'no-alerts',
                     'label'      => __('No alerts'),
-                    'attributes' => 'class="sub alerts"',
+                    'attributes' => [ 'icon' => 'fail' ],
                     'return'     => true,
                 ],
                 'div',
diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index 5cdd97e7eb..1fc8576eeb 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -2660,84 +2660,85 @@ function events_print_type_img(
     $output = '';
 
     $urlImage = ui_get_full_url(false);
-
-    $style = '';
+    $icon = '';
+    $style = 'invert_filter main_menu_icon';
 
     switch ($type) {
         case 'alert_recovered':
-            $icon = 'images/bell.png';
-            $style = 'invert_filter';
+            $icon = 'images/alert@svg.svg';
         break;
 
         case 'alert_manual_validation':
-            $icon = 'images/ok.png';
-            $style = 'invert_filter';
+            $icon = 'images/validate.svg';
         break;
 
         case 'going_down_critical':
         case 'going_up_critical':
             // This is to be backwards compatible.
-            $icon = 'images/module_critical.png';
+            $style .= ' event_module_background_state icon_background_critical';
         break;
 
         case 'going_up_normal':
         case 'going_down_normal':
             // This is to be backwards compatible.
-            $icon = 'images/module_ok.png';
+            $style .= ' event_module_background_state icon_background_normal';
         break;
 
         case 'going_up_warning':
         case 'going_down_warning':
-            $icon = 'images/module_warning.png';
+            $style .= ' event_module_background_state icon_background_warning';
         break;
 
         case 'going_unknown':
-            $icon = 'images/module_unknown.png';
+            $style .= ' event_module_background_state icon_background_unknown';
         break;
 
         case 'alert_fired':
             $icon = 'images/bell_error.png';
-            $style = 'invert_filter';
         break;
 
         case 'system':
-            $icon = 'images/cog.png';
-            $style = 'invert_filter';
+            $icon = 'images/configuration@svg.svg';
         break;
 
         case 'recon_host_detected':
             $icon = 'images/recon.png';
-            $style = 'invert_filter';
         break;
 
         case 'new_agent':
-            $icon = 'images/agent.png';
-            $style = 'invert_filter';
+            $icon = 'images/agents@svg.svg';
         break;
 
         case 'configuration_change':
-            $icon = 'images/config.png';
-            $style = 'invert_filter';
+            $icon = 'images/configuration@svg.svg';
         break;
 
         case 'unknown':
         default:
-            $icon = 'images/lightning_go.png';
-            $style = 'invert_filter';
+            $icon = 'images/event.svg';
         break;
     }
 
     if ($only_url) {
         $output = $urlImage.'/'.$icon;
     } else {
-        $output .= html_print_image(
+        $output .= html_print_div(
+            [
+                'title' => events_print_type_description($type, true),
+                'class' => $style,
+                'style' => 'margin-left: 30px;'.((empty($icon) === false) ? 'background-image: url('.$icon.'); background-repeat: no-repeat;' : ''),
+            ],
+            true
+        );
+        /*
+            $output .= html_print_image(
             $icon,
             true,
             [
                 'title' => events_print_type_description($type, true),
                 'class' => $style,
             ]
-        );
+        );*/
     }
 
     if ($return) {
@@ -4185,7 +4186,7 @@ function events_page_details($event, $server_id=0)
         $agent = [];
     }
 
-    $data[0] = __('Agent details');
+    $data[0] = '<span class="subsection_header_title">'.__('Agent details').'</span>';
     $data[1] = empty($agent) ? '<i>'.__('N/A').'</i>' : '';
     $table_details->data[] = $data;
 
@@ -4254,10 +4255,7 @@ function events_page_details($event, $server_id=0)
             'custom_button',
             false,
             '$(\'#link_custom_fields\').trigger(\'click\');',
-            [
-                'icon' => 'next',
-                'mode' => 'mini secondary',
-            ],
+            [ 'mode' => 'link' ],
             true
         );
         $table_details->data[] = $data;
@@ -4276,8 +4274,8 @@ function events_page_details($event, $server_id=0)
     }
 
     $data = [];
-    $data[0] = __('Module details');
-    $data[1] = empty($module) ? '<i>'.__('N/A').'</i>' : '';
+    $data[0] = '<span class="subsection_header_title">'.__('Module details').'<span>';
+    $data[1] = (empty($module) === true) ? '<i>'.__('N/A').'</i>' : '';
     $table_details->data[] = $data;
 
     if (empty($module) === false) {
@@ -4353,10 +4351,7 @@ function events_page_details($event, $server_id=0)
             $graph_params_str = http_build_query($graph_params);
 
             $link = "winopeng_var('".$url.'?'.$graph_params_str."','".$win_handle."', 800, 480)";
-
-            $data[1] = '<a href="javascript:'.$link.'">';
-            $data[1] .= html_print_image('images/chart_curve.png', true, ['class' => 'invert_filter']);
-            $data[1] .= '</a>';
+            $data[1] = html_print_button(__('View graph'), 'view_graph_button', false, $link, ['mode' => 'link'], true);
             $table_details->data[] = $data;
         }
     }
@@ -4373,7 +4368,7 @@ function events_page_details($event, $server_id=0)
         $standby = db_get_value('standby', 'talert_template_modules', 'id', $event['id_alert_am']);
         if (!$standby) {
             $data[1] .= html_print_image(
-                'images/bell.png',
+                'images/alert@svg.svg',
                 true,
                 [
                     'title' => __('Go to data overview'),
@@ -4382,11 +4377,12 @@ function events_page_details($event, $server_id=0)
             );
         } else {
             $data[1] .= html_print_image(
-                'images/bell_pause.png',
+                'images/alert@svg.svg',
                 true,
                 [
                     'title' => __('Go to data overview'),
                     'class' => 'invert_filter',
+                    'style' => 'opacity: .5',
                 ]
             );
         }
@@ -4554,19 +4550,19 @@ function events_display_status($status)
     switch ($status) {
         case 0:
         return [
-            'img'   => 'images/star.png',
+            'img'   => 'images/star@svg.svg',
             'title' => __('New event'),
         ];
 
         case 1:
         return [
-            'img'   => 'images/tick.png',
+            'img'   => 'images/validate.svg',
             'title' => __('Event validated'),
         ];
 
         case 2:
         return [
-            'img'   => 'images/hourglass.png',
+            'img'   => 'images/clock.svg',
             'title' => __('Event in process'),
         ];
 
@@ -4812,7 +4808,7 @@ function events_page_general($event)
     $table_general->cellclass[count($table_general->data)][1] = 'general_status';
     $data[0] = __('Status');
     $data[1] = $event_st['title'];
-    $data[2] = html_print_image($event_st['img'], true);
+    $data[2] = html_print_image($event_st['img'], true, [ 'class' => 'invert_filter main_menu_icon']);
     $table_general->data[] = $data;
 
     // If event is validated, show who and when acknowleded it.
diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php
index a3e7cc87bf..27a024f756 100755
--- a/pandora_console/include/functions_modules.php
+++ b/pandora_console/include/functions_modules.php
@@ -4132,12 +4132,12 @@ function get_module_realtime_link_graph($module)
         'community'            => urlencode($module['snmp_community']),
         'starting_oid'         => urlencode($module['snmp_oid']),
         'snmp_browser_version' => urlencode($module['tcp_send']),
-        'snmp3_auth_user'      => urlencode($module['plugin_user']),
-        'snmp3_security_level' => urlencode($module['custom_string_3']),
-        'snmp3_auth_method'    => urlencode($module['plugin_parameters']),
-        'snmp3_auth_pass'      => urlencode($module['plugin_pass']),
-        'snmp3_privacy_method' => urlencode($module['custom_string_1']),
-        'snmp3_privacy_pass'   => urlencode($module['custom_string_2']),
+        'snmp3_auth_user'      => urlencode(($module['plugin_user'] ?? '')),
+        'snmp3_security_level' => urlencode(($module['custom_string_3'] ?? '')),
+        'snmp3_auth_method'    => urlencode(($module['plugin_parameters'] ?? '')),
+        'snmp3_auth_pass'      => urlencode(($module['plugin_pass'] ?? '')),
+        'snmp3_privacy_method' => urlencode(($module['custom_string_1'] ?? '')),
+        'snmp3_privacy_pass'   => urlencode(($module['custom_string_2'] ?? '')),
         'hide_header'          => 1,
         'rel_path'             => '../../',
     ];
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 86e5da6f3b..9c2242f08a 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -3209,7 +3209,10 @@ function ui_progress(
                         success: function(data) {
                             try {
                                 val = JSON.parse(data);
-                                $("#'.$id.'").attr("data-label", val["last_contact"]+" s");
+                                if (isNaN(val["last_contact"]) == false) {
+                                    $("#'.$id.'").attr("data-label", val["last_contact"]+" s");
+                                }
+
                                 $("#'.$id.'_progress").width(val["progress"]+"%");
                             } catch (e) {
                                 console.error(e);
@@ -3221,7 +3224,10 @@ function ui_progress(
                         }
                     });
                 } else {
-                    $("#'.$id.'").attr("data-label", (last -1) + " s");
+                    if (isNaN(last) === false) {
+                        $("#'.$id.'").attr("data-label", (last -1) + " s");
+                    }
+
                     if (width < 100) {
                         $("#'.$id.'_progress").width((width+width_interval) + "%");
                     }
@@ -3600,7 +3606,7 @@ function ui_print_datatable(array $parameters)
         if (isset($parameters['form']['no_toggle']) === false) {
             $filter = ui_toggle(
                 $filter,
-                __('Filter'),
+                '<span class="subsection_header_title">'.__('Filter').'</span>',
                 '',
                 '',
                 true,
@@ -3612,7 +3618,7 @@ function ui_print_datatable(array $parameters)
     } else if (isset($parameters['form_html'])) {
         $filter = ui_toggle(
             $parameters['form_html'],
-            __('Filter'),
+            '<span class="subsection_header_title">'.__('Filter').'</span>',
             '',
             '',
             true,
diff --git a/pandora_console/include/styles/events.css b/pandora_console/include/styles/events.css
index 235b226667..365a2d6d6d 100644
--- a/pandora_console/include/styles/events.css
+++ b/pandora_console/include/styles/events.css
@@ -449,3 +449,29 @@ div.multi-response-buttons {
   align-items: center;
   margin-bottom: 5px;
 }
+
+/*
+.main_menu_icon_event {
+  height: 20px;
+}
+*/
+.event_module_background_state {
+  mask: url(../../images/modules@svg.svg) no-repeat center / contain;
+  -webkit-mask: url(../../images/modules@svg.svg) no-repeat center / contain;
+}
+
+.icon_background_critical {
+  background-color: #e63c52;
+}
+
+.icon_background_warning {
+  background-color: #fcab10;
+}
+
+.icon_background_normal {
+  background-color: #82b92e;
+}
+
+.icon_background_unknown {
+  background-color: gray;
+}
diff --git a/pandora_console/include/styles/js/jquery-ui_custom.css b/pandora_console/include/styles/js/jquery-ui_custom.css
index 1b4532b51c..53f76eccf5 100644
--- a/pandora_console/include/styles/js/jquery-ui_custom.css
+++ b/pandora_console/include/styles/js/jquery-ui_custom.css
@@ -137,7 +137,7 @@
   background-color: #3f3f3f;
 }
 .ui-dialog .ui-widget-header {
-  margin: -1px -1px 0px -1px;
+  margin: 3px 3px 0px 3px;
 }
 .ui_tpicker_hour,
 .ui_tpicker_minute,
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 3dc8f9c75c..a7bd3b60d6 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -10284,6 +10284,11 @@ button div.upd {
   -webkit-mask: url(../../images/validate.svg) no-repeat center / contain;
 }
 
+button div.sound {
+  mask: url(../../images/sound_console@svg.svg) no-repeat center / contain;
+  -webkit-mask: url(../../images/sound_console@svg.svg) no-repeat center /
+    contain;
+}
 button div.add {
   mask: url(../../images/svg/plus.svg) no-repeat center / contain;
   -webkit-mask: url(../../images/svg/plus.svg) no-repeat center / contain;
@@ -10311,8 +10316,8 @@ button div.cog {
 }
 
 button div.fail {
-  mask: url(../../images/svg/fail.svg) no-repeat center / contain;
-  -webkit-mask: url(../../images/svg/fail.svg) no-repeat center / contain;
+  mask: url(../../images/fail@svg.svg) no-repeat center / contain;
+  -webkit-mask: url(../../images/fail@svg.svg) no-repeat center / contain;
 }
 
 .ui-dialog-buttonset {
@@ -10852,12 +10857,18 @@ pre.external_tools_output {
 .fixed_filter_bar input,
 .filter_table input,
 .fixed_filter_bar .select2-container .select2-selection--single,
-.filter_table .select2-container .select2-selection--single {
+.filter_table .select2-container .select2-selection--single,
+.table_modal_alternate input,
+table.table_modal_alternate
+  span.select2
+  > span.selection
+  > span.select2-selection {
   height: 32px !important;
 }
 
 .fixed_filter_bar .select2-selection__arrow,
-.filter_table .select2-selection__arrow {
+.filter_table .select2-selection__arrow,
+table.table_modal_alternate .select2-selection__arrow {
   top: -4px !important;
 }
 
@@ -10865,6 +10876,10 @@ pre.external_tools_output {
   .select2-container
   .select2-selection--single
   .select2-selection__rendered,
+table.table_modal_alternate
+  .select2-container
+  .select2-selection--single
+  .select2-selection__rendered,
 .fixed_filter_bar
   .select2-container
   .select2-selection--single
@@ -10954,6 +10969,7 @@ pre.external_tools_output {
 
 .main_menu_icon {
   width: 20px;
+  height: 20px;
 }
 
 .after_input_icon {
@@ -11116,3 +11132,8 @@ form#satellite_conf_edit > fieldset.full-column {
   color: #8a96a6;
   font-family: "Pandora-Regular";
 }
+
+#principal_action_buttons input,
+#principal_action_buttons .select2-container {
+  z-index: 50;
+}
diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php
index 79bdce835f..009b0dd4bd 100644
--- a/pandora_console/operation/events/events.php
+++ b/pandora_console/operation/events/events.php
@@ -554,11 +554,11 @@ if (is_ajax() === true) {
                                 $tmp->user_comment .= $tmp->b64;
                                 $tmp->user_comment .= '\',\'comments\')>;';
                                 $tmp->user_comment .= html_print_image(
-                                    'images/operation.png',
+                                    'images/details.svg',
                                     true,
                                     [
                                         'title' => __('Show more'),
-                                        'class' => 'invert_filter',
+                                        'class' => 'invert_filter main_menu_icon',
                                     ]
                                 );
                                 $tmp->user_comment .= '</a>';
@@ -743,11 +743,11 @@ if (is_ajax() === true) {
                         switch ($tmp->estado) {
                             case EVENT_STATUS_NEW:
                                 $img = html_print_image(
-                                    'images/star.png',
+                                    'images/star@svg.svg',
                                     true,
                                     [
                                         'title' => __('New event'),
-                                        'class' => 'forced-title',
+                                        'class' => 'forced-title main_menu_icon',
                                     ]
                                 );
                                 $state = 0;
@@ -756,11 +756,11 @@ if (is_ajax() === true) {
                             case EVENT_STATUS_VALIDATED:
                                 $state = 1;
                                 $img = html_print_image(
-                                    'images/tick.png',
+                                    'images/validate.svg',
                                     true,
                                     [
                                         'title' => __('Event validated'),
-                                        'class' => 'forced-title invert_filter',
+                                        'class' => 'forced-title invert_filter main_menu_icon',
                                     ]
                                 );
                             break;
@@ -768,7 +768,7 @@ if (is_ajax() === true) {
                             case EVENT_STATUS_INPROCESS:
                                 $state = 2;
                                 $img = html_print_image(
-                                    'images/hourglass.png',
+                                    'images/clock.svg',
                                     true,
                                     [
                                         'title' => __('Event in process'),
@@ -779,7 +779,7 @@ if (is_ajax() === true) {
 
                             default:
                                 $img = html_print_image(
-                                    'images/star.png',
+                                    'images/star@svg.svg',
                                     true,
                                     [
                                         'title' => __('Unknown'),
@@ -819,7 +819,7 @@ if (is_ajax() === true) {
                         // Show more.
                         $tmp->options = '<a href="javascript:" onclick="show_event_dialog(\''.$tmp->b64.'\')">';
                         $tmp->options .= html_print_image(
-                            'images/operation.png',
+                            'images/details.svg',
                             true,
                             [
                                 'title' => __('Show more'),
@@ -848,11 +848,11 @@ if (is_ajax() === true) {
                                     $tmp->options .= $tmp->event_rep.', this, '.$tmp->server_id.')"';
                                     $tmp->options .= ' id="val-'.$id_val.'">';
                                     $tmp->options .= html_print_image(
-                                        'images/tick.png',
+                                        'images/validate.svg',
                                         true,
                                         [
                                             'title' => __('Validate events'),
-                                            'class' => 'invert_filter',
+                                            'class' => 'invert_filter main_menu_icon',
                                         ]
                                     );
                                     $tmp->options .= '</a>';
@@ -865,11 +865,11 @@ if (is_ajax() === true) {
                                     $tmp->options .= $tmp->id_evento.', 0, this, ';
                                     $tmp->options .= $tmp->server_id.')" id="val-'.$id_val.'">';
                                     $tmp->options .= html_print_image(
-                                        'images/tick.png',
+                                        'images/validate.svg',
                                         true,
                                         [
                                             'title' => __('Validate event'),
-                                            'class' => 'invert_filter',
+                                            'class' => 'invert_filter main_menu_icon',
                                         ]
                                     );
                                     $tmp->options .= '</a>';
@@ -900,11 +900,11 @@ if (is_ajax() === true) {
                                 }
 
                                 $tmp->options .= html_print_image(
-                                    'images/hourglass.png',
+                                    'images/clock.svg',
                                     true,
                                     [
                                         'title' => __('Change to in progress status'),
-                                        'class' => 'invert_filter',
+                                        'class' => 'invert_filter main_menu_icon',
                                     ]
                                 );
                                 $tmp->options .= '</a>';
@@ -925,11 +925,11 @@ if (is_ajax() === true) {
                                 $tmp->options .= $tmp->max_id_evento.', '.$tmp->event_rep;
                                 $tmp->options .= ', this, '.$tmp->server_id.')" id="del-'.$id_del.'">';
                                 $tmp->options .= html_print_image(
-                                    'images/cross.png',
+                                    'images/delete.svg',
                                     true,
                                     [
                                         'title' => __('Delete events'),
-                                        'class' => 'invert_filter',
+                                        'class' => 'invert_filter main_menu_icon',
                                     ]
                                 );
                                 $tmp->options .= '</a>';
@@ -942,11 +942,11 @@ if (is_ajax() === true) {
                                 $tmp->options .= $tmp->id_evento.', 0, this, ';
                                 $tmp->options .= $tmp->server_id.')" id="del-'.$id_del.'">';
                                 $tmp->options .= html_print_image(
-                                    'images/cross.png',
+                                    'images/delete.svg',
                                     true,
                                     [
                                         'title' => __('Delete event'),
-                                        'class' => 'invert_filter',
+                                        'class' => 'invert_filter main_menu_icon',
                                     ]
                                 );
                                 $tmp->options .= '</a>';
@@ -1366,7 +1366,7 @@ if ($pure) {
     echo '<li class="nomn">';
     echo '<a target="_top" href="'.$url.'&amp;pure=0">';
     echo html_print_image(
-        'images/normal_screen.png',
+        'images/exit_fullscreen@svg.svg',
         true,
         [
             'title' => __('Back to normal mode'),
@@ -1421,22 +1421,22 @@ if ($pure) {
     // Fullscreen.
     $fullscreen['active'] = false;
     $fullscreen['text'] = '<a class="events_link" href="'.$url.'&amp;pure=1&">'.html_print_image(
-        'images/full_screen.png',
+        'images/fullscreen@svg.svg',
         true,
         [
             'title' => __('Full screen'),
-            'class' => 'invert_filter',
+            'class' => 'invert_filter main_menu_icon',
         ]
     ).'</a>';
 
     // Event list.
     $list['active'] = false;
     $list['text'] = '<a class="events_link" href="index.php?sec=eventos&sec2=operation/events/events&amp;pure='.$config['pure'].'&">'.html_print_image(
-        'images/events_list.png',
+        'images/event.svg',
         true,
         [
             'title' => __('Event list'),
-            'class' => 'invert_filter',
+            'class' => 'invert_filter main_menu_icon',
         ]
     ).'</a>';
 
@@ -1447,29 +1447,29 @@ if ($pure) {
         true,
         [
             'title' => __('History event list'),
-            'class' => 'invert_filter',
+            'class' => 'invert_filter main_menu_icon',
         ]
     ).'</a>';
 
     // RSS.
     $rss['active'] = false;
     $rss['text'] = '<a class="events_link" href="operation/events/events_rss.php?user='.$config['id_user'].'&hashup='.$hashup.'&">'.html_print_image(
-        'images/rss.png',
+        'images/rrs@svg.svg',
         true,
         [
             'title' => __('RSS Events'),
-            'class' => 'invert_filter',
+            'class' => 'invert_filter main_menu_icon',
         ]
     ).'</a>';
 
     // CSV.
     $csv['active'] = false;
     $csv['text'] = '<a class="events_link" onclick="blockResubmit($(this))" href="'.ui_get_full_url(false, false, false, false).'operation/events/export_csv.php?'.($filter_b64 ?? '').'">'.html_print_image(
-        'images/csv.png',
+        'images/file-csv.svg',
         true,
         [
             'title' => __('Export to CSV file'),
-            'class' => 'invert_filter',
+            'class' => 'invert_filter main_menu_icon',
         ]
     ).'</a>';
 
@@ -1493,11 +1493,11 @@ if ($pure) {
     );
 
     $sound_event['text'] = '<a href="javascript: openSoundEventModal(`'.$data_sound.'`);">'.html_print_image(
-        'images/sound.png',
+        'images/sound_console@svg.svg',
         true,
         [
             'title' => __('Sound events'),
-            'class' => 'invert_filter',
+            'class' => 'invert_filter main_menu_icon',
         ]
     ).'</a>';
 
@@ -1506,11 +1506,11 @@ if ($pure) {
         // Manage events.
         $manage_events['active'] = false;
         $manage_events['text'] = '<a href="index.php?sec=eventos&sec2=godmode/events/events&amp;section=filter&amp;pure='.$config['pure'].'">'.html_print_image(
-            'images/setup.png',
+            'images/configuration@svg.svg',
             true,
             [
                 'title' => __('Manage events'),
-                'class' => 'invert_filter',
+                'class' => 'invert_filter main_menu_icon',
             ]
         ).'</a>';
 
@@ -1564,7 +1564,7 @@ if ($pure) {
         unset($onheader['history']);
         ui_print_standard_header(
             __('Events list'),
-            'images/lightning_go.png',
+            'images/event.svg',
             false,
             'eventview',
             false,
@@ -2205,7 +2205,7 @@ $adv_filter = join('', $adv_inputs);
 $filter = join('', $inputs);
 $filter .= ui_toggle(
     $adv_filter,
-    __('Advanced options'),
+    '<span class="subsection_header_title">'.__('Advanced options').'</span>',
     '',
     '',
     true,
@@ -2386,61 +2386,69 @@ try {
     $form_id = 'events_form';
 
     // Print datatable.
-    ui_print_datatable(
+    html_print_div(
         [
-            'id'                             => $table_id,
-            'class'                          => 'info_table events',
-            'style'                          => 'width: 100%;',
-            'ajax_url'                       => 'operation/events/events',
-            'ajax_data'                      => [
-                'get_events' => 1,
-                'history'    => (int) $history,
-                'table_id'   => $table_id,
-            ],
-            'form'                           => [
-                'id'            => $form_id,
-                'class'         => 'flex-row',
-                'html'          => $filter,
-                'inputs'        => [],
-                'extra_buttons' => $buttons,
-            ],
-            'extra_html'                     => $active_filters_div,
-            'pagination_options'             => [
+            'class'   => 'events_table_wrapper',
+            'style'   => 'margin: 10px 10px 0;',
+            'content' => ui_print_datatable(
                 [
-                    $config['block_size'],
-                    10,
-                    25,
-                    100,
-                    200,
-                    500,
-                    1000,
-                    -1,
+                    'id'                             => $table_id,
+                    'class'                          => 'info_table events',
+                    'style'                          => 'width: 100%;',
+                    'ajax_url'                       => 'operation/events/events',
+                    'ajax_data'                      => [
+                        'get_events' => 1,
+                        'history'    => (int) $history,
+                        'table_id'   => $table_id,
+                    ],
+                    'form'                           => [
+                        'id'            => $form_id,
+                        'class'         => 'flex-row',
+                        'html'          => $filter,
+                        'inputs'        => [],
+                        'extra_buttons' => $buttons,
+                    ],
+                    'extra_html'                     => $active_filters_div,
+                    'pagination_options'             => [
+                        [
+                            $config['block_size'],
+                            10,
+                            25,
+                            100,
+                            200,
+                            500,
+                            1000,
+                            -1,
+                        ],
+                        [
+                            $config['block_size'],
+                            10,
+                            25,
+                            100,
+                            200,
+                            500,
+                            1000,
+                            'All',
+                        ],
+                    ],
+                    'order'                          => [
+                        'field'     => 'timestamp',
+                        'direction' => 'desc',
+                    ],
+                    'column_names'                   => $column_names,
+                    'columns'                        => $fields,
+                    'no_sortable_columns'            => [
+                        -1,
+                        -2,
+                        'column-instructions',
+                    ],
+                    'ajax_return_operation'          => 'buffers',
+                    'ajax_return_operation_function' => 'process_buffers',
+                    'drawCallback'                   => 'process_datatables_callback(this, settings)',
+                    'print'                          => false,
+                    'csv'                            => 0,
                 ],
-                [
-                    $config['block_size'],
-                    10,
-                    25,
-                    100,
-                    200,
-                    500,
-                    1000,
-                    'All',
-                ],
-            ],
-            'order'                          => [
-                'field'     => 'timestamp',
-                'direction' => 'desc',
-            ],
-            'column_names'                   => $column_names,
-            'columns'                        => $fields,
-            'no_sortable_columns'            => [
-                -1,
-                -2,
-                'column-instructions',
-            ],
-            'ajax_return_operation'          => 'buffers',
-            'ajax_return_operation_function' => 'process_buffers',
-            'drawCallback'                   => 'process_datatables_callback(this, settings)',
+            ),
         ]
     );
 } catch (Exception $e) {