diff --git a/extras/docker/build_and_push.sh b/extras/docker/build_and_push.sh
index 980087cfe5..91e6fa15e5 100755
--- a/extras/docker/build_and_push.sh
+++ b/extras/docker/build_and_push.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
-docker build --rm=true --build-arg BRANCH="develop" --build-arg DB_PASS="pandora" -t pandorafms/pandorafms:7 . && \
+docker build --rm=true --pull --no-cache --build-arg BRANCH="develop" --build-arg DB_PASS="pandora" -t pandorafms/pandorafms:7 . && \
 docker push pandorafms/pandorafms:7
diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 9dd1537a57..cebf58c0cc 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.734-190507
+Version: 7.0NG.734-190509
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh
index a08837219a..05ee21ba04 100644
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.734-190507"
+pandora_version="7.0NG.734-190509"
 
 echo "Test if you has the tools for to make the packages."
 whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index ac717cb6f6..fb8671b220 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -42,7 +42,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.734';
-use constant AGENT_BUILD => '190507';
+use constant AGENT_BUILD => '190509';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index 75cfe17809..8b89542a17 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.734
-%define release     190507
+%define release     190509
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec
index 84e4b7156f..4c5fed356c 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.734
-%define release     190507
+%define release     190509
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer
index d9206356e9..e18f072efc 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.734"
-PI_BUILD="190507"
+PI_BUILD="190509"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index ff25c919dd..20da7b7ae4 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{190507}
+{190509}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 7338d84613..7a34c41bbe 100644
--- a/pandora_agents/win32/pandora.cc
+++ b/pandora_agents/win32/pandora.cc
@@ -30,7 +30,7 @@ using namespace Pandora;
 using namespace Pandora_Strutils;
 
 #define PATH_SIZE    _MAX_PATH+1
-#define PANDORA_VERSION ("7.0NG.734(Build 190507)")
+#define PANDORA_VERSION ("7.0NG.734(Build 190509)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 9a8f601055..d792109417 100644
--- a/pandora_agents/win32/versioninfo.rc
+++ b/pandora_agents/win32/versioninfo.rc
@@ -11,7 +11,7 @@ BEGIN
       VALUE "LegalCopyright", "Artica ST"
       VALUE "OriginalFilename", "PandoraAgent.exe"
       VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(7.0NG.734(Build 190507))"
+      VALUE "ProductVersion", "(7.0NG.734(Build 190509))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index aed2edb1a1..11235f2a12 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.734-190507
+Version: 7.0NG.734-190509
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh
index e4ce171785..7f82def4f9 100644
--- a/pandora_console/DEBIAN/make_deb_package.sh
+++ b/pandora_console/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.734-190507"
+pandora_version="7.0NG.734-190509"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index 22839d9fb5..35674550b3 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -1080,7 +1080,7 @@ if ($id_agente) {
         exit;
     }
 
-    $agent = db_get_row('tagente', 'id_agente', $id_agente);
+    $agent = db_get_row('tagente', 'id_agente', $id_agente, false, false);
     if (empty($agent)) {
         // Close out the page.
         ui_print_error_message(__('There was a problem loading the agent'));
diff --git a/pandora_console/godmode/alerts/alert_templates.php b/pandora_console/godmode/alerts/alert_templates.php
index 4542169cf3..8b83e0205f 100644
--- a/pandora_console/godmode/alerts/alert_templates.php
+++ b/pandora_console/godmode/alerts/alert_templates.php
@@ -243,7 +243,9 @@ $url = ui_get_url_refresh(
         'offset'        => false,
         'search_string' => $search_string,
         'search_type'   => $search_type,
-    ]
+    ],
+    true,
+    false
 );
 
 $table = new stdClass();
diff --git a/pandora_console/godmode/servers/plugin.php b/pandora_console/godmode/servers/plugin.php
index 08c29b92e2..645815e6c0 100644
--- a/pandora_console/godmode/servers/plugin.php
+++ b/pandora_console/godmode/servers/plugin.php
@@ -242,7 +242,6 @@ if ($filemanager) {
             $chunck_url = '&create=1';
         }
 
-        $homedir_filemanager = isset($config['homedir_filemanager']) ? $config['homedir_filemanager'] : false;
         filemanager_file_explorer(
             $real_directory,
             $directory,
@@ -253,7 +252,7 @@ if ($filemanager) {
             'index.php?sec=gservers&sec2=godmode/servers/plugin'.$chunck_url.'&plugin_command=[FILE_FULLPATH]&id_plugin='.$id_plugin,
             true,
             0775,
-            $homedir_filemanager
+            false
         );
     }
 
diff --git a/pandora_console/godmode/setup/file_manager.php b/pandora_console/godmode/setup/file_manager.php
index 27f3e232c8..6d5e7679b7 100644
--- a/pandora_console/godmode/setup/file_manager.php
+++ b/pandora_console/godmode/setup/file_manager.php
@@ -66,8 +66,6 @@ $real_directory = realpath($config['homedir'].'/'.$directory);
 
 echo '<h4>'.__('Index of %s', $directory).'</h4>';
 
-$homedir_filemanager = isset($config['homedir_filemanager']) ? $config['homedir_filemanager'] : false;
-
 filemanager_file_explorer(
     $real_directory,
     $directory,
@@ -78,5 +76,5 @@ filemanager_file_explorer(
     '',
     false,
     '',
-    $homedir_filemanager
+    false
 );
diff --git a/pandora_console/godmode/update_manager/update_manager.css b/pandora_console/godmode/update_manager/update_manager.css
index f68c92ea94..168c6fcf7a 100644
--- a/pandora_console/godmode/update_manager/update_manager.css
+++ b/pandora_console/godmode/update_manager/update_manager.css
@@ -140,6 +140,162 @@
 }
 
 #box_online {
-  background-color: #e6e6e6;
-  padding: 10px;
+  background-image: url("../../images/update_manager_background.jpg");
+  background-size: cover;
+  background-position: center center;
+  background-repeat: no-repeat;
+  background-color: #fff;
+  padding: 40px 50px;
+  border: 1px solid #f3f3f3;
+  border-radius: 5px;
+  min-height: 600px;
+}
+
+div#box_online * {
+  font-size: 16pt;
+  font-family: "Open Sans", sans-serif;
+}
+
+#box_online .content {
+  max-width: 60%;
+}
+
+.update_popup {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding-left: 10px;
+  padding-right: 10px;
+}
+
+.update_icon {
+  padding-left: 20px;
+}
+
+.update_text h3 {
+  font-weight: bold;
+  font-size: 12pt;
+}
+
+.update_text p {
+  font-size: 11pt;
+}
+
+.update_text a {
+  font-size: 11pt;
+  color: #82b92e !important;
+}
+
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
+  float: left !important;
+  padding-left: 19px;
+  padding-bottom: 5px;
+}
+
+.ui-dialog-buttonset > button.ui-button.ui-corner-all.ui-widget {
+  background-color: #cecece !important;
+  border: none !important;
+  border-radius: 2px !important;
+  text-transform: uppercase !important;
+  font-weight: bold !important;
+}
+
+.ui-dialog-buttonset > button.success_button.ui-button.ui-corner-all.ui-widget,
+.update_manager_button {
+  background-color: #82b92e !important;
+  color: #fff !important;
+  border-radius: 2px !important;
+  text-transform: uppercase !important;
+  font-weight: bold !important;
+}
+
+a.update_manager_button {
+  padding: 10px 12px;
+  margin-top: 10px;
+  display: inline-flex;
+  align-items: center;
+  font-size: 16px !important;
+  border-radius: 4px !important;
+  text-decoration: none;
+  font-family: "Open Sans", sans-serif;
+}
+
+a.update_manager_button:after {
+  content: url(../../images/update_manager_button.png);
+  padding-left: 10px;
+}
+
+.progressbar {
+  margin-top: 15px;
+}
+
+.ui-draggable,
+.ui-draggable .ui-dialog-titlebar {
+  cursor: default !important;
+}
+
+#box_online #pkg_version {
+  color: #82b92e;
+  font-size: 75pt;
+  font-weight: bold;
+}
+
+/* METACONSOLE */
+.box_online_meta {
+  background: none !important;
+  min-height: 400px !important;
+  text-align: center;
+  border: none !important;
+}
+
+div#box_online.box_online_meta * {
+  font-size: 14pt;
+}
+
+#box_online.box_online_meta .content {
+  max-width: 100%;
+}
+
+#box_online.box_online_meta #pkg_version {
+  font-size: 60pt;
+}
+
+/* COMMUNITY */
+.update_manager_open {
+  max-width: 50%;
+  font-size: 10pt;
+  margin-top: 40px;
+  padding: 20px;
+  border: 1px solid #eaeaea;
+  border-radius: 5px;
+}
+
+.update_manager_warning {
+  display: flex;
+  align-items: center;
+  margin-bottom: 10px;
+}
+
+.update_manager_warning p {
+  font-size: 10pt !important;
+}
+
+.update_manager_warning img {
+  padding-right: 20px;
+  width: 90px;
+}
+
+a.update_manager_button_open {
+  padding: 5px 10px;
+  font-size: 16px !important;
+  border-radius: 4px !important;
+  text-decoration: none;
+  border: 1px solid #82b92e;
+  color: #82b92e;
+  border-radius: 2px;
+}
+
+a.update_manager_button_open:hover {
+  color: #fff;
+  background-color: #82b92e;
 }
diff --git a/pandora_console/godmode/update_manager/update_manager.online.php b/pandora_console/godmode/update_manager/update_manager.online.php
index 3e807367bd..ef9b25075c 100644
--- a/pandora_console/godmode/update_manager/update_manager.online.php
+++ b/pandora_console/godmode/update_manager/update_manager.online.php
@@ -1,16 +1,22 @@
 <?php
 
-// Pandora FMS - http://pandorafms.com
-// ==================================================
-// Copyright (c) 2005-2011 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.
+/**
+    Pandora FMS - http://pandorafms.com
+ * ==================================================
+ * Copyright (c) 2005-2019 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.
+ *
+ * @package    category
+ * @subpackage category
+ */
+
 global $config;
 
 check_login();
@@ -61,7 +67,7 @@ if ($memory_limit < 100) {
     );
 }
 
-// Translators: Do not translade Update Manager, it's the name of the program
+// Translators: Do not translade Update Manager, it's the name of the program.
 if (is_metaconsole()) {
     echo "<style type='text/css' media='screen'>
   		@import 'styles/meta_pandora.css';
@@ -69,23 +75,29 @@ if (is_metaconsole()) {
 }
 
 if (is_metaconsole()) {
-    echo "<div id='box_online' style='float:right;padding-right:400px;padding-top:40px;padding-bottom:40px;' class='cargatextodialogo'>";
+    $baseurl = ui_get_full_url(false, false, false, false);
+    echo ' <link rel="stylesheet" type="text/css" href="'.$baseurl.'/godmode/update_manager/update_manager.css">';
+    echo "<div id='box_online' class='box_online_meta'>";
 } else {
-    echo "<div id='box_online' style='padding-top:40px;padding-bottom:40px;' class='cargatextodialogo'>";
+    echo "<div id='box_online'>";
 }
 
 echo "<span class='loading' style='font-size:18pt;'>";
 echo "<img src='images/wait.gif' />";
-echo '</span><br><br>';
+echo '</span>';
 
-echo '<div><b>'.__('The latest version of package installed is:').'</b></div><br>';
-echo "<div id='pkg_version' style='color:#82b92e;font-size:40pt;font-weight:bold;'>".$current_package.'</div>';
+echo '<p style="font-weight: 600;">'.__('The latest version of package installed is:').'</p>';
+if ($open) {
+    echo '<div id="pkg_version" style="font-size:40pt;">'.$build_version.'</div>';
+} else {
+    echo '<div id="pkg_version">'.$current_package.'</div>';
+}
 
-    echo "<div class='checking_package' style='font-size:18pt;width:100%; text-align: center; display: none;'>";
+    echo "<div class='checking_package' style='font-size:18pt;width:100%; display: none;'>";
         echo __('Checking for the newest package.');
     echo '</div>';
 
-    echo "<div class='downloading_package' style='font-size:18pt;width:100%; text-align: center; display: none;'>";
+    echo "<div class='downloading_package' style='font-size:18pt;width:100%; display: none;'>";
         echo __('Downloading for the newest package.');
     echo '</div>';
 
@@ -119,22 +131,26 @@ echo "<div id='pkg_version' style='color:#82b92e;font-size:40pt;font-weight:bold
         let you know this does not reflect any change in our opensource mentality of
         does the last 14 years.
 
-    ------------------------------------------------------------------------- */
+        -------------------------------------------------------------------------
+    */
 
 if ($open) {
-    echo "
-			<br><br>
-			<div id='updatemodal' class='publienterprisehide' title='Community version' style=''>
-				<img data-title='Enterprise version' class='img_help forced_title' data-use_title_for_force_title='1' src='images/icono_exclamacion_2.png'>
-			</div>
-			<br>";
+    echo "<div class='update_manager_open'>
+        <div class='update_manager_warning'>
+            <div><img src='images/icono_info.png'></div>
+        <div><p>".__('WARNING: You are just one click away from an automated update. This may result in a damaged system, including loss of data and operativity. Check you have a recent backup. OpenSource updates are automatically created packages, and there is no WARRANTY or SUPPORT. If you need professional support and warranty, please upgrade to Enterprise Version.')."</p></div>
+        </div>
+        <div style='text-align:center; margin-top:10px;'>
+            <a class='update_manager_button_open' href='https://pandorafms.com/pandora-fms-enterprise/' target='_blank'>About Enterprise</a>
+        </div>
+    </div>";
 }
 
 
 $enterprise = enterprise_hook('update_manager_enterprise_main');
 
 if ($enterprise == ENTERPRISE_NOT_HOOK) {
-    // Open view
+    // Open view.
     update_manager_main();
 }
 ?>
diff --git a/pandora_console/images/icon_error_db.png b/pandora_console/images/icon_error_db.png
new file mode 100644
index 0000000000..1aad380c2f
Binary files /dev/null and b/pandora_console/images/icon_error_db.png differ
diff --git a/pandora_console/images/icon_error_mr.png b/pandora_console/images/icon_error_mr.png
new file mode 100644
index 0000000000..d1e33eed42
Binary files /dev/null and b/pandora_console/images/icon_error_mr.png differ
diff --git a/pandora_console/images/icon_info_mr.png b/pandora_console/images/icon_info_mr.png
new file mode 100644
index 0000000000..4c0abb0585
Binary files /dev/null and b/pandora_console/images/icon_info_mr.png differ
diff --git a/pandora_console/images/icon_success_db.png b/pandora_console/images/icon_success_db.png
new file mode 100644
index 0000000000..38511ca06e
Binary files /dev/null and b/pandora_console/images/icon_success_db.png differ
diff --git a/pandora_console/images/icon_success_mr.png b/pandora_console/images/icon_success_mr.png
new file mode 100644
index 0000000000..39c72ea9a1
Binary files /dev/null and b/pandora_console/images/icon_success_mr.png differ
diff --git a/pandora_console/images/icon_warning_db.png b/pandora_console/images/icon_warning_db.png
new file mode 100644
index 0000000000..f89a7f51b0
Binary files /dev/null and b/pandora_console/images/icon_warning_db.png differ
diff --git a/pandora_console/images/update_manager_background.jpg b/pandora_console/images/update_manager_background.jpg
new file mode 100644
index 0000000000..121e476860
Binary files /dev/null and b/pandora_console/images/update_manager_background.jpg differ
diff --git a/pandora_console/images/update_manager_button.png b/pandora_console/images/update_manager_button.png
new file mode 100644
index 0000000000..b18b218d78
Binary files /dev/null and b/pandora_console/images/update_manager_button.png differ
diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php
index 6b7be8eb28..6ba163c7ed 100644
--- a/pandora_console/include/ajax/events.php
+++ b/pandora_console/include/ajax/events.php
@@ -418,15 +418,15 @@ if ($get_extended_event) {
     }
 
     // Tabs.
-    $tabs = "<ul style='background:#ffffff !important; border-top: 0px; border-left: 0px; border-right: 0px; border-top-left-radius: 0px; border-top-right-radius: 0px; border-bottom-right-radius: 0px; border-bottom-left-radius: 0px; border-color: #D3D3D3;'>";
-    $tabs .= "<li><a href='#extended_event_general_page' id='link_general'>".html_print_image('images/lightning_go.png', true)."<span style='position:relative;top:-6px;left:5px;margin-right:10px;'>".__('General').'</span></a></li>';
+    $tabs = "<ul class='events_tabs'>";
+    $tabs .= "<li><a href='#extended_event_general_page' id='link_general'>".html_print_image('images/lightning_go.png', true).'<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', true)."<span style='position:relative;top:-6px;left:5px;margin-right:10px;'>".__('Related').'</span></a></li>';
+        $tabs .= "<li><a href='#extended_event_related_page' id='link_related'>".html_print_image('images/zoom.png', true).'<span>'.__('Related').'</span></a></li>';
     }
 
-    $tabs .= "<li><a href='#extended_event_details_page' id='link_details'>".html_print_image('images/zoom.png', true)."<span style='position:relative;top:-6px;left:5px;margin-right:10px;'>".__('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', true)."<span style='position:relative;top:-6px;left:5px;margin-right:10px;'>".__('Agent fields').'</span></a></li>';
-    $tabs .= "<li><a href='#extended_event_comments_page' id='link_comments'>".html_print_image('images/pencil.png', true)."<span style='position:relative;top:-6px;left:5px;margin-right:10px;'>".__('Comments').'</span></a></li>';
+    $tabs .= "<li><a href='#extended_event_details_page' id='link_details'>".html_print_image('images/zoom.png', true).'<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', true).'<span>'.__('Agent fields').'</span></a></li>';
+    $tabs .= "<li><a href='#extended_event_comments_page' id='link_comments'>".html_print_image('images/pencil.png', true).'<span>'.__('Comments').'</span></a></li>';
 
     if (!$readonly
         && ((tags_checks_event_acl(
@@ -546,7 +546,7 @@ if ($get_extended_event) {
 
     $loading = '<div id="response_loading" style="display:none">'.html_print_image('images/spinner.gif', true).'</div>';
 
-    $out = '<div id="tabs" style="height:95%; overflow: auto">'.$tabs.$notifications.$loading.$general.$details.$related.$custom_fields.$comments.$responses.$custom_data.html_print_input_hidden('id_event', $event['id_evento']).'</div>';
+    $out = '<div id="tabs">'.$tabs.$notifications.$loading.$general.$details.$related.$custom_fields.$comments.$responses.$custom_data.html_print_input_hidden('id_event', $event['id_evento']).'</div>';
 
     $js = '<script>
 	$(function() {
diff --git a/pandora_console/include/ajax/events_extended.php b/pandora_console/include/ajax/events_extended.php
index 4993014ddf..9c6ea27482 100644
--- a/pandora_console/include/ajax/events_extended.php
+++ b/pandora_console/include/ajax/events_extended.php
@@ -82,11 +82,9 @@ if ($get_extended_info == 1) {
     $table->width = '100%';
     $table->data = [];
     $table->head = [];
-    $table->style[0] = 'min-width:120px; text-align: left;';
-    $table->style[1] = 'text-align: left;';
     $table->cellspacing = 2;
     $table->cellpadding = 2;
-    $table->class = 'alternate rounded_cells';
+    $table->class = 'events_show_more_table';
 
     $output = [];
     $output[] = '<b>'.__('Timestamp').'</b>';
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 937d18a9fd..20e2fb9004 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -20,7 +20,7 @@
 /**
  * Pandora build version and version
  */
-$build_version = 'PC190507';
+$build_version = 'PC190509';
 $pandora_version = 'v7.0NG.734';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/include/db/mysql.php b/pandora_console/include/db/mysql.php
index 82b654e374..17f5712d2c 100644
--- a/pandora_console/include/db/mysql.php
+++ b/pandora_console/include/db/mysql.php
@@ -205,7 +205,7 @@ function mysql_db_get_value($field, $table, $field_search=1, $condition=1, $sear
  *
  * @return mixed The first row of a database query or false.
  */
-function mysql_db_get_row($table, $field_search, $condition, $fields=false)
+function mysql_db_get_row($table, $field_search, $condition, $fields=false, $cache=true)
 {
     if (empty($fields)) {
         $fields = '*';
@@ -243,7 +243,7 @@ function mysql_db_get_row($table, $field_search, $condition, $fields=false)
         );
     }
 
-    $result = db_get_all_rows_sql($sql);
+    $result = db_get_all_rows_sql($sql, false, $cache);
 
     if ($result === false) {
         return false;
diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index 0b9f71221b..a7e0d69d42 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -3541,25 +3541,21 @@ function series_type_graph_array($data, $show_elements_graph)
                     break;
                 }
 
-                if (isset($show_elements_graph['labels'])
+                if (isset($show_elements_graph['labels'][$value['agent_module_id']])
                     && is_array($show_elements_graph['labels'])
                     && (count($show_elements_graph['labels']) > 0)
                 ) {
-                    if ($show_elements_graph['unit']) {
-                        $name_legend = $data_return['legend'][$key] = $value['agent_alias'].' / '.$value['module_name'].' / '.__('Unit ').' '.$show_elements_graph['unit'].': ';
-                    } else {
-                        $name_legend = $data_return['legend'][$key] = $value['agent_alias'].' / '.$value['module_name'].': ';
-                    }
+                    $name_legend = $data_return['legend'][$key] = $show_elements_graph['labels'][$value['agent_module_id']].' ';
                 } else {
                     if (strpos($key, 'baseline') !== false) {
-                        if ($show_elements_graph['unit']) {
-                            $name_legend = $data_return['legend'][$key] = $value['agent_alias'].' / '.$value['module_name'].' / '.__('Unit ').' '.$show_elements_graph['unit'].'Baseline ';
+                        if ($value['unit']) {
+                            $name_legend = $data_return['legend'][$key] = $value['agent_alias'].' / '.$value['module_name'].' / '.__('Unit ').' '.$value['unit'].'Baseline ';
                         } else {
                             $name_legend = $data_return['legend'][$key] = $value['agent_alias'].' / '.$value['module_name'].'Baseline ';
                         }
                     } else {
-                        if ($show_elements_graph['unit']) {
-                            $name_legend = $data_return['legend'][$key] = $value['agent_alias'].' / '.$value['module_name'].' / '.__('Unit ').' '.$show_elements_graph['unit'].': ';
+                        if ($value['unit']) {
+                            $name_legend = $data_return['legend'][$key] = $value['agent_alias'].' / '.$value['module_name'].' / '.__('Unit ').' '.$value['unit'].': ';
                         } else {
                             $name_legend = $data_return['legend'][$key] = $value['agent_alias'].' / '.$value['module_name'].': ';
                         }
@@ -3853,9 +3849,10 @@ function pandora_xhprof_display_result($key='', $method='link')
 /**
  * From a network with a mask remove the smallest ip and the highest
  *
- * @param  string address to identify the network.
- * @param  string mask to identify the mask network
- * @return array or false with smallest ip and highest ip
+ * @param string $address Identify the network.
+ * @param string $mask    Identify the mask network.
+ *
+ * @return array or false with smallest ip and highest ip.
  */
 function range_ips_for_network($address, $mask)
 {
@@ -3863,15 +3860,15 @@ function range_ips_for_network($address, $mask)
         return false;
     }
 
-    // convert ip addresses to long form
+    // Convert ip addresses to long form.
     $address_long = ip2long($address);
     $mask_long = ip2long($mask);
 
-    // caculate first usable address
+    // Calculate first usable address.
     $ip_host_first = ((~$mask_long) & $address_long);
-    $ip_first = (($address_long ^ $ip_host_first) + 1);
+    $ip_first = (($address_long ^ $ip_host_first));
 
-    // caculate last usable address
+    // Calculate last usable address.
     $ip_broadcast_invert = ~$mask_long;
     $ip_last = (($address_long | $ip_broadcast_invert) - 1);
 
@@ -3887,9 +3884,10 @@ function range_ips_for_network($address, $mask)
 /**
  * from two ips find out if there is such an ip
  *
- * @param  string ip ip wont validate
- * @param  string ip_lower
- * @param  string ip_upper
+ * @param string ip ip wont validate
+ * @param string ip_lower
+ * @param string ip_upper
+ *
  * @return boolean true or false if the ip is between the two ips
  */
 function is_in_network($ip, $ip_lower, $ip_upper)
diff --git a/pandora_console/include/functions_db.php b/pandora_console/include/functions_db.php
index 9018a1044d..2061ab215c 100644
--- a/pandora_console/include/functions_db.php
+++ b/pandora_console/include/functions_db.php
@@ -421,13 +421,13 @@ function db_get_row_sql($sql, $search_history_db=false)
  *
  * @return mixed The first row of a database query or false.
  */
-function db_get_row($table, $field_search, $condition, $fields=false)
+function db_get_row($table, $field_search, $condition, $fields=false, $cache=true)
 {
     global $config;
 
     switch ($config['dbtype']) {
         case 'mysql':
-        return mysql_db_get_row($table, $field_search, $condition, $fields);
+        return mysql_db_get_row($table, $field_search, $condition, $fields, $cache);
 
             break;
         case 'postgresql':
diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index 0182c2141b..103450ff80 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -1987,9 +1987,9 @@ function events_page_responses($event, $childrens_ids=[])
     $table_responses->width = '100%';
     $table_responses->data = [];
     $table_responses->head = [];
-    $table_responses->style[0] = 'width:35%; font-weight: bold; text-align: left; height: 23px;';
-    $table_responses->style[1] = 'text-align: left; height: 23px; text-align: right;';
-    $table_responses->class = 'alternate rounded_cells';
+    $table_responses->style[0] = 'height:30px';
+    $table_responses->style[2] = 'text-align:right;';
+    $table_responses->class = 'events_show_more_table';
 
     if (tags_checks_event_acl($config['id_user'], $event['id_grupo'], 'EM', $event['clean_tags'], $childrens_ids)) {
         // Owner.
@@ -2056,7 +2056,7 @@ function events_page_responses($event, $childrens_ids=[])
             -1,
             true
         );
-        $data[1] .= html_print_button(
+        $data[2] .= html_print_button(
             __('Update'),
             'owner_button',
             false,
@@ -2136,7 +2136,7 @@ function events_page_responses($event, $childrens_ids=[])
     );
 
     if (!$status_blocked) {
-        $data[1] .= html_print_button(
+        $data[2] .= html_print_button(
             __('Update'),
             'status_button',
             false,
@@ -2151,7 +2151,8 @@ function events_page_responses($event, $childrens_ids=[])
     // Comments.
     $data = [];
     $data[0] = __('Comment');
-    $data[1] = html_print_button(
+    $data[1] = '';
+    $data[2] = html_print_button(
         __('Add comment'),
         'comment_button',
         false,
@@ -2173,8 +2174,9 @@ function events_page_responses($event, $childrens_ids=[])
         // Delete.
         $data = [];
         $data[0] = __('Delete event');
-        $data[1] = '<form method="post">';
-        $data[1] .= html_print_button(
+        $data[1] = '';
+        $data[2] = '<form method="post">';
+        $data[2] .= html_print_button(
             __('Delete event'),
             'delete_button',
             false,
@@ -2182,13 +2184,13 @@ function events_page_responses($event, $childrens_ids=[])
             'class="sub cancel"',
             true
         );
-        $data[1] .= html_print_input_hidden('delete', 1, true);
-        $data[1] .= html_print_input_hidden(
+        $data[2] .= html_print_input_hidden('delete', 1, true);
+        $data[2] .= html_print_input_hidden(
             'validate_ids',
             $event['id_evento'],
             true
         );
-        $data[1] .= '</form>';
+        $data[2] .= '</form>';
 
         $table_responses->data[] = $data;
     }
@@ -2229,7 +2231,7 @@ function events_page_responses($event, $childrens_ids=[])
             $server_id = 0;
         }
 
-        $data[1] .= html_print_button(
+        $data[2] .= html_print_button(
             __('Execute'),
             'custom_response_button',
             false,
@@ -2249,14 +2251,14 @@ function events_page_responses($event, $childrens_ids=[])
 				$('.params_rows').remove();
 				
 				$('#responses_table')
-					.append('<tr class=\"params_rows\"><td style=\"text-align:left; font-weight: bolder;\">".__('Description')."</td><td style=\"text-align:left;\">'+description+'</td></tr>');
+					.append('<tr class=\"params_rows\"><td>".__('Description')."</td><td style=\"text-align:left; height:30px;\" colspan=\"2\">'+description+'</td></tr>');
 				
 				if (params.length == 1 && params[0] == '') {
 					return;
 				}
 				
 				$('#responses_table')
-					.append('<tr class=\"params_rows\"><td style=\"text-align:left; padding-left:20px;\" colspan=\"2\">".__('Parameters')."</td></tr>');
+					.append('<tr class=\"params_rows\"><td style=\"text-align:left; padding-left:20px; height:30px;\" colspan=\"3\">".__('Parameters')."</td></tr>');
 				
 				for (i = 0; i < params.length; i++) {
 					add_row_param('responses_table',params[i]);
@@ -2521,9 +2523,7 @@ function events_page_custom_fields($event)
     $table->width = '100%';
     $table->data = [];
     $table->head = [];
-    $table->style[0] = 'width:35%; font-weight: bold; text-align: left; height: 23px;';
-    $table->style[1] = 'text-align: left; height: 23px;';
-    $table->class = 'alternate rounded_cells';
+    $table->class = 'events_show_more_table';
 
     $all_customs_fields = (bool) check_acl(
         $config['id_user'],
@@ -2671,11 +2671,9 @@ function events_page_details($event, $server='')
     $table_details->width = '100%';
     $table_details->data = [];
     $table_details->head = [];
-    $table_details->cellspacing = 2;
-    $table_details->cellpadding = 2;
-    $table_details->style[0] = 'width:35%; font-weight: bold; text-align: left; height: 23px;';
-    $table_details->style[1] = 'text-align: left; height: 23px;';
-    $table_details->class = 'alternate rounded_cells';
+    $table_details->cellspacing = 0;
+    $table_details->cellpadding = 0;
+    $table_details->class = 'events_show_more_table';
 
     /*
      * Useless switch.
@@ -2985,9 +2983,7 @@ function events_page_custom_data($event)
     $table->width = '100%';
     $table->data = [];
     $table->head = [];
-    $table->style[0] = 'width:35%; font-weight: bold; text-align: left;';
-    $table->style[1] = 'text-align: left;';
-    $table->class = 'alternate rounded_cells';
+    $table->class = 'events_show_more_table';
 
     $json_custom_data = base64_decode($event['custom_data']);
     $custom_data = json_decode($json_custom_data);
@@ -3137,14 +3133,12 @@ function events_page_general($event)
 
     // General.
     $table_general = new stdClass;
-    $table_general->cellspacing = 2;
-    $table_general->cellpadding = 2;
+    $table_general->cellspacing = 0;
+    $table_general->cellpadding = 0;
     $table_general->width = '100%';
     $table_general->data = [];
     $table_general->head = [];
-    $table_general->style[0] = 'width:35%; font-weight: bold; text-align: left; height: 23px;';
-    $table_general->style[1] = 'text-align: left; height: 23px;';
-    $table_general->class = 'alternate rounded_cells';
+    $table_general->class = 'events_show_more_table';
 
     $data = [];
     $data[0] = __('Event ID');
@@ -3185,10 +3179,12 @@ function events_page_general($event)
 
     $data = [];
     $data[0] = __('Type');
-    $data[1] = events_print_type_img(
+    $data[1] = events_print_type_description($event['event_type'], true);
+    $data[2] = events_print_type_img(
         $event['event_type'],
         true
-    ).' '.events_print_type_description($event['event_type'], true);
+    );
+
     $table_general->data[] = $data;
 
     $data = [];
@@ -3208,8 +3204,8 @@ function events_page_general($event)
     $data = [];
     $data[0] = __('Severity');
     $event_criticity = get_priority_name($event['criticity']);
-
-    $data[1] = html_print_image(
+    $data[1] = $event_criticity;
+    $data[2] = html_print_image(
         $img_sev,
         true,
         [
@@ -3219,7 +3215,6 @@ function events_page_general($event)
             'title'  => $event_criticity,
         ]
     );
-    $data[1] .= ' '.$event_criticity;
     $table_general->data[] = $data;
 
     // Get Status.
@@ -3227,7 +3222,8 @@ function events_page_general($event)
 
     $data = [];
     $data[0] = __('Status');
-    $data[1] = html_print_image($event_st['img'], true).' '.$event_st['title'];
+    $data[1] = $event_st['title'];
+    $data[2] = html_print_image($event_st['img'], true);
     $table_general->data[] = $data;
 
     // If event is validated, show who and when acknowleded it.
@@ -3250,12 +3246,23 @@ function events_page_general($event)
 
     $data = [];
     $data[0] = __('Group');
-    $data[1] = '';
+    $data[1] = groups_get_name($event['id_grupo']);
     if (!$config['show_group_name']) {
-        $data[1] = ui_print_group_icon($event['id_grupo'], true);
+        $data[2] = ui_print_group_icon($event['id_grupo'], true);
+    }
+
+    $table_general->data[] = $data;
+
+    $data = [];
+    $data[0] = __('Contact');
+    $data[1] = '';
+    $contact = db_get_value('contact', 'tgrupo', 'id_grupo', $event['id_grupo']);
+    if (empty($contact)) {
+        $data[1] = '<i>'.__('N/A').'</i>';
+    } else {
+        $data[1] = $contact;
     }
 
-    $data[1] .= groups_get_name($event['id_grupo']);
     $table_general->data[] = $data;
 
     $data = [];
@@ -3281,6 +3288,16 @@ function events_page_general($event)
 
     $table_general->data[] = $data;
 
+    $table_data = $table_general->data;
+    $table_data_total = count($table_data);
+
+    for ($i = 0; $i <= $table_data_total; $i++) {
+        if (count($table_data[$i]) == 2) {
+            $table_general->colspan[$i][1] = 2;
+            $table_general->style[2] = 'text-align:center; width:10%;';
+        }
+    }
+
     $general = '<div id="extended_event_general_page" class="extended_event_pages">'.html_print_table($table_general, true).'</div>';
 
     return $general;
@@ -3304,9 +3321,7 @@ function events_page_comments($event, $childrens_ids=[])
     $table_comments->width = '100%';
     $table_comments->data = [];
     $table_comments->head = [];
-    $table_comments->style[0] = 'width:35%; vertical-align: top; text-align: left;';
-    $table_comments->style[1] = 'text-align: left;';
-    $table_comments->class = 'alternate rounded_cells';
+    $table_comments->class = 'events_show_more_table';
 
     $event_comments = $event['user_comment'];
     $event_comments = str_replace(["\n", '&#x0a;'], '<br>', $event_comments);
@@ -3411,9 +3426,9 @@ function events_page_comments($event, $childrens_ids=[])
         $childrens_ids
     ))) && $config['show_events_in_local'] == false || $config['event_replication'] == false
     ) {
-        $comments_form = '<br><div id="comments_form" style="width:98%;">'.html_print_textarea('comment', 3, 10, '', 'style="min-height: 15px; width: 100%; disabled"', true);
+        $comments_form = '<br><div id="comments_form" style="width:98%;">'.html_print_textarea('comment', 3, 10, '', 'style="min-height: 15px; padding:0; width: 100%; disabled"', true);
 
-        $comments_form .= '<br><div style="text-align:right;">'.html_print_button(__('Add comment'), 'comment_button', false, 'event_comment();', 'class="sub next"', true).'</div><br></div>';
+        $comments_form .= '<br><div style="text-align:right; margin-top:10px;">'.html_print_button(__('Add comment'), 'comment_button', false, 'event_comment();', 'class="sub next"', true).'</div><br></div>';
     } else {
         $comments_form = ui_print_message(
             __('If event replication is ongoing, it won\'t be possible to enter comments here. This option is only to allow local pandora users to see comments, but not to operate with them. The operation, when event replication is enabled, must be done only in the Metaconsole.')
diff --git a/pandora_console/include/functions_filemanager.php b/pandora_console/include/functions_filemanager.php
index 3df7a65afd..b3aa490edf 100644
--- a/pandora_console/include/functions_filemanager.php
+++ b/pandora_console/include/functions_filemanager.php
@@ -120,18 +120,13 @@ if (!function_exists('mime_content_type')) {
 
 global $config;
 
-if (isset($config['homedir_filemanager'])) {
-    $homedir_filemanager = trim(io_safe_output($config['homedir_filemanager']));
-} else {
-    $homedir_filemanager = trim($config['homedir']);
-}
 
+$homedir_filemanager = trim($config['homedir']);
 $sec2 = get_parameter('sec2');
 if ($sec2 == 'enterprise/godmode/agentes/collections' || $sec2 == 'advanced/collections') {
     $homedir_filemanager .= '/attachment/collection/';
 }
 
-
 $upload_file_or_zip = (bool) get_parameter('upload_file_or_zip');
 
 if ($upload_file_or_zip) {
@@ -738,6 +733,7 @@ function filemanager_file_explorer(
             $data[4] .= html_print_input_hidden('delete_file', 1, true);
 
             $relative_dir = str_replace($homedir_filemanager, '', str_replace('\\', '/', dirname($fileinfo['realpath'])));
+
             if ($relative_dir[0] == '/') {
                 $relative_dir = substr($relative_dir, 1);
             }
diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index de0a1bdd6f..f07fe1168b 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -256,6 +256,7 @@ function grafico_modulo_sparse_data(
     $array_data['sum'.$series_suffix]['agent_name']     = $data_module_graph['agent_name'];
     $array_data['sum'.$series_suffix]['module_name']    = $data_module_graph['module_name'];
     $array_data['sum'.$series_suffix]['agent_alias']    = $data_module_graph['agent_alias'];
+    $array_data['sum'.$series_suffix]['unit']    = $data_module_graph['unit'];
 
     // This is for a specific type of report that consists in passing an interval and doing the average sum and avg.
     if ($params['force_interval'] != '') {
@@ -759,6 +760,7 @@ function grafico_modulo_sparse($params)
         $data_module_graph['c_min']             = $module_data['min_critical'];
         $data_module_graph['c_max']             = $module_data['max_critical'];
         $data_module_graph['c_inv']             = $module_data['critical_inverse'];
+        $data_module_graph['unit']              = $module_data['unit'];
     } else {
         $data_module_graph = false;
     }
@@ -1225,11 +1227,11 @@ function graphic_combined_module(
             foreach ($sources as $source) {
                 array_push($modules, $source['id_agent_module']);
                 array_push($weights, $source['weight']);
-                if ($source['label'] != '') {
+                if ($source['label'] != '' || $params_combined['labels']) {
                     $item['type']            = 'custom_graph';
                     $item['id_agent']        = agents_get_module_id($source['id_agent_module']);
                     $item['id_agent_module'] = $source['id_agent_module'];
-                    $labels[$source['id_agent_module']] = reporting_label_macro($item, $source['label']);
+                    $labels[$source['id_agent_module']] = ($source['label'] != '') ? reporting_label_macro($item, $source['label']) : reporting_label_macro($item, $params_combined['labels']);
                 }
             }
         }
@@ -1357,6 +1359,7 @@ function graphic_combined_module(
                 $data_module_graph['c_max']          = $module_data['max_critical'];
                 $data_module_graph['c_inv']          = $module_data['critical_inverse'];
                 $data_module_graph['module_id']      = $agent_module_id;
+                $data_module_graph['unit']           = $module_data['unit'];
 
                 // stract data
                 $array_data_module = grafico_modulo_sparse_data(
diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index dbc91a4224..9b67d16b42 100755
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -4439,6 +4439,9 @@ function reporting_value($report, $content, $type, $pdf=false)
     $return['description'] = $content['description'];
     $return['date'] = reporting_get_date_text($report, $content);
     $return['label'] = (isset($content['style']['label'])) ? $content['style']['label'] : '';
+    $return['agents'] = [$content['id_agent']];
+    $return['id_agent'] = $content['id_agent'];
+    $return['id_agent_module'] = $content['id_agent_module'];
 
     $return['agent_name'] = $agent_name;
     $return['module_name'] = $module_name;
@@ -7267,6 +7270,7 @@ function reporting_custom_graph(
                 'modules_series' => $graphs[0]['modules_series'],
                 'id_graph'       => $id_graph,
                 'type_report'    => $type_report,
+                'labels'         => $content['style']['label'],
             ];
 
             $return['chart'] = graphic_combined_module(
diff --git a/pandora_console/include/functions_update_manager.php b/pandora_console/include/functions_update_manager.php
index 165a2e4799..6912aa05ff 100755
--- a/pandora_console/include/functions_update_manager.php
+++ b/pandora_console/include/functions_update_manager.php
@@ -397,7 +397,7 @@ function update_manager_check_online_free_packages($is_ajax=true)
                 <?php
                 $baseurl = ui_get_full_url(false, false, false, false);
                 echo '<p><b>There is a new version:</b> '.$result[0]['version'].'</p>';
-                echo "<a href='javascript: update_last_package(\"".base64_encode($result[0]['file_name']).'", "'.$result[0]['version'].'", "'.$baseurl."\");'>".__('Update to the last version').'</a>';
+                echo "<a class='update_manager_button' href='javascript: update_last_package(\"".base64_encode($result[0]['file_name']).'", "'.$result[0]['version'].'", "'.$baseurl."\");'>".__('Update').'</a>';
             } else {
                 echo __('There is no update available.');
             }
diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php
index 603afe9c90..680d6e3ce9 100755
--- a/pandora_console/include/functions_visual_map.php
+++ b/pandora_console/include/functions_visual_map.php
@@ -4094,10 +4094,8 @@ function visual_map_get_layout_status($layout_id, $status_data=[], $depth=0)
                         );
                     } else if (!empty($layout_item_data['id_agent'])) {
                         // Agent.
-                        $agent_status = agents_get_status(
-                            $layout_item_data['id_agent'],
-                            true
-                        );
+                        $agent = db_get_row('tagente', 'id_agente', $layout_item_data['id_agent']);
+                        $agent_status = agents_get_status_from_counts($agent);
                         $status = visual_map_translate_agent_status(
                             $agent_status
                         );
diff --git a/pandora_console/include/functions_visual_map_editor.php b/pandora_console/include/functions_visual_map_editor.php
index 90da456ae1..5cf5121e55 100755
--- a/pandora_console/include/functions_visual_map_editor.php
+++ b/pandora_console/include/functions_visual_map_editor.php
@@ -1394,6 +1394,9 @@ function visual_map_editor_print_hack_translate_strings()
 <script type="text/javascript">
 $(document).ready (function () {
     $("#map_linked").change(function () {
+        $("option[value=" + this.value + "]", this)
+        .attr("selected", true).siblings()
+        .removeAttr("selected")
         $("#text-agent").val("");
         $("input[name=id_agent]").val(0);
         $("#module").empty();
diff --git a/pandora_console/include/javascript/pandora_events.js b/pandora_console/include/javascript/pandora_events.js
index 42d67fffd6..1f1ff42c3f 100644
--- a/pandora_console/include/javascript/pandora_events.js
+++ b/pandora_console/include/javascript/pandora_events.js
@@ -365,9 +365,9 @@ function get_event_name(event_id, meta, history) {
 
 function add_row_param(id_table, param) {
   $("#" + id_table).append(
-    '<tr class="params_rows"><td style="text-align:left; padding-left:40px;">' +
+    '<tr class="params_rows"><td style="text-align:left; padding-left:40px; font-weight: normal; font-style: italic;">' +
       param +
-      '</td><td style="text-align:left"><input type="text" name="' +
+      '</td><td style="text-align:left" colspan="2"><input type="text" name="' +
       param +
       '" id="' +
       param +
diff --git a/pandora_console/include/javascript/update_manager.js b/pandora_console/include/javascript/update_manager.js
index 96b390ef43..bab4ef2aae 100644
--- a/pandora_console/include/javascript/update_manager.js
+++ b/pandora_console/include/javascript/update_manager.js
@@ -326,20 +326,20 @@ function install_package(package, homeurl) {
                                     });
 
                                     var dialog_accept_package_mr_fail_text =
-                                      "<div>";
+                                      "<div class='update_popup'>";
                                     dialog_accept_package_mr_fail_text =
                                       dialog_accept_package_mr_fail_text +
-                                      "<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='" +
-                                      home_url +
-                                      "images/icono_info_mr.png'></div>";
+                                      "<div class='update_text'><h3>INFO</h3>";
                                     dialog_accept_package_mr_fail_text =
                                       dialog_accept_package_mr_fail_text +
-                                      "<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>INFO</strong></h3>";
-                                    dialog_accept_package_mr_fail_text =
-                                      dialog_accept_package_mr_fail_text +
-                                      "<p style='font-family:Verdana; font-size:12pt;'>" +
+                                      "<p>" +
                                       mr_not_accepted_code_yes +
                                       "</p></div>";
+                                    dialog_accept_package_mr_fail_text =
+                                      dialog_accept_package_mr_fail_text +
+                                      "<div class='update_icon'><img src='" +
+                                      home_url +
+                                      "images/icon_info_mr.png'></div>";
                                     dialog_accept_package_mr_fail_text =
                                       dialog_accept_package_mr_fail_text +
                                       "</div>";
@@ -397,20 +397,21 @@ function install_package(package, homeurl) {
                                             ]
                                           });
 
-                                          var dialog_success_pkg_text = "<div>";
+                                          var dialog_success_pkg_text =
+                                            "<div class='update_popup'>";
                                           dialog_success_pkg_text =
                                             dialog_success_pkg_text +
-                                            "<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='" +
-                                            home_url +
-                                            "images/icono_exito_mr.png'></div>";
+                                            "<div class='update_text'><h3>SUCCESS</h3>";
                                           dialog_success_pkg_text =
                                             dialog_success_pkg_text +
-                                            "<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>SUCCESS</strong></h3>";
-                                          dialog_success_pkg_text =
-                                            dialog_success_pkg_text +
-                                            "<p style='font-family:Verdana; font-size:12pt;'>" +
+                                            "<p>" +
                                             package_success +
                                             "</p></div>";
+                                          dialog_success_pkg_text =
+                                            dialog_success_pkg_text +
+                                            "<div class='update_icon'><img src='" +
+                                            home_url +
+                                            "images/icon_success_mr.png'></div>";
                                           dialog_success_pkg_text =
                                             dialog_success_pkg_text + "</div>";
 
@@ -456,20 +457,21 @@ function install_package(package, homeurl) {
                                             ]
                                           });
 
-                                          var dialog_error_pkg_text = "<div>";
+                                          var dialog_error_pkg_text =
+                                            "<div class='update_popup'>";
                                           dialog_error_pkg_text =
                                             dialog_error_pkg_text +
-                                            "<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='" +
-                                            home_url +
-                                            "images/icono_error_mr.png'></div>";
+                                            "<div class='update_text'><h3>ERROR</h3>";
                                           dialog_error_pkg_text =
                                             dialog_error_pkg_text +
-                                            "<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>ERROR</strong></h3>";
-                                          dialog_error_pkg_text =
-                                            dialog_error_pkg_text +
-                                            "<p style='font-family:Verdana; font-size:12pt;'>" +
+                                            "<p>" +
                                             package_error +
                                             "</p></div>";
+                                          dialog_error_pkg_text =
+                                            dialog_error_pkg_text +
+                                            "<div class='update_icon'><img src='" +
+                                            home_url +
+                                            "images/icon_error_mr.png'></div>";
                                           dialog_error_pkg_text =
                                             dialog_error_pkg_text + "</div>";
 
@@ -533,20 +535,21 @@ function install_package(package, homeurl) {
                                       ]
                                     });
 
-                                    var dialog_cancel_pkg_text = "<div>";
+                                    var dialog_cancel_pkg_text =
+                                      "<div class='update_popup'>";
                                     dialog_cancel_pkg_text =
                                       dialog_cancel_pkg_text +
-                                      "<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='" +
-                                      home_url +
-                                      "images/icono_info_mr.png'></div>";
+                                      "<div class='update_text'><h3>INFO</h3>";
                                     dialog_cancel_pkg_text =
                                       dialog_cancel_pkg_text +
-                                      "<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>INFO</strong></h3>";
-                                    dialog_cancel_pkg_text =
-                                      dialog_cancel_pkg_text +
-                                      "<p style='font-family:Verdana; font-size:12pt;'>" +
+                                      "<p>" +
                                       package_cancel +
                                       "</p></div>";
+                                    dialog_cancel_pkg_text =
+                                      dialog_cancel_pkg_text +
+                                      "<div class='update_icon'><img src='" +
+                                      home_url +
+                                      "images/icon_info_mr.png'></div>";
                                     dialog_cancel_pkg_text =
                                       dialog_cancel_pkg_text + "</div>";
 
@@ -571,20 +574,21 @@ function install_package(package, homeurl) {
                               ]
                             });
 
-                            var dialog_bad_message_text = "<div>";
+                            var dialog_bad_message_text =
+                              "<div class='update_popup'>";
                             dialog_bad_message_text =
                               dialog_bad_message_text +
-                              "<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='" +
-                              home_url +
-                              "images/icono_error_mr.png'></div>";
+                              "<div class='update_text'><h3>ERROR</h3>";
                             dialog_bad_message_text =
                               dialog_bad_message_text +
-                              "<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>ERROR</strong></h3>";
-                            dialog_bad_message_text =
-                              dialog_bad_message_text +
-                              "<p style='font-family:Verdana; font-size:12pt;'>" +
+                              "<p>" +
                               bad_mr_file +
                               "</p></div>";
+                            dialog_bad_message_text =
+                              dialog_bad_message_text +
+                              "<div class='update_icon'><img src='" +
+                              home_url +
+                              "images/icon_error_mr.png'></div>";
                             dialog_bad_message_text =
                               dialog_bad_message_text + "</div>";
 
@@ -616,20 +620,21 @@ function install_package(package, homeurl) {
                               ]
                             });
 
-                            var dialog_success_mr_text = "<div>";
+                            var dialog_success_mr_text =
+                              "<div class='update_popup'>";
                             dialog_success_mr_text =
                               dialog_success_mr_text +
-                              "<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='" +
-                              home_url +
-                              "images/icono_exito_mr.png'></div>";
+                              "<div class='update_text'><h3>SUCCESS</h3>";
                             dialog_success_mr_text =
                               dialog_success_mr_text +
-                              "<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>SUCCESS</strong></h3>";
-                            dialog_success_mr_text =
-                              dialog_success_mr_text +
-                              "<p style='font-family:Verdana; font-size:12pt;'>" +
+                              "<p>" +
                               mr_success +
                               "</p></div>";
+                            dialog_success_mr_text =
+                              dialog_success_mr_text +
+                              "<div class='update_icon'><img src='" +
+                              home_url +
+                              "images/icon_success_mr.png'></div>";
                             dialog_success_mr_text =
                               dialog_success_mr_text + "</div>";
 
@@ -684,20 +689,21 @@ function install_package(package, homeurl) {
                                     ]
                                   });
 
-                                  var dialog_success_pkg_text = "<div>";
+                                  var dialog_success_pkg_text =
+                                    "<div class='update_popup'>";
                                   dialog_success_pkg_text =
                                     dialog_success_pkg_text +
-                                    "<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='" +
-                                    home_url +
-                                    "images/icono_exito_mr.png'></div>";
+                                    "<div class='update_text'><h3>SUCCESS</h3>";
                                   dialog_success_pkg_text =
                                     dialog_success_pkg_text +
-                                    "<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>SUCCESS</strong></h3>";
-                                  dialog_success_pkg_text =
-                                    dialog_success_pkg_text +
-                                    "<p style='font-family:Verdana; font-size:12pt;'>" +
+                                    "<p>" +
                                     package_success +
                                     "</p></div>";
+                                  dialog_success_pkg_text =
+                                    dialog_success_pkg_text +
+                                    "<div class='update_icon'><img src='" +
+                                    home_url +
+                                    "images/icon_success_mr.png'></div>";
                                   dialog_success_pkg_text =
                                     dialog_success_pkg_text + "</div>";
 
@@ -743,20 +749,21 @@ function install_package(package, homeurl) {
                                     ]
                                   });
 
-                                  var dialog_error_pkg_text = "<div>";
+                                  var dialog_error_pkg_text =
+                                    "<div class='update_popup'>";
                                   dialog_error_pkg_text =
                                     dialog_error_pkg_text +
-                                    "<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='" +
-                                    home_url +
-                                    "images/icono_error_mr.png'></div>";
+                                    "<div class='update_text'><h3>ERROR</h3>";
                                   dialog_error_pkg_text =
                                     dialog_error_pkg_text +
-                                    "<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>ERROR</strong></h3>";
-                                  dialog_error_pkg_text =
-                                    dialog_error_pkg_text +
-                                    "<p style='font-family:Verdana; font-size:12pt;'>" +
+                                    "<p>" +
                                     package_error +
                                     "</p></div>";
+                                  dialog_error_pkg_text =
+                                    dialog_error_pkg_text +
+                                    "<div class='update_icon'><img src='" +
+                                    home_url +
+                                    "images/icon_error_mr.png'></div>";
                                   dialog_error_pkg_text =
                                     dialog_error_pkg_text + "</div>";
 
@@ -814,20 +821,21 @@ function install_package(package, homeurl) {
                             ]
                           });
 
-                          var dialog_error_mr_text = "<div>";
+                          var dialog_error_mr_text =
+                            "<div class='update_popup'>";
                           dialog_error_mr_text =
                             dialog_error_mr_text +
-                            "<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='" +
-                            home_url +
-                            "images/icono_error_mr.png'></div>";
+                            "<div class='update_text'><h3>ERROR</h3>";
                           dialog_error_mr_text =
                             dialog_error_mr_text +
-                            "<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>ERROR</strong></h3>";
-                          dialog_error_mr_text =
-                            dialog_error_mr_text +
-                            "<p style='font-family:Verdana; font-size:12pt;'>" +
+                            "<p>" +
                             mr_error +
                             "</p></div>";
+                          dialog_error_mr_text =
+                            dialog_error_mr_text +
+                            "<div class='update_icon'><img src='" +
+                            home_url +
+                            "images/icon_error_mr.png'></div>";
                           dialog_error_mr_text =
                             dialog_error_mr_text + "</div>";
 
@@ -874,20 +882,21 @@ function install_package(package, homeurl) {
                           ]
                         });
 
-                        var dialog_cancel_mr_text = "<div>";
+                        var dialog_cancel_mr_text =
+                          "<div class='update_popup'>";
                         dialog_cancel_mr_text =
                           dialog_cancel_mr_text +
-                          "<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='" +
-                          home_url +
-                          "images/icono_info_mr.png'></div>";
+                          "<div class='update_text'><h3>INFO</h3>";
                         dialog_cancel_mr_text =
                           dialog_cancel_mr_text +
-                          "<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>INFO</strong></h3>";
-                        dialog_cancel_mr_text =
-                          dialog_cancel_mr_text +
-                          "<p style='font-family:Verdana; font-size:12pt;'>" +
+                          "<p>" +
                           mr_cancel +
                           "</p></div>";
+                        dialog_cancel_mr_text =
+                          dialog_cancel_mr_text +
+                          "<div class='update_icon'><img src='" +
+                          home_url +
+                          "images/icon_info_mr.png'></div>";
                         dialog_cancel_mr_text =
                           dialog_cancel_mr_text + "</div>";
 
@@ -910,34 +919,33 @@ function install_package(package, homeurl) {
                   ]
                 });
 
-                $("button:contains(Apply MR)").attr("id", "apply_rr_button");
+                $("button:contains(Apply MR)")
+                  .attr("id", "apply_rr_button")
+                  .addClass("success_button");
                 $("button:contains(Cancel)").attr("id", "cancel_rr_button");
 
-                var dialog_have_mr_text = "<div>";
+                var dialog_have_mr_text = "<div class='update_popup'>";
                 dialog_have_mr_text =
                   dialog_have_mr_text +
-                  "<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='" +
-                  home_url +
-                  "images/icono_warning_mr.png'></div>";
-                dialog_have_mr_text =
-                  dialog_have_mr_text +
-                  "<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>" +
+                  "<div class='update_text'><h3>" +
                   mr_available_header +
-                  "</strong></h3>";
+                  "</h3>";
+                dialog_have_mr_text =
+                  dialog_have_mr_text + "<p>" + text1_mr_file + "</p>";
                 dialog_have_mr_text =
                   dialog_have_mr_text +
-                  "<p style='font-family:Verdana; font-size:12pt;'>" +
-                  text1_mr_file +
-                  "</p>";
-                dialog_have_mr_text =
-                  dialog_have_mr_text +
-                  "<p style='font-family:Verdana; font-size:12pt;'>" +
+                  "<p>" +
                   text2_mr_file +
-                  "<a style='font-family:Verdana bold; font-size:12pt; color:#82B92E'href=\"index.php?sec=extensions&sec2=godmode/agentes/planned_downtime.list\">" +
+                  '<a href="index.php?sec=extensions&sec2=godmode/agentes/planned_downtime.list">' +
                   text3_mr_file +
                   "</a>" +
                   text4_mr_file +
                   "</p></div>";
+                dialog_have_mr_text =
+                  dialog_have_mr_text +
+                  "<div class='update_icon'><img src='" +
+                  home_url +
+                  "images/icon_warning_db.png'></div>";
                 dialog_have_mr_text = dialog_have_mr_text + "</div>";
 
                 $("#mr_dialog2").html(dialog_have_mr_text);
@@ -992,20 +1000,21 @@ function install_package(package, homeurl) {
                         ]
                       });
 
-                      var dialog_success_pkg_text = "<div>";
+                      var dialog_success_pkg_text =
+                        "<div class='update_popup'>";
                       dialog_success_pkg_text =
                         dialog_success_pkg_text +
-                        "<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='" +
-                        home_url +
-                        "images/icono_exito_mr.png'></div>";
+                        "<div class='update_text'><h3>SUCCESS</h3>";
                       dialog_success_pkg_text =
                         dialog_success_pkg_text +
-                        "<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>SUCCESS</strong></h3>";
-                      dialog_success_pkg_text =
-                        dialog_success_pkg_text +
-                        "<p style='font-family:Verdana; font-size:12pt;'>" +
+                        "<p>" +
                         package_success +
                         "</p></div>";
+                      dialog_success_pkg_text =
+                        dialog_success_pkg_text +
+                        "<div class='update_icon'><img src='" +
+                        home_url +
+                        "images/icon_success_mr.png'></div>";
                       dialog_success_pkg_text =
                         dialog_success_pkg_text + "</div>";
 
@@ -1047,20 +1056,20 @@ function install_package(package, homeurl) {
                         ]
                       });
 
-                      var dialog_error_pkg_text = "<div>";
+                      var dialog_error_pkg_text = "<div class='update_popup'>";
                       dialog_error_pkg_text =
                         dialog_error_pkg_text +
-                        "<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='" +
-                        home_url +
-                        "images/icono_error_mr.png'></div>";
+                        "<div class='update_text'><h3>ERROR</h3>";
                       dialog_error_pkg_text =
                         dialog_error_pkg_text +
-                        "<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>ERROR</strong></h3>";
-                      dialog_error_pkg_text =
-                        dialog_error_pkg_text +
-                        "<p style='font-family:Verdana; font-size:12pt;'>" +
+                        "<p>" +
                         package_error +
                         "</p></div>";
+                      dialog_error_pkg_text =
+                        dialog_error_pkg_text +
+                        "<div class='update_icon'><img src='" +
+                        home_url +
+                        "images/icon_error_mr.png'></div>";
                       dialog_error_pkg_text = dialog_error_pkg_text + "</div>";
 
                       $("#error_pkg").html(dialog_error_pkg_text);
@@ -1124,20 +1133,16 @@ function install_package(package, homeurl) {
             ]
           });
 
-          var dialog_cancel_pkg_text = "<div>";
+          var dialog_cancel_pkg_text = "<div class='update_popup'>";
+          dialog_cancel_pkg_text =
+            dialog_cancel_pkg_text + "<div class='update_text'><h3>INFO</h3>";
+          dialog_cancel_pkg_text =
+            dialog_cancel_pkg_text + "<p>" + package_cancel + "</p></div>";
           dialog_cancel_pkg_text =
             dialog_cancel_pkg_text +
-            "<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='" +
+            "<div class='update_icon'><img src='" +
             home_url +
-            "images/icono_info_mr.png'></div>";
-          dialog_cancel_pkg_text =
-            dialog_cancel_pkg_text +
-            "<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>INFO</strong></h3>";
-          dialog_cancel_pkg_text =
-            dialog_cancel_pkg_text +
-            "<p style='font-family:Verdana; font-size:12pt;'>" +
-            package_cancel +
-            "</p></div>";
+            "images/icon_info_mr.png'></div>";
           dialog_cancel_pkg_text = dialog_cancel_pkg_text + "</div>";
 
           $("#cancel_pkg").html(dialog_cancel_pkg_text);
@@ -1214,22 +1219,18 @@ function install_package(package, homeurl) {
     ]
   });
 
-  var dialog_text = "<div>";
+  var dialog_text = "<div class='update_popup'>";
   dialog_text =
     dialog_text +
-    "<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='" +
-    home_url +
-    "images/icono_info_mr.png'></div>";
-  dialog_text =
-    dialog_text +
-    "<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>" +
+    "<div class='update_text'><h3>" +
     text1_package_file +
-    "</strong></h3>";
+    "</h3>";
+  dialog_text = dialog_text + "<p>" + text2_package_file + "</p></div>";
   dialog_text =
     dialog_text +
-    "<p style='font-family:Verdana; font-size:12pt;'>" +
-    text2_package_file +
-    "</p></div>";
+    "<div class='update_icon'><img src='" +
+    home_url +
+    "images/icon_info_mr.png'></div>";
   dialog_text = dialog_text + "</div>";
 
   $("#pkg_apply_dialog").html(dialog_text);
@@ -1522,20 +1523,20 @@ function install_free_package_prev_step(package, version, homeurl) {
                                     });
 
                                     var dialog_accept_package_mr_fail_text =
-                                      "<div>";
+                                      "<div class='update_popup'>";
                                     dialog_accept_package_mr_fail_text =
                                       dialog_accept_package_mr_fail_text +
-                                      "<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='" +
-                                      home_url +
-                                      "images/icono_info_mr.png'></div>";
+                                      "<div class='update_text'><h3>INFO</h3>";
                                     dialog_accept_package_mr_fail_text =
                                       dialog_accept_package_mr_fail_text +
-                                      "<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>INFO</strong></h3>";
-                                    dialog_accept_package_mr_fail_text =
-                                      dialog_accept_package_mr_fail_text +
-                                      "<p style='font-family:Verdana; font-size:12pt;'>" +
+                                      "<p>" +
                                       mr_not_accepted_code_yes +
                                       "</p></div>";
+                                    dialog_accept_package_mr_fail_text =
+                                      dialog_accept_package_mr_fail_text +
+                                      "<div class='update_icon'><img src='" +
+                                      home_url +
+                                      "images/icon_info_mr.png'></div>";
                                     dialog_accept_package_mr_fail_text =
                                       dialog_accept_package_mr_fail_text +
                                       "</div>";
@@ -1616,20 +1617,21 @@ function install_free_package_prev_step(package, version, homeurl) {
                                       ]
                                     });
 
-                                    var dialog_cancel_pkg_text = "<div>";
+                                    var dialog_cancel_pkg_text =
+                                      "<div class='update_popup'>";
                                     dialog_cancel_pkg_text =
                                       dialog_cancel_pkg_text +
-                                      "<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='" +
-                                      home_url +
-                                      "images/icono_info_mr.png'></div>";
+                                      "<div class='update_text'><h3>INFO</h3>";
                                     dialog_cancel_pkg_text =
                                       dialog_cancel_pkg_text +
-                                      "<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>INFO</strong></h3>";
-                                    dialog_cancel_pkg_text =
-                                      dialog_cancel_pkg_text +
-                                      "<p style='font-family:Verdana; font-size:12pt;'>" +
+                                      "<p>" +
                                       package_cancel +
                                       "</p></div>";
+                                    dialog_cancel_pkg_text =
+                                      dialog_cancel_pkg_text +
+                                      "<div class='update_icon'><img src='" +
+                                      home_url +
+                                      "images/icon_info_mr.png'></div>";
                                     dialog_cancel_pkg_text =
                                       dialog_cancel_pkg_text + "</div>";
 
@@ -1646,20 +1648,21 @@ function install_free_package_prev_step(package, version, homeurl) {
                               ]
                             });
 
-                            var dialog_bad_message_text = "<div>";
+                            var dialog_bad_message_text =
+                              "<div class='update_popup'>";
                             dialog_bad_message_text =
                               dialog_bad_message_text +
-                              "<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='" +
-                              home_url +
-                              "images/icono_error_mr.png'></div>";
+                              "<div class='update_text'><h3>ERROR</h3>";
                             dialog_bad_message_text =
                               dialog_bad_message_text +
-                              "<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>ERROR</strong></h3>";
-                            dialog_bad_message_text =
-                              dialog_bad_message_text +
-                              "<p style='font-family:Verdana; font-size:12pt;'>" +
+                              "<p>" +
                               bad_mr_file +
                               "</p></div>";
+                            dialog_bad_message_text =
+                              dialog_bad_message_text +
+                              "<div class='update_icon'><img src='" +
+                              home_url +
+                              "images/icon_error_mr.png'></div>";
                             dialog_bad_message_text =
                               dialog_bad_message_text + "</div>";
 
@@ -1691,20 +1694,21 @@ function install_free_package_prev_step(package, version, homeurl) {
                               ]
                             });
 
-                            var dialog_success_mr_text = "<div>";
+                            var dialog_success_mr_text =
+                              "<div class='update_popup'>";
                             dialog_success_mr_text =
                               dialog_success_mr_text +
-                              "<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='" +
-                              home_url +
-                              "images/icono_exito_mr.png'></div>";
+                              "<div class='update_text'><h3>SUCCESS</h3>";
                             dialog_success_mr_text =
                               dialog_success_mr_text +
-                              "<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>SUCCESS</strong></h3>";
-                            dialog_success_mr_text =
-                              dialog_success_mr_text +
-                              "<p style='font-family:Verdana; font-size:12pt;'>" +
+                              "<p>" +
                               mr_success +
                               "</p></div>";
+                            dialog_success_mr_text =
+                              dialog_success_mr_text +
+                              "<div class='update_icon'><img src='" +
+                              home_url +
+                              "images/icon_success_mr.png'></div>";
                             dialog_success_mr_text =
                               dialog_success_mr_text + "</div>";
 
@@ -1774,20 +1778,21 @@ function install_free_package_prev_step(package, version, homeurl) {
                             ]
                           });
 
-                          var dialog_error_mr_text = "<div>";
+                          var dialog_error_mr_text =
+                            "<div class='update_popup'>";
                           dialog_error_mr_text =
                             dialog_error_mr_text +
-                            "<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='" +
-                            home_url +
-                            "images/icono_error_mr.png'></div>";
+                            "<div class='update_text'><h3>ERROR</h3>";
                           dialog_error_mr_text =
                             dialog_error_mr_text +
-                            "<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>ERROR</strong></h3>";
-                          dialog_error_mr_text =
-                            dialog_error_mr_text +
-                            "<p style='font-family:Verdana; font-size:12pt;'>" +
+                            "<p>" +
                             mr_error +
                             "</p></div>";
+                          dialog_error_mr_text =
+                            dialog_error_mr_text +
+                            "<div class='update_icon'><img src='" +
+                            home_url +
+                            "images/icon_error_mr.png'></div>";
                           dialog_error_mr_text =
                             dialog_error_mr_text + "</div>";
 
@@ -1827,20 +1832,21 @@ function install_free_package_prev_step(package, version, homeurl) {
                           ]
                         });
 
-                        var dialog_cancel_mr_text = "<div>";
+                        var dialog_cancel_mr_text =
+                          "<div class='update_popup'>";
                         dialog_cancel_mr_text =
                           dialog_cancel_mr_text +
-                          "<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='" +
-                          home_url +
-                          "images/icono_info_mr.png'></div>";
+                          "<div class='update_text'><h3>INFO</h3>";
                         dialog_cancel_mr_text =
                           dialog_cancel_mr_text +
-                          "<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>INFO</strong></h3>";
-                        dialog_cancel_mr_text =
-                          dialog_cancel_mr_text +
-                          "<p style='font-family:Verdana; font-size:12pt;'>" +
+                          "<p>" +
                           mr_cancel +
                           "</p></div>";
+                        dialog_cancel_mr_text =
+                          dialog_cancel_mr_text +
+                          "<div class='update_icon'><img src='" +
+                          home_url +
+                          "images/icon_info_mr.png'></div>";
                         dialog_cancel_mr_text =
                           dialog_cancel_mr_text + "</div>";
 
@@ -1855,34 +1861,33 @@ function install_free_package_prev_step(package, version, homeurl) {
                   ]
                 });
 
-                $("button:contains(Apply MR)").attr("id", "apply_rr_button");
+                $("button:contains(Apply MR)")
+                  .attr("id", "apply_rr_button")
+                  .addClass("success_button");
                 $("button:contains(Cancel)").attr("id", "cancel_rr_button");
 
-                var dialog_have_mr_text = "<div>";
+                var dialog_have_mr_text = "<div class='update_popup'>";
                 dialog_have_mr_text =
                   dialog_have_mr_text +
-                  "<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='" +
-                  home_url +
-                  "images/icono_warning_mr.png'></div>";
-                dialog_have_mr_text =
-                  dialog_have_mr_text +
-                  "<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>" +
+                  "<div class='update_text'><h3>" +
                   mr_available_header +
-                  "</strong></h3>";
+                  "</h3>";
+                dialog_have_mr_text =
+                  dialog_have_mr_text + "<p>" + text1_mr_file + "</p>";
                 dialog_have_mr_text =
                   dialog_have_mr_text +
-                  "<p style='font-family:Verdana; font-size:12pt;'>" +
-                  text1_mr_file +
-                  "</p>";
-                dialog_have_mr_text =
-                  dialog_have_mr_text +
-                  "<p style='font-family:Verdana; font-size:12pt;'>" +
+                  "<p>" +
                   text2_mr_file +
-                  "<a style='font-family:Verdana bold; font-size:12pt; color:#82B92E'href=\"index.php?sec=extensions&sec2=godmode/agentes/planned_downtime.list\">" +
+                  '<a href="index.php?sec=extensions&sec2=godmode/agentes/planned_downtime.list">' +
                   text3_mr_file +
                   "</a>" +
                   text4_mr_file +
                   "</p></div>";
+                dialog_have_mr_text =
+                  dialog_have_mr_text +
+                  "<div class='update_icon'><img src='" +
+                  home_url +
+                  "images/icon_warning_db.png'></div>";
                 dialog_have_mr_text = dialog_have_mr_text + "</div>";
 
                 $("#mr_dialog2").html(dialog_have_mr_text);
@@ -1950,20 +1955,16 @@ function install_free_package_prev_step(package, version, homeurl) {
             ]
           });
 
-          var dialog_cancel_pkg_text = "<div>";
+          var dialog_cancel_pkg_text = "<div class='update_popup'>";
+          dialog_cancel_pkg_text =
+            dialog_cancel_pkg_text + "<div class='update_text'><h3>INFO</h3>";
+          dialog_cancel_pkg_text =
+            dialog_cancel_pkg_text + "<p>" + package_cancel + "</p></div>";
           dialog_cancel_pkg_text =
             dialog_cancel_pkg_text +
-            "<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='" +
+            "<div class='update_icon'><img src='" +
             home_url +
-            "images/icono_info_mr.png'></div>";
-          dialog_cancel_pkg_text =
-            dialog_cancel_pkg_text +
-            "<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>INFO</strong></h3>";
-          dialog_cancel_pkg_text =
-            dialog_cancel_pkg_text +
-            "<p style='font-family:Verdana; font-size:12pt;'>" +
-            package_cancel +
-            "</p></div>";
+            "images/icon_info_mr.png'></div>";
           dialog_cancel_pkg_text = dialog_cancel_pkg_text + "</div>";
 
           $("#cancel_pkg").html(dialog_cancel_pkg_text);
@@ -1977,22 +1978,18 @@ function install_free_package_prev_step(package, version, homeurl) {
     ]
   });
 
-  var dialog_text = "<div>";
+  var dialog_text = "<div class='update_popup'>";
   dialog_text =
     dialog_text +
-    "<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='" +
-    home_url +
-    "images/icono_info_mr.png'></div>";
-  dialog_text =
-    dialog_text +
-    "<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>" +
+    "<div class='update_text'><h3>" +
     text1_package_file +
-    "</strong></h3>";
+    "</h3>";
+  dialog_text = dialog_text + "<p>" + text2_package_file + "</p></div>";
   dialog_text =
     dialog_text +
-    "<p style='font-family:Verdana; font-size:12pt;'>" +
-    text2_package_file +
-    "</p></div>";
+    "<div class='update_icon'><img src='" +
+    home_url +
+    "images/icon_info_mr.png'></div>";
   dialog_text = dialog_text + "</div>";
 
   $("#pkg_apply_dialog").html(dialog_text);
@@ -2039,20 +2036,16 @@ function install_free_package(package, version, homeurl) {
         ]
       });
 
-      var dialog_error_pkg_text = "<div>";
+      var dialog_error_pkg_text = "<div class='update_popup'>";
+      dialog_error_pkg_text =
+        dialog_error_pkg_text + "<div class='update_text'><h3>ERROR</h3>";
+      dialog_error_pkg_text =
+        dialog_error_pkg_text + "<p>" + data["message"] + "</p></div>";
       dialog_error_pkg_text =
         dialog_error_pkg_text +
-        "<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='" +
+        "<div class='update_icon'><img src='" +
         home_url +
-        "images/icono_error_mr.png'></div>";
-      dialog_error_pkg_text =
-        dialog_error_pkg_text +
-        "<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>ERROR</strong></h3>";
-      dialog_error_pkg_text =
-        dialog_error_pkg_text +
-        "<p style='font-family:Verdana; font-size:12pt;'>" +
-        data["message"] +
-        "</p></div>";
+        "images/icon_error_mr.png'></div>";
       dialog_error_pkg_text = dialog_error_pkg_text + "</div>";
 
       $("#error_pkg").html(dialog_error_pkg_text);
@@ -2092,20 +2085,17 @@ function install_free_package(package, version, homeurl) {
             ]
           });
 
-          var dialog_success_pkg_text = "<div>";
+          var dialog_success_pkg_text = "<div class='update_popup'>";
           dialog_success_pkg_text =
             dialog_success_pkg_text +
-            "<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='" +
+            "<div class='update_text'><h3>SUCCESS</h3>";
+          dialog_success_pkg_text =
+            dialog_success_pkg_text + "<p>" + data["message"] + "</p></div>";
+          dialog_success_pkg_text =
+            dialog_success_pkg_text +
+            "<div class='update_icon'><img src='" +
             home_url +
-            "images/icono_exito_mr.png'></div>";
-          dialog_success_pkg_text =
-            dialog_success_pkg_text +
-            "<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>SUCCESS</strong></h3>";
-          dialog_success_pkg_text =
-            dialog_success_pkg_text +
-            "<p style='font-family:Verdana; font-size:12pt;'>" +
-            data["message"] +
-            "</p></div>";
+            "images/icon_success_mr.png'></div>";
           dialog_success_pkg_text = dialog_success_pkg_text + "</div>";
 
           $("#success_pkg").html(dialog_success_pkg_text);
@@ -2142,20 +2132,16 @@ function install_free_package(package, version, homeurl) {
             ]
           });
 
-          var dialog_error_pkg_text = "<div>";
+          var dialog_error_pkg_text = "<div class='update_popup'>";
+          dialog_error_pkg_text =
+            dialog_error_pkg_text + "<div class='update_text'><h3>ERROR</h3>";
+          dialog_error_pkg_text =
+            dialog_error_pkg_text + "<p>" + data["message"] + "</p></div>";
           dialog_error_pkg_text =
             dialog_error_pkg_text +
-            "<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='" +
+            "<div class='update_icon'><img src='" +
             home_url +
-            "images/icono_error_mr.png'></div>";
-          dialog_error_pkg_text =
-            dialog_error_pkg_text +
-            "<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>ERROR</strong></h3>";
-          dialog_error_pkg_text =
-            dialog_error_pkg_text +
-            "<p style='font-family:Verdana; font-size:12pt;'>" +
-            data["message"] +
-            "</p></div>";
+            "images/icon_error_mr.png'></div>";
           dialog_error_pkg_text = dialog_error_pkg_text + "</div>";
 
           $("#error_pkg").html(dialog_error_pkg_text);
@@ -2193,20 +2179,16 @@ function install_free_package(package, version, homeurl) {
           ]
         });
 
-        var dialog_error_pkg_text = "<div>";
+        var dialog_error_pkg_text = "<div class='update_popup'>";
+        dialog_error_pkg_text =
+          dialog_error_pkg_text + "<div class='update_text'><h3>ERROR</h3>";
+        dialog_error_pkg_text =
+          dialog_error_pkg_text + "<p>" + data["message"] + "</p></div>";
         dialog_error_pkg_text =
           dialog_error_pkg_text +
-          "<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='" +
+          "<div class='update_icon'><img src='" +
           home_url +
-          "images/icono_error_mr.png'></div>";
-        dialog_error_pkg_text =
-          dialog_error_pkg_text +
-          "<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>ERROR</strong></h3>";
-        dialog_error_pkg_text =
-          dialog_error_pkg_text +
-          "<p style='font-family:Verdana; font-size:12pt;'>" +
-          data["message"] +
-          "</p></div>";
+          "images/icon_error_mr.png'></div>";
         dialog_error_pkg_text = dialog_error_pkg_text + "</div>";
 
         $("#error_pkg").html(dialog_error_pkg_text);
@@ -2246,13 +2228,7 @@ function apply_minor_release(n_mr, pkg, ent, off, homeurl) {
           $("#mr_dialog2").html(data);
           error["error"] = true;
         } else {
-          $("#mr_dialog2").append(
-            "<p style='font-family:Verdana; font-size:12pt;'>- " +
-              applying_mr +
-              " #" +
-              mr +
-              "</p>"
-          );
+          $("#mr_dialog2").append("<p>- " + applying_mr + " #" + mr + "</p>");
         }
       }
     });
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 6752f69eb3..614151bc47 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.734';
-            $build = '190507';
+            $build = '190509';
             $banner = "v$version Build $build";
 
             error_reporting(0);
diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php
index 291454d962..09f952108c 100644
--- a/pandora_console/operation/events/events.php
+++ b/pandora_console/operation/events/events.php
@@ -937,11 +937,11 @@ $(document).ready( function() {
                         // Remove delete link (if event is not grouped and there is more than one event)
                         if ($("#group_rep").val() == 1) {
                             if (parseInt($("#count_event_group_"+id).text()) <= 1) {
-                                $("#delete-"+id).replaceWith('<img alt="' + <?php echo "'".__('Is not allowed delete events in process')."'"; ?> + '" title="' + <?php echo "'".__('Is not allowed delete events in process')."'"; ?> + '" src="images/cross.disabled.png">');
+                                $("#delete-"+id).replaceWith('<img alt=" <?php echo addslashes(__('Is not allowed delete events in process')); ?>" title="<?php echo addslashes(__('Is not allowed delete events in process')); ?>"  src="images/cross.disabled.png">');
                             }
                         }
                         else { // Remove delete link (if event is not grouped)
-                            $("#delete-"+id).replaceWith('<img alt="' + <?php echo "'".__('Is not allowed delete events in process')."'"; ?> + '" title="' + <?php echo "'".__('Is not allowed delete events in process')."'"; ?> + '" src="images/cross.disabled.png">');
+                            $("#delete-"+id).replaceWith('<img alt="<?php echo addslashes(__('Is not allowed delete events in process')); ?> " title="<?php echo addslashes(__('Is not allowed delete events in process')); ?>"  src="images/cross.disabled.png">');
                         }
                         
                         // Change state image
@@ -1142,10 +1142,10 @@ function validate_event_advanced(id, new_status) {
                     $("#in-progress-"+id).remove();
                     // Format the new disabled delete icon.
                     $("#validate-"+id).parent().append("<img id='delete-" + id + "' src='" + cross_disabled_image + "' />");
-                    $("#delete-"+id).attr ("data-title", <?php echo "'".__('Is not allowed delete events in process')."'"; ?>);
-                    $("#delete-"+id).attr ("alt", <?php echo "'".__('Is not allowed delete events in process')."'"; ?>);
+                    $("#delete-"+id).attr ("data-title",  "<?php echo addslashes(__('Is not allowed delete events in process')); ?>");
+                    $("#delete-"+id).attr ("alt"," <?php echo addslashes(__('Is not allowed delete events in process')); ?>");
                     $("#delete-"+id).attr ("data-use_title_for_force_title", 1);
-                    $("#delete-"+id).attr ("class", "forced_title");
+                    $("#delete-"+id).attr ("class", "forced_title"); 
 
                     // Remove row due to new state
                     if (($("#status").val() == 0)
@@ -1193,4 +1193,4 @@ if ($load_event) {
 }
 ?>
 /* ]]> */
-</script>
+</script>
\ No newline at end of file
diff --git a/pandora_console/operation/search_modules.php b/pandora_console/operation/search_modules.php
index 687dea13e2..bb86159035 100644
--- a/pandora_console/operation/search_modules.php
+++ b/pandora_console/operation/search_modules.php
@@ -108,6 +108,12 @@ if (!$modules || !$searchModules) {
                 __('WARNING').': '.modules_get_last_value($module['id_agente_modulo']),
                 true
             );
+        } else if ($status_sql['estado'] == 3) {
+            $statusCell = ui_print_status_image(
+                STATUS_MODULE_UNKNOWN,
+                __('UNKNOWN').': '.modules_get_last_value($module['id_agente_modulo']),
+                true
+            );
         } else {
             $last_status = modules_get_agentmodule_last_status($module['id_agente_modulo']);
             switch ($last_status) {
diff --git a/pandora_console/operation/snmpconsole/snmp_mib_uploader.php b/pandora_console/operation/snmpconsole/snmp_mib_uploader.php
index 7754fe3743..1fbe2b1823 100644
--- a/pandora_console/operation/snmpconsole/snmp_mib_uploader.php
+++ b/pandora_console/operation/snmpconsole/snmp_mib_uploader.php
@@ -69,9 +69,6 @@ $real_directory = realpath($config['homedir'].'/'.$directory);
 
 ui_print_info_message(__('MIB files will be installed on the system. Please note that a MIB may depend on other MIB. To customize trap definitions use the SNMP trap editor.'));
 
-// echo '<h4>' . __('Index of %s', $directory) . '</h4>';
-$homedir_filemanager = isset($config['homedir_filemanager']) ? $config['homedir_filemanager'] : false;
-
 filemanager_file_explorer(
     $real_directory,
     $directory,
@@ -82,5 +79,5 @@ filemanager_file_explorer(
     '',
     false,
     '',
-    $homedir_filemanager
+    false
 );
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 1c6caf0756..8ecf30fe42 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.734
-%define release     190507
+%define release     190509
 
 # User and Group under which Apache is running
 %define httpd_name  httpd
diff --git a/pandora_console/pandora_console.rhel7.spec b/pandora_console/pandora_console.rhel7.spec
index 06a27373cf..0511d452ff 100644
--- a/pandora_console/pandora_console.rhel7.spec
+++ b/pandora_console/pandora_console.rhel7.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.734
-%define release     190507
+%define release     190509
 
 # User and Group under which Apache is running
 %define httpd_name  httpd
diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec
index d60ff34b24..813ddb75b1 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.734
-%define release     190507
+%define release     190509
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index 54d6ceca05..24e2b18ce3 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.734-190507
+Version: 7.0NG.734-190509
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh
index 4fc0bf1dab..3be04eadb9 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/pandora_server/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.734-190507"
+pandora_version="7.0NG.734-190509"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 330a652a5e..1249c57e1c 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -45,7 +45,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.734";
-my $pandora_build = "190507";
+my $pandora_build = "190509";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 16f596be7e..26df3aa1e4 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -32,7 +32,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.734";
-my $pandora_build = "190507";
+my $pandora_build = "190509";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index a42cf2ad9d..73d08f06a5 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.734
-%define release     190507
+%define release     190509
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 56474e629c..231349ee24 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.734
-%define release     190507
+%define release     190509
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 6173d21c75..1896c72705 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.734"
-PI_BUILD="190507"
+PI_BUILD="190509"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 2007d33276..881f73940b 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -34,7 +34,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.734 PS190507";
+my $version = "7.0NG.734 PS190509";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index f309208fd2..babf1f7eff 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.734 PS190507";
+my $version = "7.0NG.734 PS190509";
 
 # save program name for logging
 my $progname = basename($0);