diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index e6553ada2f..d2e886052d 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.769-230313
+Version: 7.0NG.769-230323
 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 cadc4a6fd2..122b06ac79 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.769-230313"
+pandora_version="7.0NG.769-230323"
 
 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 f828e1a7ae..ef17f8a8f4 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -1023,7 +1023,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.769';
-use constant AGENT_BUILD => '230313';
+use constant AGENT_BUILD => '230323';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
@@ -3749,6 +3749,7 @@ sub module_plugin ($) {
 	
 	# Do not save the output if there was an error
 	if ($? != 0) {
+		log_message ('error', "plugin execution '". $command ."' exited with error code " . $?);
 		return ();
 	}
 
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index 4ff8cf8848..af7e2e2596 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux
 %define version     7.0NG.769
-%define release     230313
+%define release     230323
 
 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 6705e0ee72..7a3adae918 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux
 %define version     7.0NG.769
-%define release     230313
+%define release     230323
 
 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 06c37d34cd..97c4765dbd 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.769"
-PI_BUILD="230313"
+PI_BUILD="230323"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/unix/plugins/autodiscover b/pandora_agents/unix/plugins/autodiscover
index 03b2c3d76d..01b9bd3d96 100644
--- a/pandora_agents/unix/plugins/autodiscover
+++ b/pandora_agents/unix/plugins/autodiscover
@@ -6,21 +6,22 @@
 #
 # (c) A. Kevin Rojas <kevin.rojas@pandorafms.com>
 #
+# Edited in 2023 by Alejandro Sánchez <alejandro.sanchez@pandorafms.com>
+#
 # TO DO LIST:
 # - Enable child services detection (Windows)
 # - Make CPU/Memory usage available for child services (Windows)
 #
 ###################################################
-
 try:
     from sys import argv
     from sys import stderr
     from sys import exit
+    import psutil
     from subprocess import Popen
     from subprocess import PIPE
     from subprocess import DEVNULL
     from subprocess import getstatusoutput
-    import psutil
 except ModuleNotFoundError as err:
     print("{} error: {}. Exiting...".format(argv[0], err), file=stderr)
     exit(1)
@@ -28,99 +29,100 @@ except ModuleNotFoundError as err:
 module_list = []
 VERSION = "1.2"
 
+def win_service(servicelist, option=False, memcpu=False):
 
-#########################################################################################
-# Powershell class
-#########################################################################################
-class PSCheck:
-    @staticmethod
-    def check_service(servicename, option=False, memcpu=False):
-        """Check services with powershell by parsing their DisplayName. Returns a dict\
-        list with the name of the service and a boolean with its status.\n
-        Requires service name (case insensitive)."""
-        pscall = Popen(["powershell", "Get-Service", "-Name", "'*"+ str(servicename) + "*'",
-                        "|", "Select-Object", "-ExpandProperty", "Name"],
-                        stdout=PIPE, stdin=DEVNULL, stderr=DEVNULL, universal_newlines=True)
-        result = pscall.communicate()
-        result = str(result[0]).strip().split("\n")
-        procname = ''
-        if result != '':
-            output = []
-            for element in result:
-                if element != '':
-                    # Get process name
-                    procname = PSCheck.get_serviceprocess(element)
-                    # Get process status
-                    parstatus = PSCheck.getstatus(element)
-                    if memcpu and parstatus == 1:
-                        usage = get_memcpu(str(procname), str(element))
-                        output += usage
-                    # Generate module with name and status
-                    parent = service_module(str(element), parstatus)
-                    output += parent
-                    if option:
-                        children = PSCheck.getchildren(element, memcpu)
-                        if isinstance(children, list) and len(children) > 1:
-                            for child in children:
-                                output += child
-                        else:
-                            output += children
-                else:
-                    next
-
-            if output and element and procname:
-                return ({"name" : element, "process" : procname, "modules": output})
+    modules_default = []
+    modules_percentage=[]
+    ## take all services
+    services=psutil.win_service_iter()
+    for service in services:
+        if service.name() in servicelist:      
+            serv=service.as_dict()
+            if serv['status']=='running':
+                value=1
             else:
-                return (None)
+                value=0
 
-    @staticmethod
-    def getchildren(servicename, memcpu=False):
-        """Gets Dependent services of a given Windows service"""
-        pschild = Popen(["powershell", "Get-Service", "-Name '" + str(servicename) +
-                        "' -DS", "|", "Select-Object", "-ExpandProperty", "Name"], 
-                        stdout=PIPE, stdin=DEVNULL, stderr=DEVNULL, universal_newlines=True)
-        children = pschild.communicate()[0].strip()
-        kids = []
-        for child in (children.split("\n") if children != "" else []):
-            status = PSCheck.getstatus(child)
-            kids += service_module(str(child), status, "Service " + str(servicename) + " - Status")
-            if status:
-                if memcpu:
-                    kidsusage = get_memcpu(str(child))
-                    for usage in kidsusage:
-                        kids += usage
+            ## create module for each service
+            parent = build_module("Service " + str(serv['name']) + " - Status", value,"generic_proc")
+            modules_default +=parent
+
+            # memory and cpu percentage
+            if memcpu:
+                 ## process
+                srv_pid = service.pid()
+                process = psutil.Process(srv_pid)
+                proc_name = process.name()
+                ##cpu
+                value_cpu=process.cpu_percent(interval=0.5)
+                parent = build_module("Service " + str(proc_name) + " - CPU usage", value_cpu,"generic_data")
+                parent[0].update([("unit","%"),("module_parent",str(serv['name']))])
+                modules_percentage +=parent
+                ##mem
+                value_mem=process.memory_percent()
+                parent = build_module("Service " + str(proc_name) + " - Memory usage", value_mem,"generic_data")
+                parent[0].update([("unit","%"),("module_parent",str(serv['name']))])
+                modules_percentage +=parent
+
+
+    for module in modules_default:
+        print_module(module, 1)
+    if memcpu:
+        for module in modules_percentage:
+            print_module(module, 1)
+
+def lnx_service(services_list, memcpu=False):
+    """Creates modules for Linux servers"""
+    modules = []
+    sysctl = getstatusoutput("command -v systemctl")[0]
+    servic = getstatusoutput("command -v service")[0]
+    for srvc in services_list:
+        status = None
+        if sysctl == 0: 
+            ### Systemd available
+            syscall = Popen(["systemctl", "show", "-pLoadState", "-pActiveState", srvc], stdout=PIPE,
+                            stdin=DEVNULL, universal_newlines=True)
+            result = syscall.communicate()
+            srvstatus = result[0].strip().lower().split("\n")
+            if srvstatus[0] == "loadstate=not-found":
+                next
+            else:
+                if srvstatus[1] == "activestate=active":
+                    modules += build_module("Service " + srvc + " - Status", 1, "generic_proc")
+                    status = 1
+                elif srvstatus[1] == "activestate=inactive":
+                    modules += build_module("Service " +srvc+ " - Status", 0, "generic_proc")
+                    status = 0
+        elif sysctl != 0 and servic == 0: 
+            ### Systemd not available, switch to service command
+            syscall = Popen(["service", srvc, "status"], stdout=PIPE,
+                            stdin=DEVNULL, stderr=DEVNULL, universal_newlines=True)
+            result = syscall.communicate()[0].lower()
+            if "is running" in result:
+                modules += build_module("Service " + srvc + " - Status", 1, "generic_proc")
+                status = 1
+            elif "is stopped" in result:
+                modules += build_module("Service " +srvc+ " - Status", 0, "generic_proc")
+                status = 0
             else:
                 next
-        return kids
-
-    @staticmethod
-    def getstatus(servicename):
-        """Gets the status of a given Windows service"""
-        running = Popen(["powershell", "Get-Service", "-Name '" + str(servicename) +
-                "' |", "Select-Object", "-ExpandProperty", "Status"],
-                stdout=PIPE, stdin=DEVNULL, stderr=DEVNULL, universal_newlines=True)
-        status = running.communicate()[0].strip()
-        return int(status == "Running")
-
-    @staticmethod
-    def get_serviceprocess(servicename):
-        """Gets name of the process of the service"""
-        service = psutil.win_service_get(servicename)
-        srv_pid = service.pid()
-        process = psutil.Process(srv_pid)
-        proc_name = process.name()
-        return proc_name
+        else:
+            print("No systemd or service commands available. Exiting...", file=stderr)
+            exit()
+        if status:
+            module_list.append(srvc)
+            if memcpu:
+                modules += get_memcpu(srvc, None)
+    
+    for m in modules:
+        print_module(m, 1)
 
 
-#########################################################################################
-# Services creation
-#########################################################################################
-
-def service_module(name, value, parent=None):
+def build_module(name, value, module_type, parent=None):
     #print ("service_module BEGIN "+str(now(0,1)))
     module = [{
-            "name"              :   "Service "+ name + " - Status",
-            "type"              :   "generic_proc",
+            "name"              :   name ,
+            "type"              :   module_type,
             "value"             :   value,
             "module_parent"     :   parent,
         }]
@@ -167,74 +169,6 @@ def proc_percentbyname(procname): ############# 03/03/2020
         next
     #print ("proc_percentbyname END "+str(now(0,1)))
     return [sum(memory),sum(cpu)]
-
-def win_service(servicelist, option=False, memcpu=False):
-    """Creates modules for Windows servers."""
-    modules = []
-    for srvc in servicelist:
-        if srvc and len(srvc) > 2:
-            output = PSCheck.check_service(srvc, option, memcpu)
-            if output is not None and output["modules"]:
-                modules += PSCheck.check_service(srvc.strip(), option, memcpu)["modules"]
-                module_list.append(srvc)
-                #winprocess = output["name"]
-                #if memcpu == True:
-                #    modules += get_memcpu(winprocess) ## Only available for parent service ATM.
-            else:
-                next
-        else:
-            next
-    for module in modules:
-        print_module(module, 1)
-
-
-def lnx_service(services_list, memcpu=False):
-    """Creates modules for Linux servers"""
-    modules = []
-    sysctl = getstatusoutput("command -v systemctl")[0]
-    servic = getstatusoutput("command -v service")[0]
-    for srvc in services_list:
-        status = None
-        if sysctl == 0: 
-            ### Systemd available
-            syscall = Popen(["systemctl", "show", "-pLoadState", "-pActiveState", srvc], stdout=PIPE,
-                            stdin=DEVNULL, universal_newlines=True)
-            result = syscall.communicate()
-            srvstatus = result[0].strip().lower().split("\n")
-            if srvstatus[0] == "loadstate=not-found":
-                next
-            else:
-                if srvstatus[1] == "activestate=active":
-                    modules += service_module(srvc, 1)
-                    status = 1
-                elif srvstatus[1] == "activestate=inactive":
-                    modules += service_module(srvc, 0)
-                    status = 0
-        elif sysctl != 0 and servic == 0: 
-            ### Systemd not available, switch to service command
-            syscall = Popen(["service", srvc, "status"], stdout=PIPE,
-                            stdin=DEVNULL, stderr=DEVNULL, universal_newlines=True)
-            result = syscall.communicate()[0].lower()
-            if "is running" in result:
-                modules += service_module(srvc, 1)
-                status = 1
-            elif "is stopped" in result:
-                modules += service_module(srvc, 0)
-                status = 0
-            else:
-                next
-        else:
-            print("No systemd or service commands available. Exiting...", file=stderr)
-            exit()
-        if status:
-            module_list.append(srvc)
-            if memcpu:
-                modules += get_memcpu(srvc, None)
-    
-    for m in modules:
-        print_module(m, 1)
-
-
 #########################################################################################
 # print_module function
 #########################################################################################
@@ -356,6 +290,7 @@ def main():
         service_list = ["MySQL", "postgresql", "pgsql", "oracle", "MSSQL", "IISADMIN",
                         "apache", "nginx", "W3svc", "NTDS", "Netlogon", "DNS", "MSExchangeADTopology",
                         "MSExchangeServiceHost", "MSExchangeSA", "MSExchangeTransport"]
+
         discover(OS, service_list)
     elif psutil.LINUX:
         OS = "Linux"
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 60ebc7abad..9f9bbb30f2 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{230313}
+{230323}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index e7aeba8540..1a59e872aa 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.769 Build 230313")
+#define PANDORA_VERSION ("7.0NG.769 Build 230323")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 394e2e2be5..bb8562378a 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.769(Build 230313))"
+      VALUE "ProductVersion", "(7.0NG.769(Build 230323))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 020733306e..b766df0562 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.769-230313
+Version: 7.0NG.769-230323
 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 5a23822ad2..7425ed46b6 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.769-230313"
+pandora_version="7.0NG.769-230323"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/extensions/files_repo.php b/pandora_console/extensions/files_repo.php
index 656c3377c7..26e21750bb 100644
--- a/pandora_console/extensions/files_repo.php
+++ b/pandora_console/extensions/files_repo.php
@@ -240,7 +240,28 @@ function pandora_files_repo_operation()
     }
 
     // Header.
-    ui_print_page_header(__('Files repository'), 'images/extensions.png', false, '', false, $onheader);
+    ui_print_standard_header(
+        __('Files repository'),
+        'images/extensions.png',
+        false,
+        '',
+        false,
+        $onheader,
+        [
+            [
+                'link'  => '',
+                'label' => __('Admin tools'),
+            ],
+            [
+                'link'  => '',
+                'label' => __('Extension manager'),
+            ],
+            [
+                'link'  => '',
+                'label' => __('Files repository'),
+            ],
+        ]
+    );
 
     $full_extensions_dir = $config['homedir'].'/'.EXTENSIONS_DIR.'/';
     include_once $full_extensions_dir.'files_repo/functions_files_repo.php';
diff --git a/pandora_console/extensions/quick_shell.php b/pandora_console/extensions/quick_shell.php
index 9182380a95..21e41cb63a 100644
--- a/pandora_console/extensions/quick_shell.php
+++ b/pandora_console/extensions/quick_shell.php
@@ -140,25 +140,26 @@ function quickShell()
             ui_print_error_message(__('WebService engine has not been started, please check documentation.'));
             $wiz->printForm(
                 [
-                    'form'   => [
+                    'form' => [
                         'method' => 'POST',
                         'action' => '#',
-                    ],
-                    'inputs' => [
-                        [
-                            'class'     => 'w100p',
-                            'arguments' => [
-                                'name'       => 'submit',
-                                'label'      => __('Retry'),
-                                'type'       => 'submit',
-                                'attributes' => ['icon' => 'next'],
-                                'return'     => true,
-                            ],
-                        ],
+                        'id'     => 'retry_form',
                     ],
                 ]
             );
 
+            html_print_action_buttons(
+                html_print_submit_button(
+                    __('Retry'),
+                    'submit',
+                    false,
+                    [
+                        'icon' => 'next',
+                        'form' => 'retry_form',
+                    ],
+                    true
+                )
+            );
             return;
         }
 
@@ -168,6 +169,7 @@ function quickShell()
                     'action' => '#',
                     'class'  => 'wizard',
                     'method' => 'post',
+                    'id'     => 'connect_form',
                 ],
                 'inputs' => [
                     [
@@ -198,19 +200,24 @@ function quickShell()
                             'script' => "p=22; if(this.value == 'telnet') { p=23; } $('#text-port').val(p);",
                         ],
                     ],
-                    [
-                        'arguments' => [
-                            'type'       => 'submit',
-                            'label'      => __('Connect'),
-                            'attributes' => ['icon' => 'cog'],
-                        ],
-                    ],
                 ],
             ],
             false,
             true
         );
 
+        html_print_action_buttons(
+            html_print_submit_button(
+                __('Connect'),
+                'submit',
+                false,
+                [
+                    'icon' => 'cog',
+                    'form' => 'connect_form',
+                ],
+                true
+            )
+        );
         return;
     }
 
@@ -434,84 +441,95 @@ function quickShellSettings()
     }
 
     // Form. Using old style.
-    echo '<fieldset>';
+    echo '<fieldset class="margin-bottom-10">';
     echo '<legend>'.__('Quickshell').'</legend>';
 
     $t = new StdClass();
     $t->data = [];
     $t->width = '100%';
-    $t->class = 'databox filters';
+    $t->class = 'filter-table-adv';
     $t->data = [];
     $t->style = [];
-    $t->style[0] = 'font-weight: bold; width: 40%;';
+    $t->style[0] = 'width: 50%;';
 
-    $t->data[0][0] = __('Gotty path');
-    $t->data[0][1] = html_print_input_text(
-        'gotty',
-        $config['gotty'],
-        '',
-        30,
-        100,
-        true
+    $t->data[0][] = html_print_label_input_block(
+        __('Gotty path'),
+        html_print_input_text(
+            'gotty',
+            $config['gotty'],
+            '',
+            30,
+            100,
+            true
+        )
     );
 
-    $t->data[1][0] = __('Gotty host');
-    $t->data[1][1] = html_print_input_text(
-        'gotty_host',
-        $config['gotty_host'],
-        '',
-        30,
-        100,
-        true
+    $t->data[0][] = html_print_label_input_block(
+        __('Gotty host'),
+        html_print_input_text(
+            'gotty_host',
+            $config['gotty_host'],
+            '',
+            30,
+            100,
+            true
+        )
     );
 
-    $t->data[2][0] = __('Gotty ssh port');
-    $t->data[2][1] = html_print_input_text(
-        'gotty_ssh_port',
-        $config['gotty_ssh_port'],
-        '',
-        30,
-        100,
-        true
+    $t->data[1][] = html_print_label_input_block(
+        __('Gotty ssh port'),
+        html_print_input_text(
+            'gotty_ssh_port',
+            $config['gotty_ssh_port'],
+            '',
+            30,
+            100,
+            true
+        )
     );
 
-    $t->data[3][0] = __('Gotty telnet port');
-    $t->data[3][1] = html_print_input_text(
-        'gotty_telnet_port',
-        $config['gotty_telnet_port'],
-        '',
-        30,
-        100,
-        true
+    $t->data[1][] = html_print_label_input_block(
+        __('Gotty telnet port'),
+        html_print_input_text(
+            'gotty_telnet_port',
+            $config['gotty_telnet_port'],
+            '',
+            30,
+            100,
+            true
+        )
     );
 
-    $hidden = new StdClass();
+    $hidden = new stdClass();
     $hidden->data = [];
     $hidden->width = '100%';
-    $hidden->class = 'databox filters';
+    $hidden->class = 'filter-table-adv';
     $hidden->data = [];
-    $hidden->style[0] = 'font-weight: bold;width: 40%;';
+    $hidden->style[0] = 'width: 50%;';
 
-    $hidden->data[0][0] = __('Gotty user');
-    $hidden->data[0][1] = html_print_input_text(
-        'gotty_user',
-        $config['gotty_user'],
-        '',
-        30,
-        100,
-        true
+    $hidden->data[0][] = html_print_label_input_block(
+        __('Gotty user'),
+        html_print_input_text(
+            'gotty_user',
+            $config['gotty_user'],
+            '',
+            30,
+            100,
+            true
+        )
     );
 
-    $hidden->data[1][0] = __('Gotty password');
-    $hidden->data[1][1] = html_print_input_password(
-        'gotty_pass',
-        io_output_password($config['gotty_pass']),
-        '',
-        30,
-        100,
-        true
+    $hidden->data[0][] = html_print_label_input_block(
+        __('Gotty password'),
+        html_print_input_password(
+            'gotty_pass',
+            io_output_password($config['gotty_pass']),
+            '',
+            30,
+            100,
+            true
+        )
     );
-    $hidden->data[1][1] .= ui_print_reveal_password('gotty_pass', true);
 
     html_print_table($t);
 
diff --git a/pandora_console/extras/mr/62.sql b/pandora_console/extras/mr/62.sql
index 76f0a84c4e..eaef394fcc 100644
--- a/pandora_console/extras/mr/62.sql
+++ b/pandora_console/extras/mr/62.sql
@@ -1,5 +1,14 @@
 START TRANSACTION;
 
+ALTER TABLE `tdatabase` ADD COLUMN `ssh_status` TINYINT UNSIGNED DEFAULT 0;
+ALTER TABLE `tdatabase` ADD COLUMN `db_status` TINYINT UNSIGNED DEFAULT 0;
+ALTER TABLE `tdatabase` ADD COLUMN `replication_status` TINYINT UNSIGNED DEFAULT 0;
+ALTER TABLE `tdatabase` ADD COLUMN `replication_delay` BIGINT DEFAULT 0;
+ALTER TABLE `tdatabase` ADD COLUMN `master` TINYINT UNSIGNED DEFAULT 0;
+ALTER TABLE `tdatabase` ADD COLUMN `utimestamp` BIGINT DEFAULT 0;
+ALTER TABLE `tdatabase` ADD COLUMN `mysql_version` VARCHAR(10) DEFAULT '';
+ALTER TABLE `tdatabase` ADD COLUMN `pandora_version` VARCHAR(10) DEFAULT '';
+
 UPDATE tconfig_os SET `icon_name` = 'linux@os.svg' WHERE `id_os` = 1;
 UPDATE tconfig_os SET `icon_name` = 'solaris@os.svg' WHERE `id_os` = 2;
 UPDATE tconfig_os SET `icon_name` = 'aix@os.svg' WHERE `id_os` = 3;
@@ -155,4 +164,17 @@ INSERT INTO `twelcome_tip_file` (`twelcome_tip_file`, `filename`, `path`) VALUES
 (20, 'zoom_en_graficas.png', 'images/tips/'),
 (22, 'politica_de_pass.png', 'images/tips/');
 
+ALTER TABLE `tusuario` ADD COLUMN `show_tips_startup` TINYINT UNSIGNED NOT NULL DEFAULT 1;
+
+CREATE TABLE IF NOT EXISTS `tfavmenu_user` (
+  `id` INT NOT NULL AUTO_INCREMENT,
+  `id_user` VARCHAR(255) NOT NULL,
+  `id_element` TEXT,
+  `url` TEXT NOT NULL,
+  `label` VARCHAR(255) NOT NULL,
+  `section` VARCHAR(255) NOT NULL,
+PRIMARY KEY (`id`));
+
+INSERT INTO `tconfig` (`token`, `value`) VALUES ('legacy_database_ha', 1);
+
 COMMIT;
diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php
index 40f6c3a382..b0cbc0cec5 100644
--- a/pandora_console/general/header.php
+++ b/pandora_console/general/header.php
@@ -407,7 +407,6 @@ echo sprintf('<div id="header_table" class="header_table_%s">', $menuTypeClass);
 
 
         // User.
-        // $headerUserImage = (is_user_admin($config['id_user']) === true) ? 'images/header_user_admin_green.png' : 'images/header_user_green.png';
         $headerUser = [];
         $headerUser[] = html_print_image(
             'images/edit_user@header.svg',
diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php
index 8517b1c46c..0c89430122 100755
--- a/pandora_console/general/login_page.php
+++ b/pandora_console/general/login_page.php
@@ -27,10 +27,27 @@ require_once __DIR__.'/../include/functions_ui.php';
 require_once __DIR__.'/../include/functions.php';
 require_once __DIR__.'/../include/functions_html.php';
 
+echo '<style>
+        :root {';
+if ($config['style'] === 'pandora') {
+    echo '--login-background-color: rgba(255, 255, 255, 0.2);';
+    echo '--login-label-color: #545454;';
+    echo '--login-text-color: #000;';
+    $style_theme = 'white-theme';
+} else {
+    echo '--login-background-color: rgba(0, 0, 0, 0.8);';
+    echo '--login-label-color: #c5c5c5;';
+    echo '--login-text-color: #fff;';
+    $style_theme = '';
+}
+
+echo '}
+</style>';
 
 if ($config['visual_animation']) {
+    // form#login_form, div.login_data {
     echo '<style>
-        div.container_login {
+    div.container_login {
             animation: container_login 3s ease;
         }
         
@@ -120,7 +137,13 @@ if (empty($config['background_opacity']) === false) {
     $opacity = 30;
 }
 
-$login_body_style = 'style="'.$background_100.'background: linear-gradient(rgba(0,0,0,.'.$opacity.'), rgba(0,0,0,.'.$opacity.")), url('".$background_url."');\"";
+if ($config['style'] === 'pandora') {
+    $opacity_color = '255, 255, 255, .';
+} else {
+    $opacity_color = '0, 0, 0, .';
+}
+
+$login_body_style = 'style="'.$background_100.'background: linear-gradient(rgba('.$opacity_color.$opacity.'), rgba('.$opacity_color.$opacity.")), url('".$background_url."');\"";
 
 // Get alternative custom in case of db fail.
 $custom_fields = [
@@ -147,7 +170,7 @@ foreach ($custom_fields as $field) {
 $docs_logo = ui_get_docs_logo();
 $support_logo = ui_get_support_logo();
 echo '<div id="login_body" '.$login_body_style.'>';
-echo '<div id="header_login">';
+echo '<div id="header_login" class="'.$style_theme.'">';
 
 echo '<div id="list_icon_docs_support"><ul>';
 
@@ -185,7 +208,7 @@ echo '</div>';
 
 echo '<div class="container_login">';
 echo '<div class="login_page">';
-    echo '<form method="post" action="'.ui_get_full_url('index.php'.$url).'" ><div class="login_logo_icon">';
+    echo '<form method="post" id="login_form" action="'.ui_get_full_url('index.php'.$url).'" ><div class="login_logo_icon">';
         echo '<a href="'.$logo_link.'">';
 if (is_metaconsole() === true) {
     if (!isset($config['custom_logo_login'])) {
@@ -297,7 +320,7 @@ switch ($login_screen) {
                 );
             echo '</div>';
         } else {
-            echo '<div class="login_nick">';
+            echo '<div class="login_nick '.$style_theme.'">';
                 html_print_input_text_extended(
                     'nick',
                     '',
@@ -307,10 +330,11 @@ switch ($login_screen) {
                     '',
                     false,
                     '',
-                    'autocomplete="off" placeholder="'.__('User').'"'
+                    'autocomplete="off" class="input" placeholder=" "'
                 );
+                echo '<label for="nick" class="placeholder">'.__('User').'</label>';
             echo '</div>';
-            echo '<div class="login_pass">';
+            echo '<div class="login_pass '.$style_theme.'">';
                 html_print_input_text_extended(
                     'pass',
                     '',
@@ -320,20 +344,18 @@ switch ($login_screen) {
                     '',
                     false,
                     '',
-                    'autocomplete="off" placeholder="'.__('Password').'"',
+                    'autocomplete="off" class="input " placeholder=" " style="background-image: url(images/enable.svg);"',
                     false,
                     true
                 );
+                echo '<label for="pass" class="placeholder">'.__('Password').'</label>';
             echo '</div>';
             echo '<div class="login_button">';
                 html_print_submit_button(
-                    __('Login'),
+                    __('Let&#39;s go'),
                     'login_button',
                     false,
-                    [
-                        'fixed_id' => 'submit-login_button',
-                        'icon'     => 'signin',
-                    ]
+                    ['fixed_id' => 'submit-login_button']
                 );
             echo '</div>';
         }
@@ -346,15 +368,36 @@ switch ($login_screen) {
             }
         }
 
-        echo '<div class="login_nick">';
+        echo '<div class="login_nick '.$style_theme.'">';
         echo '<div>';
 
         echo '</div>';
-        html_print_input_text_extended('auth_code', '', 'auth_code', '', '', '', false, '', 'class="login login_password" placeholder="'.__('Authentication code').'"', false, true);
+        html_print_input_text_extended(
+            'auth_code',
+            '',
+            'auth_code',
+            '',
+            '',
+            '',
+            false,
+            '',
+            'class="login login_password input" placeholder=" "',
+            false,
+            true
+        );
+        echo '<label for="pass" class="placeholder">'.__('Authentication code').'</label>';
         echo '</div>';
         echo '<div class="login_button">';
         // html_print_submit_button(__('Check code').'&nbsp;&nbsp;>', 'login_button', false, 'class="next_login"');
-        html_print_submit_button(__('Check code').'&nbsp;&nbsp;>', 'login_button', false, [ 'fixed_id' => 'submit-login_button', 'class' => 'next_login']);
+        html_print_submit_button(
+            __('Check code'),
+            'login_button',
+            false,
+            [
+                'fixed_id' => 'submit-login_button',
+                'class'    => 'next_login',
+            ]
+        );
         echo '</div>';
     break;
 
@@ -425,39 +468,15 @@ html_print_csrf_hidden();
 
     echo '</form></div>';
     echo '<div class="login_data">';
-        echo '<div class ="text_banner_login">';
-            echo '<div><span class="span1">';
-if (file_exists(ENTERPRISE_DIR.'/load_enterprise.php')) {
-    if ($config['custom_title1_login']) {
-        echo io_safe_output($config['custom_title1_login']);
-    } else {
-        echo __('WELCOME TO %s', get_product_name());
-    }
-} else {
-    echo __('WELCOME TO %s', get_product_name());
-}
 
-            echo '</span></div>';
-            echo '<div><span class="span2">';
-if (file_exists(ENTERPRISE_DIR.'/load_enterprise.php')) {
-    if ($config['custom_title2_login']) {
-        echo io_safe_output($config['custom_title2_login']);
-    } else {
-        echo __('NEXT GENERATION');
-    }
-} else {
-    echo __('NEXT GENERATION');
-}
-
-            echo '</span></div>';
-        echo '</div>';
-        echo '<div class ="img_banner_login">';
+    echo '<div class ="img_banner_login">';
 if (file_exists(ENTERPRISE_DIR.'/load_enterprise.php')) {
     if (empty($config['custom_splash_login']) === false && $config['custom_splash_login'] !== 'default') {
         html_print_image(
             'enterprise/images/custom_splash_login/'.$config['custom_splash_login'],
             false,
             [
+                'class'  => 'splash-logo',
                 'alt'    => 'splash',
                 'border' => 0,
             ],
@@ -466,37 +485,60 @@ if (file_exists(ENTERPRISE_DIR.'/load_enterprise.php')) {
         );
     } else {
         echo '
-            <div class="loginimg-container">
-                <div class="lineone"></div> 
-                <div class="linetwo"></div>
-                <div class="linethree"></div>
-                <div style="display:flex;">
-                    <div class="towerone"></div>
-                    <div class="towertwo"></div>
-                    <div class="towerthree"></div>
-                    <div class="towerfour"></div>
+                <div class="loginimg-container">
+                    <div class="lineone"></div> 
+                    <div class="linetwo"></div>
+                    <div class="linethree"></div>
+                    <div style="display:flex;">
+                        <div class="towerone"></div>
+                        <div class="towertwo"></div>
+                        <div class="towerthree"></div>
+                        <div class="towerfour"></div>
+                    </div>
                 </div>
-            </div>
-        ';
+            ';
     }
 } else {
     echo '
-            <div class="loginimg-container">
-                <div class="lineone"></div> 
-                <div class="linetwo"></div>
-                <div class="linethree"></div>
-                <div style="display:flex;">
-                    <div class="towerone"></div>
-                    <div class="towertwo"></div>
-                    <div class="towerthree"></div>
-                    <div class="towerfour"></div>
+                <div class="loginimg-container">
+                    <div class="lineone"></div> 
+                    <div class="linetwo"></div>
+                    <div class="linethree"></div>
+                    <div style="display:flex;">
+                        <div class="towerone"></div>
+                        <div class="towertwo"></div>
+                        <div class="towerthree"></div>
+                        <div class="towerfour"></div>
+                    </div>
                 </div>
-            </div>
-        ';
+            ';
 }
 
-        echo '</div>';
-    echo '</div>';
+            echo '</div>';
+
+        echo '<div class ="text_banner_login">';
+echo '<div><span class="span1">';
+if (file_exists(ENTERPRISE_DIR.'/load_enterprise.php')) {
+    if ($config['custom_title1_login']) {
+        echo io_safe_output($config['custom_title1_login']);
+    } else {
+        echo __('ONE TOOL TO RULE THEM ALL');
+    }
+} else {
+    echo __('ONE TOOL TO RULE THEM ALL');
+}
+
+echo '</span></div>';
+echo '<div><span class="span2">';
+if (file_exists(ENTERPRISE_DIR.'/load_enterprise.php')) {
+    if ($config['custom_title2_login']) {
+        echo io_safe_output($config['custom_title2_login']);
+    }
+}
+
+echo '</span></div>';
+echo '</div>';
+echo '</div>';
 echo '</div>';
 echo '</div>';
 
diff --git a/pandora_console/general/register.php b/pandora_console/general/register.php
index 8714d1ec12..ed646f52f3 100644
--- a/pandora_console/general/register.php
+++ b/pandora_console/general/register.php
@@ -184,7 +184,7 @@ if (!$double_auth_enabled
       background: "black"
     },
     width: 500,
-    height: 400,
+    height: 'auto',
     close: function (event, ui) {
       // Abort the ajax request
       if (typeof request != 'undefined'){
diff --git a/pandora_console/godmode/agentes/agent_conf_gis.php b/pandora_console/godmode/agentes/agent_conf_gis.php
index ca213bae37..460f977b9e 100644
--- a/pandora_console/godmode/agentes/agent_conf_gis.php
+++ b/pandora_console/godmode/agentes/agent_conf_gis.php
@@ -61,79 +61,110 @@ ui_print_warning_message(
 
 $table = new stdClass();
 $table->width = '100%';
-$table->class = 'databox filters';
+$table->class = 'databox filter-table-adv mrgn_top_15px pdd_t_0px_important';
 $table->data = [];
 $table->cellpadding = 0;
 $table->cellspacing = 0;
 $table->head[0] = __('Agent position');
 $table->head_colspan[0] = 4;
 $table->headstyle[0] = 'text-align:center';
-$table->style[0] = 'font-weight: bold; ';
-$table->style[2] = 'font-weight: bold; ';
+$table->size[0] = '50%';
+$table->size[2] = '50%';
 
-$table->data[1][0] = __('Latitude: ');
-$table->data[1][1] = html_print_input_text_extended(
-    'latitude',
-    $agentData['stored_latitude'],
-    'text-latitude',
-    '',
-    20,
-    20,
-    false,
-    '',
-    [
-        'onchange' => 'setIgnoreGISDataEnabled()',
-        'onkeyup'  => 'setIgnoreGISDataEnabled()',
-    ],
-    true
+$table->data[1][0] = html_print_label_input_block(
+    __('Latitude: '),
+    html_print_input_text_extended(
+        'latitude',
+        $agentData['stored_latitude'],
+        'text-latitude',
+        '',
+        20,
+        20,
+        false,
+        '',
+        [
+            'onchange' => 'setIgnoreGISDataEnabled()',
+            'onkeyup'  => 'setIgnoreGISDataEnabled()',
+        ],
+        true
+    )
 );
 
-$table->data[1][2] = __('Longitude: ');
-$table->data[1][3] = html_print_input_text_extended(
-    'longitude',
-    $agentData['stored_longitude'],
-    'text-longitude',
-    '',
-    20,
-    20,
-    false,
-    '',
-    [
-        'onchange' => 'setIgnoreGISDataEnabled()',
-        'onkeyup'  => 'setIgnoreGISDataEnabled()',
-    ],
-    true
+$table->data[1][1] = html_print_label_input_block(
+    __('Longitude: '),
+    html_print_input_text_extended(
+        'longitude',
+        $agentData['stored_longitude'],
+        'text-longitude',
+        '',
+        20,
+        20,
+        false,
+        '',
+        [
+            'onchange' => 'setIgnoreGISDataEnabled()',
+            'onkeyup'  => 'setIgnoreGISDataEnabled()',
+        ],
+        true
+    )
 );
 
-$table->data[2][0] = __('Altitude: ');
-$table->data[2][1] = html_print_input_text_extended(
-    'altitude',
-    $agentData['stored_altitude'],
-    'text-altitude',
-    '',
-    10,
-    10,
-    false,
-    '',
-    [
-        'onchange' => 'setIgnoreGISDataEnabled()',
-        'onkeyup'  => 'setIgnoreGISDataEnabled()',
-    ],
-    true
+$table->data[2][0] = html_print_label_input_block(
+    __('Altitude: '),
+    html_print_input_text_extended(
+        'altitude',
+        $agentData['stored_altitude'],
+        'text-altitude',
+        '',
+        10,
+        10,
+        false,
+        '',
+        [
+            'onchange' => 'setIgnoreGISDataEnabled()',
+            'onkeyup'  => 'setIgnoreGISDataEnabled()',
+        ],
+        true
+    )
 );
 
-$table->data[2][2] = __('Ignore new GIS data:');
-$table->data[2][3] = __('Yes').' '.html_print_radio_button_extended('update_gis_data', 0, '', $updateGisData, false, '', 'class="mrgn_right_40px"', true);
-$table->data[2][3] .= __('No').' '.html_print_radio_button_extended('update_gis_data', 1, '', $updateGisData, false, '', 'class="mrgn_right_40px"', true);
+$table->data[2][1] = html_print_label_input_block(
+    __('Ignore new GIS data: '),
+    '<div class="flex mrgn_top_5px">'.__('Yes').' '.html_print_radio_button_extended(
+        'update_gis_data',
+        0,
+        '',
+        $updateGisData,
+        false,
+        '',
+        'class="mrgn_right_40px"',
+        true
+    ).__('No').' '.html_print_radio_button_extended(
+        'update_gis_data',
+        1,
+        '',
+        $updateGisData,
+        false,
+        '',
+        'class="mrgn_right_40px"',
+        true
+    ).'</div>'
+);
 
 $url = 'index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=gis&id_agente='.$id_agente;
-echo "<form method='post' action='".$url."' onsubmit ='return validateFormFields();'>";
+echo "<form method='post' action='".$url."' onsubmit ='return validateFormFields();' class='max_floating_element_size'>";
 html_print_input_hidden('update_gis', 1);
 html_print_table($table);
 
-echo '<div class="action-buttons float-left" style="width: '.$table->width.';">';
-html_print_submit_button(__('Update'), '', false, 'class="sub upd"');
-echo '</div>';
+html_print_action_buttons(
+    html_print_submit_button(
+        __('Update'),
+        '',
+        false,
+        ['icon' => 'wand'],
+        true
+    )
+);
 echo '</form>';
 ?>
 <script type="text/javascript">
diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php
index f524fb7d9e..06ec4a5308 100644
--- a/pandora_console/godmode/agentes/agent_manager.php
+++ b/pandora_console/godmode/agentes/agent_manager.php
@@ -487,21 +487,18 @@ if (isset($groups[$grupo]) === true || $new_agent === true) {
     $tableAgent->data['primary_group'][0] .= html_print_input_hidden('grupo', $grupo, true);
 }
 
-$tableAgent->data['primary_group'][0] .= html_print_div(
-    [
-        'content' => ui_print_group_icon(
-            $grupo,
-            true,
-            '',
-            ($id_agente === 0) ? 'display: none;' : '',
-            true,
-            false,
-            false,
-            'after_input_icon'
-        ),
-    ],
-    true
+$tableAgent->data['primary_group'][0] .= '<span id="group_preview">';
+$tableAgent->data['primary_group'][0] .= ui_print_group_icon(
+    $grupo,
+    true,
+    '',
+    ($id_agente === 0) ? 'display: none;' : '',
+    true,
+    false,
+    false,
+    'after_input_icon'
 );
+$tableAgent->data['primary_group'][0] .= '</span>';
 
 $tableAgent->data['caption_interval'][0] = __('Interval');
 // $tableAgent->rowstyle['interval'] = 'width: 260px';
@@ -974,7 +971,7 @@ foreach ($fields as $field) {
         $data_field[1] .= html_print_textarea(
             'customvalue_'.$field['id_field'].'[]',
             2,
-            65,
+            1000,
             $link_text,
             'class="min-height-30px w100p"',
             true
@@ -985,7 +982,7 @@ foreach ($fields as $field) {
         $data_field[1] .= html_print_textarea(
             'customvalue_'.$field['id_field'].'[]',
             2,
-            65,
+            1000,
             $link_url,
             'class="min-height-30px w100p"',
             true
@@ -994,7 +991,7 @@ foreach ($fields as $field) {
         $customContent = html_print_textarea(
             'customvalue_'.$field['id_field'],
             2,
-            65,
+            1000,
             $custom_value,
             'class="min-height-30px w100p"',
             true
@@ -1039,7 +1036,7 @@ if (empty($fields) === false) {
         '',
         true,
         false,
-        'white_box white_box_opened white_table_graph_fixed',
+        'white_box white_box_opened white_table_graph_fixed no_border',
         'no-border custom_fields_elements'
     );
 }
diff --git a/pandora_console/godmode/agentes/agent_template.php b/pandora_console/godmode/agentes/agent_template.php
index ea5c8176c8..3e265ab8fc 100644
--- a/pandora_console/godmode/agentes/agent_template.php
+++ b/pandora_console/godmode/agentes/agent_template.php
@@ -196,29 +196,52 @@ foreach ($nps as $row) {
 
 $filterTable = new stdClass();
 $filterTable->width = '100%';
-$filterTable->class = 'fixed_filter_bar';
+$filterTable->class = 'filter-table-adv';
+$filterTable->size[0] = '100%';
 $filterTable->data = [];
-$filterTable->data[0][0] = __('Module templates');
-$filterTable->data[1][0] = html_print_select($select, 'template_id', '', '', '', 0, true, false, true, '', false, 'max-width: 200px !important');
-$filterTable->data[1][1] = html_print_div(
+
+$filterTable->data[0][0] = html_print_label_input_block(
+    __('Module templates'),
+    html_print_select(
+        $select,
+        'template_id',
+        '',
+        '',
+        '',
+        0,
+        true,
+        false,
+        true,
+        '',
+        false,
+        'width: 250px '
+    )
+);
+
+$filterTable->data[1][0] = html_print_submit_button(
+    __('Assign'),
+    'crt',
+    false,
     [
-        'class'   => 'action-buttons',
-        'content' => html_print_submit_button(
-            __('Assign'),
-            'crt',
-            false,
-            [
-                'icon' => 'wand',
-                'mode' => 'secondary mini',
-            ],
-            true
-        ),
+        'class' => 'float-right',
+        'icon'  => 'wand',
+        'mode'  => 'mini',
     ],
     true
 );
 
-$outputFilterTable = '<form style="border:0" class="fixed_filter_bar" method="post" action="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=template&id_agente='.$id_agente.'">';
-$outputFilterTable .= html_print_table($filterTable, true);
+$outputFilterTable = '<form method="post" action="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=template&id_agente='.$id_agente.'">';
+$outputFilterTable .= ui_toggle(
+    html_print_table($filterTable, true),
+    '<span class="subsection_header_title">'.__('Assign').'</span>',
+    __('Assign'),
+    'assign',
+    true,
+    true,
+    '',
+    'white-box-content no_border',
+    'filter-datatable-main box-flat white_table_graph fixed_filter_bar'
+);
 $outputFilterTable .= '</form>';
 
 echo $outputFilterTable;
diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index a5a1445341..f559b4e3eb 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -808,7 +808,7 @@ if ($id_agente) {
     $pure = (int) get_parameter('pure');
     if ($pure === 0) {
         ui_print_standard_header(
-            __('Agent setup view'),
+            __('Agent setup view').' ( '.strtolower(agents_get_alias($id_agente)).' )',
             'images/agent.png',
             false,
             $helper,
diff --git a/pandora_console/godmode/agentes/inventory_manager.php b/pandora_console/godmode/agentes/inventory_manager.php
index 42984caeda..59a7a869a5 100644
--- a/pandora_console/godmode/agentes/inventory_manager.php
+++ b/pandora_console/godmode/agentes/inventory_manager.php
@@ -180,14 +180,26 @@ if ($load_inventory_module) {
 $form_buttons = '';
 if ($load_inventory_module) {
     $form_buttons .= html_print_input_hidden('id_agent_module_inventory', $id_agent_module_inventory, true);
-    $form_buttons .= html_print_submit_button(__('Update'), 'update_inventory_module', false, 'class="sub next"', true);
+    $form_buttons .= html_print_submit_button(
+        __('Update'),
+        'update_inventory_module',
+        false,
+        ['icon' => 'wand'],
+        true
+    );
 } else {
-    $form_buttons .= html_print_submit_button(__('Add'), 'add_inventory_module', false, 'class="sub next"', true);
+    $form_buttons .= html_print_submit_button(
+        __('Add'),
+        'add_inventory_module',
+        false,
+        ['icon' => 'wand'],
+        true
+    );
 }
 
 echo ui_get_inventory_module_add_form(
     'index.php?sec=estado&sec2=godmode/agentes/configurar_agente&tab=inventory&id_agente='.$id_agente,
-    $form_buttons,
+    html_print_action_buttons($form_buttons, [], true),
     $load_inventory_module,
     $id_os,
     $target,
@@ -213,10 +225,10 @@ if (db_get_num_rows($sql) == 0) {
 } else {
     $table = new stdClass();
     $table->width = '100%';
-    $table->class = 'databox filters';
+    $table->class = 'databox info_table max_floating_element_size';
     $table->data = [];
     $table->head = [];
-    $table->styleTable = 'margin-top: 20px;';
+    $table->styleTable = '';
     $table->head[0] = "<span title='".__('Policy')."'>".__('P.').'</span>';
     $table->head[1] = __('Name');
     $table->head[2] = __('Description');
diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php
index 4fcd3d2d5b..27f81b1f43 100644
--- a/pandora_console/godmode/agentes/modificar_agente.php
+++ b/pandora_console/godmode/agentes/modificar_agente.php
@@ -302,93 +302,122 @@ foreach ($pre_fields as $key => $value) {
 
 // Filter table.
 $filterTable = new stdClass();
-$filterTable->class = 'fixed_filter_bar';
+$filterTable->class = 'filter-table-adv w100p';
+$filterTable->size[0] = '20%';
+$filterTable->size[1] = '20%';
+$filterTable->size[2] = '20%';
+$filterTable->size[3] = '20%';
+$filterTable->size[4] = '20%';
 $filterTable->data = [];
-$filterTable->cellstyle[0][0] = 'width:0';
-$filterTable->cellstyle[0][1] = 'width:0';
-$filterTable->cellstyle[0][2] = 'width:0';
-$filterTable->cellstyle[0][3] = 'width:0';
 
-$filterTable->data[0][0] = __('Group');
-$filterTable->data[1][0] = html_print_select_groups(
-    false,
-    'AR',
-    $return_all_group,
-    'ag_group',
-    $ag_group,
-    'this.form.submit();',
-    '',
-    0,
-    true,
-    false,
-    true,
-    '',
-    false
+$filterTable->data[0][0] = html_print_label_input_block(
+    __('Group'),
+    html_print_select_groups(
+        false,
+        'AR',
+        $return_all_group,
+        'ag_group',
+        $ag_group,
+        'this.form.submit();',
+        '',
+        0,
+        true,
+        false,
+        true,
+        '',
+        false
+    )
 );
 
-$filterTable->data[0][1] = __('Recursion');
-$filterTable->data[1][1] = html_print_checkbox_switch(
-    'recursion',
-    1,
-    $recursion,
-    true,
-    false,
-    'this.form.submit()'
+$filterTable->data[0][1] = html_print_label_input_block(
+    __('Recursion'),
+    '<div class="mrgn_top_10px">'.html_print_checkbox_switch(
+        'recursion',
+        1,
+        $recursion,
+        true,
+        false,
+        'this.form.submit()'
+    ).'</div>'
 );
 
-$filterTable->data[0][2] = __('Show agents');
-$filterTable->data[1][2] = html_print_select(
-    $showAgentFields,
-    'disabled',
-    $disabled,
-    'this.form.submit()',
-    '',
-    0,
-    true
+$filterTable->data[0][2] = html_print_label_input_block(
+    __('Show agents'),
+    html_print_select(
+        $showAgentFields,
+        'disabled',
+        $disabled,
+        'this.form.submit()',
+        '',
+        0,
+        true,
+        false,
+        true,
+        'w100p',
+        false,
+        'width: 100%'
+    )
 );
 
-$filterTable->data[0][3] = __('Operating System');
-$filterTable->data[1][3] = html_print_select(
-    $fields,
-    'os',
-    $os,
-    'this.form.submit()',
-    'All',
-    0,
-    true
+$filterTable->data[0][3] = html_print_label_input_block(
+    __('Operating System'),
+    html_print_select(
+        $fields,
+        'os',
+        $os,
+        'this.form.submit()',
+        'All',
+        0,
+        true,
+        false,
+        true,
+        'w100p',
+        false,
+        'width: 100%'
+    )
 );
 
-$filterTable->data[0][4] = __('Free search');
-$filterTable->data[0][4] .= ui_print_help_tip(
-    __('Search filter by alias, name, description, IP address or custom fields content'),
-    true
-);
-$filterTable->data[1][4] = html_print_input_text(
-    'search',
-    $search,
-    '',
-    12,
-    255,
-    true
+$filterTable->data[0][4] = html_print_label_input_block(
+    __('Free search').ui_print_help_tip(
+        __('Search filter by alias, name, description, IP address or custom fields content'),
+        true
+    ),
+    html_print_input_text(
+        'search',
+        $search,
+        '',
+        12,
+        255,
+        true
+    )
 );
 
-$filterTable->cellstyle[1][5] = 'vertical-align: bottom';
-$filterTable->data[1][5] = html_print_submit_button(
+$filterTable->colspan[1][0] = 5;
+$filterTable->data[1][0] = html_print_submit_button(
     __('Filter'),
     'srcbutton',
     false,
     [
         'icon'  => 'search',
-        'class' => 'float-right',
-        'mode'  => 'secondary mini',
+        'class' => 'float-right mrgn_right_10px',
+        'mode'  => 'mini',
     ],
     true
 );
 
 // Print filter table.
-echo '<form method=\'post\'	action=\'index.php?sec=gagente&sec2=godmode/agentes/modificar_agente\'>';
-html_print_table($filterTable);
-echo '</form>';
+$form = '<form method=\'post\'	action=\'index.php?sec=gagente&sec2=godmode/agentes/modificar_agente\'>';
+ui_toggle(
+    $form.html_print_table($filterTable, true).'</form>',
+    '<span class="subsection_header_title">'.__('Filter').'</span>',
+    __('Filter'),
+    'filter',
+    true,
+    false,
+    '',
+    'white-box-content no_border',
+    'filter-datatable-main box-flat white_table_graph fixed_filter_bar'
+);
 
 // Data table.
 $selected = true;
@@ -765,7 +794,7 @@ if ($agents !== false) {
         // Agent name column (1). Agent name.
         $agentNameColumn = html_print_anchor(
             [
-                'href'    => ui_get_full_url($agentNameUrl),
+                'href'    => ui_get_full_url($agentViewUrl),
                 'title'   => $agent['nombre'],
                 'content' => ui_print_truncate_text($agent['alias'], 'agent_medium').implode('', $additionalDataAgentName),
             ],
@@ -837,7 +866,6 @@ if ($agents !== false) {
         // Operating System icon column.
         $osIconColumn = html_print_div(
             [
-                'class'   => 'main_menu_icon invert_filter',
                 'content' => ui_print_os_icon($agent['id_os'], false, true),
             ],
             true
@@ -856,7 +884,6 @@ if ($agents !== false) {
         // Group icon and name column.
         $agentGroupIconColumn = html_print_div(
             [
-                'class'   => 'main_menu_icon invert_filter',
                 'content' => ui_print_group_icon($agent['id_grupo'], true),
             ],
             true
@@ -878,12 +905,12 @@ if ($agents !== false) {
             $agentDisableEnableTitle = __('Enable agent');
             $agentDisableEnableAction = 'enable_agent';
             $agentDisableEnableCaption = __('You are going to enable a cluster agent. Are you sure?');
-            $agentDisableEnableIcon = 'change-pause.svg';
+            $agentDisableEnableIcon = 'change-active.svg';
         } else {
             $agentDisableEnableTitle = __('Disable agent');
             $agentDisableEnableAction = 'disable_agent';
             $agentDisableEnableCaption = __('You are going to disable a cluster agent. Are you sure?');
-            $agentDisableEnableIcon = 'change-active.svg';
+            $agentDisableEnableIcon = 'change-pause.svg';
         }
 
         $agentActionButtons[] = html_print_menu_button(
diff --git a/pandora_console/godmode/agentes/module_manager.php b/pandora_console/godmode/agentes/module_manager.php
index bc544b2861..02dbd4c600 100644
--- a/pandora_console/godmode/agentes/module_manager.php
+++ b/pandora_console/godmode/agentes/module_manager.php
@@ -1071,30 +1071,53 @@ if ((bool) check_acl_one_of_groups($config['id_user'], $all_groups, 'AW') === tr
     echo '</form>';
 }
 
-$modalCreateModule = '<form name="create_module_form" method="post">';
-$input_type = html_print_input_hidden('edit_module', 1, true);
-$input_type .= html_print_select(
-    policies_type_modules_availables($sec2),
-    'moduletype',
-    '',
-    '',
-    '',
-    '',
-    true,
-    false,
-    false,
-    '',
-    false,
-    'max-width:300px;'
+// Form table for Module creation.
+$createModuleTable = new stdClass();
+$createModuleTable->id = 'module_creation_modal';
+$createModuleTable->class = 'filter-table-adv';
+$createModuleTable->data = [];
+
+$createModuleTable->data[0][] = html_print_label_input_block(
+    __('Select module type'),
+    html_print_select(
+        policies_type_modules_availables($sec2),
+        'moduletype',
+        '',
+        '',
+        '',
+        '',
+        true,
+        false,
+        false,
+        '',
+        false,
+        'max-width:300px;'
+    )
 );
 
-$modalCreateModule .= $input_type;
+$createModuleTable->data[1][] = html_print_label_input_block(
+    '',
+    html_print_anchor(
+        [
+            'href'    => 'https://pandorafms.com/Library/Library/',
+            'class'   => 'color-black-grey invert_filter',
+            'content' => __('Get more modules on Monitoring Library'),
+        ],
+        true
+    )
+);
+
+$createModuleFormTable = html_print_input_hidden('edit_module', 1, true);
+$createModuleFormTable .= html_print_table($createModuleTable, true);
+// Form definition.
+$modalCreateModule = '<form name="create_module_form" method="post">';
+$modalCreateModule .= $createModuleFormTable;
 $modalCreateModule .= html_print_div(
     [
-        'class'   => 'action-buttons',
+        'class'   => 'action-buttons-right-forced',
         'content' => html_print_submit_button(
             __('Create'),
-            'create_module',
+            'modal_button_create',
             false,
             [
                 'icon' => 'next',
@@ -1119,7 +1142,6 @@ html_print_div(
 <script type="text/javascript">
 
     function create_module_dialog(){
-        console.log('Entra');
         $('#modal').dialog({
             title: '<?php echo __('Create Module'); ?>',
             resizable: true,
diff --git a/pandora_console/godmode/agentes/module_manager_editor_common.php b/pandora_console/godmode/agentes/module_manager_editor_common.php
index 2cceb5fa34..b30f3d4c2c 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_common.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_common.php
@@ -444,79 +444,76 @@ $tableBasicThresholds->data = [];
 $tableBasicThresholds->rowclass['caption_warning_threshold'] = 'field_half_width pdd_t_10px';
 $tableBasicThresholds->rowclass['warning_threshold'] = 'field_half_width';
 $tableBasicThresholds->data['caption_warning_threshold'][0] .= __('Warning threshold').'&nbsp;';
-if ($edit_module === false && (isset($stringTypeModule) === false || $stringTypeModule === false)) {
-    $tableBasicThresholds->data['caption_warning_threshold'][0] .= '<span class="font_11" id="caption_minmax_warning">('.__('Min / Max').')</span>';
-    $tableBasicThresholds->data['warning_threshold'][0] .= html_print_input_text(
-        'min_warning',
-        $min_warning,
-        '',
-        10,
-        255,
-        true,
-        $disabledBecauseInPolicy || $edit === true,
-        false,
-        '',
-        $classdisabledBecauseInPolicy
-    );
-    $tableBasicThresholds->data['warning_threshold'][1] .= html_print_input_text(
-        'max_warning',
-        $max_warning,
-        '',
-        10,
-        255,
-        true,
-        $disabledBecauseInPolicy || $edit === true,
-        false,
-        '',
-        $classdisabledBecauseInPolicy
-    ).'</span>';
 
-    $tableBasicThresholds->data['switch_warning_threshold'][0] .= html_print_switch_radio_button(
-        [
-            html_print_radio_button_extended('warning_thresholds_checks', 'normal_warning', __('Normal'), ($percentage_warning && $warning_inverse) === false, false, '', '', true, false, '', 'radius-normal_warning'),
-            html_print_radio_button_extended('warning_thresholds_checks', 'warning_inverse', __('Inverse interval'), $warning_inverse, $disabledBecauseInPolicy, '', '', true, false, '', 'radius-warning_inverse'),
-            html_print_radio_button_extended('warning_thresholds_checks', 'percentage_warning', __('Percentage'), $percentage_warning, $disabledBecauseInPolicy, '', '', true, false, '', 'radius-percentage_warning'),
-        ],
-        [ 'class' => 'margin-top-10' ],
-        true
-    );
-}
+$tableBasicThresholds->data['caption_warning_threshold'][0] .= '<span class="font_11" id="caption_minmax_warning">('.__('Min / Max').')</span>';
+$tableBasicThresholds->data['warning_threshold'][0] .= html_print_input_text(
+    'min_warning',
+    $min_warning,
+    '',
+    10,
+    255,
+    true,
+    $disabledBecauseInPolicy || $edit === true,
+    false,
+    '',
+    $classdisabledBecauseInPolicy
+);
+$tableBasicThresholds->data['warning_threshold'][1] .= html_print_input_text(
+    'max_warning',
+    $max_warning,
+    '',
+    10,
+    255,
+    true,
+    $disabledBecauseInPolicy || $edit === true,
+    false,
+    '',
+    $classdisabledBecauseInPolicy
+).'</span>';
 
-if ($edit_module === false && isset($stringTypeModule) === true && $stringTypeModule === true) {
-    $basicThresholdsIntervalWarning = [];
-    $basicThresholdsIntervalWarning[] = '<span>'.__('Inverse interval').'</span>';
-    $basicThresholdsIntervalWarning[] = html_print_checkbox_switch(
-        'warning_inverse_string',
-        1,
-        $warning_inverse,
-        true,
-        $disabledBecauseInPolicy
-    );
+$tableBasicThresholds->data['switch_warning_threshold'][0] .= html_print_switch_radio_button(
+    [
+        html_print_radio_button_extended('warning_thresholds_checks', 'normal_warning', __('Normal'), ($percentage_warning && $warning_inverse) === false, false, '', '', true, false, '', 'radius-normal_warning'),
+        html_print_radio_button_extended('warning_thresholds_checks', 'warning_inverse', __('Inverse interval'), $warning_inverse, $disabledBecauseInPolicy, '', '', true, false, '', 'radius-warning_inverse'),
+        html_print_radio_button_extended('warning_thresholds_checks', 'percentage_warning', __('Percentage'), $percentage_warning, $disabledBecauseInPolicy, '', '', true, false, '', 'radius-percentage_warning'),
+    ],
+    [ 'class' => 'margin-top-10' ],
+    true
+);
 
-    $tableBasicThresholds->rowclass['caption_switch_warning_inverse_string'] = 'field_half_width';
-    $tableBasicThresholds->data['caption_switch_warning_inverse_string'][0] = html_print_div(
-        [
-            'class'   => 'margin-top-10',
-            'style'   => 'display: flex; flex-direction: row-reverse; align-items: center;',
-            'content' => implode('', $basicThresholdsIntervalWarning),
-        ],
-        true
-    );
+$basicThresholdsIntervalWarning = [];
+$basicThresholdsIntervalWarning[] = '<span>'.__('Inverse interval').'</span>';
+$basicThresholdsIntervalWarning[] = html_print_checkbox_switch(
+    'warning_inverse_string',
+    1,
+    $warning_inverse,
+    true,
+    $disabledBecauseInPolicy
+);
 
-    $tableBasicThresholds->data['caption_warning_threshold'][0] .= '<span class="font_11" id="caption_str_warning">('.__('Str.').')</span>';
-    $tableBasicThresholds->data['warning_threshold'][0] .= html_print_input_text(
-        'str_warning',
-        str_replace('"', '', $str_warning),
-        '',
-        10,
-        1024,
-        true,
-        $disabledBecauseInPolicy || $edit === false,
-        false,
-        '',
-        $classdisabledBecauseInPolicy
-    ).'</span>';
-}
+$tableBasicThresholds->rowclass['caption_switch_warning_inverse_string'] = 'field_half_width';
+$tableBasicThresholds->data['caption_switch_warning_inverse_string'][0] = html_print_div(
+    [
+        'class'   => 'margin-top-10',
+        'style'   => 'display: flex; flex-direction: row-reverse; align-items: center;',
+        'content' => implode('', $basicThresholdsIntervalWarning),
+    ],
+    true
+);
+
+$tableBasicThresholds->data['caption_warning_threshold'][0] .= '<span class="font_11" id="caption_str_warning">('.__('Str.').')</span>';
+$tableBasicThresholds->data['warning_threshold'][0] .= html_print_input_text(
+    'str_warning',
+    str_replace('"', '', $str_warning),
+    '',
+    10,
+    1024,
+    true,
+    $disabledBecauseInPolicy || $edit === false,
+    false,
+    '',
+    $classdisabledBecauseInPolicy
+).'</span>';
 
 
 $tableBasicThresholds->data['switch_warning_threshold'][0] .= html_print_div(
@@ -531,87 +528,84 @@ $tableBasicThresholds->data['switch_warning_threshold'][0] .= html_print_div(
 $tableBasicThresholds->rowclass['caption_critical_threshold'] = 'field_half_width pdd_t_10px';
 $tableBasicThresholds->rowclass['critical_threshold'] = 'field_half_width';
 $tableBasicThresholds->data['caption_critical_threshold'][0] .= __('Critical threshold').'&nbsp;';
-if ($edit_module === false && (isset($stringTypeModule) === false || $stringTypeModule === false)) {
-    $tableBasicThresholds->data['caption_critical_threshold'][0] .= '<span class="font_11" id="caption_minmax_critical">('.__('Min / Max').')</span>';
-    $tableBasicThresholds->data['critical_threshold'][0] .= html_print_input_text(
-        'min_critical',
-        $min_critical,
-        '',
-        10,
-        255,
-        true,
-        $disabledBecauseInPolicy || $edit === false,
-        false,
-        '',
-        $classdisabledBecauseInPolicy
-    );
-    $tableBasicThresholds->data['critical_threshold'][1] .= html_print_input_text(
-        'max_critical',
-        $max_critical,
-        '',
-        10,
-        255,
-        true,
-        $disabledBecauseInPolicy || $edit === false,
-        false,
-        '',
-        $classdisabledBecauseInPolicy
-    ).'</span>';
+$tableBasicThresholds->data['caption_critical_threshold'][0] .= '<span class="font_11" id="caption_minmax_critical">('.__('Min / Max').')</span>';
+$tableBasicThresholds->data['critical_threshold'][0] .= html_print_input_text(
+    'min_critical',
+    $min_critical,
+    '',
+    10,
+    255,
+    true,
+    $disabledBecauseInPolicy || $edit === false,
+    false,
+    '',
+    $classdisabledBecauseInPolicy
+);
+$tableBasicThresholds->data['critical_threshold'][1] .= html_print_input_text(
+    'max_critical',
+    $max_critical,
+    '',
+    10,
+    255,
+    true,
+    $disabledBecauseInPolicy || $edit === false,
+    false,
+    '',
+    $classdisabledBecauseInPolicy
+).'</span>';
 
-    $tableBasicThresholds->data['switch_critical_threshold'][0] .= html_print_switch_radio_button(
-        [
-            html_print_radio_button_extended('critical_thresholds_checks', 'normal_critical', __('Normal'), ($percentage_critical && $critical_inverse) === false, false, '', '', true, false, '', 'radius-normal_critical'),
-            html_print_radio_button_extended('critical_thresholds_checks', 'critical_inverse', __('Inverse interval'), $critical_inverse, $disabledBecauseInPolicy, '', '', true, false, '', 'radius-critical_inverse'),
-            html_print_radio_button_extended('critical_thresholds_checks', 'percentage_critical', __('Percentage'), $percentage_critical, $disabledBecauseInPolicy, '', '', true, false, '', 'radius-percentage_critical'),
-        ],
-        [ 'class' => 'margin-top-10' ],
-        true
-    );
-}
+$tableBasicThresholds->data['switch_critical_threshold'][0] .= html_print_switch_radio_button(
+    [
+        html_print_radio_button_extended('critical_thresholds_checks', 'normal_critical', __('Normal'), ($percentage_critical && $critical_inverse) === false, false, '', '', true, false, '', 'radius-normal_critical'),
+        html_print_radio_button_extended('critical_thresholds_checks', 'critical_inverse', __('Inverse interval'), $critical_inverse, $disabledBecauseInPolicy, '', '', true, false, '', 'radius-critical_inverse'),
+        html_print_radio_button_extended('critical_thresholds_checks', 'percentage_critical', __('Percentage'), $percentage_critical, $disabledBecauseInPolicy, '', '', true, false, '', 'radius-percentage_critical'),
+    ],
+    [ 'class' => 'margin-top-10' ],
+    true
+);
 
-if ($edit_module === false && isset($stringTypeModule) === true && $stringTypeModule === true) {
-    $basicThresholdsIntervalCritical = [];
-    $basicThresholdsIntervalCritical[] = '<span>'.__('Inverse interval').'</span>';
-    $basicThresholdsIntervalCritical[] = html_print_checkbox_switch(
-        'critical_inverse_string',
-        1,
-        $critical_inverse,
-        true,
-        $disabledBecauseInPolicy
-    );
 
-    $tableBasicThresholds->rowclass['caption_switch_critical_inverse_string'] = 'field_half_width';
-    $tableBasicThresholds->data['caption_switch_critical_inverse_string'][0] = html_print_div(
-        [
-            'class'   => 'margin-top-10',
-            'style'   => 'display: flex; flex-direction: row-reverse; align-items: center;',
-            'content' => implode('', $basicThresholdsIntervalCritical),
-        ],
-        true
-    );
+$basicThresholdsIntervalCritical = [];
+$basicThresholdsIntervalCritical[] = '<span>'.__('Inverse interval').'</span>';
+$basicThresholdsIntervalCritical[] = html_print_checkbox_switch(
+    'critical_inverse_string',
+    1,
+    $critical_inverse,
+    true,
+    $disabledBecauseInPolicy
+);
 
-    $tableBasicThresholds->data['switch_critical_threshold'][0] .= html_print_div(
-        [
-            'id'      => 'percentage_critical',
-            'content' => $divPercentageContent,
-        ],
-        true
-    );
+$tableBasicThresholds->rowclass['caption_switch_critical_inverse_string'] = 'field_half_width';
+$tableBasicThresholds->data['caption_switch_critical_inverse_string'][0] = html_print_div(
+    [
+        'class'   => 'margin-top-10',
+        'style'   => 'display: flex; flex-direction: row-reverse; align-items: center;',
+        'content' => implode('', $basicThresholdsIntervalCritical),
+    ],
+    true
+);
 
-    $tableBasicThresholds->data['caption_critical_threshold'][0] .= '<span class="font_11" id="caption_str_critical">('.__('Str.').')</span>';
-    $tableBasicThresholds->data['critical_threshold'][0] .= html_print_input_text(
-        'str_critical',
-        str_replace('"', '', $str_critical),
-        '',
-        10,
-        1024,
-        true,
-        $disabledBecauseInPolicy,
-        false,
-        '',
-        $classdisabledBecauseInPolicy
-    );
-}
+$tableBasicThresholds->data['switch_critical_threshold'][0] .= html_print_div(
+    [
+        'id'      => 'percentage_critical',
+        'content' => $divPercentageContent,
+    ],
+    true
+);
+
+$tableBasicThresholds->data['caption_critical_threshold'][0] .= '<span class="font_11" id="caption_str_critical">('.__('Str.').')</span>';
+$tableBasicThresholds->data['critical_threshold'][0] .= html_print_input_text(
+    'str_critical',
+    str_replace('"', '', $str_critical),
+    '',
+    10,
+    1024,
+    true,
+    $disabledBecauseInPolicy,
+    false,
+    '',
+    $classdisabledBecauseInPolicy
+);
 
 $table_simple->rowstyle['thresholds_table'] = 'margin-top: 15px;height: 340px;width: 100%';
 $table_simple->cellclass['thresholds_table'][0] = 'table_section half_section_left';
@@ -1622,6 +1616,11 @@ ui_require_jquery_file('json');
 /* <![CDATA[ */
 $(document).ready (function () {
     var disabledBecauseInPolicy = <?php echo '\''.((empty($disabledBecauseInPolicy) === true) ? '0' : '1').'\''; ?>;
+    var idModuleType  = '<?php echo $type_names_hash[$id_module_type]; ?>';
+    if (idModuleType != '') {
+        setModuleType(idModuleType);
+    }
+
     $("#right").click (function () {
         jQuery.each($("select[name='id_tag_available[]'] option:selected"), function (key, value) {
             tag_name = $(value).html();
@@ -1906,77 +1905,50 @@ $(document).ready (function () {
 
     $('.switch_radio_button label').on('click', function(){
         var thisLabel = $(this).attr('for');
-        $('#'+thisLabel).attr('checked', 'checked');
-        $('#'+thisLabel).siblings().attr('checked', false);
+        $('#'+thisLabel).prop('checked', true);
+        $('#'+thisLabel).siblings().prop('checked', false);
         
-        if ($('#radius-warning_inverse').prop('checked') === true) {
-            //$('#percentage_warning').hide();
-            $("#svg_dinamic").show();
-        }
-
-        if ($('#radius-critical_inverse').prop('checked') === true) {
-            //$('#percentage_critical').hide();
+        if ($('#radius-percentage_warning').prop('checked') === true || $('#radius-percentage_critical').prop('checked') === true) {
+            $("#svg_dinamic").hide();
+        } else {
+            paint_graph_values();
             $("#svg_dinamic").show();
         }
 
         if ($('#radius-percentage_warning').prop('checked') === true) {
-            //$('#warning_inverse').hide();
-            $("#svg_dinamic").hide();
+            $('#radius-warning_inverse').hide();
+            $('#label-radius-warning_inverse').hide();
         }
 
+        if ($('#radius-warning_inverse').prop('checked') === true) {
+            $('#radius-percentage_warning').hide();
+            $('#label-radius-percentage_warning').hide();
+        }
+
+        if ($('#radius-normal_warning').prop('checked') === true) {
+            $('#radius-warning_inverse').show();
+            $('#label-radius-warning_inverse').show();
+            $('#radius-percentage_warning').show();
+            $('#label-radius-percentage_warning').show();
+        }
+
+
         if ($('#radius-percentage_critical').prop('checked') === true) {
-            //$('#critical_inverse').hide();
-            $("#svg_dinamic").hide();
+            $('#radius-critical_inverse').hide();
+            $('#label-radius-critical_inverse').hide();
         }
 
-        $('#radius-warning_inverse').change (function() {
-            paint_graph_values();
-            if ($('#radius-warning_inverse').prop('checked') === true){
-                $('#radius-percentage_warning').prop('checked', false);
-                $('#percentage_warning').attr('onClick', 'return false;');
-                $('#percentage_warning>em').addClass('color_666');
-            } else {
-                $('#percentage_warning').removeAttr('onClick');
-                $('#percentage_warning>em').removeClass('color_666');
-            }
-        });
+        if ($('#radius-critical_inverse').prop('checked') === true) {
+            $('#radius-percentage_critical').hide();
+            $('#label-radius-percentage_critical').hide();
+        }
 
-        $('#radius-critical_inverse').change (function() {
-            paint_graph_values();
-
-            if ($('#radius-critical_inverse').prop('checked') === true){
-                $('#radius-percentage_critical').prop('checked', false);
-                $('#percentage_critical').attr('onClick', 'return false;');
-                $('#percentage_critical>em').addClass('color_666');
-            } else {
-                $('#percentage_critical').removeAttr('onClick');
-                $('#percentage_critical>em').removeClass('color_666');
-            }
-        });
-
-        $('#radius-percentage_warning').change (function() {
-            paint_graph_values();
-            if ($('#radius-percentage_warning').prop('checked') === true){
-                $('#radius-warning_inverse').prop('checked', false);
-                $('#warning_inverse').attr('onClick', 'return false;');
-                $('#warning_inverse>em').addClass('color_666');
-            } else {
-                $('#warning_inverse').removeAttr('onClick');
-                $('#warning_inverse>em').removeClass('color_666');
-            }
-        });
-
-        $('#radius-percentage_critical').change (function() {
-            paint_graph_values();
-            if ($('#radius-percentage_critical').prop('checked') === true){
-                $('#radius-critical_inverse').prop('checked', false);
-                $('#critical_inverse').attr('onClick', 'return false;');
-                $('#critical_inverse>em').addClass('color_666');
-            } else {
-                $('#critical_inverse').removeAttr('onClick');
-                $('#critical_inverse>em').removeClass('color_666');
-            }
-        });
+        if ($('#radius-normal_critical').prop('checked') === true) {
+            $('#radius-critical_inverse').show();
+            $('#label-radius-critical_inverse').show();
+            $('#radius-percentage_critical').show();
+            $('#label-radius-percentage_critical').show();
+        }
     });
 
     
@@ -2235,91 +2207,66 @@ function validate_post_process() {
     }
 }
 
-//function paint graph
+//function paint graph.
 function paint_graph_values(){
-    //Parse integrer
     var min_w = parseFloat($('#text-min_warning').val());
-        if(min_w == '0.00'){ min_w = 0; }
-    var max_w = parseFloat($('#text-max_warning').val());
-        if(max_w == '0.00'){ max_w = 0; }
-    var min_c = parseFloat($('#text-min_critical').val());
-        if(min_c =='0.00'){ min_c = 0; }
-    var max_c = parseFloat($('#text-max_critical').val());
-        if(max_c =='0.00'){ max_c = 0; }
-    var inverse_w = $('input:radio[name=warning_inverse]:checked').val();
-        if(!inverse_w){ inverse_w = 0; }
-    var inverse_c = $('input:radio[name=critical_inverse]:checked').val();
-        if(!inverse_c){ inverse_c = 0; }
+    if(min_w == '0.00' || isNaN(min_w)){ min_w = 0; }
 
-    //inicialiced error
+    var max_w = parseFloat($('#text-max_warning').val());
+    if(max_w == '0.00' || isNaN(max_w)){ max_w = 0; }
+
+    var min_c = parseFloat($('#text-min_critical').val());
+    if(min_c =='0.00' || isNaN(min_c)){ min_c = 0; }
+
+    var max_c = parseFloat($('#text-max_critical').val());
+    if(max_c =='0.00' || isNaN(max_c)){ max_c = 0; }
+
+    var inverse_w = $('input:radio[value=warning_inverse]:checked').val();
+    if(!inverse_w){ inverse_w = 0; }
+
+    var inverse_c = $('input:radio[value=critical_inverse]:checked').val();
+    if(!inverse_c){ inverse_c = 0; }
+
+    //inicialiced error.
     var error_w = 0;
     var error_c = 0;
-    //messages legend
+
+    //messages legend.
     var legend_normal = '<?php echo __('Normal Status'); ?>';
     var legend_warning = '<?php echo __('Warning Status'); ?>';
     var legend_critical = '<?php echo __('Critical Status'); ?>';
-    //messages error
+
+    //messages error.
     var message_error_warning = '<?php echo __('Please introduce a maximum warning higher than the minimun warning'); ?>';
     var message_error_critical = '<?php echo __('Please introduce a maximum critical higher than the minimun critical'); ?>';
     var message_error_percentage = '<?php echo __('Please introduce a positive percentage value'); ?>';
-
-
-    //Percentage selector
-    var percentage_w = $('#checkbox-percentage_warning').prop('checked');
-    var percentage_c = $('#checkbox-percentage_critical').prop('checked');
-
-    if(percentage_w == true || percentage_c == true) {
-        d3.select("#svg_dinamic rect").remove();
-        //create svg
-        var svg = d3.select("#svg_dinamic");
-        svg.selectAll("g").remove();
-        if (percentage_w === true) {
-            if(max_w < 0 || min_w < 0) {
-                paint_graph_status(0,0,0,0,0,0,1,0,legend_normal,legend_warning,legend_critical,message_error_percentage,message_error_percentage);
-            } else {
-                $("#text-max_warning").removeClass("input_error");
-                $("#text-min_warning").removeClass("input_error");
-            }
-            
-        }
-
-        if(percentage_c === true) {
-            if(max_c < 0 || min_c < 0) {
-                paint_graph_status(0,0,0,0,0,0,0,1,legend_normal,legend_warning,legend_critical,message_error_percentage,message_error_percentage);
-            } else {
-                $("#text-min-critical").removeClass("input_error");
-                $("#text-max_critical").removeClass("input_error");
-
-            }
-            } 
-
-        return;
-
-    } else {
-        $('#svg_dinamic').show();
-    }
     
     //if haven't error
     if(max_w == 0 || max_w > min_w){
         if(max_c == 0 || max_c > min_c){
-            paint_graph_status(min_w, max_w, min_c, max_c, inverse_w, 
-                                inverse_c, error_w, error_c,
-                                legend_normal, legend_warning, legend_critical,
-                                message_error_warning, message_error_critical);
+            paint_graph_status(
+                min_w, max_w, min_c, max_c, inverse_w, 
+                inverse_c, error_w, error_c,
+                legend_normal, legend_warning, legend_critical,
+                message_error_warning, message_error_critical
+            );
         } else {
             error_c = 1;
-            paint_graph_status(0,0,0,0,0,0, error_w, error_c,
-                            legend_normal, legend_warning, legend_critical,
-                            message_error_warning, message_error_critical);
+            paint_graph_status(
+                0,0,0,0,0,0, error_w, error_c,
+                legend_normal, legend_warning, legend_critical,
+                message_error_warning, message_error_critical
+            );
         }
     } else {
         error_w = 1;
-        paint_graph_status(0,0,0,0,0,0, error_w, error_c, 
-                            legend_normal, legend_warning, legend_critical,
-                            message_error_warning, message_error_critical);
+        paint_graph_status(
+            0,0,0,0,0,0, error_w, error_c, 
+            legend_normal, legend_warning, legend_critical,
+            message_error_warning, message_error_critical
+        );
     }
 }
-/* End of relationship javascript */
 
 /* ]]> */
 </script>
diff --git a/pandora_console/godmode/alerts/alert_list.builder.php b/pandora_console/godmode/alerts/alert_list.builder.php
index 74120d36c8..4844e5c443 100644
--- a/pandora_console/godmode/alerts/alert_list.builder.php
+++ b/pandora_console/godmode/alerts/alert_list.builder.php
@@ -123,7 +123,7 @@ $table->data[1][0] = html_print_label_input_block(
         'w100p',
         false,
         'width: 100%;'
-    ).'<span id="advanced_action" class="advanced_actions invisible"><br>'.__('Number of alerts match from').' '.html_print_input_text('fires_min', '', '', 4, 10, true).' '.__('to').' '.html_print_input_text('fires_max', '', '', 4, 10, true).'</span>'.$create_action
+    ).'<span id="advanced_action" class="advanced_actions invisible"><br>'.__('Number of alerts match from').' '.html_print_input_text('fires_min', '', '', 4, 10, true).' '.__('to').' '.html_print_input_text('fires_max', '', '', 4, 10, true).'</span><div class="flex_justify_end">'.$create_action.'</div>'
 );
 
 $own_info = get_user_info($config['id_user']);
@@ -162,7 +162,7 @@ $table->data[1][1] = html_print_label_input_block(
         'w100p',
         false,
         'width: 100%;'
-    ).' <a class="template_details invisible" href="#">'.html_print_image('images/zoom.png', true, ['class' => 'img_help']).'</a>'.$create_template
+    ).' <a class="template_details invisible" href="#">'.html_print_image('images/zoom.png', true, ['class' => 'img_help']).'</a><div class="flex_justify_end">'.$create_template.'</div>'
 );
 
 $table->data[2][0] = html_print_label_input_block(
diff --git a/pandora_console/godmode/alerts/alert_list.list.php b/pandora_console/godmode/alerts/alert_list.list.php
index 45003b2bc0..c11e3631a7 100644
--- a/pandora_console/godmode/alerts/alert_list.list.php
+++ b/pandora_console/godmode/alerts/alert_list.list.php
@@ -672,14 +672,14 @@ foreach ($simple_alerts as $alert) {
         '[&hellip;]',
         ''
     );
-    $data[2] .= ' <a class="template_details patatas"
+    $data[2] .= ' <a class="template_details"
 		href="'.ui_get_full_url(false, false, false, false).'ajax.php?page=godmode/alerts/alert_templates&get_template_tooltip=1&id_template='.$alert['id_alert_template'].'">';
         $data[2] .= html_print_image(
-            'images/zoom.png',
+            'images/details.svg',
             true,
             [
                 'id'    => 'template-details-'.$alert['id_alert_template'],
-                'class' => 'img_help action_button_img invert_filter',
+                'class' => 'img_help main_menu_icon invert_filter',
             ]
         );
     $data[2] .= '</a> ';
@@ -753,11 +753,11 @@ foreach ($simple_alerts as $alert) {
                 'delete',
                 'images/delete.svg',
                 1,
-                'padding:0px; margin-left:5px; margin-right:5px;',
+                'padding:0px; margin-left:5px; margin-right:5px; width: 22px;',
                 true,
                 [
                     'title' => __('Delete action'),
-                    'class' => 'action_button_img invert_filter',
+                    'class' => 'main_menu_icon invert_filter',
                 ]
             );
             $data[3] .= html_print_input_hidden('delete_action', 1, true);
@@ -772,7 +772,7 @@ foreach ($simple_alerts as $alert) {
                 true,
                 [
                     'title'   => __('Update action'),
-                    'class'   => 'action_button_img invert_filter',
+                    'class'   => 'main_menu_icon invert_filter',
                     'onclick' => 'show_display_update_action(\''.$action['id'].'\',\''.$alert['id'].'\',\''.$alert['id_agent_module'].'\',\''.$action_id.'\',\''.$alert['id_agent_module'].'\')',
                 ]
             );
@@ -913,7 +913,7 @@ foreach ($simple_alerts as $alert) {
             'enable',
             'images/lightbulb_off.png',
             1,
-            'padding:0px',
+            'padding:0px; width: 22px; height: 22px;',
             true,
             ['class' => 'filter_none main_menu_icon']
         );
@@ -923,7 +923,7 @@ foreach ($simple_alerts as $alert) {
             'disable',
             'images/lightbulb.png',
             1,
-            'padding:0px;',
+            'padding:0px; width: 22px; height: 22px;',
             true,
             ['class' => 'main_menu_icon']
         );
@@ -941,7 +941,7 @@ foreach ($simple_alerts as $alert) {
                 'standby_off',
                 'images/bell.png',
                 1,
-                'padding:0px;',
+                'padding:0px; width: 22px; height: 22px;',
                 true,
                 ['class' => 'invert_filter main_menu_icon']
             );
@@ -951,7 +951,7 @@ foreach ($simple_alerts as $alert) {
                 'standby_on',
                 'images/bell_pause.png',
                 1,
-                'padding:0px;',
+                'padding:0px; width: 22px; height: 22px;',
                 true,
                 ['class' => 'invert_filter main_menu_icon']
             );
diff --git a/pandora_console/godmode/alerts/alert_list.php b/pandora_console/godmode/alerts/alert_list.php
index 55f786c3c2..23371066c4 100644
--- a/pandora_console/godmode/alerts/alert_list.php
+++ b/pandora_console/godmode/alerts/alert_list.php
@@ -484,7 +484,7 @@ if (is_metaconsole() === false) {
         $buttons = [
             'list'    => [
                 'active' => false,
-                'text'   => '<a href="index.php?sec=galertas&sec2=godmode/alerts/alert_list&tab=list&pure='.$pure.'">'.html_print_image('images/load@svg.svg', true, ['title' => __('List alerts'), 'class' => 'main_menu_icon invert_filter']).'</a>',
+                'text'   => '<a href="index.php?sec=galertas&sec2=godmode/alerts/alert_list&tab=list&pure='.$pure.'">'.html_print_image('images/logs@svg.svg', true, ['title' => __('List alerts'), 'class' => 'main_menu_icon invert_filter']).'</a>',
             ],
             'builder' => [
                 'active' => false,
@@ -497,44 +497,46 @@ if (is_metaconsole() === false) {
         $buttons = '';
     }
 
-    if ($tab === 'list') {
-        ui_print_standard_header(
-            __('Alerts'),
-            'images/gm_alerts.png',
-            false,
-            '',
-            true,
-            $buttons,
-            [
+    if ($tab !== 'alert') {
+        if ($tab === 'list') {
+            ui_print_standard_header(
+                __('Alerts'),
+                'images/gm_alerts.png',
+                false,
+                '',
+                true,
+                $buttons,
                 [
-                    'link'  => '',
-                    'label' => __('Manage alerts'),
-                ],
+                    [
+                        'link'  => '',
+                        'label' => __('Manage alerts'),
+                    ],
+                    [
+                        'link'  => '',
+                        'label' => __('List'),
+                    ],
+                ]
+            );
+        } else {
+            ui_print_standard_header(
+                __('Alerts'),
+                'images/gm_alerts.png',
+                false,
+                '',
+                true,
+                $buttons,
                 [
-                    'link'  => '',
-                    'label' => __('List'),
-                ],
-            ]
-        );
-    } else {
-        ui_print_standard_header(
-            __('Alerts'),
-            'images/gm_alerts.png',
-            false,
-            '',
-            true,
-            $buttons,
-            [
-                [
-                    'link'  => '',
-                    'label' => __('Manage alerts'),
-                ],
-                [
-                    'link'  => '',
-                    'label' => __('Create'),
-                ],
-            ]
-        );
+                    [
+                        'link'  => '',
+                        'label' => __('Manage alerts'),
+                    ],
+                    [
+                        'link'  => '',
+                        'label' => __('Create'),
+                    ],
+                ]
+            );
+        }
     }
 } else {
     alerts_meta_print_header();
diff --git a/pandora_console/godmode/alerts/alert_templates.php b/pandora_console/godmode/alerts/alert_templates.php
index 23d94b094d..51379a7820 100644
--- a/pandora_console/godmode/alerts/alert_templates.php
+++ b/pandora_console/godmode/alerts/alert_templates.php
@@ -122,24 +122,24 @@ $sec = (is_metaconsole() === true) ? 'advanced' : 'galertas';
 // case delete_templete action is performed.
 if (!$delete_template) {
     // Header.
-    if (is_metaconsole() === true) {
-        alerts_meta_print_header();
-    } else {
-        ui_print_standard_header(
-            __('Alerts'),
-            'images/gm_alerts.png',
-            false,
-            '',
-            true,
-            [],
+    ui_print_standard_header(
+        __('Alerts'),
+        'images/gm_alerts.png',
+        false,
+        '',
+        true,
+        [],
+        [
             [
-                [
-                    'link'  => '',
-                    'label' => __('Alert templates'),
-                ],
-            ]
-        );
-    }
+                'link'  => '',
+                'label' => __('Alerts'),
+            ],
+            [
+                'link'  => '',
+                'label' => __('Alert templates'),
+            ],
+        ]
+    );
 }
 
 if ($update_template) {
diff --git a/pandora_console/godmode/alerts/alert_view.php b/pandora_console/godmode/alerts/alert_view.php
index 67b31ed3f3..e8b906b220 100644
--- a/pandora_console/godmode/alerts/alert_view.php
+++ b/pandora_console/godmode/alerts/alert_view.php
@@ -61,13 +61,19 @@ if ($default_action != 0) {
 }
 
 // Header.
-ui_print_page_header(
+ui_print_standard_header(
     __('Alert details'),
     'images/op_alerts.png',
     false,
     '',
     false,
-    ''
+    [],
+    [
+        [
+            'link'  => '',
+            'label' => __('Alerts'),
+        ],
+    ]
 );
 
 // TABLE DETAILS.
diff --git a/pandora_console/godmode/category/category.php b/pandora_console/godmode/category/category.php
index aa3a23778d..935d2c1d5d 100755
--- a/pandora_console/godmode/category/category.php
+++ b/pandora_console/godmode/category/category.php
@@ -262,10 +262,7 @@ if ($is_management_allowed === true) {
             [ 'icon' => 'next' ],
             true
         ),
-        [
-            'type'          => 'form_action',
-            'right_content' => $tablePagination,
-        ]
+        [ 'right_content' => $tablePagination ]
     );
 
     echo '</form>';
diff --git a/pandora_console/godmode/events/custom_events.php b/pandora_console/godmode/events/custom_events.php
index 627c81c27b..ea44daac5e 100644
--- a/pandora_console/godmode/events/custom_events.php
+++ b/pandora_console/godmode/events/custom_events.php
@@ -132,7 +132,8 @@ $table->data[1][1] = '<a href="javascript:">'.html_print_image(
     [
         'id'    => 'right',
         'title' => __('Add fields to select'),
-        'style' => 'rotate: 180deg; width: 40px',
+        'style' => 'rotate: 180deg;',
+        'class' => 'main_menu_icon invert_filter',
     ]
 ).'</a>';
 $table->data[1][1] .= '<br><br><br><br><a href="javascript:">'.html_print_image(
@@ -141,7 +142,7 @@ $table->data[1][1] .= '<br><br><br><br><a href="javascript:">'.html_print_image(
     [
         'id'    => 'left',
         'title' => __('Delete fields to select'),
-        'style' => 'width: 40px',
+        'style' => '',
     ]
 ).'</a>';
 
@@ -169,6 +170,7 @@ $table->data[1][2] .= '<a href="javascript:">'.html_print_image(
     [
         'onclick' => 'sortUpDown(\'up\');',
         'title'   => __('Move up selected fields'),
+        'class'   => 'main_menu_icon invert_filter',
     ]
 ).'</a>';
 $table->data[1][2] .= '<a href="javascript:">'.html_print_image(
@@ -177,6 +179,7 @@ $table->data[1][2] .= '<a href="javascript:">'.html_print_image(
     [
         'onclick' => 'sortUpDown(\'down\');',
         'title'   => __('Move down selected fields'),
+        'class'   => 'main_menu_icon invert_filter',
     ]
 ).'</a>';
 $table->data[1][2] .= '</div></div>';
diff --git a/pandora_console/godmode/events/event_filter.php b/pandora_console/godmode/events/event_filter.php
index 9a2c9df9f6..2bbbb18077 100644
--- a/pandora_console/godmode/events/event_filter.php
+++ b/pandora_console/godmode/events/event_filter.php
@@ -59,6 +59,14 @@ if ($delete) {
     }
 
     if ($result !== false) {
+        db_process_sql_delete(
+            'tfavmenu_user',
+            [
+                'id_element' => $id_filter,
+                'section'    => 'Events',
+                'id_user'    => $config['id_user'],
+            ]
+        );
         $result = true;
     } else {
         $result = false;
diff --git a/pandora_console/godmode/groups/group_list.php b/pandora_console/godmode/groups/group_list.php
index 95785a0edd..2d3faf11db 100644
--- a/pandora_console/godmode/groups/group_list.php
+++ b/pandora_console/godmode/groups/group_list.php
@@ -714,6 +714,14 @@ if ($is_management_allowed === true
             );
 
             if ($result && (!$usedGroup['return'])) {
+                db_process_sql_delete(
+                    'tfavmenu_user',
+                    [
+                        'id_element' => $id_group,
+                        'section'    => 'Groups',
+                        'id_user'    => $config['id_user'],
+                    ]
+                );
                 ui_print_success_message(__('Group successfully deleted'));
             } else {
                 ui_print_error_message(
@@ -898,7 +906,6 @@ if ($tab == 'tree') {
 
         foreach ($groups as $key => $group) {
             $url_edit = 'index.php?sec=gagente&sec2=godmode/groups/configure_group&id_group='.$group['id_grupo'];
-            $url_tactical = 'index.php?sec=gagente&sec2=godmode/groups/tactical&id_group='.$group['id_grupo'];
             if (is_metaconsole()) {
                 $url_delete = 'index.php?sec=gagente&sec2=godmode/groups/group_list&delete_group=1&id_group='.$group['id_grupo'].'&tab=groups';
             } else {
@@ -907,7 +914,7 @@ if ($tab == 'tree') {
 
             $table->data[$key][0] = $group['id_grupo'];
             if ($is_management_allowed === true) {
-                $table->data[$key][1] = '<a href="'.$url_tactical.'">'.$group['nombre'].'</a>';
+                $table->data[$key][1] = '<a href="'.$url_edit.'">'.$group['nombre'].'</a>';
             } else {
                 $table->data[$key][1] = $group['nombre'];
             }
@@ -918,7 +925,7 @@ if ($tab == 'tree') {
                     true,
                     [
                         'style' => '',
-                        'class' => 'bot',
+                        'class' => 'bot main_menu_icon invert_filter',
                         'alt'   => io_safe_input($group['nombre']),
                         'title' => io_safe_input($group['nombre']),
                     ],
diff --git a/pandora_console/godmode/groups/tactical.php b/pandora_console/godmode/groups/tactical.php
index 037af05723..5339590bc4 100644
--- a/pandora_console/godmode/groups/tactical.php
+++ b/pandora_console/godmode/groups/tactical.php
@@ -72,8 +72,14 @@ if (is_metaconsole() === false) {
             ],
             [
                 'link'  => '',
-                'label' => __('Tactic group'),
+                'label' => __('Tactical group view'),
             ],
+        ],
+        [
+            'id_element' => $id_group,
+            'url'        => 'gagent&sec2=godmode/groups/tactical&id_group='.$id_group,
+            'label'      => groups_get_name($id_group),
+            'section'    => 'Groups',
         ]
     );
 }
@@ -181,7 +187,7 @@ try {
         [
             'id'                  => 'list_agents_tactical',
             'class'               => 'info_table',
-            'style'               => 'width: 100%',
+            'style'               => 'width: 99%',
             'columns'             => $columns,
             'column_names'        => $columnNames,
             'return'              => true,
@@ -190,6 +196,7 @@ try {
                 'method'   => 'getAgentsByGroup',
                 'id_group' => $id_group,
             ],
+            'dom_elements'        => 'lpfti',
             'no_sortable_columns' => [-1],
             'order'               => [
                 'field'     => 'alias',
diff --git a/pandora_console/godmode/massive/massive_operations.php b/pandora_console/godmode/massive/massive_operations.php
index 100b3eb933..04a2a20a2f 100755
--- a/pandora_console/godmode/massive/massive_operations.php
+++ b/pandora_console/godmode/massive/massive_operations.php
@@ -306,21 +306,37 @@ $onheader['snmp'] = $snmptab;
 $onheader['satellite'] = $satellitetab;
 $onheader['services'] = $servicestab;
 
+
 // Header.
-if (is_metaconsole() === false) {
-    ui_print_page_header(
-        __('Bulk operations').' &raquo; '.$options[$option],
-        'images/gm_massive_operations.png',
-        false,
-        $help_header,
-        true,
-        $onheader,
-        false,
-        'massivemodal'
-    );
-} else {
-    massive_meta_print_header();
-}
+ui_print_standard_header(
+    __('Bulk operations').' - '.$options[$option],
+    'images/gm_massive_operations.png',
+    false,
+    $help_header,
+    false,
+    [
+        $agentstab,
+        $modulestab,
+        $pluginstab,
+        $userstab,
+        $alertstab,
+        $policiestab,
+        $snmptab,
+        $satellitetab,
+        $servicestab,
+    ],
+    [
+        [
+            'link'  => '',
+            'label' => __('Configuration'),
+        ],
+        [
+            'link'  => '',
+            'label' => __('Bulk operations'),
+        ],
+    ]
+);
+
 
 // Checks if the PHP configuration is correctly.
 if ((get_cfg_var('max_execution_time') != 0)
diff --git a/pandora_console/godmode/netflow/nf_edit.php b/pandora_console/godmode/netflow/nf_edit.php
index b267b40254..2ac2c5975d 100644
--- a/pandora_console/godmode/netflow/nf_edit.php
+++ b/pandora_console/godmode/netflow/nf_edit.php
@@ -1,16 +1,31 @@
 <?php
+/**
+ * Netflow Filter view
+ *
+ * @category   Netflow
+ * @package    Pandora FMS
+ * @subpackage Community
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2005-2023 Artica Soluciones Tecnologicas
+ * Please see http://pandorafms.org for full contribution list
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation for version 2.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * ============================================================================
+ */
 
-// Pandora FMS - http://pandorafms.com
-// ==================================================
-// Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
-// Please see http://pandorafms.org for full contribution list
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; version 2
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
 global $config;
 
 require_once $config['homedir'].'/include/functions_ui.php';
@@ -30,35 +45,29 @@ if (! check_acl($config['id_user'], 0, 'AW')) {
 
 $pure = get_parameter('pure', 0);
 
-// Header
-if (! defined('METACONSOLE')) {
-    ui_print_page_header(
-        __('Manage Netflow Filter'),
-        'images/gm_netflow.png',
-        false,
-        '',
-        true
-    );
-
-    $is_windows = strtoupper(substr(PHP_OS, 0, 3)) == 'WIN';
-    if ($is_windows) {
-        ui_print_error_message(__('Not supported in Windows systems'));
-    }
-} else {
-    $nav_bar = [
+// Header.
+ui_print_standard_header(
+    __('Manage Filters'),
+    'images/gm_netflow.png',
+    false,
+    '',
+    true,
+    [],
+    [
         [
-            'link' => 'index.php?sec=main',
-            'text' => __('Main'),
+            'link'  => '',
+            'label' => __('Resources'),
         ],
         [
-            'link' => 'index.php?sec=netf&sec2=godmode/netflow/nf_edit',
-            'text' => __('Netflow filters'),
+            'link'  => '',
+            'label' => __('Netflow filters'),
         ],
-    ];
+    ]
+);
 
-    ui_meta_print_page_header($nav_bar);
-
-    ui_meta_print_header(__('Netflow filters'));
+$is_windows = (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN');
+if ($is_windows === true) {
+    ui_print_error_message(__('Not supported in Windows systems'));
 }
 
 $delete = (bool) get_parameter('delete');
@@ -190,30 +199,36 @@ foreach ($filters as $filter) {
 
     if (check_acl_restricted_all($config['id_user'], $filter['id_group'], 'AW')) {
         $table->cellclass[][3] = 'table_action_buttons';
-        $data[3] = "<a onclick='if(confirm(\"".__('Are you sure?')."\")) return true; else return false;' 
-            href='".$config['homeurl'].'index.php?sec=netf&sec2=godmode/netflow/nf_edit&delete=1&id='.$filter['id_sg']."&offset=0&pure=$pure'>".html_print_image('images/delete.svg', true, ['title' => __('Delete'), 'class' => 'invert_filter']).'</a>';
+        $data[3] = '<a onclick="if(confirm(\''.__('Are you sure?').'\')) return true; else return false;" href="'.$config['homeurl'].'index.php?sec=netf&sec2=godmode/netflow/nf_edit&delete=1&id='.$filter['id_sg'].'&offset=0&pure='.$pure.'">';
+        $data[3] .= html_print_image('images/delete.svg', true, ['title' => __('Delete'), 'class' => 'main_menu_icon invert_filter']);
+        $data[3] .= '</a>';
     }
 
     array_push($table->data, $data);
 }
 
-if (isset($data)) {
-    echo "<form method='post' action='".$config['homeurl']."index.php?sec=netf&sec2=godmode/netflow/nf_edit&pure=$pure'>";
+$buttons = html_print_submit_button(
+    __('Create filter'),
+    'crt',
+    false,
+    ['icon' => 'wand'],
+    true
+);
+
+if (empty($filters) === false) {
+    echo '<form id="multiple_delete" method="POST" action="'.$config['homeurl'].'index.php?sec=netf&sec2=godmode/netflow/nf_edit&pure='.$pure.'">';
     html_print_input_hidden('multiple_delete', 1);
     html_print_table($table);
-    echo "<div class='right'>";
-
-    html_print_submit_button(__('Delete'), 'delete_btn', false, 'class="sub delete"');
-    echo '</div>';
     echo '</form>';
+    $buttons .= html_print_submit_button(__('Delete'), 'delete_btn', false, ['icon' => 'delete', 'mode' => 'secondary', 'form' => 'multiple_delete'], true);
 } else {
     ui_print_info_message(['no_close' => true, 'message' => __('There are no defined filters') ]);
 }
 
 echo '<form method="post" action="'.$config['homeurl'].'index.php?sec=netf&sec2=godmode/netflow/nf_edit_form&pure='.$pure.'">';
-echo "<div class='mrgn_right_5px right'>";
-html_print_submit_button(__('Create filter'), 'crt', false, 'class="sub wand"');
-echo '</div>';
+html_print_action_buttons(
+    $buttons
+);
 echo '</form>';
 
 ?>
@@ -221,27 +236,14 @@ echo '</form>';
 <script type="text/javascript">
 
     $( document ).ready(function() {
-
-        $('[id^=checkbox-delete_multiple]').change(function(){
-            if($(this).parent().parent().hasClass('checkselected')){
-                $(this).parent().parent().removeClass('checkselected');
+        $('[id^=checkbox-all_delete]').change(function() {
+            if ($("input[name=all_delete]").prop("checked")) {
+                $(".custom_checkbox_input").prop("checked", true);
             }
-            else{
-                $(this).parent().parent().addClass('checkselected');    
+            else {
+                $(".custom_checkbox_input").prop("checked", false);
             }
         });
-
-        $('[id^=checkbox-all_delete]').change(function(){    
-            if ($("#checkbox-all_delete").prop("checked")) {
-                $('[id^=checkbox-delete_multiple]').parent().parent().addClass('checkselected');
-                $(".check_delete").prop("checked", true);
-            }
-            else{
-                $('[id^=checkbox-delete_multiple]').parent().parent().removeClass('checkselected');
-                $(".check_delete").prop("checked", false);
-            }    
-        });
-
     });
 
 
diff --git a/pandora_console/godmode/netflow/nf_edit_form.php b/pandora_console/godmode/netflow/nf_edit_form.php
index bdd0059328..2f9e6bd41d 100644
--- a/pandora_console/godmode/netflow/nf_edit_form.php
+++ b/pandora_console/godmode/netflow/nf_edit_form.php
@@ -1,16 +1,31 @@
 <?php
+/**
+ * Netflow Filter Editor.
+ *
+ * @category   Netflow
+ * @package    Pandora FMS
+ * @subpackage Community
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2005-2023 Artica Soluciones Tecnologicas
+ * Please see http://pandorafms.org for full contribution list
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation for version 2.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * ============================================================================
+ */
 
-// Pandora FMS - http://pandorafms.com
-// ==================================================
-// Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
-// Please see http://pandorafms.org for full contribution list
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; version 2
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
 global $config;
 
 require_once $config['homedir'].'/include/functions_ui.php';
@@ -46,40 +61,28 @@ if ($id) {
     }
 }
 
-// Header
-if (! defined('METACONSOLE')) {
-    $buttons['edit']['text'] = '<a href="index.php?sec=netf&sec2=godmode/netflow/nf_edit">'.html_print_image('images/list.png', true, ['title' => __('Filter list')]).'</a>';
+// Header Buttons.
+$buttons = [];
+$buttons[] = ['text' => '<a href="index.php?sec=netf&sec2=godmode/netflow/nf_edit">'.html_print_image('images/logs@svg.svg', true, ['title' => __('Filter list')]).'</a>'];
+$buttons[] = ['text' => '<a href="index.php?sec=netf&sec2=godmode/netflow/nf_edit_form">'.html_print_image('images/plus@svg.svg', true, ['title' => __('Add filter')]).'</a>'];
+// Header Caption.
+$headerTitle = ($id) ? __('Update filter') : __('Create filter');
 
-    $buttons['add']['text'] = '<a href="index.php?sec=netf&sec2=godmode/netflow/nf_edit_form">'.html_print_image('images/add_mc.png', true, ['title' => __('Add filter')]).'</a>';
-
-    ui_print_page_header(
-        __('Netflow Filter'),
-        'images/gm_netflow.png',
-        false,
-        '',
-        true,
-        $buttons
-    );
-} else {
-    $nav_bar = [
+// Header.
+ui_print_standard_header(
+    $headerTitle,
+    'images/gm_netflow.png',
+    false,
+    '',
+    true,
+    $buttons,
+    [
         [
-            'link' => 'index.php?sec=main',
-            'text' => __('Main'),
+            'link'  => '',
+            'label' => __('Netflow'),
         ],
-        [
-            'link' => 'index.php?sec=netf&sec2=godmode/netflow/nf_edit',
-            'text' => __('Netflow filters'),
-        ],
-        [
-            'link' => 'index.php?sec=netf&sec2=godmode/netflow/nf_edit_form',
-            'text' => __('Add filter'),
-        ],
-    ];
-
-    ui_meta_print_page_header($nav_bar);
-
-    ui_meta_print_header(__('Netflow filters'));
-}
+    ],
+);
 
 if ($id) {
     $filter = netflow_filter_get_filter($id);
@@ -127,7 +130,7 @@ if ($update) {
             'advanced_filter' => $advanced_filter,
         ];
 
-        // Save filter args
+        // Save filter args.
         $values['filter_args'] = netflow_get_filter_arguments($values, true);
 
         $result = db_process_sql_update('tnetflow_filter', $values, ['id_sg' => $id]);
@@ -172,83 +175,8 @@ if ($create) {
     }
 }
 
-$table = new stdClass();
-$table->id = 'table1';
-$table->width = '100%';
-$table->border = 0;
-$table->cellspacing = 0;
-$table->cellpadding = 0;
-$table->class = 'databox filters';
-$table->style[0] = 'font-weight: bold';
-
-if (defined('METACONSOLE')) {
-    if ($id) {
-        $table->head[0] = __('Update filter');
-    } else {
-        $table->head[0] = __('Create filter');
-    }
-
-    $table->head_colspan[0] = 5;
-    $table->headstyle[0] = 'text-align: center';
-}
-
-$table->data = [];
-
-$table->data[0][0] = '<b>'.__('Name').'</b>';
-$table->data[0][1] = html_print_input_text('name', $name, false, 20, 80, true);
-
 $own_info = get_user_info($config['id_user']);
-$table->data[1][0] = '<b>'.__('Group').'</b>';
-// Fix: Netflow filters have to check RW ACL
-$table->data[1][1] = html_print_select_groups(
-    $config['id_user'],
-    'RW',
-    $own_info['is_admin'],
-    'assign_group',
-    $assign_group,
-    '',
-    '',
-    -1,
-    true,
-    false,
-    false,
-    '',
-    false,
-    false,
-    false,
-    false,
-    'id_grupo',
-    false,
-    false,
-    false,
-    '250px'
-);
-
-if ($advanced_filter != '') {
-    $filter_type = 1;
-} else {
-    $filter_type = 0;
-}
-
-$table->data[2][0] = '<b>'.__('Filter:').'</b>';
-$table->data[2][1] = __('Normal').' '.html_print_radio_button_extended('filter_type', 0, '', $filter_type, false, 'displayNormalFilter();', 'class="mrgn_right_40px"', true);
-$table->data[2][1] .= __('Advanced').' '.html_print_radio_button_extended('filter_type', 1, '', $filter_type, false, 'displayAdvancedFilter();', 'class="mrgn_right_40px"', true);
-
-$table->data[3][0] = __('Dst Ip').ui_print_help_tip(__('Destination IP. A comma separated list of destination ip. If we leave the field blank, will show all ip. Example filter by ip:<br>25.46.157.214,160.253.135.249'), true);
-$table->data[3][1] = html_print_input_text('ip_dst', $ip_dst, false, 40, 80, true);
-
-$table->data[4][0] = __('Src Ip').ui_print_help_tip(__('Source IP. A comma separated list of source ip. If we leave the field blank, will show all ip. Example filter by ip:<br>25.46.157.214,160.253.135.249'), true);
-$table->data[4][1] = html_print_input_text('ip_src', $ip_src, false, 40, 80, true);
-
-$table->data[5][0] = __('Dst Port').ui_print_help_tip(__('Destination port. A comma separated list of destination ports. If we leave the field blank, will show all ports. Example filter by ports 80 and 22:<br>80,22'), true);
-$table->data[5][1] = html_print_input_text('dst_port', $dst_port, false, 40, 80, true);
-
-$table->data[6][0] = __('Src Port').ui_print_help_tip(__('Source port. A comma separated list of source ports. If we leave the field blank, will show all ports. Example filter by ports 80 and 22:<br>80,22'), true);
-$table->data[6][1] = html_print_input_text('src_port', $src_port, false, 40, 80, true);
-
-$table->data[7][1] = html_print_textarea('advanced_filter', 4, 40, $advanced_filter, '', true);
-
-$table->data[8][0] = '<b>'.__('Aggregate by').'</b>';
+$filter_type = (empty($advanced_filter) === false) ? 1 : 0;
 $aggregate_list = [
     'srcip'   => __('Src Ip Address'),
     'dstip'   => __('Dst Ip Address'),
@@ -256,27 +184,194 @@ $aggregate_list = [
     'dstport' => __('Dst Port'),
 ];
 
-$table->data[8][1] = html_print_select($aggregate_list, 'aggregate', $aggregate, '', '', 0, true, false, true, '', false);
 
-echo '<form method="post" action="'.$config['homeurl'].'index.php?sec=netf&sec2=godmode/netflow/nf_edit_form&pure='.$pure.'">';
-html_print_table($table);
-echo '<div class="action-buttons" style="width: '.$table->width.'">';
+$table = new stdClass();
+$table->id = 'table1';
+$table->width = '100%';
+$table->class = 'databox filter-table-adv';
+$table->size = [];
+$table->size[0] = '50%';
+$table->size[1] = '50%';
+
+$table->data = [];
+
+$table->data['first_line'][] = html_print_label_input_block(
+    __('Name'),
+    html_print_input_text(
+        'name',
+        $name,
+        false,
+        20,
+        80,
+        true
+    )
+);
+
+$table->data['first_line'][] = html_print_label_input_block(
+    __('Group'),
+    html_print_select_groups(
+        $config['id_user'],
+        'RW',
+        $own_info['is_admin'],
+        'assign_group',
+        $assign_group,
+        '',
+        '',
+        -1,
+        true,
+        false,
+        false,
+        '',
+        false,
+        false,
+        false,
+        false,
+        'id_grupo',
+        false,
+        false,
+        false,
+        '250px'
+    )
+);
+
+$table->data['filter_line'][] = html_print_label_input_block(
+    __('Filter'),
+    html_print_div(
+        [
+            'class'   => 'flex',
+            'content' => html_print_div(
+                [
+                    'class'   => 'flex-row-end',
+                    'content' => __('Normal').' '.html_print_radio_button_extended('filter_type', 0, '', $filter_type, false, 'displayNormalFilter();', 'class="mrgn_right_40px"', true),
+                ],
+                true
+            ).html_print_div(
+                [
+                    'class'   => 'flex-row-end',
+                    'content' => __('Advanced').' '.html_print_radio_button_extended('filter_type', 1, '', $filter_type, false, 'displayAdvancedFilter();', 'class="mrgn_right_40px"', true),
+                ],
+                true
+            ),
+        ],
+        true
+    ),
+);
+
+$table->data['filter_line'][] = html_print_label_input_block(
+    __('Aggregate by'),
+    html_print_select(
+        $aggregate_list,
+        'aggregate',
+        $aggregate,
+        '',
+        '',
+        0,
+        true,
+        false,
+        true,
+        '',
+        false
+    )
+);
+
+$table->data['ip_line'][] = html_print_label_input_block(
+    __('Dst Ip'),
+    html_print_input_text(
+        'ip_dst',
+        $ip_dst,
+        false,
+        40,
+        80,
+        true
+    ).ui_print_input_placeholder(__('Destination IP. A comma separated list of destination ip. If we leave the field blank, will show all ip. Example filter by ip:<br>25.46.157.214,160.253.135.249'), true)
+);
+
+$table->data['ip_line'][] = html_print_label_input_block(
+    __('Src Ip'),
+    html_print_input_text(
+        'ip_src',
+        $ip_src,
+        false,
+        40,
+        80,
+        true
+    ).ui_print_input_placeholder(__('Source IP. A comma separated list of source ip. If we leave the field blank, will show all ip. Example filter by ip:<br>25.46.157.214,160.253.135.249'), true)
+);
+
+$table->data['ports_line'][] = html_print_label_input_block(
+    __('Dst Port'),
+    html_print_input_text(
+        'dst_port',
+        $dst_port,
+        false,
+        40,
+        80,
+        true
+    ).ui_print_input_placeholder(__('Destination port. A comma separated list of destination ports. If we leave the field blank, will show all ports. Example filter by ports 80 and 22:<br>80,22'), true)
+);
+
+$table->data['ports_line'][] = html_print_label_input_block(
+    __('Src Port'),
+    html_print_input_text(
+        'src_port',
+        $src_port,
+        false,
+        40,
+        80,
+        true
+    ).ui_print_input_placeholder(__('Source port. A comma separated list of source ports. If we leave the field blank, will show all ports. Example filter by ports 80 and 22:<br>80,22'), true)
+);
+
+$table->colspan['advanced_filters'][] = 2;
+$table->data['advanced_filters'][] = html_print_label_input_block(
+    __('Advanced filters'),
+    html_print_textarea('advanced_filter', 4, 40, $advanced_filter, '', true, 'w50p')
+);
+
+
+$hiddens = '';
 if ($id) {
-    html_print_input_hidden('update', 1);
-    html_print_input_hidden('id', $id);
-    html_print_submit_button(__('Update'), 'crt', false, 'class="sub upd"');
+    $buttonTitle = __('Update');
+    $hiddens .= html_print_input_hidden('update', 1, true);
+    $hiddens .= html_print_input_hidden('id', $id, true);
 } else {
-    html_print_input_hidden('create', 1);
-    html_print_submit_button(__('Create'), 'crt', false, 'class="sub wand"');
+    $buttonTitle = __('Create');
+    $hiddens .= html_print_input_hidden('create', 1, true);
 }
 
-echo '</div>';
+echo '<form class="max_floating_element_size" id="nf_edit_form" method="post" action="'.$config['homeurl'].'index.php?sec=netf&sec2=godmode/netflow/nf_edit_form&pure='.$pure.'">';
+echo $hiddens;
+html_print_table($table);
 echo '</form>';
 
+html_print_action_buttons(
+    html_print_submit_button(
+        $buttonTitle,
+        'crt',
+        false,
+        [
+            'icon' => 'upd',
+            'form' => 'nf_edit_form',
+        ],
+        true
+    )
+);
+
 ?>
 
 <script type="text/javascript">
+    $(document).ready(function(){
+        var filter_type = <?php echo $filter_type; ?>;
+        if (filter_type == 0) {
+            displayNormalFilter ();
+        }
+        else {
+            displayAdvancedFilter ();
+        }
+    });
+
     function displayAdvancedFilter () {
+        console.log('papapa advanced filter');
         // Erase the normal filter
         document.getElementById("text-ip_dst").value = '';
         document.getElementById("text-ip_src").value = '';
@@ -284,34 +379,32 @@ echo '</form>';
         document.getElementById("text-src_port").value = '';
         
         // Hide the normal filter
-        document.getElementById("table1-3").style.display = 'none';
-        document.getElementById("table1-4").style.display = 'none';
-        document.getElementById("table1-5").style.display = 'none';
-        document.getElementById("table1-6").style.display = 'none';
-        
+        //document.getElementById("table1-3").style.display = 'none';
+        //document.getElementById("table1-4").style.display = 'none';
+        //document.getElementById("table1-5").style.display = 'none';
+        //document.getElementById("table1-6").style.display = 'none';
+        $("#table1-ip_line").css("display", "none");
+        $("#table1-ports_line").css("display", "none");
         // Show the advanced filter
-        document.getElementById("table1-7").style.display = '';
+        $("#table1-advanced_filters").css("display", "table-row");
+        //document.getElementById("table1-7").style.display = '';
     };
     
     function displayNormalFilter () {
+        console.log('papapa normal filter');
         // Erase the advanced filter
         document.getElementById("textarea_advanced_filter").value = '';
-        
         // Hide the advanced filter
-        document.getElementById("table1-7").style.display = 'none';
-        
+        //document.getElementById("table1-7").style.display = 'none';
+        $("#table1-advanced_filters").css("display", "none");
         // Show the normal filter
+        $("#table1-ip_line").css("display", "table-row");
+        $("#table1-ports_line").css("display", "table-row");
+        /*
         document.getElementById("table1-3").style.display = '';
         document.getElementById("table1-4").style.display = '';
         document.getElementById("table1-5").style.display = '';
         document.getElementById("table1-6").style.display = '';
+        */
     };
-    
-    var filter_type = <?php echo $filter_type; ?>;
-    if (filter_type == 0) {
-        displayNormalFilter ();
-    }
-    else {
-        displayAdvancedFilter ();
-    }
 </script>
diff --git a/pandora_console/godmode/reporting/map_builder.php b/pandora_console/godmode/reporting/map_builder.php
index 898c3becda..85d4ecb6c4 100644
--- a/pandora_console/godmode/reporting/map_builder.php
+++ b/pandora_console/godmode/reporting/map_builder.php
@@ -189,6 +189,14 @@ if ($delete_layout || $copy_layout) {
             'tlayout',
             ['id' => $id_layout]
         );
+        db_process_sql_delete(
+            'tfavmenu_user',
+            [
+                'id_element' => $id_layout,
+                'section'    => 'Visual_Console',
+                'id_user'    => $config['id_user'],
+            ]
+        );
 
         $auditMessage = ((bool) $result === true) ? 'Delete visual console' : 'Fail try to delete visual console';
         db_pandora_audit(
diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
index c28bfca6ee..24b782a0d4 100755
--- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php
+++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
@@ -115,6 +115,7 @@ $exception_condition_value = 10;
 $modulegroup = 0;
 $period = SECONDS_1DAY;
 $search = '';
+$full_text = 0;
 $log_number = 1000;
 // Added support for projection graphs.
 $period_pg = SECONDS_5DAY;
@@ -316,6 +317,7 @@ switch ($action) {
                     $source = $es['source'];
                     $search = $es['search'];
                     $log_number = empty($es['log_number']) ? $log_number : $es['log_number'];
+                    $full_text = empty($es['full_text']) ? 0 : $es['full_text'];
                 break;
 
                 case 'simple_graph':
@@ -1047,17 +1049,6 @@ $class = 'databox filters';
 
 ?>
 <table id="table_item_edit_reporting"  class="<?php echo $class; ?>" id="" border="0" cellpadding="4" cellspacing="4" width="100%">
-    <?php
-    if (defined('METACONSOLE')) {
-        echo '<thead>
-				<tr>
-					<th align=center colspan=5>
-						'.__('Item Editor').'
-					</th>
-				</tr>
-			</thead>';
-    }
-    ?>
     <tbody>
         <tr id="row_type"   class="datos">
             <td class="bolder w220px">
@@ -1324,6 +1315,14 @@ $class = 'databox filters';
             <td  >
                 <?php
                 html_print_input_text('search', $search, '', 40, 100);
+                html_print_checkbox(
+                    'full_text',
+                    1,
+                    $full_text,
+                    false,
+                    false
+                );
+                ui_print_help_tip(__('Full context'), false);
                 ?>
             </td>
         </tr>
diff --git a/pandora_console/godmode/reporting/reporting_builder.list_items.php b/pandora_console/godmode/reporting/reporting_builder.list_items.php
index 15f9e391c3..238f020004 100755
--- a/pandora_console/godmode/reporting/reporting_builder.list_items.php
+++ b/pandora_console/godmode/reporting/reporting_builder.list_items.php
@@ -201,139 +201,86 @@ if (($agentFilter == 0) && ($moduleFilter == 0) && ($typeFilter == 0)) {
 
 $urlFilter = '&agent_filter='.$agentFilter.'&module_filter='.$moduleFilter.'&type_filter='.$typeFilter;
 
-if (!defined('METACONSOLE')) {
-    $table = new stdClass();
-    $table->width = '100%';
-    $table->class = 'filter-table-adv';
-    $table->size[0] = '33%';
-    $table->size[1] = '33%';
-    $table->size[1] = '33%';
-    $table->data[0][0] = html_print_label_input_block(
-        __('Agents'),
-        html_print_select(
-            $agents,
-            'agent_filter',
-            $agentFilter,
-            '',
-            __('All'),
-            0,
-            true,
-            false,
-            true,
-            '',
-            false,
-            'width:100%'
-        )
-    );
-    $table->data[0][1] = html_print_label_input_block(
-        __('Modules'),
-        html_print_select(
-            $modules,
-            'module_filter',
-            $moduleFilter,
-            '',
-            __('All'),
-            0,
-            true,
-            false,
-            true,
-            '',
-            false,
-            'width:100%'
-        )
-    );
-    $table->data[0][2] = html_print_label_input_block(
-        __('Type'),
-        html_print_select(
-            $types,
-            'type_filter',
-            $typeFilter,
-            '',
-            __('All'),
-            0,
-            true,
-            false,
-            true,
-            '',
-            false,
-            'width:100%'
-        )
-    );
-    $form = '<form method="post" action ="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=filter&id_report='.$idReport.'">';
-    $form .= html_print_table($table, true);
-    $form .= html_print_div(
-        [
-            'class'   => 'action-buttons',
-            'content' => html_print_submit_button(
-                __('Filter'),
-                'filter',
-                false,
-                [
-                    'class' => 'mini',
-                    'icon'  => 'search',
-                    'mode'  => 'secondary',
-                ],
-                true
-            ),
-        ],
-        true
-    );
-    $form .= html_print_input_hidden('action', 'filter', true);
-    $form .= '</form>';
-
-    ui_toggle($form, __('Filters'), '', '', false);
-} else {
-    $table = new stdClass();
-    $table->width = '96%';
-    $table->class = 'databox_filters';
-    $table->cellpadding = 0;
-    $table->cellspacing = 0;
-    $table->data[0][0] = __('Agents');
-    $table->data[0][1] = html_print_select(
+$table = new stdClass();
+$table->width = '100%';
+$table->class = 'filter-table-adv';
+$table->size[0] = '33%';
+$table->size[1] = '33%';
+$table->size[1] = '33%';
+$table->data[0][0] = html_print_label_input_block(
+    __('Agents'),
+    html_print_select(
         $agents,
         'agent_filter',
         $agentFilter,
         '',
         __('All'),
         0,
-        true
-    );
-    $table->data[0][2] = __('Modules');
-    $table->data[0][3] = html_print_select(
+        true,
+        false,
+        true,
+        '',
+        false,
+        'width:100%'
+    )
+);
+$table->data[0][1] = html_print_label_input_block(
+    __('Modules'),
+    html_print_select(
         $modules,
         'module_filter',
         $moduleFilter,
         '',
         __('All'),
         0,
-        true
-    );
-    $table->data[0][4] = __('Type');
-    $table->data[0][5] = html_print_select(
+        true,
+        false,
+        true,
+        '',
+        false,
+        'width:100%'
+    )
+);
+$table->data[0][2] = html_print_label_input_block(
+    __('Type'),
+    html_print_select(
         $types,
         'type_filter',
         $typeFilter,
         '',
         __('All'),
         0,
-        true
-    );
-    $table->style[6] = 'text-align:right;';
-    $table->data[0][6] = html_print_submit_button(
-        __('Filter'),
-        'filter',
+        true,
         false,
-        'class="sub upd"',
-        true
-    ).html_print_input_hidden('action', 'filter', true);
+        true,
+        '',
+        false,
+        'width:100%'
+    )
+);
+$form = '<form method="post" action ="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=filter&id_report='.$idReport.'">';
+$form .= html_print_table($table, true);
+$form .= html_print_div(
+    [
+        'class'   => 'action-buttons',
+        'content' => html_print_submit_button(
+            __('Filter'),
+            'filter',
+            false,
+            [
+                'class' => 'mini',
+                'icon'  => 'search',
+                'mode'  => 'secondary',
+            ],
+            true
+        ),
+    ],
+    true
+);
+$form .= html_print_input_hidden('action', 'filter', true);
+$form .= '</form>';
 
-    $filters = '<form class="filters_form" method="post" action ="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=
-				list_items&action=filter&id_report='.$idReport.'">';
-
-    $filters .= html_print_table($table, true);
-    $filters .= '</form>';
-    ui_toggle($filters, __('Show Options'));
-}
+ui_toggle($form, __('Filters'), '', '', false);
 
 $where = '1=1';
 if ($typeFilter != '0') {
@@ -412,16 +359,9 @@ $table->style[0] = 'text-align: right;';
 
 if ($items) {
     $table->width = '100%';
-    if (defined('METACONSOLE')) {
-        $table->width = '100%';
-        $table->class = 'databox data';
-        $arrow_up = 'images/sort_up.png';
-        $arrow_down = 'images/sort_down.png';
-    } else {
-        $table->class = 'info_table';
-        $arrow_up = 'images/sort_up_black.png';
-        $arrow_down = 'images/sort_down_black.png';
-    }
+    $table->class = 'info_table';
+    $arrow_up = 'images/sort_up_black.png';
+    $arrow_down = 'images/sort_down_black.png';
 
     $table->size = [];
     $table->size[0] = '5px';
@@ -717,90 +657,65 @@ foreach ($items as $item) {
     }
 }
 
-if (defined('METACONSOLE')) {
-    if ($items != false) {
-        ui_pagination($countItems, 'index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=edit&id_report='.$idReport.$urlFilter);
-        html_print_table($table);
-        ui_pagination($countItems, 'index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=edit&id_report='.$idReport.$urlFilter);
-        echo "<form action='index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=delete_items&id_report=".$idReport."'
-		method='post' onSubmit='return added_ids_deleted_items_to_hidden_input();'>";
-            echo "<div class='right w100p'>";
+if ($items != false) {
+    ui_pagination(
+        $countItems,
+        'index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=edit&id_report='.$idReport.$urlFilter
+    );
+    html_print_table($table);
+    ui_pagination(
+        $countItems,
+        'index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=edit&id_report='.$idReport.$urlFilter
+    );
 
-        if (check_acl($config['id_user'], 0, 'RM')) {
-            html_print_input_hidden('ids_items_to_delete', '');
-            html_print_submit_button(__('Delete'), 'delete_btn', false, 'class="sub delete right mrgn_btn_15px"');
-        }
+    echo "<form id='form_delete' action='index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=delete_items&id_report=".$idReport."'
+    method='post' onSubmit='return added_ids_deleted_items_to_hidden_input();'>";
 
-            echo '</div>';
-        echo '</form>';
-    }
-} else {
-    if ($items != false) {
-        ui_pagination(
-            $countItems,
-            'index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=edit&id_report='.$idReport.$urlFilter
-        );
-        html_print_table($table);
-        ui_pagination(
-            $countItems,
-            'index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=edit&id_report='.$idReport.$urlFilter
-        );
-
-        echo "<form id='form_delete' action='index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=delete_items&id_report=".$idReport."'
-        method='post' onSubmit='return added_ids_deleted_items_to_hidden_input();'>";
-
-        echo '<div  class="action-buttons w100p">';
-        html_print_input_hidden('ids_items_to_delete', '');
-        $ActionButtons[] = html_print_submit_button(
-            __('Delete'),
-            'delete_btn',
-            false,
-            [
-                'class' => 'sub ok',
-                'icon'  => 'next',
-            ],
-            true
-        );
-        html_print_action_buttons(
-            implode('', $ActionButtons),
-            ['type' => 'form_action']
-        );
-        echo '</div>';
-        echo '</form>';
-    }
+    echo '<div  class="action-buttons w100p">';
+    html_print_input_hidden('ids_items_to_delete', '');
+    $ActionButtons[] = html_print_submit_button(
+        __('Delete'),
+        'delete_btn',
+        false,
+        [
+            'class' => 'sub ok',
+            'icon'  => 'next',
+        ],
+        true
+    );
+    html_print_action_buttons(
+        implode('', $ActionButtons),
+        ['type' => 'form_action']
+    );
+    echo '</div>';
+    echo '</form>';
 }
 
 $table = new stdClass();
 $table->width = '100%';
+$table->class = 'filter-table-adv';
+$table->size[0] = '50%';
+$table->size[1] = '50%';
 
-
-if (defined('METACONSOLE')) {
-    $table->colspan[0][0] = 3;
-    $table->size = [];
-    $table->size[0] = '25%';
-    $table->size[1] = '25%';
-    $table->size[2] = '25%';
-    $table->size[3] = '25%';
-    $table->class = 'databox data';
-    $table->head[0] = __('Sort items');
-    $table->head_colspan[0] = 4;
-    $table->headstyle[0] = 'text-align: center';
-
-    $table->data[1][0] = __('Sort selected items from position: ');
-    $table->data[1][1] = html_print_select_style(
+$table->data[1][0] = html_print_label_input_block(
+    __('Sort selected items from position: '),
+    html_print_select_style(
         [
             'before' => __('Move before to'),
             'after'  => __('Move after to'),
         ],
         'move_to',
         '',
-        '',
+        'width:100%',
         '',
         '',
         0,
-        true
-    );
-    $table->data[1][2] = html_print_input_text_extended(
+        true,
+    )
+);
+$table->data[1][2] = html_print_label_input_block(
+    __('Position'),
+    html_print_input_text_extended(
         'position_to_sort',
         1,
         'text-position_to_sort',
@@ -811,93 +726,42 @@ if (defined('METACONSOLE')) {
         "only_numbers('position_to_sort');",
         '',
         true
-    );
-    $table->data[1][2] .= html_print_input_hidden('ids_items_to_sort', '', true);
-    $table->data[1][3] = html_print_submit_button(__('Sort'), 'sort_submit', false, 'class="sub upd"', true);
+    ).html_print_input_hidden('ids_items_to_sort', '', true)
+);
 
-    echo "<form action='index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=sort_items&id_report=".$idReport."'
-        method='post' onsubmit='return added_ids_sorted_items_to_hidden_input();'>";
-    html_print_table($table);
-    echo '</form>';
-} else {
-    $table->class = 'filter-table-adv';
-    $table->size[0] = '50%';
-    $table->size[1] = '50%';
-
-    $table->data[1][0] = html_print_label_input_block(
-        __('Sort selected items from position: '),
-        html_print_select_style(
-            [
-                'before' => __('Move before to'),
-                'after'  => __('Move after to'),
-            ],
-            'move_to',
-            '',
-            'width:100%',
-            '',
-            '',
-            0,
-            true,
-        )
-    );
-    $table->data[1][2] = html_print_label_input_block(
-        __('Position'),
-        html_print_input_text_extended(
-            'position_to_sort',
-            1,
-            'text-position_to_sort',
-            '',
-            3,
-            10,
+$form = "<form action='index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=sort_items&id_report=".$idReport."' method='post' onsubmit='return added_ids_sorted_items_to_hidden_input();'>";
+$form .= html_print_table($table, true);
+$form .= html_print_div(
+    [
+        'class'   => 'action-buttons',
+        'content' => html_print_submit_button(
+            __('Sort'),
+            'sort_submit',
             false,
-            "only_numbers('position_to_sort');",
-            '',
+            [
+                'class' => 'mini',
+                'icon'  => 'search',
+                'mode'  => 'secondary',
+            ],
             true
-        ).html_print_input_hidden('ids_items_to_sort', '', true)
-    );
+        ),
+    ],
+    true
+);
+$form .= html_print_input_hidden('action', 'sort_items', true);
+$form .= '</form>';
 
-    $form = "<form action='index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=sort_items&id_report=".$idReport."' method='post' onsubmit='return added_ids_sorted_items_to_hidden_input();'>";
-    $form .= html_print_table($table, true);
-    $form .= html_print_div(
-        [
-            'class'   => 'action-buttons',
-            'content' => html_print_submit_button(
-                __('Sort'),
-                'sort_submit',
-                false,
-                [
-                    'class' => 'mini',
-                    'icon'  => 'search',
-                    'mode'  => 'secondary',
-                ],
-                true
-            ),
-        ],
-        true
-    );
-    $form .= html_print_input_hidden('action', 'filter', true);
-    $form .= '</form>';
-
-    ui_toggle($form, __('Sort items'), '', '', false);
-}
+ui_toggle($form, __('Sort items'), '', '', false);
 
 $table = new stdClass();
 $table->width = '100%';
+$table->class = 'filter-table-adv';
+$table->size[0] = '50%';
+$table->size[1] = '50%';
 
-if (defined('METACONSOLE')) {
-    $table->colspan[0][0] = 3;
-    $table->size = [];
-    $table->size[0] = '25%';
-    $table->size[1] = '25%';
-    $table->size[2] = '25%';
-    $table->size[3] = '25%';
-    $table->class = 'databox data';
-    $table->head[0] = __('Delete items');
-    $table->head_colspan[0] = 4;
-    $table->headstyle[0] = 'text-align: center';
-
-    $table->data[1][0] = __('Delete selected items from position: ');
-    $table->data[1][1] = html_print_select_style(
+$table->data[0][0] = html_print_label_input_block(
+    __('Delete selected items from position: '),
+    html_print_select_style(
         [
             'above' => __('Delete above to'),
             'below' => __('Delete below to'),
@@ -909,8 +773,11 @@ if (defined('METACONSOLE')) {
         '',
         0,
         true
-    );
-    $table->data[1][2] = html_print_input_text_extended(
+    )
+);
+$table->data[0][1] = html_print_label_input_block(
+    __('Poisition'),
+    html_print_input_text_extended(
         'position_to_delete',
         1,
         'text-position_to_delete',
@@ -921,75 +788,33 @@ if (defined('METACONSOLE')) {
         "only_numbers('position_to_delete');",
         '',
         true
-    );
-    $table->data[1][2] .= html_print_input_hidden('ids_items_to_delete', '', true);
-    $table->data[1][3] = html_print_submit_button(__('Delete'), 'delete_submit', false, 'class="sub upd"', true);
+    )
+);
 
-    echo "<form action='index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=delete_items_pos&id_report=".$idReport."'
-        method='post'>";
-    html_print_table($table);
-    echo '</form>';
-} else {
-    $table->class = 'filter-table-adv';
-    $table->size[0] = '50%';
-    $table->size[1] = '50%';
-
-    $table->data[0][0] = html_print_label_input_block(
-        __('Delete selected items from position: '),
-        html_print_select_style(
-            [
-                'above' => __('Delete above to'),
-                'below' => __('Delete below to'),
-            ],
-            'delete_m',
-            '',
-            '',
-            '',
-            '',
-            0,
-            true
-        )
-    );
-    $table->data[0][1] = html_print_label_input_block(
-        __('Poisition'),
-        html_print_input_text_extended(
-            'position_to_delete',
-            1,
-            'text-position_to_delete',
-            '',
-            3,
-            10,
+$form = "<form action='index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=delete_items_pos&id_report=".$idReport."'
+method='post'>";
+$form .= html_print_input_hidden('ids_items_to_delete', '', true);
+$form .= html_print_table($table, true);
+$form .= html_print_div(
+    [
+        'class'   => 'action-buttons',
+        'content' => html_print_submit_button(
+            __('Delete'),
+            'delete_submit',
             false,
-            "only_numbers('position_to_delete');",
-            '',
+            [
+                'class' => 'mini',
+                'icon'  => 'delete',
+                'mode'  => 'secondary',
+            ],
             true
-        )
-    );
+        ),
+    ],
+    true
+);
+$form .= '</form>';
+ui_toggle($form, __('Delete items'), '', '', false);
 
-    $form = "<form action='index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=delete_items_pos&id_report=".$idReport."'
-    method='post'>";
-    $form .= html_print_input_hidden('ids_items_to_delete', '', true);
-    $form .= html_print_table($table, true);
-    $form .= html_print_div(
-        [
-            'class'   => 'action-buttons',
-            'content' => html_print_submit_button(
-                __('Delete'),
-                'delete_submit',
-                false,
-                [
-                    'class' => 'mini',
-                    'icon'  => 'delete',
-                    'mode'  => 'secondary',
-                ],
-                true
-            ),
-        ],
-        true
-    );
-    $form .= '</form>';
-    ui_toggle($form, __('Delete items'), '', '', false);
-}
 
 ?>
 <script type="text/javascript">
diff --git a/pandora_console/godmode/reporting/reporting_builder.main.php b/pandora_console/godmode/reporting/reporting_builder.main.php
index 702a4e670b..7d0364191f 100755
--- a/pandora_console/godmode/reporting/reporting_builder.main.php
+++ b/pandora_console/godmode/reporting/reporting_builder.main.php
@@ -70,21 +70,13 @@ $table->head = [];
 $table->data = [];
 $table->size = [];
 
-if (is_metaconsole() === true) {
-    $table->class = 'databox filters';
-    $table->head[0] = __('Main data');
-    $table->head_colspan[0] = 4;
-    $table->headstyle[0] = 'text-align: center';
-    $table->size[0] = '15%';
-    $table->size[1] = '90%';
-    $table->style[0] = 'font-weight: bold; vertical-align: top;';
-} else {
-    $table->class = 'filter-table-adv databox';
-    $table->size[0] = '50%';
-    $table->size[1] = '50%';
-    $table->size[2] = '50%';
-    $table->size[3] = '50%';
-}
+
+$table->class = 'filter-table-adv databox';
+$table->size[0] = '50%';
+$table->size[1] = '50%';
+$table->size[2] = '50%';
+$table->size[3] = '50%';
+
 
 $write_groups = users_get_groups_for_select(
     false,
@@ -95,35 +87,20 @@ $write_groups = users_get_groups_for_select(
     'id_grupo'
 );
 
-if (is_metaconsole() === true) {
-    $table->data['name'][0] = __('Name');
-    $table->data['name'][1] = html_print_input_text(
+$table->data[0][0] = html_print_label_input_block(
+    __('Name'),
+    html_print_input_text(
         'name',
         $reportName,
         __('Name'),
-        80,
+        false,
         100,
         true,
         false,
         true
-    );
+    )
+);
 
-    $table->data['group'][0] = __('Group');
-} else {
-    $table->data[0][0] = html_print_label_input_block(
-        __('Name'),
-        html_print_input_text(
-            'name',
-            $reportName,
-            __('Name'),
-            false,
-            100,
-            true,
-            false,
-            true
-        )
-    );
-}
 
 // If the report group is not among the
 // RW groups (special permission) we add it.
@@ -137,9 +114,10 @@ if (users_can_manage_group_all('RW') === true) {
     $return_all_group = true;
 }
 
-if (is_metaconsole() === true) {
-    $table->data['group'][1] = '<div class="w290px inline">';
-    $table->data['group'][1] .= html_print_input(
+
+$table->data[0][1] = html_print_label_input_block(
+    __('Group'),
+    html_print_input(
         [
             'type'           => 'select_groups',
             'id_user'        => $config['id_user'],
@@ -153,28 +131,23 @@ if (is_metaconsole() === true) {
             'return'         => true,
             'required'       => true,
         ]
-    );
-    $table->data['group'][1] .= '</div>';
-} else {
-    $table->data[0][1] = html_print_label_input_block(
-        __('Group'),
-        html_print_input(
-            [
-                'type'           => 'select_groups',
-                'id_user'        => $config['id_user'],
-                'privilege'      => 'AR',
-                'returnAllGroup' => $return_all_group,
-                'name'           => 'id_group',
-                'selected'       => $idGroupReport,
-                'script'         => '',
-                'nothing'        => '',
-                'nothing_value'  => '',
-                'return'         => true,
-                'required'       => true,
-            ]
-        )
-    );
-}
+    )
+);
+
+
+$table->colspan[1][0] = 2;
+$table->data[1][0] = html_print_label_input_block(
+    __('Description'),
+    html_print_textarea(
+        'description',
+        2,
+        1,
+        $description,
+        '',
+        true
+    )
+);
+
 
 if ($report_id_user == $config['id_user']
     || is_user_admin($config['id_user'])
@@ -185,13 +158,12 @@ if ($report_id_user == $config['id_user']
         'group_edit' => __('The next group can edit the report'),
         'user_edit'  => __('Only the user and admin user can edit the report'),
     ];
-    if (is_metaconsole() === true) {
-        $table->data['access'][0] = __('Write Access');
-        $table->data['access'][0] .= ui_print_help_tip(
+    $table->data[2][0] = html_print_label_input_block(
+        __('Write Access').ui_print_help_tip(
             __('For example, you want a report that the people of "All" groups can see but you want to edit only for you or your group.'),
             true
-        );
-        $table->data['access'][1] = html_print_select(
+        ),
+        html_print_select(
             $type_access,
             'type_access',
             $type_access_selected,
@@ -199,16 +171,18 @@ if ($report_id_user == $config['id_user']
             '',
             0,
             true
-        );
+        )
+    );
 
-        $class = ' invisible_important ';
-        if ($type_access_selected == 'group_edit') {
-            $class = '';
-        }
+    $options['div_class'] = 'invisible_important';
+    $options['div_id'] = 'group_edit';
+    if ($type_access_selected == 'group_edit') {
+        $options['div_class'] = '';
+    }
 
-        $table->data['access'][1] .= '<span class="access_subform'.$class.'" id="group_edit">';
-        $table->data['access'][1] .= '<div class="w290px inline">';
-        $table->data['access'][1] .= html_print_select_groups(
+    $table->data[2][1] = html_print_label_input_block(
+        __('Group'),
+        html_print_select_groups(
             false,
             'RW',
             false,
@@ -218,48 +192,9 @@ if ($report_id_user == $config['id_user']
             '',
             '',
             true
-        );
-        $table->data['access'][1] .= '</div>';
-        $table->data['access'][1] .= '</span>';
-    } else {
-        $table->data[1][0] = html_print_label_input_block(
-            __('Write Access').ui_print_help_tip(
-                __('For example, you want a report that the people of "All" groups can see but you want to edit only for you or your group.'),
-                true
-            ),
-            html_print_select(
-                $type_access,
-                'type_access',
-                $type_access_selected,
-                'change_type_access(this)',
-                '',
-                0,
-                true
-            )
-        );
-
-        $options['div_class'] = 'invisible_important';
-        $options['div_id'] = 'group_edit';
-        if ($type_access_selected == 'group_edit') {
-            $options['div_class'] = '';
-        }
-
-        $table->data[1][1] = html_print_label_input_block(
-            __('Group'),
-            html_print_select_groups(
-                false,
-                'RW',
-                false,
-                'id_group_edit',
-                $id_group_edit,
-                false,
-                '',
-                '',
-                true
-            ),
-            $options
-        );
-    }
+        ),
+        $options
+    );
 }
 
 if ($enterpriseEnable) {
@@ -268,91 +203,41 @@ if ($enterpriseEnable) {
         $non_interactive_check = $non_interactive;
     }
 
-    if (is_metaconsole() === true) {
-        $table->data['interactive_report'][0] = __('Non interactive report');
-        $table->data['interactive_report'][1] .= html_print_checkbox_switch(
+    $table->data[2][1] = html_print_label_input_block(
+        __('Non interactive report'),
+        html_print_checkbox_switch(
             'non_interactive',
             1,
             $non_interactive_check,
             true
-        );
-    } else {
-        $table->data[2][0] = html_print_label_input_block(
-            __('Non interactive report'),
-            html_print_checkbox_switch(
-                'non_interactive',
-                1,
-                $non_interactive_check,
-                true
-            )
-        );
-    }
-}
-
-if (is_metaconsole() === true) {
-    $table->data['description'][0] = __('Description');
-    $table->data['description'][1] = html_print_textarea(
-        'description',
-        2,
-        80,
-        $description,
-        '',
-        true
-    );
-} else {
-    $table->data[2][1] = html_print_label_input_block(
-        __('Description'),
-        html_print_textarea(
-            'description',
-            2,
-            1,
-            $description,
-            '',
-            true
         )
     );
 }
 
+
 if (enterprise_installed() === true) {
-    if (is_metaconsole() === true) {
-        $table->data['cover'][0] = __('Generate cover page in PDF render');
-        $table->data['cover'][1] = html_print_checkbox_switch(
+    $table->data[3][0] = html_print_label_input_block(
+        __('Generate cover page in PDF render'),
+        html_print_checkbox_switch(
             'cover_page_render',
             1,
             $cover_page_render,
             true
-        );
+        )
+    );
 
-        $table->data['index'][0] = __('Generate index in PDF render');
-        $table->data['index'][1] = html_print_checkbox_switch(
+    $table->data[3][1] = html_print_label_input_block(
+        __('Generate index in PDF render'),
+        html_print_checkbox_switch(
             'index_render',
             1,
             $index_render,
             true
-        );
-    } else {
-        $table->data[3][0] = html_print_label_input_block(
-            __('Generate cover page in PDF render'),
-            html_print_checkbox_switch(
-                'cover_page_render',
-                1,
-                $cover_page_render,
-                true
-            )
-        );
-
-        $table->data[3][1] = html_print_label_input_block(
-            __('Generate index in PDF render'),
-            html_print_checkbox_switch(
-                'index_render',
-                1,
-                $index_render,
-                true
-            )
-        );
-    }
+        )
+    );
 }
 
+
 echo '<form class="" method="post">';
 html_print_table($table);
 
diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php
index a0e25d0e04..3494ff8f78 100755
--- a/pandora_console/godmode/reporting/reporting_builder.php
+++ b/pandora_console/godmode/reporting/reporting_builder.php
@@ -713,13 +713,14 @@ switch ($action) {
 
         $table_aux = new stdClass();
         $table_aux->width = '100%';
-        if (is_metaconsole()) {
-            $table_aux->class = 'databox filters';
+        $table_aux->class = 'filter-table-adv';
+        $table_aux->size[0] = '30%';
+        $table_aux->size[1] = '30%';
+        $table_aux->size[2] = '30%';
 
-            $table_aux->colspan[0][0] = 4;
-            $table_aux->data[0][0] = '<b>'.__('Group').'</b>';
-
-            $table_aux->data[0][1] = html_print_select_groups(
+        $table_aux->data[0][0] = html_print_label_input_block(
+            __('Group'),
+            html_print_select_groups(
                 false,
                 $access,
                 true,
@@ -737,116 +738,56 @@ switch ($action) {
                 false,
                 false,
                 'id_grupo'
-            ).'<br>';
+            )
+        );
 
-            $table_aux->data[0][2] = '<b>'.__('Free text for search: ');
-            $table_aux->data[0][2] .= ui_print_help_tip(
+        $table_aux->data[0][1] = html_print_label_input_block(
+            __('Free text for search: ').ui_print_help_tip(
                 __('Search by report name or description, list matches.'),
                 true
-            );
-            $table_aux->data[0][2] .= '</b>';
-            $table_aux->data[0][3] = html_print_input_text(
+            ),
+            html_print_input_text(
                 __('search'),
                 $search,
                 '',
                 30,
                 '',
                 true
-            );
-        } else {
-            $table_aux->class = 'filter-table-adv';
-            $table_aux->size[0] = '30%';
-            $table_aux->size[1] = '30%';
-            $table_aux->size[2] = '30%';
-
-            $table_aux->data[0][0] = html_print_label_input_block(
-                __('Group'),
-                html_print_select_groups(
-                    false,
-                    $access,
-                    true,
-                    'id_group',
-                    $id_group,
-                    '',
-                    '',
-                    '',
-                    true,
-                    false,
-                    true,
-                    '',
-                    false,
-                    '',
-                    false,
-                    false,
-                    'id_grupo'
-                )
-            );
-
-            $table_aux->data[0][1] = html_print_label_input_block(
-                __('Free text for search: ').ui_print_help_tip(
-                    __('Search by report name or description, list matches.'),
-                    true
-                ),
-                html_print_input_text(
-                    __('search'),
-                    $search,
-                    '',
-                    30,
-                    '',
-                    true
-                )
-            );
-        }
-
-        if (is_metaconsole()) {
-            $table_aux->data[0][6] = html_print_submit_button(
-                __('Search'),
-                'search_submit',
-                false,
-                'class="sub upd"',
-                true
-            );
-        }
+            )
+        );
 
         $url_rb = 'index.php?sec=reporting&sec2=godmode/reporting/reporting_builder';
-        if (is_metaconsole()) {
-            $filter = '<form action="'.$url_rb.'&id_group='.$id_group.'&pure='.$pure.'" method="post">';
-            $filter .= html_print_table($table_aux, true);
-            $filter .= '</form>';
-            ui_toggle($filter, __('Show Option'));
-        } else {
-            $searchForm = '<form action="'.$url_rb.'&id_group='.$id_group.'&pure='.$pure.'" method="post">';
-            $searchForm .= html_print_table($table_aux, true);
-            $searchForm .= html_print_div(
-                [
-                    'class'   => 'action-buttons',
-                    'content' => html_print_submit_button(
-                        __('Filter'),
-                        'search_submit',
-                        false,
-                        [
-                            'mode' => 'mini',
-                            'icon' => 'search',
-                        ],
-                        true
-                    ),
-                ],
-                true
-            );
-            $searchForm .= '</form>';
+        $searchForm = '<form action="'.$url_rb.'&id_group='.$id_group.'&pure='.$pure.'" method="post">';
+        $searchForm .= html_print_table($table_aux, true);
+        $searchForm .= html_print_div(
+            [
+                'class'   => 'action-buttons',
+                'content' => html_print_submit_button(
+                    __('Filter'),
+                    'search_submit',
+                    false,
+                    [
+                        'mode' => 'mini',
+                        'icon' => 'search',
+                    ],
+                    true
+                ),
+            ],
+            true
+        );
+        $searchForm .= '</form>';
 
-            ui_toggle(
-                $searchForm,
-                '<span class="subsection_header_title">'.__('Filters').'</span>',
-                'filter_form',
-                '',
-                false,
-                false,
-                '',
-                'white-box-content',
-                'box-flat white_table_graph fixed_filter_bar'
-            );
-        }
+        ui_toggle(
+            $searchForm,
+            '<span class="subsection_header_title">'.__('Filters').'</span>',
+            'filter_form',
+            '',
+            false,
+            false,
+            '',
+            'white-box-content',
+            'box-flat white_table_graph fixed_filter_bar'
+        );
 
         ui_require_jquery_file('pandora.controls');
         ui_require_jquery_file('ajaxqueue');
@@ -1656,11 +1597,13 @@ switch ($action) {
                                 $agents_to_report = get_parameter('id_agents3');
                                 $source = get_parameter('source', '');
                                 $search = get_parameter('search', '');
+                                $full_text = (integer) get_parameter('full_text', 0);
                                 $log_number = get_parameter('log_number', '');
 
                                 $es['source'] = $source;
                                 $es['id_agents'] = $agents_to_report;
                                 $es['search'] = $search;
+                                $es['full_text'] = $full_text;
                                 $es['log_number'] = $log_number;
 
                                 $values['external_source'] = json_encode($es);
@@ -2601,11 +2544,13 @@ switch ($action) {
                                 $agents_to_report = get_parameter('id_agents3');
                                 $source = get_parameter('source', '');
                                 $search = get_parameter('search', '');
+                                $full_text = (integer) get_parameter('full_text', 0);
                                 $log_number = get_parameter('log_number', '');
 
                                 $es['source'] = $source;
                                 $es['id_agents'] = $agents_to_report;
                                 $es['search'] = $search;
+                                $es['full_text'] = $full_text;
                                 $es['log_number'] = $log_number;
 
                                 $values['external_source'] = json_encode($es);
diff --git a/pandora_console/godmode/servers/plugin.php b/pandora_console/godmode/servers/plugin.php
index 688e898c9d..a5705da95a 100644
--- a/pandora_console/godmode/servers/plugin.php
+++ b/pandora_console/godmode/servers/plugin.php
@@ -389,7 +389,7 @@ if (empty($create) === false || empty($view) === false) {
     $disabled = ($locked === true) ? 'readonly="readonly"' : '';
 
     if (empty($create) === true) {
-        $formAction = 'index.php?sec=gservers&sec2=godmode/servers/plugin&tab=$tab&update_plugin=$plugin_id&pure='.$config['pure'];
+        $formAction = 'index.php?sec=gservers&sec2=godmode/servers/plugin&tab=$tab&update_plugin='.$plugin_id.'&pure='.$config['pure'];
     } else {
         $formAction = 'index.php?sec=gservers&sec2=godmode/servers/plugin&tab=$tab&create_plugin=1&pure='.$config['pure'];
     }
@@ -403,69 +403,61 @@ if (empty($create) === false || empty($view) === false) {
 
     $table = new stdClass();
     $table->id = 'table-form';
-    $table->class = 'floating_form';
+    $table->class = 'filter-table-adv';
     $table->style = [];
     $table->data['plugin_name_captions'] = $data;
-    $table->style[0] = 'vertical-align: top';
-    $table->style[1] = 'vertical-align: top';
+    $table->size[0] = '50%';
+    $table->size[1] = '50%';
 
     $table->data = [];
     // General title.
-    $generalTitleContent = [];
-    $generalTitleContent[] = html_print_div([ 'style' => 'width: 10px; flex: 0 0 auto; margin-right: 5px;}', 'class' => 'section_table_title_line' ], true);
-    $generalTitleContent[] = html_print_div([ 'class' => 'section_table_title', 'content' => __('General')], true);
-    $data[0] = html_print_div(['class' => 'flex-row-center', 'content' => implode('', $generalTitleContent) ], true);
+    $data[0] = html_print_div([ 'class' => 'section_table_title', 'content' => __('General')], true);
     $table->data['general_title'] = $data;
 
     $data = [];
-    $data[0] = __('Name');
+    $data[0] = html_print_label_input_block(
+        __('Name'),
+        html_print_input_text('form_name', $form_name, '', 100, 255, true, false, false, '')
+    );
     $table->data['plugin_name_captions'] = $data;
 
     $data = [];
-    $data[0] = html_print_input_text('form_name', $form_name, '', 100, 255, true, false, false, '', 'w100p');
-    $table->data['plugin_name_inputs'] = $data;
-    $table->colspan['plugin_name_inputs'][0] = 3;
 
+    $data[0] = html_print_label_input_block(
+        __('Plugin type'),
+        html_print_select($formPluginType, 'form_plugin_type', $form_plugin_type, '', '', 0, true, false, true, '', false, 'width: 100%')
+    );
 
-    $data = [];
-    $data[0] = __('Plugin type');
-    $data[1] = __('Max. timeout');
-    $table->data['plugin_type_timeout_captions'] = $data;
-    // $table->colspan['plugin_type'][1] = 3;
-    $data = [];
-    $data[0] = html_print_select($formPluginType, 'form_plugin_type', $form_plugin_type, '', '', 0, true);
     $timeoutContent = [];
     $timeoutContent[] = '<div>'.html_print_extended_select_for_time('form_max_timeout', $form_max_timeout, '', '', '0', false, true).'</div>';
     $timeoutContent[] = ui_print_input_placeholder(__('This value only will be applied if is minor than the server general configuration plugin timeout').'<br>'.__('If you set a 0 seconds timeout, the server plugin timeout will be used'), true);
-    $data[1] = html_print_div(
-        [
-            'class'   => 'flex flex_column',
-            'content' => implode('', $timeoutContent),
-        ],
-        true
+    $data[1] = html_print_label_input_block(
+        __('Max. timeout'),
+        html_print_div(
+            [
+                'class'   => 'flex flex_column',
+                'content' => implode('', $timeoutContent),
+            ],
+            true
+        )
     );
-    $table->data['plugin_type_timeout_inputs'] = $data;
+
+    $table->data['plugin_type_timeout'] = $data;
 
     $data = [];
-    $data[0] = __('Description');
-    $table->data['plugin_desc_captions'] = $data;
+    $data[0] = html_print_label_input_block(
+        __('Description'),
+        html_print_textarea('form_description', 4, 50, $form_description, '', true)
+    );
 
-    $data = [];
-    $data[0] = html_print_textarea('form_description', 4, 50, $form_description, '', true, 'w100p');
-    $table->colspan['plugin_desc_inputs'][0] = 3;
+    $table->colspan['plugin_desc_inputs'][0] = 2;
     $table->data['plugin_desc_inputs'] = $data;
 
-    // Command title.
-    $commandTitleContent = [];
-    $commandTitleContent[] = html_print_div([ 'style' => 'width: 10px; flex: 0 0 auto; margin-right: 5px;}', 'class' => 'section_table_title_line' ], true);
-    $commandTitleContent[] = html_print_div([ 'class' => 'section_table_title', 'content' => __('Command')], true);
-    $data = [];
-    $data[0] = html_print_div(['class' => 'flex-row-center', 'content' => implode('', $commandTitleContent) ], true);
-    $table->data['command_title'] = $data;
 
+    // Command title.
     $data = [];
-    $data[0] = __('Plugin command').ui_print_help_tip(__('Specify interpreter and plugin path. The server needs permissions to run it.'), true);
-    $table->data['plugin_command_caption'] = $data;
+    $data[0] = html_print_div([ 'class' => 'section_table_title', 'content' => __('Command')], true);
+    $table->data['command_title'] = $data;
 
     $data = [];
     $formExecuteContent = [];
@@ -480,45 +472,53 @@ if (empty($create) === false || empty($view) === false) {
         true
     );
 
-    $data[0] = html_print_div(['class' => 'flex-row-center', 'content' => implode('', $formExecuteContent)], true);
+    $data[0] = html_print_label_input_block(
+        __('Plugin command'),
+        html_print_div(['class' => 'flex-row-center', 'content' => implode('', $formExecuteContent)], true).ui_print_input_placeholder(
+            __('Specify interpreter and plugin path. The server needs permissions to run it.'),
+            true
+        )
+    );
+
+    // $data[0] = html_print_div(['class' => 'flex-row-center', 'content' => implode('', $formExecuteContent)], true);
     $table->data['plugin_command_inputs'] = $data;
     $table->colspan['plugin_command_inputs'][0] = 2;
 
     $data = [];
-    $data[0] = __('Plug-in parameters');
-    $table->data['plugin_parameters_caption'] = $data;
-
-    $data = [];
-    $data[0] = html_print_input_text(
-        'form_parameters',
-        $parameters,
-        '',
-        100,
-        255,
-        true,
-        false,
-        false,
-        '',
-        'command_component command_advanced_conf text_input w100p'
+    $data[0] = html_print_label_input_block(
+        __('Plug-in parameters'),
+        html_print_input_text(
+            'form_parameters',
+            $parameters,
+            '',
+            100,
+            255,
+            true,
+            false,
+            false,
+            '',
+            'command_component command_advanced_conf text_input'
+        )
     );
+
     $table->data['plugin_parameters_inputs'] = $data;
     $table->colspan['plugin_parameters_inputs'][0] = 2;
 
     $data = [];
-    $data[0] = __('Command preview');
-    $table->data['plugin_preview_captions'] = $data;
-    $data = [];
-
-    $data[0] = html_print_div(['id' => 'command_preview', 'class' => 'mono'], true);
+    // $data[0] = __('Command preview');
+    // $table->data['plugin_preview_captions'] = $data;
+    // $data = [];
+    // $data[0] = html_print_div(['id' => 'command_preview', 'class' => 'mono'], true);
+    $data[0] = html_print_label_input_block(
+        __('Command preview'),
+        html_print_div(['id' => 'command_preview', 'class' => 'mono'], true)
+    );
     $table->data['plugin_preview_inputs'] = $data;
     $table->colspan['plugin_preview_inputs'][0] = 2;
 
     // Parameters macros title.
-    $macrosTitleContent = [];
-    $macrosTitleContent[] = html_print_div([ 'style' => 'width: 10px; flex: 0 0 auto; margin-right: 5px;}', 'class' => 'section_table_title_line' ], true);
-    $macrosTitleContent[] = html_print_div([ 'class' => 'section_table_title', 'content' => __('Parameters macros')], true);
     $data = [];
-    $data[0] = html_print_div(['class' => 'flex-row-center', 'content' => implode('', $macrosTitleContent) ], true);
+    $data[0] = html_print_div([ 'class' => 'section_table_title', 'content' => __('Parameters macros')], true);
     $table->data['parameters_macros_title'] = $data;
 
     $macros = json_decode($macros, true);
@@ -563,53 +563,59 @@ if (empty($create) === false || empty($view) === false) {
         }
 
         $datam = [];
-        $datam[0] = __('Description')."<span class='normal_weight'> ($macro_name)</span>";
+        $datam[0] = html_print_label_input_block(
+            __('Description').'<span class="normal_weight">('.$macro_name.')</span>',
+            html_print_input_text_extended($macro_desc_name, $macro_desc_value, 'text-'.$macro_desc_name, '', 30, 255, false, '', "class='command_macro text_input'", true)
+        );
         $datam[0] .= html_print_input_hidden($macro_name_name, $macro_name, true);
-        $datam[1] = html_print_input_text_extended($macro_desc_name, $macro_desc_value, 'text-'.$macro_desc_name, '', 30, 255, false, '', "class='command_macro text_input'", true);
 
-        $datam[2] = __('Default value')."<span class='normal_weight'> ($macro_name)</span>";
-        $datam[3] = html_print_input_text_extended($macro_value_name, $macro_value_value, 'text-'.$macro_value_name, '', 30, 255, false, '', "class='command_component command_macro text_input'", true);
+        $datam[1] = html_print_label_input_block(
+            __('Default value').'<span class="normal_weight">('.$macro_name.')</span>',
+            html_print_input_text_extended($macro_value_name, $macro_value_value, 'text-'.$macro_value_name, '', 30, 255, false, '', "class='command_component command_macro text_input'", true)
+        );
 
         $table->data['plugin_'.$next_name_number] = $datam;
 
         $next_name_number++;
 
-        $table->colspan['plugin_'.$next_name_number][1] = 3;
+        $table->colspan['plugin_'.$next_name_number][1] = 2;
 
         $datam = [];
-        $datam[0] = __('Hide value').ui_print_help_tip(
-            __('This field will show up as dots like a password'),
-            true
-        );
-        $datam[1] = html_print_checkbox_extended(
-            $macro_hide_value_name,
-            1,
-            $macro_hide_value_value,
-            0,
-            '',
-            ['class' => 'command_macro'],
-            true,
-            'checkbox-'.$macro_hide_value_name
+        $datam = html_print_label_input_block(
+            __('Hide value'),
+            html_print_checkbox_switch(
+                $macro_hide_value_name,
+                1,
+                $macro_hide_value_value,
+                0,
+                '',
+                ['class' => 'command_macro'],
+                true,
+                'checkbox-'.$macro_hide_value_name
+            ).ui_print_input_placeholder(
+                __('This field will show up as dots like a password'),
+                true
+            )
         );
 
         $table->data['plugin_'.$next_name_number] = $datam;
         $next_name_number++;
 
-        $table->colspan['plugin_'.$next_name_number][1] = 3;
-
+        // $table->colspan['plugin_'.$next_name_number][1] = 3;
         $datam = [];
-        $datam[0] = __('Help')."<span class='normal_weight'> ($macro_name)</span><br><br><br>";
-        $datam[1] = html_print_textarea(
-            $macro_help_name,
-            6,
-            100,
-            $macro_help_value,
-            'class="command_macro" class="w97p"',
-            true
+        $datam[0] = html_print_label_input_block(
+            __('Help').'<span class="normal_weight"> ('.$macro_name.')</span>',
+            html_print_textarea(
+                $macro_help_name,
+                6,
+                100,
+                $macro_help_value,
+                'class="command_macro" class="w97p"',
+                true
+            )
         );
 
-        $datam[1] .= '<br><br><br>';
-
+        $table->colspan['plugin_'.$next_name_number][0] = 2;
         $table->data['plugin_'.$next_name_number] = $datam;
         $next_name_number++;
         $i++;
@@ -617,7 +623,7 @@ if (empty($create) === false || empty($view) === false) {
 
     // Add/Delete buttons
     $datam = [];
-
+    $buttons = '';
     if (!$locked) {
         $datam[0] = '<a id="add_macro_btn" href="javascript:;">'.'<span class="bolder">'.__('Add macro').'</span>'.'&nbsp;'.html_print_image(
             'images/add.png',
@@ -627,20 +633,55 @@ if (empty($create) === false || empty($view) === false) {
         $datam[0] .= '<div id="next_macro" class="invisible">'.$i.'</div>';
         $datam[0] .= '<div id="next_row" class="invisible">'.$next_name_number.'</div>';
 
+        $buttons = html_print_anchor(
+            [
+                'id'      => 'add_macro_btn',
+                'href'    => 'javascript:;',
+                'content' => html_print_image(
+                    'images/plus@svg.svg',
+                    true,
+                    ['class' => 'invert_filter']
+                ),
+            ],
+            true
+        );
+
+        $buttons .= html_print_div(['id' => 'next_macro', 'class' => 'invisible', 'content' => $i], true);
+        $buttons .= html_print_div(['id' => 'next_row', 'class' => 'invisible', 'content' => $next_name_number], true);
+
         $delete_macro_style = '';
         if ($i <= 2) {
             $delete_macro_style = 'display:none;';
         }
 
-        $datam[2] = '<div id="delete_macro_button" style="'.$delete_macro_style.'">'.'<a href="javascript:;">'.'<span class="bolder">'.__('Delete macro').'</span>'.'&nbsp;'.html_print_image('images/delete.svg', true, ['class' => 'main_menu_icon invert_filter']).'</a>'.'</div>';
+        // $datam[1] = '<div id="delete_macro_button" style="'.$delete_macro_style.'">'.'<a href="javascript:;">'.'<span class="bolder">'.__('Delete macro').'</span>'.'&nbsp;'.html_print_image('images/delete.svg', true, ['class' => 'main_menu_icon invert_filter']).'</a>'.'</div>';
+        $buttons .= html_print_anchor(
+            [
+                'id'      => 'delete_macro_button',
+                'style'   => $delete_macro_style,
+                'href'    => 'javascript:;',
+                'content' => html_print_image(
+                    'images/delete.svg',
+                    true,
+                    ['class' => 'main_menu_icon invert_filter']
+                ),
+            ],
+            true
+        );
 
+        $datam[0] = html_print_div(
+            [
+                'style'   => 'flex-direction: row-reverse;justify-content: flex-start;',
+                'content' => $buttons,
+            ],
+            true
+        );
         $table->colspan['plugin_action'][0] = 2;
-        $table->colspan['plugin_action'][2] = 2;
     } else {
-        $table->colspan['plugin_action'][0] = 4;
+        // $table->colspan['plugin_action'][0] = 4;
     }
 
-    $table->rowstyle['plugin_action'] = 'text-align:center';
+    // $table->rowstyle['plugin_action'] = 'text-align:center';
     $table->data['plugin_action'] = $datam;
 
 
diff --git a/pandora_console/godmode/setup/os.builder.php b/pandora_console/godmode/setup/os.builder.php
index f54eea5834..4c79ae4c07 100644
--- a/pandora_console/godmode/setup/os.builder.php
+++ b/pandora_console/godmode/setup/os.builder.php
@@ -55,7 +55,7 @@ $iconData[] = html_print_select(
 $iconData[] = html_print_div(
     [
         'id'      => 'icon_image',
-        'class'   => 'inverse_filter main_menu_icon',
+        'class'   => 'invert_filter main_menu_icon',
         'style'   => 'margin-left: 10px',
         'content' => ui_print_os_icon($idOS, false, true),
     ],
diff --git a/pandora_console/godmode/setup/os.list.php b/pandora_console/godmode/setup/os.list.php
index 2ae5096893..7ec091e04b 100644
--- a/pandora_console/godmode/setup/os.list.php
+++ b/pandora_console/godmode/setup/os.list.php
@@ -69,7 +69,6 @@ if ($is_management_allowed === true) {
     $table->head[4] = '';
 }
 
-$table->align[1] = 'center';
 if ($is_management_allowed === true) {
     $table->align[4] = 'center';
 }
@@ -100,7 +99,7 @@ $table->data = [];
 foreach ($osList as $os) {
     $data = [];
     $data[] = $os['id_os'];
-    $data[] = html_print_div(['class' => 'invert_filter main_menu_icon', 'content' => ui_print_os_icon($os['id_os'], false, true)], true);
+    $data[] = ui_print_os_icon($os['id_os'], false, true);
     if ($is_management_allowed === true) {
         if (is_metaconsole() === true) {
             $osNameUrl = 'index.php?sec=advanced&sec2=advanced/component_management&tab=os_manage&action=edit&tab2=builder&id_os='.$os['id_os'];
@@ -133,7 +132,7 @@ foreach ($osList as $os) {
             $data[] = html_print_anchor(
                 [
                     'href'    => $hrefDelete,
-                    'class'   => 'inverse_filter main_menu_icon',
+                    'class'   => 'invert_filter main_menu_icon',
                     'content' => html_print_image('images/delete.svg', true),
                 ],
                 true
diff --git a/pandora_console/godmode/setup/performance.php b/pandora_console/godmode/setup/performance.php
index 2139118ff1..e367a2c54b 100644
--- a/pandora_console/godmode/setup/performance.php
+++ b/pandora_console/godmode/setup/performance.php
@@ -254,188 +254,187 @@ if ($config['history_db_enabled'] == 1) {
 
 $table = new StdClass();
 $table->width = '100%';
-$table->class = 'databox filters';
+$table->class = 'filter-table-adv';
 $table->data = [];
-$table->style[0] = 'font-weight: bold';
+$table->size[0] = '50%';
+$table->size[1] = '50%';
 
-$table->size[0] = '70%';
-$table->size[1] = '30%';
-
-$table->data[1][0] = __('Max. days before delete events');
-$table->data[1][1] = html_print_input(
-    [
-        'type'   => 'number',
-        'size'   => 5,
-        'max'    => $performance_variables_control['event_purge']->max,
-        'name'   => 'event_purge',
-        'value'  => $config['event_purge'],
-        'return' => true,
-        'min'    => $performance_variables_control['event_purge']->min,
-        'style'  => 'width:43px',
-    ]
+$table->data[0][0] = html_print_label_input_block(
+    __('Max. days before delete events'),
+    html_print_input(
+        [
+            'type'   => 'number',
+            'size'   => 5,
+            'max'    => $performance_variables_control['event_purge']->max,
+            'name'   => 'event_purge',
+            'value'  => $config['event_purge'],
+            'return' => true,
+            'min'    => $performance_variables_control['event_purge']->min,
+        ]
+    )
 );
 
-$table->data[2][0] = __('Max. days before delete traps');
-$table->data[2][1] = html_print_input(
-    [
-        'type'   => 'number',
-        'size'   => 5,
-        'max'    => $performance_variables_control['trap_purge']->max,
-        'name'   => 'trap_purge',
-        'value'  => $config['trap_purge'],
-        'return' => true,
-        'min'    => $performance_variables_control['trap_purge']->min,
-        'style'  => 'width:43px',
-    ]
+$table->data[0][1] = html_print_label_input_block(
+    __('Max. days before delete traps'),
+    html_print_input(
+        [
+            'type'   => 'number',
+            'size'   => 5,
+            'max'    => $performance_variables_control['trap_purge']->max,
+            'name'   => 'trap_purge',
+            'value'  => $config['trap_purge'],
+            'return' => true,
+            'min'    => $performance_variables_control['trap_purge']->min,
+        ]
+    )
 );
 
-$table->data[3][0] = __('Max. days before delete audit events');
-$table->data[3][1] = html_print_input(
-    [
-        'type'   => 'number',
-        'size'   => 5,
-        'max'    => $performance_variables_control['audit_purge']->max,
-        'name'   => 'audit_purge',
-        'value'  => $config['audit_purge'],
-        'return' => true,
-        'min'    => $performance_variables_control['audit_purge']->min,
-        'style'  => 'width:43px',
-    ]
+$table->data[1][0] = html_print_label_input_block(
+    __('Max. days before delete audit events'),
+    html_print_input(
+        [
+            'type'   => 'number',
+            'size'   => 5,
+            'max'    => $performance_variables_control['audit_purge']->max,
+            'name'   => 'audit_purge',
+            'value'  => $config['audit_purge'],
+            'return' => true,
+            'min'    => $performance_variables_control['audit_purge']->min,
+        ]
+    )
 );
 
-$table->data[4][0] = __('Max. days before delete string data');
-$table->data[4][1] = html_print_input(
-    [
-        'type'   => 'number',
-        'size'   => 5,
-        'max'    => $performance_variables_control['string_purge']->max,
-        'name'   => 'string_purge',
-        'value'  => $config['string_purge'],
-        'return' => true,
-        'min'    => $performance_variables_control['string_purge']->min,
-        'style'  => 'width:43px',
-    ]
+$table->data[1][1] = html_print_label_input_block(
+    __('Max. days before delete string data'),
+    html_print_input(
+        [
+            'type'   => 'number',
+            'size'   => 5,
+            'max'    => $performance_variables_control['string_purge']->max,
+            'name'   => 'string_purge',
+            'value'  => $config['string_purge'],
+            'return' => true,
+            'min'    => $performance_variables_control['string_purge']->min,
+        ]
+    )
 );
 
-$table->data[5][0] = __('Max. days before delete GIS data');
-$table->data[5][1] = html_print_input(
-    [
-        'type'   => 'number',
-        'size'   => 5,
-        'max'    => $performance_variables_control['gis_purge']->max,
-        'name'   => 'gis_purge',
-        'value'  => $config['gis_purge'],
-        'return' => true,
-        'min'    => $performance_variables_control['gis_purge']->min,
-        'style'  => 'width:43px',
-    ]
+$table->data[2][0] = html_print_label_input_block(
+    __('Max. days before delete GIS data'),
+    html_print_input(
+        [
+            'type'   => 'number',
+            'size'   => 5,
+            'max'    => $performance_variables_control['gis_purge']->max,
+            'name'   => 'gis_purge',
+            'value'  => $config['gis_purge'],
+            'return' => true,
+            'min'    => $performance_variables_control['gis_purge']->min,
+        ]
+    )
 );
 
-$table->data[6][0] = __('Max. days before purge');
-$table->data[6][1] = html_print_input(
-    [
-        'type'   => 'number',
-        'size'   => 5,
-        'max'    => $performance_variables_control['days_purge']->max,
-        'name'   => 'days_purge',
-        'value'  => $config['days_purge'],
-        'return' => true,
-        'min'    => $performance_variables_control['days_purge']->min,
-        'style'  => 'width:43px',
-    ]
+$table->data[2][1] = html_print_label_input_block(
+    __('Max. days before purge'),
+    html_print_input(
+        [
+            'type'   => 'number',
+            'size'   => 5,
+            'max'    => $performance_variables_control['days_purge']->max,
+            'name'   => 'days_purge',
+            'value'  => $config['days_purge'],
+            'return' => true,
+            'min'    => $performance_variables_control['days_purge']->min,
+        ]
+    )
 );
 
-$table->data[7][0] = __('Max. days before compact data');
-$table->data[7][1] = html_print_input(
-    [
-        'type'   => 'number',
-        'size'   => 5,
-        'max'    => $performance_variables_control['days_compact']->max,
-        'name'   => 'days_compact',
-        'value'  => $config['days_compact'],
-        'return' => true,
-        'min'    => $performance_variables_control['days_compact']->min,
-        'style'  => 'width:43px',
-    ]
+$table->data[3][0] = html_print_label_input_block(
+    __('Max. days before compact data'),
+    html_print_input(
+        [
+            'type'   => 'number',
+            'size'   => 5,
+            'max'    => $performance_variables_control['days_compact']->max,
+            'name'   => 'days_compact',
+            'value'  => $config['days_compact'],
+            'return' => true,
+            'min'    => $performance_variables_control['days_compact']->min,
+        ]
+    )
 );
 
-$table->data[8][0] = __('Max. days before delete unknown modules');
-$table->data[8][1] = html_print_input(
-    [
-        'type'   => 'number',
-        'size'   => 5,
-        'max'    => $performance_variables_control['days_delete_unknown']->max,
-        'name'   => 'days_delete_unknown',
-        'value'  => $config['days_delete_unknown'],
-        'return' => true,
-        'min'    => $performance_variables_control['days_delete_unknown']->min,
-        'style'  => 'width:43px',
-    ]
+$table->data[3][1] = html_print_label_input_block(
+    __('Max. days before delete unknown modules'),
+    html_print_input(
+        [
+            'type'   => 'number',
+            'size'   => 5,
+            'max'    => $performance_variables_control['days_delete_unknown']->max,
+            'name'   => 'days_delete_unknown',
+            'value'  => $config['days_delete_unknown'],
+            'return' => true,
+            'min'    => $performance_variables_control['days_delete_unknown']->min,
+        ]
+    )
 );
 
-
-$table->data[9][0] = __('Max. days before delete not initialized modules');
-$table->data[9][1] = html_print_input(
-    [
-        'type'   => 'number',
-        'size'   => 5,
-        'max'    => $performance_variables_control['days_delete_not_initialized']->max,
-        'name'   => 'days_delete_not_initialized',
-        'value'  => $config['days_delete_not_initialized'],
-        'return' => true,
-        'min'    => $performance_variables_control['days_delete_not_initialized']->min,
-        'style'  => 'width:43px',
-    ]
+$table->data[4][0] = html_print_label_input_block(
+    __('Max. days before delete not initialized modules'),
+    html_print_input(
+        [
+            'type'   => 'number',
+            'size'   => 5,
+            'max'    => $performance_variables_control['days_delete_not_initialized']->max,
+            'name'   => 'days_delete_not_initialized',
+            'value'  => $config['days_delete_not_initialized'],
+            'return' => true,
+            'min'    => $performance_variables_control['days_delete_not_initialized']->min,
+        ]
+    )
 );
 
-$table->data[10][0] = __('Max. days before delete autodisabled agents');
-$table->data[10][1] = html_print_input(
-    [
-        'type'   => 'number',
-        'size'   => 5,
-        'max'    => $performance_variables_control['days_autodisable_deletion']->max,
-        'name'   => 'days_autodisable_deletion',
-        'value'  => $config['days_autodisable_deletion'],
-        'return' => true,
-        'min'    => $performance_variables_control['days_autodisable_deletion']->min,
-        'style'  => 'width:43px',
-    ]
+$table->data[4][1] = html_print_label_input_block(
+    __('Max. days before delete autodisabled agents'),
+    html_print_input(
+        [
+            'type'   => 'number',
+            'size'   => 5,
+            'max'    => $performance_variables_control['days_autodisable_deletion']->max,
+            'name'   => 'days_autodisable_deletion',
+            'value'  => $config['days_autodisable_deletion'],
+            'return' => true,
+            'min'    => $performance_variables_control['days_autodisable_deletion']->min,
+        ]
+    )
 );
 
-$table->data[11][0] = __('Retention period of past special days');
-$table->data[11][1] = html_print_input_text(
-    'num_past_special_days',
-    $config['num_past_special_days'],
-    '',
-    5,
-    5,
-    true
-);
-
-$table->data[12][0] = __('Max. macro data fields');
-$table->data[12][1] = html_print_input_text(
-    'max_macro_fields',
-    $config['max_macro_fields'],
-    '',
-    5,
-    5,
-    true,
-    false,
-    false,
-    'onChange="change_macro_fields()"'
-);
-
-if (enterprise_installed()) {
-    $table->data[13][0] = __('Max. days before delete inventory data');
-    $table->data[13][1] = html_print_input_text(
-        'inventory_purge',
-        $config['inventory_purge'],
+$table->data[5][0] = html_print_label_input_block(
+    __('Retention period of past special days'),
+    html_print_input_text(
+        'num_past_special_days',
+        $config['num_past_special_days'],
         '',
-        5,
+        false,
         5,
         true
-    );
-}
+    )
+);
+
+$table->data[5][1] = html_print_label_input_block(
+    __('Max. macro data fields'),
+    html_print_input_text(
+        'max_macro_fields',
+        $config['max_macro_fields'],
+        '',
+        false,
+        5,
+        true,
+        false,
+        false,
+        'onChange="change_macro_fields()"'
+    )
+);
 
 if ($config['history_db_enabled'] == 1) {
     if (! isset($config['history_db_connection'])
@@ -459,86 +458,94 @@ if ($config['history_db_enabled'] == 1) {
 
     $table_historical = new StdClass();
     $table_historical->width = '100%';
-    $table_historical->class = 'databox filters';
+    $table_historical->class = 'filter-table-adv';
     $table_historical->data = [];
-    $table_historical->style[0] = 'font-weight: bold';
 
-    $table_historical->size[0] = '70%';
-    $table_historical->size[1] = '30%';
+    $table_historical->size[0] = '50%';
+    $table_historical->size[1] = '50%';
 
     enterprise_hook('enterprise_warnings_history_days');
 
-    $table_historical->data[0][0] = __('Max. days before purge');
-    $table_historical->data[0][1] = html_print_input_text(
-        'historical_days_purge',
-        $config_history['days_purge'],
-        '',
-        5,
-        5,
-        true
+    $table_historical->data[0][0] = html_print_label_input_block(
+        __('Max. days before purge'),
+        html_print_input_text(
+            'historical_days_purge',
+            $config_history['days_purge'],
+            '',
+            false,
+            5,
+            true
+        )
     );
 
-    $table_historical->data[1][0] = __('Max. days before compact data');
-    $table_historical->data[1][1] = html_print_input_text(
-        'historical_days_compact',
-        $config_history['days_compact'],
-        '',
-        5,
-        5,
-        true
+    $table_historical->data[0][1] = html_print_label_input_block(
+        __('Max. days before compact data'),
+        html_print_input_text(
+            'historical_days_compact',
+            $config_history['days_compact'],
+            '',
+            false,
+            5,
+            true
+        )
     );
 
-    $table_historical->data[2][0] = __('Compact interpolation in hours (1 Fine-20 bad)');
-    $table_historical->data[2][1] = html_print_input_text(
-        'historical_step_compact',
-        $config_history['step_compact'],
-        '',
-        5,
-        5,
-        true
+    $table_historical->data[1][0] = html_print_label_input_block(
+        __('Compact interpolation in hours (1 Fine-20 bad)'),
+        html_print_input_text(
+            'historical_step_compact',
+            $config_history['step_compact'],
+            '',
+            false,
+            5,
+            true
+        )
     );
 
-    $table_historical->data[3][0] = __('Max. days before delete events');
-    $table_historical->data[3][1] = html_print_input_text(
-        'historical_event_purge',
-        $config_history['event_purge'],
-        '',
-        5,
-        5,
-        true
+    $table_historical->data[1][1] = html_print_label_input_block(
+        __('Max. days before delete events'),
+        html_print_input_text(
+            'historical_event_purge',
+            $config_history['event_purge'],
+            '',
+            false,
+            5,
+            true
+        )
     );
 
-    $table_historical->data[4][0] = __('Max. days before delete string data');
-    $table_historical->data[4][1] = html_print_input_text(
-        'historical_string_purge',
-        $config_history['string_purge'],
-        '',
-        5,
-        5,
-        true
+    $table_historical->data[2][0] = html_print_label_input_block(
+        __('Max. days before delete string data'),
+        html_print_input_text(
+            'historical_string_purge',
+            $config_history['string_purge'],
+            '',
+            5,
+            5,
+            true
+        )
     );
 
-    $table_historical->data[4][1] .= html_print_input_hidden(
+    $table_historical->data[2][0] .= html_print_input_hidden(
         'historical_history_db_enabled',
         0,
         true
     );
 }
 
-$table->data[] = [
+$table->data[6][0] = html_print_label_input_block(
     __('Max. days before delete old messages'),
     html_print_input_text(
         'delete_old_messages',
         $config['delete_old_messages'],
         '',
-        5,
+        false,
         5,
         true
-    ),
-];
+    )
+);
 
-
-$table->data[] = [
+$table->data[6][1] = html_print_label_input_block(
     __('Max. days before delete old network matrix data'),
     html_print_input(
         [
@@ -549,55 +556,71 @@ $table->data[] = [
             'value'  => $config['delete_old_network_matrix'],
             'return' => true,
             'min'    => $performance_variables_control['delete_old_network_matrix']->min,
-            'style'  => 'width:43px',
         ]
-    ),
-];
+    )
+);
+
+if (enterprise_installed()) {
+    $table->data[7][0] = html_print_label_input_block(
+        __('Max. days before delete inventory data'),
+        html_print_input_text(
+            'inventory_purge',
+            $config['inventory_purge'],
+            '',
+            false,
+            5,
+            true
+        )
+    );
+}
 
 $table_other = new stdClass();
 $table_other->width = '100%';
-$table_other->class = 'databox filters';
+$table_other->class = 'filter-table-adv';
 $table_other->data = [];
-$table_other->style[0] = 'font-weight: bold';
 
-$table_other->size[0] = '70%';
-$table_other->size[1] = '30%';
-$i = 0;
-$table_other->data[$i][0] = __('Item limit for realtime reports');
-$table_other->data[$i++][1] = html_print_input(
-    [
-        'type'   => 'number',
-        'size'   => 5,
-        'max'    => $performance_variables_control['report_limit']->max,
-        'name'   => 'report_limit',
-        'value'  => $config['report_limit'],
-        'return' => true,
-        'min'    => $performance_variables_control['report_limit']->min,
-        'style'  => 'width:43px',
-    ]
+$table_other->size[0] = '50%';
+$table_other->size[1] = '50%';
+
+$table_other->data[0][0] = html_print_label_input_block(
+    __('Item limit for realtime reports'),
+    html_print_input(
+        [
+            'type'   => 'number',
+            'size'   => 5,
+            'max'    => $performance_variables_control['report_limit']->max,
+            'name'   => 'report_limit',
+            'value'  => $config['report_limit'],
+            'return' => true,
+            'min'    => $performance_variables_control['report_limit']->min,
+        ]
+    )
 );
 
-$table_other->data[$i][0] = __('Limit of events per query');
-$table_other->data[$i++][1] = html_print_input(
-    [
-        'type'   => 'number',
-        'size'   => 5,
-        'max'    => 10000,
-        'name'   => 'events_per_query',
-        'value'  => $config['events_per_query'],
-        'return' => true,
-        'style'  => 'width:50px',
-    ]
+$table_other->data[0][1] = html_print_label_input_block(
+    __('Limit of events per query'),
+    html_print_input(
+        [
+            'type'   => 'number',
+            'size'   => 5,
+            'max'    => 10000,
+            'name'   => 'events_per_query',
+            'value'  => $config['events_per_query'],
+            'return' => true,
+        ]
+    )
 );
 
-$table_other->data[$i][0] = __('Compact interpolation in hours (1 Fine-20 bad)');
-$table_other->data[$i++][1] = html_print_input_text(
-    'step_compact',
-    $config['step_compact'],
-    '',
-    5,
-    5,
-    true
+$table_other->data[1][0] = html_print_label_input_block(
+    __('Compact interpolation in hours (1 Fine-20 bad)'),
+    html_print_input_text(
+        'step_compact',
+        $config['step_compact'],
+        '',
+        false,
+        5,
+        true
+    )
 );
 
 $intervals = [];
@@ -610,140 +633,172 @@ $intervals[SECONDS_1WEEK] = __('Last week');
 $intervals[SECONDS_2WEEK] = __('2 weeks');
 $intervals[SECONDS_1MONTH] = __('Last month');
 
-$table_other->data[$i][0] = __('Default hours for event view');
-$table_other->data[$i++][1] = html_print_input(
-    [
-        'type'   => 'number',
-        'size'   => 5,
-        'max'    => $performance_variables_control['event_view_hr']->max,
-        'name'   => 'event_view_hr',
-        'value'  => $config['event_view_hr'],
-        'return' => true,
-        'min'    => $performance_variables_control['event_view_hr']->min,
-        'style'  => 'width:43px',
-    ]
+$table_other->data[1][1] = html_print_label_input_block(
+    __('Default hours for event view'),
+    html_print_input(
+        [
+            'type'   => 'number',
+            'size'   => 5,
+            'max'    => $performance_variables_control['event_view_hr']->max,
+            'name'   => 'event_view_hr',
+            'value'  => $config['event_view_hr'],
+            'return' => true,
+            'min'    => $performance_variables_control['event_view_hr']->min,
+        ]
+    )
 );
 
-$table_other->data[$i][0] = __('Use realtime statistics');
-$table_other->data[$i++][1] = html_print_checkbox_switch(
-    'realtimestats',
-    1,
-    $config['realtimestats'],
-    true
+$table_other->data[2][0] = html_print_label_input_block(
+    __('Use realtime statistics'),
+    html_print_checkbox_switch(
+        'realtimestats',
+        1,
+        $config['realtimestats'],
+        true
+    )
 );
 
-$table_other->data[$i][0] = __('Batch statistics period (secs)');
-$table_other->data[$i++][1] = html_print_input_text(
-    'stats_interval',
-    $config['stats_interval'],
-    '',
-    5,
-    5,
-    true
+$table_other->data[2][1] = html_print_label_input_block(
+    __('Batch statistics period (secs)'),
+    html_print_input_text(
+        'stats_interval',
+        $config['stats_interval'],
+        '',
+        false,
+        5,
+        true
+    )
 );
 
-$table_other->data[$i][0] = __('Use agent access graph');
-$table_other->data[$i++][1] = html_print_checkbox_switch('agentaccess', 1, $config['agentaccess'], true, $disable_agentaccess);
-
-$table_other->data[$i][0] = __('Max. recommended number of files in attachment directory');
-$table_other->data[$i++][1] = html_print_input_text(
-    'num_files_attachment',
-    $config['num_files_attachment'],
-    '',
-    5,
-    5,
-    true
+$table_other->data[3][0] = html_print_label_input_block(
+    __('Use agent access graph'),
+    html_print_checkbox_switch(
+        'agentaccess',
+        1,
+        $config['agentaccess'],
+        true,
+        $disable_agentaccess
+    )
 );
 
-$table_other->data[$i][0] = __('Delete not init modules');
-$table_other->data[$i++][1] = html_print_checkbox_switch('delete_notinit', 1, $config['delete_notinit'], true);
-
-$table_other->data[$i][0] = __('Big Operation Step to purge old data');
-$table_other->data[$i++][1] = html_print_input(
-    [
-        'type'   => 'number',
-        'size'   => 5,
-        'max'    => $performance_variables_control['big_operation_step_datos_purge']->max,
-        'name'   => 'big_operation_step_datos_purge',
-        'value'  => $config['big_operation_step_datos_purge'],
-        'return' => true,
-        'min'    => $performance_variables_control['big_operation_step_datos_purge']->min,
-        'style'  => 'width:50px',
-    ]
+$table_other->data[3][1] = html_print_label_input_block(
+    __('Max. recommended number of files in attachment directory'),
+    html_print_input_text(
+        'num_files_attachment',
+        $config['num_files_attachment'],
+        '',
+        false,
+        5,
+        true
+    )
 );
 
-
-
-$table_other->data[$i][0] = __('Small Operation Step to purge old data');
-$table_other->data[$i++][1] = html_print_input(
-    [
-        'type'   => 'number',
-        'size'   => 5,
-        'max'    => $performance_variables_control['small_operation_step_datos_purge']->max,
-        'name'   => 'small_operation_step_datos_purge',
-        'value'  => $config['small_operation_step_datos_purge'],
-        'return' => true,
-        'min'    => $performance_variables_control['small_operation_step_datos_purge']->min,
-        'style'  => 'width:50px',
-    ]
+$table_other->data[4][0] = html_print_label_input_block(
+    __('Delete not init modules'),
+    html_print_checkbox_switch(
+        'delete_notinit',
+        1,
+        $config['delete_notinit'],
+        true
+    )
 );
 
-$table_other->data[$i][0] = __('Graph container - Max. Items');
-$table_other->data[$i++][1] = html_print_input_text(
-    'max_graph_container',
-    $config['max_graph_container'],
-    '',
-    5,
-    5,
-    true
+$table_other->data[4][1] = html_print_label_input_block(
+    __('Big Operation Step to purge old data'),
+    html_print_input(
+        [
+            'type'   => 'number',
+            'size'   => 5,
+            'max'    => $performance_variables_control['big_operation_step_datos_purge']->max,
+            'name'   => 'big_operation_step_datos_purge',
+            'value'  => $config['big_operation_step_datos_purge'],
+            'return' => true,
+            'min'    => $performance_variables_control['big_operation_step_datos_purge']->min,
+        ]
+    )
 );
 
-$table_other->data[$i][0] = __('Events response max. execution');
-$table_other->data[$i++][1] = html_print_input_text(
-    'max_execution_event_response',
-    $config['max_execution_event_response'],
-    '',
-    5,
-    5,
-    true
+$table_other->data[5][0] = html_print_label_input_block(
+    __('Small Operation Step to purge old data'),
+    html_print_input(
+        [
+            'type'   => 'number',
+            'size'   => 5,
+            'max'    => $performance_variables_control['small_operation_step_datos_purge']->max,
+            'name'   => 'small_operation_step_datos_purge',
+            'value'  => $config['small_operation_step_datos_purge'],
+            'return' => true,
+            'min'    => $performance_variables_control['small_operation_step_datos_purge']->min,
+        ]
+    )
 );
 
-$table_other->data[$i][0] = __('Row limit in csv log');
-$table_other->data[$i++][1] = html_print_input(
-    [
-        'type'   => 'number',
-        'size'   => 5,
-        'max'    => $performance_variables_control['row_limit_csv']->max,
-        'name'   => 'row_limit_csv',
-        'value'  => $config['row_limit_csv'],
-        'return' => true,
-        'min'    => $performance_variables_control['row_limit_csv']->min,
-        'style'  => 'width:63px',
-    ]
+$table_other->data[5][1] = html_print_label_input_block(
+    __('Graph container - Max. Items'),
+    html_print_input_text(
+        'max_graph_container',
+        $config['max_graph_container'],
+        '',
+        false,
+        5,
+        true
+    )
 );
 
-$table_other->data[$i][0] = __('SNMP walk binary');
-$table_other->data[$i++][1] = html_print_input_text(
-    'snmpwalk',
-    $config['snmpwalk'],
-    '',
-    50,
-    10,
-    true
+$table_other->data[6][0] = html_print_label_input_block(
+    __('Events response max. execution'),
+    html_print_input_text(
+        'max_execution_event_response',
+        $config['max_execution_event_response'],
+        '',
+        false,
+        5,
+        true
+    )
+);
+
+$table_other->data[6][1] = html_print_label_input_block(
+    __('Row limit in csv log'),
+    html_print_input(
+        [
+            'type'   => 'number',
+            'size'   => 5,
+            'max'    => $performance_variables_control['row_limit_csv']->max,
+            'name'   => 'row_limit_csv',
+            'value'  => $config['row_limit_csv'],
+            'return' => true,
+            'min'    => $performance_variables_control['row_limit_csv']->min,
+        ]
+    )
+);
+
+$table_other->data[7][0] = html_print_label_input_block(
+    __('SNMP walk binary'),
+    html_print_input_text(
+        'snmpwalk',
+        $config['snmpwalk'],
+        '',
+        false,
+        10,
+        true
+    )
 );
 
 $tip = ui_print_help_tip(
     __('SNMP bulk walk is not able to request V1 SNMP, this option will be used instead (by default snmpwalk, slower).'),
     true
 );
-$table_other->data[$i][0] = __('SNMP walk binary (fallback)').$tip;
-$table_other->data[$i++][1] = html_print_input_text(
-    'snmpwalk_fallback',
-    $config['snmpwalk_fallback'],
-    '',
-    50,
-    10,
-    true
+
+$table_other->data[7][1] = html_print_label_input_block(
+    __('SNMP walk binary (fallback)').$tip,
+    html_print_input_text(
+        'snmpwalk_fallback',
+        $config['snmpwalk_fallback'],
+        '',
+        false,
+        10,
+        true
+    )
 );
 
 $tip = ui_print_help_tip(
@@ -754,41 +809,45 @@ $tip = ui_print_help_tip(
     true
 );
 
-$table_other->data[$i][0] = __('WMI binary');
-$table_other->data[$i++][1] = html_print_input_text(
-    'wmiBinary',
-    $config['wmiBinary'],
-    '',
-    50,
-    50,
-    true
+$table_other->data[8][0] = html_print_label_input_block(
+    __('WMI binary'),
+    html_print_input_text(
+        'wmiBinary',
+        $config['wmiBinary'],
+        '',
+        false,
+        50,
+        true
+    )
 );
 
 // Agent Wizard defaults.
 $defaultAgentWizardOptions = json_decode(io_safe_output($config['agent_wizard_defaults']));
 $tableSnmpWizard = new stdClass();
 $tableSnmpWizard->width = '100%';
-$tableSnmpWizard->class = 'databox filters';
+$tableSnmpWizard->class = 'filter-table-adv';
 $tableSnmpWizard->data = [];
-$tableSnmpWizard->style[0] = 'font-weight: bold';
-$tableSnmpWizard->style[2] = 'font-weight: bold';
-$tableSnmpWizard->size[0] = '30%';
-$tableSnmpWizard->size[2] = '30%';
+$tableSnmpWizard->size[0] = '50%';
+$tableSnmpWizard->size[1] = '50%';
 
 $i = 0;
 $j = 0;
 foreach ($defaultAgentWizardOptions as $key => $value) {
-    $tableSnmpWizard->data[$i][$j++] = $key;
-    $tableSnmpWizard->data[$i][$j++] = html_print_checkbox_switch('agent_wizard_defaults_'.$key, 1, $value, true);
-    if ($j >= 3) {
-        $j = 0;
-        $i++;
+    if ($i > 1) {
+        $i = 0;
+        $j++;
     }
+
+    $tableSnmpWizard->data[$j][$i] = html_print_label_input_block(
+        $key,
+        html_print_checkbox_switch('agent_wizard_defaults_'.$key, 1, $value, true)
+    );
+    $i++;
 }
 
-echo '<form id="form_setup" method="post">';
+echo '<form id="form_setup" method="post" class="max_floating_element_size">';
 
-echo '<fieldset class="full-column">';
+echo '<fieldset>';
     echo '<legend>'.__('Database maintenance status').' '.ui_print_help_icon('database_maintenance_status_tab', true).'</legend>';
     html_print_table($table_status);
 echo '</fieldset>';
@@ -817,18 +876,14 @@ echo '</fieldset>';
 
 echo '<div class="action-buttons" style="width: '.$table->width.'">';
 html_print_input_hidden('update_config', 1);
-html_print_div(
-    [
-        'class'   => 'action-buttons w100p',
-        'content' => html_print_submit_button(
-            __('Update'),
-            'update_button',
-            false,
-            [ 'icon' => 'update' ],
-            true
-        ),
-    ]
+$actionButtons = html_print_submit_button(
+    __('Update'),
+    'update_button',
+    false,
+    [ 'icon' => 'update' ],
+    true
 );
+html_print_action_buttons($actionButtons, ['type' => 'form_action']);
 echo '</form>';
 ?>
 
diff --git a/pandora_console/godmode/setup/setup.php b/pandora_console/godmode/setup/setup.php
index e693d2f2e2..ae24d914e4 100644
--- a/pandora_console/godmode/setup/setup.php
+++ b/pandora_console/godmode/setup/setup.php
@@ -251,69 +251,69 @@ if (enterprise_installed()) {
 switch ($section) {
     case 'general':
         $buttons['general']['active'] = true;
-        $subpage = ' &raquo '.__('General');
+        $subpage = __('General');
         $help_header = 'setup_general_tab';
     break;
 
     case 'auth':
         $buttons['auth']['active'] = true;
-        $subpage = ' &raquo '.__('Authentication');
+        $subpage = __('Authentication');
     break;
 
     case 'perf':
         $buttons['perf']['active'] = true;
-        $subpage = ' &raquo '.__('Performance');
+        $subpage = __('Performance');
         $help_header = '';
     break;
 
     case 'vis':
         $buttons['vis']['active'] = true;
-        $subpage = ' &raquo '.__('Visual styles');
+        $subpage = __('Visual styles');
     break;
 
     case 'net':
         $buttons['net']['active'] = true;
-        $subpage = ' &raquo '.__('Netflow');
+        $subpage = __('Netflow');
         $help_header = 'setup_netflow_tab';
     break;
 
     case 'ehorus':
         $buttons['ehorus']['active'] = true;
-        $subpage = ' &raquo '.__('eHorus');
+        $subpage = __('eHorus');
         $help_header = 'setup_ehorus_tab';
     break;
 
     case 'integria':
         $buttons['integria']['active'] = true;
-        $subpage = ' &raquo '.__('Integria IMS');
+        $subpage = __('Integria IMS');
         $help_header = 'setup_integria_tab';
     break;
 
     case 'module_library':
         $buttons['module_library']['active'] = true;
-        $subpage = ' &raquo '.__('Module Library');
+        $subpage = __('Module Library');
         $help_header = 'setup_module_library_tab';
     break;
 
     case 'gis':
         $buttons['gis']['active'] = true;
-        $subpage = ' &raquo '.__('Map conections GIS');
+        $subpage = __('Map conections GIS');
     break;
 
     case 'notifications':
         $buttons['notifications']['active'] = true;
-        $subpage = ' &raquo '.__('Notifications');
+        $subpage = __('Notifications');
     break;
 
     case 'websocket_engine':
         $buttons['websocket_engine']['active'] = true;
-        $subpage = ' &raquo '.__('Pandora Websocket Engine');
+        $subpage = __('Pandora Websocket Engine');
         $help_header = 'quickshell_settings';
     break;
 
     case 'external_tools':
         $buttons['external_tools']['active'] = true;
-        $subpage = ' &raquo '.__('External Tools');
+        $subpage = __('External Tools');
         $help_header = '';
     break;
 
@@ -327,39 +327,49 @@ switch ($section) {
         }
 
         $buttons['welcome_tips']['active'] = true;
-        $subpage = ' &raquo '.$title;
+        $subpage = $title;
         $help_header = '';
     break;
 
     case 'enterprise':
         $buttons['enterprise']['active'] = true;
-        $subpage = ' &raquo '.__('Enterprise');
+        $subpage = __('Enterprise');
         $help_header = 'setup_enterprise_tab';
     break;
 
+    case 'hist_db':
+        $buttons['hist_db']['active'] = true;
+        $subpage = __('Historical database');
+        $help_header = '';
+    break;
+
+    case 'pass':
+        $buttons['pass']['active'] = true;
+        $subpage = __('Password policies');
+        $help_header = '';
+    break;
+
     default:
+        $subpage = 'seccion: '.$section;
         // Default.
     break;
 }
 
-// Put header inside div for special sizing.(No right margin).
-echo '<div id="header_configuration" style="width: calc(100%);">';
 // Header.
-ui_print_page_header(
-    __('Configuration').$subpage,
+ui_print_standard_header(
+    $subpage,
     '',
     false,
     $help_header,
     true,
     $buttons,
-    false,
-    '',
-    GENERIC_SIZE_TEXT,
-    '',
-    '',
-    true
+    [
+        [
+            'link'  => '',
+            'label' => __('Setup'),
+        ],
+    ]
 );
-echo '</div>';
 
 if (isset($config['error_config_update_config'])) {
     if ($config['error_config_update_config']['correct'] == false) {
diff --git a/pandora_console/godmode/setup/setup_auth.php b/pandora_console/godmode/setup/setup_auth.php
index 6686a26c7b..c0548b32e8 100644
--- a/pandora_console/godmode/setup/setup_auth.php
+++ b/pandora_console/godmode/setup/setup_auth.php
@@ -43,7 +43,7 @@ if (is_ajax() === true) {
         $table = new StdClass();
         $table->data = [];
         $table->width = '100%';
-        $table->class = 'databox filters table_result_auth';
+        $table->class = 'databox filters table_result_auth filter-table-adv';
         $table->size['name'] = '30%';
         $table->style['name'] = 'font-weight: bold';
 
@@ -94,7 +94,11 @@ if (is_ajax() === true) {
                     '',
                     30,
                     100,
-                    true
+                    true,
+                    false,
+                    false,
+                    '',
+                    'w400px'
                 );
                 $table->data['ldap_server'] = $row;
 
@@ -107,7 +111,11 @@ if (is_ajax() === true) {
                     '',
                     10,
                     100,
-                    true
+                    true,
+                    false,
+                    false,
+                    '',
+                    'w400px'
                 );
                 $table->data['ldap_port'] = $row;
 
@@ -126,7 +134,10 @@ if (is_ajax() === true) {
                     '',
                     '',
                     0,
-                    true
+                    true,
+                    false,
+                    true,
+                    'w400px'
                 );
                 $table->data['ldap_version'] = $row;
 
@@ -189,12 +200,12 @@ if (is_ajax() === true) {
                     $alt = '',
                     60,
                     100,
-                    true
-                );
-                $row['control'] .= ui_print_reveal_password(
-                    'ldap_admin_pass',
-                    true
+                    true,
+                    false,
+                    false,
+                    'w400px-important'
                 );
+
                 $table->data['ldap_admin_pass'] = $row;
 
                 // Ldapsearch timeout.
@@ -208,7 +219,11 @@ if (is_ajax() === true) {
                     '',
                     10,
                     10,
-                    true
+                    true,
+                    false,
+                    false,
+                    '',
+                    'w400px'
                 );
                 $table->data['ldap_search_timeout'] = $row;
 
@@ -239,7 +254,11 @@ if (is_ajax() === true) {
                     '',
                     30,
                     100,
-                    true
+                    true,
+                    false,
+                    false,
+                    '',
+                    'w400px'
                 );
                 $table->data['ldap_server_secondary'] = $row;
 
@@ -252,7 +271,11 @@ if (is_ajax() === true) {
                     '',
                     10,
                     100,
-                    true
+                    true,
+                    false,
+                    false,
+                    '',
+                    'w400px'
                 );
                 $table->data['ldap_port_secondary'] = $row;
 
@@ -271,7 +294,10 @@ if (is_ajax() === true) {
                     '',
                     '',
                     0,
-                    true
+                    true,
+                    false,
+                    true,
+                    'w400px'
                 );
                 $table->data['ldap_version_secondary'] = $row;
 
@@ -334,11 +360,10 @@ if (is_ajax() === true) {
                     $alt = '',
                     60,
                     100,
-                    true
-                );
-                $row['control'] .= ui_print_reveal_password(
-                    'ldap_admin_pass_secondary',
-                    true
+                    true,
+                    false,
+                    false,
+                    'w400px-important'
                 );
                 $table->data['ldap_admin_pass_secondary'] = $row;
             break;
@@ -407,7 +432,11 @@ if (is_ajax() === true) {
             '',
             10,
             10,
-            true
+            true,
+            false,
+            false,
+            '',
+            'w400px'
         );
         $table->data['session_timeout'] = $row;
 
@@ -421,7 +450,7 @@ require_once $config['homedir'].'/include/functions_profile.php';
 $table = new StdClass();
 $table->data = [];
 $table->width = '100%';
-$table->class = 'databox filters';
+$table->class = 'databox filters filter-table-adv';
 $table->size['name'] = '30%';
 $table->style['name'] = 'font-weight: bold';
 
@@ -459,12 +488,15 @@ $row['control'] = html_print_select(
     '',
     '',
     0,
-    true
+    true,
+    false,
+    true,
+    'w400px'
 );
 $table->data['auth'] = $row;
 
 // Form.
-echo '<form id="form_setup" method="post">';
+echo '<form id="form_setup" class="max_floating_element_size" method="post">';
 
 if (is_metaconsole() === false) {
     html_print_input_hidden('update_config', 1);
@@ -478,17 +510,14 @@ html_print_csrf_hidden();
 
 html_print_table($table);
 html_print_div([ 'id' => 'table_auth_result' ]);
-html_print_div(
-    [
-        'class'   => 'action-buttons w100p',
-        'content' => html_print_submit_button(
-            __('Update'),
-            'update_button',
-            false,
-            [ 'icon' => 'update' ],
-            true
-        ),
-    ]
+html_print_action_buttons(
+    html_print_submit_button(
+        __('Update'),
+        'update_button',
+        false,
+        [ 'icon' => 'update' ],
+        true
+    )
 );
 
 echo '</form>';
diff --git a/pandora_console/godmode/setup/setup_ehorus.php b/pandora_console/godmode/setup/setup_ehorus.php
index 308f3b8189..e69b9668f3 100644
--- a/pandora_console/godmode/setup/setup_ehorus.php
+++ b/pandora_console/godmode/setup/setup_ehorus.php
@@ -74,82 +74,98 @@ $table_remote->data = [];
 $table_remote->width = '100%';
 $table_remote->styleTable = 'margin-bottom: 10px;';
 $table_remote->id = 'ehorus-remote-setup';
-$table_remote->class = 'databox filters';
-$table_remote->size['name'] = '30%';
-$table_remote->style['name'] = 'font-weight: bold';
-$table_remote->style['control'] = 'display: flex;align-items: center;';
+$table_remote->class = 'databox filters filter-table-adv';
+$table_remote->size['ehorus_hostname'] = '50%';
+$table_remote->size['ehorus_port'] = '50%';
 
 // Enable eHorus user configuration.
 $row = [];
-$row['name'] = ('eHorus configuration at user level');
-$row['control'] = html_print_checkbox_switch('ehorus_user_level_conf', 1, $config['ehorus_user_level_conf'], true);
+$row['ehorus_user_level_conf'] = html_print_label_input_block(
+    __('eHorus configuration at user level'),
+    html_print_checkbox_switch(
+        'ehorus_user_level_conf',
+        1,
+        $config['ehorus_user_level_conf'],
+        true
+    )
+);
 $table_remote->data['ehorus_user_level_conf'] = $row;
 
 // User.
 $row = [];
-$row['name'] = __('User');
-$row['control'] = html_print_input_text('ehorus_user', $config['ehorus_user'], '', 30, 100, true);
-$table_remote->data['ehorus_user'] = $row;
+$row['ehorus_user'] = html_print_label_input_block(
+    __('User'),
+    html_print_input_text('ehorus_user', $config['ehorus_user'], '', 30, 100, true),
+    ['div_class' => 'ehorus-remote-setup-ehorus_user']
+);
 
 // Pass.
-$row = [];
-$row['name'] = __('Password');
-$row['control'] = html_print_input_password('ehorus_pass', io_output_password($config['ehorus_pass']), '', 30, 100, true);
-$row['control'] .= ui_print_reveal_password('ehorus_pass', true);
+$row['ehorus_pass'] = html_print_label_input_block(
+    __('Password'),
+    html_print_input_password('ehorus_pass', io_output_password($config['ehorus_pass']), '', 30, 100, true),
+    ['div_class' => 'ehorus-remote-setup-ehorus_user']
+);
 $table_remote->data['ehorus_pass'] = $row;
 
 // Directory hostname.
 $row = [];
-$row['name'] = __('API Hostname');
-$row['control'] = html_print_input_text('ehorus_hostname', $config['ehorus_hostname'], '', 30, 100, true);
-$table_remote->data['ehorus_hostname'] = $row;
+$row['ehorus_hostname'] = html_print_label_input_block(
+    __('API Hostname'),
+    html_print_input_text('ehorus_hostname', $config['ehorus_hostname'], '', 30, 100, true)
+);
 
 // Directory port.
-$row = [];
-$row['name'] = __('API Port');
-$row['control'] = html_print_input_text('ehorus_port', $config['ehorus_port'], '', 6, 100, true);
+$row['ehorus_port'] = html_print_label_input_block(
+    __('API Port'),
+    html_print_input_text('ehorus_port', $config['ehorus_port'], '', 6, 100, true)
+);
 $table_remote->data['ehorus_port'] = $row;
 
 // Request timeout.
 $row = [];
-$row['name'] = __('Request timeout');
-$row['control'] = html_print_input_text('ehorus_req_timeout', $config['ehorus_req_timeout'], '', 3, 10, true);
+$row['ehorus_req_timeout'] = html_print_label_input_block(
+    __('Request timeout'),
+    html_print_input_text('ehorus_req_timeout', $config['ehorus_req_timeout'], '', 3, 10, true)
+);
 $table_remote->data['ehorus_req_timeout'] = $row;
 
 // Test.
 $row = [];
-$row['name'] = __('Test');
-$row['control'] = html_print_button(
-    __('Start'),
-    'test-ehorus',
-    false,
-    '',
-    [
-        'icon' => 'cog',
-        'mode' => 'secondary mini',
-    ],
-    true
+$test_start = '<span id="test-ehorus-spinner" class="invisible">&nbsp;'.html_print_image('images/spinner.gif', true).'</span>';
+$test_start .= '<span id="test-ehorus-success" class="invisible">&nbsp;'.html_print_image('images/status_sets/default/severity_normal.png', true).'</span>';
+$test_start .= '<span id="test-ehorus-failure" class="invisible">&nbsp;'.html_print_image('images/status_sets/default/severity_critical.png', true).'</span>';
+$test_start .= '&nbsp;<span id="test-ehorus-message" class="invisible"></span>';
+$row['ehorus_test'] = html_print_label_input_block(
+    __('Test'),
+    html_print_button(
+        __('Start'),
+        'test-ehorus',
+        false,
+        '',
+        [
+            'icon'  => 'cog',
+            'mode'  => 'secondary mini',
+            'style' => 'width: 115px;',
+        ],
+        true
+    ).$test_start
 );
-$row['control'] .= '<span id="test-ehorus-spinner" class="invisible">&nbsp;'.html_print_image('images/spinner.gif', true).'</span>';
-$row['control'] .= '<span id="test-ehorus-success" class="invisible">&nbsp;'.html_print_image('images/status_sets/default/severity_normal.png', true).'</span>';
-$row['control'] .= '<span id="test-ehorus-failure" class="invisible">&nbsp;'.html_print_image('images/status_sets/default/severity_critical.png', true).'</span>';
-$row['control'] .= '&nbsp;<span id="test-ehorus-message" class="invisible"></span>';
 $table_remote->data['ehorus_test'] = $row;
 
 // Print.
-echo '<div class="center pdd_b_20px mrgn_top_20px">';
+echo '<div class="center pdd_b_10px mrgn_btn_20px white_box max_floating_element_size">';
 echo '<a target="_blank" rel="noopener noreferrer" href="http://ehorus.com">';
 if ($config['style'] === 'pandora_black' && is_metaconsole() === true) {
     html_print_image(
         'include/ehorus/images/ehorus-logo.png',
         false,
-        ['class' => 'w400px']
+        ['class' => 'w400px mrgn_top_15px']
     );
 } else {
     html_print_image(
         'include/ehorus/images/ehorus-logo-grey.png',
         false,
-        ['class' => 'w400px']
+        ['class' => 'w400px mrgn_top_15px']
     );
 }
 
@@ -179,7 +195,7 @@ if ($config['ehorus_enabled'] && !$custom_field_exists) {
     ui_print_error_message($error_message);
 }
 
-echo "<form method='post'>";
+echo "<form method='post' class='max_floating_element_size'>";
 // Form enable.
 echo '<div id="form_enable">';
 html_print_input_hidden('update_config', 1);
@@ -195,17 +211,14 @@ echo '</div>';
 
     echo '</fieldset>';
     echo '</div>';
-    html_print_div(
-        [
-            'class'   => 'action-buttons w100p',
-            'content' => html_print_submit_button(
-                __('Update'),
-                'update_button',
-                false,
-                ['icon' => 'update'],
-                true
-            ),
-        ]
+    html_print_action_buttons(
+        html_print_submit_button(
+            __('Update'),
+            'update_button',
+            false,
+            ['icon' => 'update'],
+            true
+        )
     );
     echo '</form>';
 
@@ -220,8 +233,8 @@ if(!$('input:checkbox[name="ehorus_enabled"]').is(':checked'))
 
 if($('input:checkbox[name="ehorus_user_level_conf"]').is(':checked'))
 {
-    $('#ehorus-remote-setup-ehorus_user').hide();
-    $('#ehorus-remote-setup-ehorus_pass').hide()
+    $('.ehorus-remote-setup-ehorus_user').hide();
+    $('.ehorus-remote-setup-ehorus_pass').hide()
 }
 
 
@@ -234,13 +247,13 @@ if($('input:checkbox[name="ehorus_user_level_conf"]').is(':checked'))
     }
 
     var hideUserPass = function () {
-        $('#ehorus-remote-setup-ehorus_user').hide();
-        $('#ehorus-remote-setup-ehorus_pass').hide();
+        $('.ehorus-remote-setup-ehorus_user').hide();
+        $('.ehorus-remote-setup-ehorus_pass').hide();
     }
 
     var showUserPass = function () {
-        $('#ehorus-remote-setup-ehorus_user').show();
-        $('#ehorus-remote-setup-ehorus_pass').show();
+        $('.ehorus-remote-setup-ehorus_user').show();
+        $('.ehorus-remote-setup-ehorus_pass').show();
     }
 
     var handleEnable = function (event) {
diff --git a/pandora_console/godmode/setup/setup_external_tools.php b/pandora_console/godmode/setup/setup_external_tools.php
index 30bdd6b188..1aa0fd7638 100644
--- a/pandora_console/godmode/setup/setup_external_tools.php
+++ b/pandora_console/godmode/setup/setup_external_tools.php
@@ -14,7 +14,7 @@
  * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
  *
  * ============================================================================
- * Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
+ * Copyright (c) 2005-2023 Artica Soluciones Tecnologicas
  * Please see http://pandorafms.org for full contribution list
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/pandora_console/godmode/setup/setup_general.php b/pandora_console/godmode/setup/setup_general.php
index d19d3587c6..b586cb0d72 100644
--- a/pandora_console/godmode/setup/setup_general.php
+++ b/pandora_console/godmode/setup/setup_general.php
@@ -14,7 +14,7 @@
  * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
  *
  * ============================================================================
- * Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
+ * Copyright (c) 2005-2023 Artica Soluciones Tecnologicas
  * Please see http://pandorafms.org for full contribution list
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -26,6 +26,8 @@
  * ============================================================================
  */
 
+use function PHPSTORM_META\map;
+
 // File begin.
 global $config;
 
@@ -47,153 +49,17 @@ if (is_ajax()) {
     exit();
 }
 
-$performance_variables_control = (array) json_decode(io_safe_output($config['performance_variables_control']));
-
-$table = new StdClass();
-$table->class = 'databox filters';
-$table->id = 'setup_general';
-$table->width = '100%';
-$table->data = [];
-$table->size = [];
-$table->size[0] = '30%';
-$table->style[0] = 'font-weight:bold';
-$table->size[1] = '70%';
-
-$table_mail_conf = new stdClass();
-$table_mail_conf->width = '100%';
-$table_mail_conf->class = 'databox filters';
-$table_mail_conf->data = [];
-$table_mail_conf->style[0] = 'font-weight: bold';
-
-// Current config["language"] could be set by user, not taken from global setup !
-$current_system_lang = db_get_sql(
-    'SELECT `value` FROM tconfig WHERE `token` = "language"'
-);
-
-if ($current_system_lang == '') {
-    $current_system_lang = 'en';
-}
-
-$i = 0;
-
-$table->data[$i][0] = __('Language code');
-$table->data[$i++][1] = html_print_select_from_sql(
-    'SELECT id_language, name FROM tlanguage',
-    'language',
-    $current_system_lang,
-    '',
-    '',
-    '',
-    true
-);
-
-$table->data[$i][0] = __('Remote config directory');
-$table->data[$i++][1] = html_print_input_text(
-    'remote_config',
-    io_safe_output($config['remote_config']),
-    '',
-    30,
-    100,
-    true
-);
-
-$table->data[$i][0] = __('Chromium path');
-$table->data[$i++][1] = html_print_input_text(
-    'chromium_path',
-    io_safe_output(
-        $config['chromium_path']
-    ),
-    '',
-    30,
-    100,
-    true
-);
-
-$table->data[$i][0] = __('Auto login (hash) password');
-$table->data[$i][1] = html_print_input_password(
-    'loginhash_pwd',
-    io_output_password($config['loginhash_pwd']),
-    '',
-    15,
-    15,
-    true
-);
-$table->data[$i++][1] .= ui_print_reveal_password(
-    'loginhash_pwd',
-    true
-);
-
-$table->data[$i][0] = __('Time source');
-$sources['system'] = __('System');
-$sources['sql'] = __('Database');
-$table->data[$i++][1] = html_print_select(
-    $sources,
-    'timesource',
-    $config['timesource'],
-    '',
-    '',
-    '',
-    true
-);
-
-$table->data[$i][0] = __('Automatic check for updates');
-$table->data[$i++][1] = html_print_checkbox_switch(
-    'autoupdate',
-    1,
-    $config['autoupdate'],
-    true
-);
-
 echo "<div id='dialog' title='".__('Enforce https Information')."' class='invisible'>";
 echo "<p class='center'>".__('If SSL is not properly configured you will lose access to ').get_product_name().__(' Console').'</p>';
 echo '</div>';
 
-$table->data[$i][0] = __('Enforce https');
-$table->data[$i++][1] = html_print_checkbox_switch_extended(
-    'https',
-    1,
-    $config['https'],
-    false,
-    '',
-    '',
-    true
-);
+$performance_variables_control = (array) json_decode(io_safe_output($config['performance_variables_control']));
+$sources = [];
+$sources['system'] = __('System');
+$sources['sql'] = __('Database');
 
-$table->data[$i][0] = __('Use cert of SSL');
-$table->data[$i++][1] = html_print_checkbox_switch_extended(
-    'use_cert',
-    1,
-    $config['use_cert'],
-    false,
-    '',
-    '',
-    true
-);
-
-$table->rowstyle[$i] = 'display: none;';
-$table->rowid[$i] = 'ssl-path-tr';
-$table->data[$i][0] = __('Path of SSL Cert.');
-$table->data[$i++][1] = html_print_input_text(
-    'cert_path',
-    io_safe_output($config['cert_path']),
-    '',
-    50,
-    255,
-    true
-);
-
-$table->data[$i][0] = __('Attachment store');
-$table->data[$i++][1] = html_print_input_text(
-    'attachment_store',
-    io_safe_output($config['attachment_store']),
-    '',
-    50,
-    255,
-    true
-);
-
-$table->data[$i][0] = __('IP list with API access');
-if (isset($_POST['list_ACL_IPs_for_API'])) {
+// ACL Ips for API.
+if (isset($_POST['list_ACL_IPs_for_API']) === true) {
     $list_ACL_IPs_for_API = get_parameter_post('list_ACL_IPs_for_API');
 } else {
     $list_ACL_IPs_for_API = get_parameter_get(
@@ -202,51 +68,14 @@ if (isset($_POST['list_ACL_IPs_for_API'])) {
     );
 }
 
-$table->data[$i++][1] = html_print_textarea(
-    'list_ACL_IPs_for_API',
-    2,
-    25,
-    $list_ACL_IPs_for_API,
-    'class="height_130px w300px"',
-    true
-);
-
-$table->data[$i][0] = __('API password');
-$table->data[$i][1] = html_print_input_password(
-    'api_password',
-    io_output_password($config['api_password']),
-    '',
-    25,
-    255,
-    true
-);
-$table->data[$i++][1] .= ui_print_reveal_password('api_password', true);
-
-$table->data[$i][0] = __('Enable GIS features');
-$table->data[$i++][1] = html_print_checkbox_switch(
-    'activate_gis',
-    1,
-    $config['activate_gis'],
-    true
-);
-
-$table->data[$i][0] = __('Enable Netflow');
-$rbt_disabled = false;
+// Enable Netflow.
 if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') {
     $rbt_disabled = true;
+} else {
+    $rbt_disabled = false;
 }
 
-$table->data[$i++][1] = html_print_checkbox_switch_extended(
-    'activate_netflow',
-    1,
-    $config['activate_netflow'],
-    $rbt_disabled,
-    '',
-    '',
-    true
-);
-
-
+// Zone names.
 $zone_name = [
     'Africa'     => __('Africa'),
     'America'    => __('America'),
@@ -278,83 +107,16 @@ foreach ($timezones as $timezone) {
     }
 }
 
-$table->data[$i][0] = __('Timezone setup');
-$table->data[$i][1] = html_print_input_text_extended(
-    'timezone_text',
-    $config['timezone'],
-    'text-timezone_text',
-    '',
-    25,
-    25,
-    false,
-    '',
-    'readonly',
-    true
-);
-$table->data[$i][1] .= '<a id="change_timezone">'.html_print_image(
-    'images/edit.svg',
-    true,
+// Force Public URL Dialog.
+html_print_div(
     [
-        'title' => __('Change timezone'),
-        'class' => 'main_menu_icon invert_filter',
-    ]
-).'</a>';
-$table->data[$i][1] .= '&nbsp;&nbsp;'.html_print_select(
-    $zone_name,
-    'zone',
-    $zone_selected,
-    'show_timezone();',
-    '',
-    '',
-    true
-);
-$table->data[$i++][1] .= '&nbsp;&nbsp;'.html_print_select(
-    $timezone_n,
-    'timezone',
-    $config['timezone'],
-    '',
-    '',
-    '',
-    true
-);
-
-$table->data[$i][0] = __('Public URL');
-$table->data[$i++][1] = html_print_input_text(
-    'public_url',
-    $config['public_url'],
-    '',
-    40,
-    255,
-    true
-);
-
-$table->data[$i][0] = __('Force use Public URL');
-$table->data[$i++][1] = html_print_switch(
-    [
-        'name'  => 'force_public_url',
-        'value' => $config['force_public_url'],
+        'id'      => 'force_public_url_dialog',
+        'class'   => 'invisible',
+        'content' => __('If public URL is not properly configured you will lose access to ').get_product_name().__(' Console'),
     ]
 );
 
-echo "<div id='force_public_url_dialog' title='".__(
-    'Enforce public URL usage information'
-)."' class='invisible'>";
-echo "<p class='center'>".__('If public URL is not properly configured you will lose access to ').get_product_name().__(' Console').'</p>';
-echo '</div>';
-
-$table->data[$i][0] = __('Public URL host exclusions');
-$table->data[$i++][1] = html_print_textarea(
-    'public_url_exclusions',
-    2,
-    25,
-    $config['public_url_exclusions'],
-    'class="height_50px w300px"',
-    true
-);
-
-// Inventory changes blacklist.
-$table->data[$i][0] = __('Inventory changes blacklist');
-
+// Inventory blacklist.
 $inventory_changes_blacklist_id = get_parameter(
     'inventory_changes_blacklist',
     $config['inventory_changes_blacklist']
@@ -416,188 +178,509 @@ $select_in = html_print_select(
 
 $table_ichanges = '<table>
         <tr>
-            <td>'.__('Out of black list').'</td>
-            <td></td>
-            <td>'.__('In black list').'</td>
+            <td style="width: 45%">'.__('Out of black list').'</td>
+            <td style="width: 10%"></td>
+            <td style="width: 45%">'.__('In black list').'</td>
         </tr>
         <tr>
-            <td>'.$select_out.'</td>
-            <td>
+            <td style="width: 45%">'.$select_out.'</td>
+            <td style="width: 10%">
                 <a href="javascript:">'.html_print_image('images/arrow@svg.svg', true, ['style' => 'rotate: 180deg;', 'id' => 'right_iblacklist', 'alt' => __('Push selected modules into blacklist'), 'title' => __('Push selected modules into blacklist'), 'class' => 'main_menu_icon invert_filter']).'</a>
                 <br><br>
                 <a href="javascript:">'.html_print_image('images/arrow@svg.svg', true, ['style' => 'rotate: 0', 'id' => 'left_iblacklist', 'alt' => __('Pop selected modules out of blacklist'), 'title' => __('Pop selected modules out of blacklist'), 'class' => 'main_menu_icon invert_filter']).'</a>
             </td>
-            <td>'.$select_in.'</td>
+            <td style="width: 45%">'.$select_in.'</td>
         </tr>
     </table>';
 
-$table->data[$i++][1] = $table_ichanges;
-
-$table->data[$i][0] = __('Referer security');
-$table->data[$i++][1] = html_print_checkbox_switch(
-    'referer_security',
-    1,
-    $config['referer_security'],
-    true
-);
-
-$table->data[$i][0] = __('Event storm protection');
-$table->data[$i++][1] = html_print_checkbox_switch(
-    'event_storm_protection',
-    1,
-    $config['event_storm_protection'],
-    true
-);
-
-
-$table->data[$i][0] = __('Command Snapshot');
-$table->data[$i++][1] = html_print_checkbox_switch(
-    'command_snapshot',
-    1,
-    $config['command_snapshot'],
-    true
-);
-
-$table->data[$i][0] = __('Change remote config encoding');
-$table->data[$i++][1] = html_print_checkbox_switch(
-    'use_custom_encoding',
-    1,
-    $config['use_custom_encoding'],
-    true
-);
-
-$table->data[$i][0] = __('Server logs directory');
-$table->data[$i++][1] = html_print_input_text(
-    'server_log_dir',
-    $config['server_log_dir'],
-    '',
-    50,
-    255,
-    true
-);
-
-$table->data[$i][0] = __('Log size limit in system logs viewer extension');
-$table->data[$i++][1] = html_print_input_text(
-    'max_log_size',
-    $config['max_log_size'],
-    '',
-    10,
-    255,
-    true
-).html_print_label(' x1000', 'max_log_size', true);
-
 $modes_tutorial = [
     'full'      => __('Full mode'),
     'on_demand' => __('On demand'),
     'expert'    => __('Expert'),
 ];
-$table->data[$i][0] = __('Tutorial mode');
-$table->data[$i++][1] = html_print_select(
-    $modes_tutorial,
-    'tutorial_mode',
-    $config['tutorial_mode'],
-    '',
-    '',
-    0,
-    true
-);
 
 $config['past_planned_downtimes'] = isset(
     $config['past_planned_downtimes']
 ) ? $config['past_planned_downtimes'] : 1;
-$table->data[$i][0] = __('Allow create scheduled downtimes in the past');
-$table->data[$i++][1] = html_print_checkbox_switch(
-    'past_planned_downtimes',
-    1,
-    $config['past_planned_downtimes'],
-    true
+
+$table = new stdClass();
+$table->class = 'filter-table-adv';
+$table->id = 'setup_general';
+$table->width = '100%';
+$table->data = [];
+$table->size = [];
+$table->size[0] = '50%';
+$table->size[1] = '50%';
+
+// Current config["language"] could be set by user, not taken from global setup !
+$current_system_lang = db_get_sql(
+    'SELECT `value` FROM tconfig WHERE `token` = "language"'
 );
 
-$table->data[$i][0] = __('Limit for bulk operations');
-$table->data[$i++][1] = html_print_input(
+if ($current_system_lang === '') {
+    $current_system_lang = 'en';
+}
+
+$i = 0;
+
+$table->data[$i][] = html_print_label_input_block(
+    __('Language code'),
+    html_print_select_from_sql(
+        'SELECT id_language, name FROM tlanguage',
+        'language',
+        $current_system_lang,
+        '',
+        '',
+        '',
+        true,
+        false,
+        true,
+        false,
+        'width:100%'
+    )
+);
+
+$table->data[$i++][] = html_print_label_input_block(
+    __('Remote config directory'),
+    html_print_input_text(
+        'remote_config',
+        io_safe_output($config['remote_config']),
+        '',
+        30,
+        100,
+        true
+    )
+);
+
+$table->data[$i][] = html_print_label_input_block(
+    __('Chromium path'),
+    html_print_input_text(
+        'chromium_path',
+        io_safe_output(
+            $config['chromium_path']
+        ),
+        '',
+        30,
+        100,
+        true
+    )
+);
+
+$table->data[$i++][] = html_print_label_input_block(
+    __('Auto login (hash) password'),
+    html_print_input_password(
+        'loginhash_pwd',
+        io_output_password($config['loginhash_pwd']),
+        '',
+        15,
+        15,
+        true
+    )
+);
+
+$table->data[$i][] = html_print_label_input_block(
+    __('Time source'),
+    html_print_select(
+        $sources,
+        'timesource',
+        $config['timesource'],
+        '',
+        '',
+        '',
+        true
+    )
+);
+
+$table->data[$i++][] = html_print_label_input_block(
+    __('Attachment store'),
+    html_print_input_text(
+        'attachment_store',
+        io_safe_output($config['attachment_store']),
+        '',
+        50,
+        255,
+        true
+    )
+);
+
+$table->data[$i][] = html_print_label_input_block(
+    __('Enforce https'),
+    html_print_checkbox_switch_extended(
+        'https',
+        1,
+        $config['https'],
+        false,
+        '',
+        '',
+        true
+    )
+);
+
+$table->data[$i++][] = html_print_label_input_block(
+    __('Automatic check for updates'),
+    html_print_checkbox_switch(
+        'autoupdate',
+        1,
+        $config['autoupdate'],
+        true
+    )
+);
+
+$table->data[$i][] = html_print_label_input_block(
+    __('Use cert of SSL'),
+    html_print_checkbox_switch_extended(
+        'use_cert',
+        1,
+        $config['use_cert'],
+        false,
+        '',
+        '',
+        true
+    )
+);
+
+$table->data[$i++][] = html_print_label_input_block(
+    __('Path of SSL Cert.'),
+    html_print_input_text(
+        'cert_path',
+        io_safe_output($config['cert_path']),
+        '',
+        50,
+        255,
+        true
+    ),
     [
-        'type'   => 'number',
-        'size'   => 5,
-        'max'    => $performance_variables_control['limit_parameters_massive']->max,
-        'name'   => 'limit_parameters_massive',
-        'value'  => $config['limit_parameters_massive'],
-        'return' => true,
-        'min'    => $performance_variables_control['limit_parameters_massive']->min,
-        'style'  => 'width:50px',
+        'div_id'    => 'ssl-path-tr',
+        'div_style' => 'display: none',
     ]
 );
 
-$table->data[$i][0] = __('Include agents manually disabled');
-$table->data[$i++][1] = html_print_checkbox_switch(
-    'include_agents',
-    1,
-    $config['include_agents'],
-    true
+$table->data[$i][] = html_print_label_input_block(
+    __('API password'),
+    html_print_input_password(
+        'api_password',
+        io_output_password($config['api_password']),
+        '',
+        25,
+        255,
+        true
+    )
 );
 
-$table->data[$i][0] = __('Set alias as name by default in agent creation');
-$table->data[$i++][1] = html_print_checkbox_switch(
-    'alias_as_name',
-    1,
-    $config['alias_as_name'],
-    true
+$table->data[$i++][] = html_print_label_input_block(
+    __('IP list with API access'),
+    html_print_textarea(
+        'list_ACL_IPs_for_API',
+        2,
+        25,
+        $list_ACL_IPs_for_API,
+        'class="height_130px"',
+        true
+    )
 );
 
-$table->data[$i][0] = __('Unique IP');
-$table->data[$i++][1] = html_print_checkbox_switch(
-    'unique_ip',
-    1,
-    $config['unique_ip'],
-    true
+
+$table->data[$i][] = html_print_label_input_block(
+    __('Enable GIS features'),
+    html_print_checkbox_switch(
+        'activate_gis',
+        1,
+        $config['activate_gis'],
+        true
+    )
 );
 
-$table->data[$i][0] = __('Enable console log').ui_print_help_tip(
-    __('Log location').': pandora_console/log/console.log',
-    true
-);
-$table->data[$i++][1] = html_print_checkbox_switch(
-    'console_log_enabled',
-    1,
-    $config['console_log_enabled'],
-    true
+$table->data[$i++][] = html_print_label_input_block(
+    __('Enable Netflow'),
+    html_print_checkbox_switch_extended(
+        'activate_netflow',
+        1,
+        $config['activate_netflow'],
+        $rbt_disabled,
+        '',
+        '',
+        true
+    )
 );
 
-$table->data[$i][0] = __('Enable audit log').ui_print_help_tip(
-    __('Log location').': pandora_console/log/audit.log',
-    true
-);
-$table->data[$i++][1] = html_print_checkbox_switch(
-    'audit_log_enabled',
-    1,
-    $config['audit_log_enabled'],
-    true
+$table->colspan[$i][] = 2;
+$table->data[$i++][] = html_print_label_input_block(
+    __('Timezone setup'),
+    html_print_div(
+        [
+            'class'   => '',
+            'content' => html_print_input_text_extended(
+                'timezone_text',
+                $config['timezone'],
+                'text-timezone_text',
+                '',
+                25,
+                25,
+                false,
+                '',
+                'readonly',
+                true
+            ).html_print_image(
+                'images/edit.svg',
+                true,
+                [
+                    'id'    => 'change_timezone',
+                    'title' => __('Change timezone'),
+                    'class' => 'main_menu_icon invert_filter',
+                ]
+            ).html_print_select(
+                $zone_name,
+                'zone',
+                $zone_selected,
+                'show_timezone();',
+                '',
+                '',
+                true
+            ).html_print_select(
+                $timezone_n,
+                'timezone',
+                $config['timezone'],
+                '',
+                '',
+                '',
+                true
+            ),
+        ],
+        true
+    )
 );
 
-$table->data[$i][0] = __('Module custom ID readonly').ui_print_help_tip(
-    __('Useful for integrations'),
-    true
-);
-$table->data[$i++][1] = html_print_checkbox_switch(
-    'module_custom_id_ro',
-    1,
-    $config['module_custom_id_ro'],
-    true
+$table->data[$i][] = html_print_label_input_block(
+    __('Public URL'),
+    html_print_input_text(
+        'public_url',
+        $config['public_url'],
+        '',
+        40,
+        255,
+        true
+    )
 );
 
-$table->data[$i][0] = __('Enable console report').ui_print_help_tip(
+$table->data[$i++][] = html_print_label_input_block(
+    __('Force use Public URL'),
+    html_print_switch(
+        [
+            'name'  => 'force_public_url',
+            'value' => $config['force_public_url'],
+        ]
+    )
+);
+
+$table->data[$i++][] = html_print_label_input_block(
+    __('Public URL host exclusions'),
+    html_print_textarea(
+        'public_url_exclusions',
+        2,
+        25,
+        $config['public_url_exclusions'],
+        'class="height_50px w300px"',
+        true
+    )
+);
+
+// Inventory changes blacklist.
+$table->data[$i][] = html_print_label_input_block(
+    __('Inventory changes blacklist'),
+    $table_ichanges
+);
+
+$table->data[$i++][] = html_print_label_input_block(
+    __('Server logs directory'),
+    html_print_input_text(
+        'server_log_dir',
+        $config['server_log_dir'],
+        '',
+        50,
+        255,
+        true
+    )
+);
+
+$table->data[$i][] = html_print_label_input_block(
+    __('Event storm protection'),
+    html_print_checkbox_switch(
+        'event_storm_protection',
+        1,
+        $config['event_storm_protection'],
+        true
+    )
+);
+
+$table->data[$i++][] = html_print_label_input_block(
+    __('Command Snapshot'),
+    html_print_checkbox_switch(
+        'command_snapshot',
+        1,
+        $config['command_snapshot'],
+        true
+    )
+);
+
+$table->data[$i][] = html_print_label_input_block(
+    __('Change remote config encoding'),
+    html_print_checkbox_switch(
+        'use_custom_encoding',
+        1,
+        $config['use_custom_encoding'],
+        true
+    )
+);
+$table->data[$i++][] = html_print_label_input_block(
+    __('Referer security'),
+    html_print_checkbox_switch(
+        'referer_security',
+        1,
+        $config['referer_security'],
+        true
+    )
+);
+
+$table->data[$i][] = html_print_label_input_block(
+    __('Log size limit in system logs viewer extension'),
+    html_print_div(
+        [
+            'class'   => '',
+            'content' => html_print_input_text(
+                'max_log_size',
+                $config['max_log_size'],
+                '',
+                20,
+                255,
+                true
+            ).html_print_label(
+                ' x1000',
+                'max_log_size',
+                true
+            ),
+        ],
+        true
+    )
+);
+$table->data[$i++][] = html_print_label_input_block(
+    __('Tutorial mode'),
+    html_print_select(
+        $modes_tutorial,
+        'tutorial_mode',
+        $config['tutorial_mode'],
+        '',
+        '',
+        0,
+        true
+    )
+);
+
+$table->data[$i][] = html_print_label_input_block(
+    __('Allow create scheduled downtimes in the past'),
+    html_print_checkbox_switch(
+        'past_planned_downtimes',
+        1,
+        $config['past_planned_downtimes'],
+        true
+    )
+);
+$table->data[$i++][] = html_print_label_input_block(
+    __('Limit for bulk operations'),
+    html_print_input(
+        [
+            'type'   => 'number',
+            'size'   => 5,
+            'max'    => $performance_variables_control['limit_parameters_massive']->max,
+            'name'   => 'limit_parameters_massive',
+            'value'  => $config['limit_parameters_massive'],
+            'return' => true,
+            'min'    => $performance_variables_control['limit_parameters_massive']->min,
+            'style'  => 'width:50%',
+        ]
+    )
+);
+
+$table->data[$i][] = html_print_label_input_block(
+    __('Include agents manually disabled'),
+    html_print_checkbox_switch(
+        'include_agents',
+        1,
+        $config['include_agents'],
+        true
+    )
+);
+$table->data[$i++][] = html_print_label_input_block(
+    __('Set alias as name by default in agent creation'),
+    html_print_checkbox_switch(
+        'alias_as_name',
+        1,
+        $config['alias_as_name'],
+        true
+    )
+);
+
+$table->data[$i][] = html_print_label_input_block(
+    __('Unique IP'),
+    html_print_checkbox_switch(
+        'unique_ip',
+        1,
+        $config['unique_ip'],
+        true
+    )
+);
+
+$table->data[$i++][] = html_print_label_input_block(
+    __('Module custom ID readonly'),
+    html_print_checkbox_switch(
+        'module_custom_id_ro',
+        1,
+        $config['module_custom_id_ro'],
+        true
+    ).ui_print_input_placeholder(
+        __('Useful for integrations'),
+        true
+    )
+);
+
+$table->data[$i][] = html_print_label_input_block(
+    __('Enable console log'),
+    html_print_checkbox_switch(
+        'console_log_enabled',
+        1,
+        $config['console_log_enabled'],
+        true
+    ).ui_print_input_placeholder(
+        __('Log location').': pandora_console/log/console.log',
+        true
+    )
+);
+
+$table->data[$i++][] = html_print_label_input_block(
+    __('Enable audit log'),
+    html_print_checkbox_switch(
+        'audit_log_enabled',
+        1,
+        $config['audit_log_enabled'],
+        true
+    ).ui_print_input_placeholder(
+        __('Log location').': pandora_console/log/audit.log',
+        true
+    )
+);
+
+$table->data[$i][] = html_print_label_input_block(
     __('Enable console report'),
-    true
-);
-$table->data[$i++][1] = html_print_checkbox_switch(
-    'reporting_console_enable',
-    1,
-    $config['reporting_console_enable'],
-    true
+    html_print_checkbox_switch(
+        'reporting_console_enable',
+        1,
+        $config['reporting_console_enable'],
+        true
+    )
 );
 
-echo '<form id="form_setup" method="post" action="index.php?sec=gsetup&sec2=godmode/setup/setup&amp;section=general&amp;pure='.$config['pure'].'">';
+echo '<form class="max_floating_element_size" id="form_setup" method="post" action="index.php?sec=gsetup&sec2=godmode/setup/setup&amp;section=general&amp;pure='.$config['pure'].'">';
 
-echo '<fieldset>';
+echo '<fieldset class="margin-bottom-10">';
 echo '<legend>'.__('General options').'</legend>';
 
     html_print_input_hidden('update_config', 1);
@@ -612,10 +695,10 @@ $encryption = [
 
 echo '</fieldset>';
 
-echo '<fieldset>';
+echo '<fieldset class="margin-bottom-10">';
 echo '<legend>'.__('Mail configuration').'</legend>';
 
-    $table_mail_conf->data[0][0] = ui_print_warning_message(
+    ui_print_warning_message(
         __(
             'Please notice that some providers like Gmail or Office365 need to setup/enable manually external connections using SMTP and you need to use STARTTLS on port 587.
 
@@ -623,114 +706,128 @@ echo '<legend>'.__('Mail configuration').'</legend>';
         )
     );
 
-    $table_mail_conf->data[1][0] = __('From address');
-    $table_mail_conf->data[1][1] = html_print_input_text(
-        'email_from_dir',
-        $config['email_from_dir'],
-        '',
-        30,
-        100,
-        true
+    $table_mail_conf = new stdClass();
+    $table_mail_conf->width = '100%';
+    $table_mail_conf->class = 'databox filter-table-adv';
+    $table_mail_conf->size = [];
+    $table_mail_conf->size[0] = '50%';
+    $table_mail_conf->size[1] = '50%';
+    $table_mail_conf->data = [];
+
+    $table_mail_conf->data[0][] = html_print_label_input_block(
+        __('From address'),
+        html_print_input_text(
+            'email_from_dir',
+            $config['email_from_dir'],
+            '',
+            30,
+            100,
+            true
+        )
     );
 
-    $table_mail_conf->data[2][0] = __('From name');
-    $table_mail_conf->data[2][1] = html_print_input_text(
-        'email_from_name',
-        $config['email_from_name'],
-        '',
-        30,
-        100,
-        true
+    $table_mail_conf->data[0][] = html_print_label_input_block(
+        __('From name'),
+        html_print_input_text(
+            'email_from_name',
+            $config['email_from_name'],
+            '',
+            30,
+            100,
+            true
+        )
     );
 
-    $table_mail_conf->data[3][0] = __('SMTP Server');
-    $table_mail_conf->data[3][1] = html_print_input_text(
-        'email_smtpServer',
-        $config['email_smtpServer'],
-        '',
-        30,
-        100,
-        true
+    $table_mail_conf->data[1][] = html_print_label_input_block(
+        __('SMTP Server'),
+        html_print_input_text(
+            'email_smtpServer',
+            $config['email_smtpServer'],
+            '',
+            30,
+            100,
+            true
+        )
     );
 
-    $table_mail_conf->data[4][0] = __('SMTP Port');
-    $table_mail_conf->data[4][1] = html_print_input_text(
-        'email_smtpPort',
-        $config['email_smtpPort'],
-        '',
-        30,
-        100,
-        true
+    $table_mail_conf->data[1][] = html_print_label_input_block(
+        __('SMTP Port'),
+        html_print_input_text(
+            'email_smtpPort',
+            $config['email_smtpPort'],
+            '',
+            30,
+            100,
+            true
+        )
     );
 
-    $table_mail_conf->data[5][0] = __('Encryption');
-    $table_mail_conf->data[5][1] = html_print_select(
-        $encryption,
-        'email_encryption',
-        $config['email_encryption'],
-        '',
-        __('none'),
-        0,
-        true
+    $table_mail_conf->data[2][] = html_print_label_input_block(
+        __('Email user'),
+        html_print_input_text(
+            'email_username',
+            $config['email_username'],
+            '',
+            30,
+            100,
+            true
+        )
+    );
+    $table_mail_conf->data[2][] = html_print_label_input_block(
+        __('Email password'),
+        html_print_input_password(
+            'email_password',
+            io_output_password(
+                $config['email_password']
+            ),
+            '',
+            30,
+            100,
+            true
+        )
     );
 
-    $table_mail_conf->data[6][0] = __('Email user');
-    $table_mail_conf->data[6][1] = html_print_input_text(
-        'email_username',
-        $config['email_username'],
-        '',
-        30,
-        100,
-        true
-    );
-
-    $table_mail_conf->data[7][0] = __('Email password');
-    $table_mail_conf->data[7][1] = html_print_input_password(
-        'email_password',
-        io_output_password(
-            $config['email_password']
-        ),
-        '',
-        30,
-        100,
-        true
-    );
-    $table_mail_conf->data[7][1] .= ui_print_reveal_password(
-        'email_password',
-        true
+    $table_mail_conf->data[3][] = html_print_label_input_block(
+        __('Encryption'),
+        html_print_select(
+            $encryption,
+            'email_encryption',
+            $config['email_encryption'],
+            '',
+            __('none'),
+            0,
+            true
+        )
     );
 
     $uniqid = uniqid();
 
-    $table_mail_conf->data[8][0] = html_print_button(
-        __('Email test'),
-        'email_test_dialog',
-        false,
-        "show_email_test('".$uniqid."');",
-        [ 'icon' => 'next' ],
-        true
-    );
-
     print_email_test_modal_window($uniqid);
 
     html_print_input_hidden('update_config', 1);
     html_print_table($table_mail_conf);
 
-
     echo '</fieldset>';
 
 
-    html_print_div(
-        [
-            'class'   => 'action-buttons w100p',
-            'content' => html_print_submit_button(
-                __('Update'),
-                'update_button',
-                false,
-                ['icon' => 'update'],
-                true
-            ),
-        ]
+    html_print_action_buttons(
+        html_print_submit_button(
+            __('Update'),
+            'update_button',
+            false,
+            ['icon' => 'update'],
+            true
+        ).html_print_button(
+            __('Email test'),
+            'email_test_dialog',
+            false,
+            'show_email_test("'.$uniqid.'");',
+            [
+                'icon' => 'mail',
+                'mode' => 'secondary',
+            ],
+            true
+        )
     );
 
     echo '</form>';
@@ -748,26 +845,27 @@ echo '<legend>'.__('Mail configuration').'</legend>';
         // Email config table.
         $table_mail_test = new stdClass();
         $table_mail_test->width = '100%';
-        $table_mail_test->class = 'databox filters';
+        $table_mail_test->class = 'filter-table-adv';
         $table_mail_test->data = [];
-        $table_mail_test->style[0] = 'font-weight: bold;';
-        $table_mail_test->style[1] = 'font-weight: bold;display: flex;height: 54px;align-items: center;padding-left: 15px;';
 
-        $table_mail_test->data[0][0] = __('Address');
-        $table_mail_test->data[0][1] = html_print_input_text(
-            'email_test_address',
-            '',
-            '',
-            35,
-            100,
-            true
+        $table_mail_test->data[0][] = html_print_label_input_block(
+            __('Address'),
+            html_print_input_text(
+                'email_test_address',
+                '',
+                '',
+                35,
+                100,
+                true
+            )
         );
 
-        $table_mail_test->data[1][0] = '&nbsp&nbsp<span id="email_test_sent_message" class="invisible"><b>Email sent</b></span><span id="email_test_failure_message" class=invisible"><b>Email could not be sent</b></span>';
+        $table_mail_test->data[1][] = '&nbsp&nbsp<span id="email_test_sent_message" class="invisible"><b>Email sent</b></span><span id="email_test_failure_message" class=invisible"><b>Email could not be sent</b></span>';
 
-        $table_mail_test->data[1][1] = html_print_div(
+        // $table_mail_test->colspan[2][0] = 2;
+        $submitButton = html_print_div(
             [
-                'class'   => 'action-buttons w100p',
+                'class'   => 'action-buttons-right-forced',
                 'content' => html_print_button(
                     __('Send'),
                     'email_test',
@@ -783,7 +881,7 @@ echo '<legend>'.__('Mail configuration').'</legend>';
             true
         );
 
-        echo '<div id="email_test_'.$id.'" title="'.__('Check mail configuration').'" class="invisible">'.html_print_table($table_mail_test, true).'</div>';
+        echo '<div id="email_test_'.$id.'" title="'.__('Check mail configuration').'" class="invisible">'.html_print_table($table_mail_test, true).$submitButton.'</div>';
     }
 
 
diff --git a/pandora_console/godmode/setup/setup_integria.php b/pandora_console/godmode/setup/setup_integria.php
index fae8178498..9b4770471c 100644
--- a/pandora_console/godmode/setup/setup_integria.php
+++ b/pandora_console/godmode/setup/setup_integria.php
@@ -269,52 +269,102 @@ $table_remote->data = [];
 $table_remote->width = '100%';
 $table_remote->styleTable = 'margin-bottom: 10px;';
 $table_remote->id = 'integria-remote-setup';
-$table_remote->class = 'databox filters';
-$table_remote->size['name'] = '30%';
-$table_remote->style['name'] = 'font-weight: bold';
-$table_remote->style['control'] = 'display: flex;align-items: center;';
+$table_remote->class = 'databox filters filter-table-adv';
+$table_remote->size['hostname'] = '50%';
+$table_remote->size['api_pass'] = '50%';
 
-// Enable eHorus user configuration.
+// Enable Integria user configuration.
 $row = [];
-$row['name'] = ('Integria configuration at user level');
-$row['control'] = html_print_checkbox_switch('integria_user_level_conf', 1, $config['integria_user_level_conf'], true);
+$row['user_level'] = html_print_label_input_block(
+    __('Integria configuration at user level'),
+    html_print_checkbox_switch(
+        'integria_user_level_conf',
+        1,
+        $config['integria_user_level_conf'],
+        true
+    )
+);
 $table_remote->data['integria_user_level_conf'] = $row;
 
 // Integria user.
 $row = [];
-$row['name'] = __('User');
-$row['control'] = html_print_input_text('integria_user', $config['integria_user'], '', 30, 100, true);
-$table_remote->data['integria_user'] = $row;
+$row['user'] = html_print_label_input_block(
+    __('User'),
+    html_print_input_text(
+        'integria_user',
+        $config['integria_user'],
+        '',
+        30,
+        100,
+        true
+    ),
+    ['div_class' => 'integria-remote-setup-integria_user']
+);
 
 // Integria password.
-$row = [];
-$row['name'] = __('Password');
-$row['control'] = html_print_input_password('integria_pass', io_output_password($config['integria_pass']), '', 30, 100, true);
-$row['control'] .= ui_print_reveal_password('integria_pass', true);
+$row['password'] = html_print_label_input_block(
+    __('Password'),
+    html_print_input_password(
+        'integria_pass',
+        io_output_password($config['integria_pass']),
+        '',
+        30,
+        100,
+        true
+    ),
+    ['div_class' => 'integria-remote-setup-integria_pass']
+);
 $table_remote->data['integria_pass'] = $row;
 
 // Integria hostname.
 $row = [];
-$row['name'] = __('URL to Integria IMS setup').ui_print_help_tip(__('Full URL to your Integria IMS setup (e.g., http://192.168.1.20/integria, https://support.mycompany.com).'), true);
-$row['control'] = html_print_input_text('integria_hostname', $config['integria_hostname'], '', 30, 100, true);
-$table_remote->data['integria_hostname'] = $row;
+$row['hostname'] = html_print_label_input_block(
+    __('URL to Integria IMS setup').ui_print_help_tip(__('Full URL to your Integria IMS setup (e.g., http://192.168.1.20/integria, https://support.mycompany.com).'), true),
+    html_print_input_text(
+        'integria_hostname',
+        $config['integria_hostname'],
+        '',
+        30,
+        100,
+        true
+    ),
+    ['div_class' => 'integria-remote-setup-integria_hostname']
+);
 
 // API password.
-$row = [];
-$row['name'] = __('API Password');
-$row['control'] = html_print_input_password('integria_api_pass', io_output_password($config['integria_api_pass']), '', 30, 100, true);
-$row['control'] .= ui_print_reveal_password('integria_api_pass', true);
+$row['api_pass'] = html_print_label_input_block(
+    __('API Password'),
+    html_print_input_password(
+        'integria_api_pass',
+        io_output_password($config['integria_api_pass']),
+        '',
+        30,
+        100,
+        true
+    ),
+    ['div_class' => 'integria-remote-setup-integria_api_pass']
+);
 $table_remote->data['integria_api_pass'] = $row;
 
 // Request timeout.
 $row = [];
-$row['name'] = __('Request timeout');
-$row['control'] = html_print_input_text('integria_req_timeout', $config['integria_req_timeout'], '', 3, 10, true);
+$row['req_timeout'] = html_print_label_input_block(
+    __('Request timeout'),
+    html_print_input_text(
+        'integria_req_timeout',
+        $config['integria_req_timeout'],
+        '',
+        3,
+        10,
+        true
+    ),
+    ['div_class' => 'integria-remote-setup-integria_req_timeout']
+);
 $table_remote->data['integria_req_timeout'] = $row;
 
 $row = [];
-$row['name'] = __('Inventory');
-$row['control'] = html_print_button(
+$row['control'] = __('Inventory');
+$row['control'] .= html_print_button(
     __('Sync inventory'),
     'sync-inventory',
     false,
@@ -575,8 +625,8 @@ $table_cr_settings->data['custom_response_incident_status'] = $row;
 
 // Test.
 $row = [];
-$row['name'] = __('Test');
-$row['control'] = html_print_button(
+$row['control'] = __('Test');
+$row['control'] .= html_print_button(
     __('Start'),
     'test-integria',
     false,
@@ -594,12 +644,12 @@ $row['control'] .= '&nbsp;<span id="test-integria-message" class="invisible"></s
 $table_remote->data['integria_test'] = $row;
 
 // Print.
-echo '<div class="center pdd_b_20px mrgn_top_20px">';
+echo '<div class="center pdd_b_10px mrgn_btn_20px white_box max_floating_element_size">';
 echo '<a target="_blank" rel="noopener noreferrer" href="http://integriaims.com">';
 html_print_image(
     'images/integria_logo.svg',
     false,
-    ['class' => 'w400px'    ]
+    ['class' => 'w400px mrgn_top_15px']
 );
 echo '</a>';
 echo '<br />';
@@ -611,7 +661,7 @@ echo 'https://integriaims.com';
 echo '</a>';
 echo '</div>';
 
-echo "<form method='post'>";
+echo "<form method='post' class='max_floating_element_size'>";
 html_print_input_hidden('update_config', 1);
 
 // Form enable.
@@ -650,33 +700,24 @@ if ($has_connection != false) {
     echo '</fieldset>';
     echo '</div>';
 
-    html_print_div(
-        [
-            'class'   => 'action-buttons w100p',
-            'content' => html_print_submit_button(
-                __('Update'),
-                'update_button',
-                false,
-                ['icon' => 'update'],
-                true
-            ),
-        ]
+    $update_button = html_print_submit_button(
+        __('Update'),
+        'update_button',
+        false,
+        ['icon' => 'update'],
+        true
     );
 } else {
-    html_print_div(
-        [
-            'class'   => 'action-buttons w100p',
-            'content' => html_print_submit_button(
-                __('Update and continue'),
-                'update_button',
-                false,
-                ['icon' => 'update'],
-                true
-            ),
-        ]
+    $update_button = html_print_submit_button(
+        __('Update and continue'),
+        'update_button',
+        false,
+        ['icon' => 'update'],
+        true
     );
 }
 
+html_print_action_buttons($update_button);
 
 echo '</form>';
 
@@ -686,8 +727,8 @@ echo '</form>';
 
     if($('input:checkbox[name="integria_user_level_conf"]').is(':checked'))
     {
-        $('#integria-remote-setup-integria_user').hide();
-        $('#integria-remote-setup-integria_pass').hide()
+        $('.integria-remote-setup-integria_user').hide();
+        $('.integria-remote-setup-integria_pass').hide()
     }
 
     var handleUserLevel = function(event) {
@@ -726,13 +767,13 @@ echo '</form>';
     }
 
     var hideUserPass = function () {
-        $('#integria-remote-setup-integria_user').hide();
-        $('#integria-remote-setup-integria_pass').hide();
+        $('.integria-remote-setup-integria_user').hide();
+        $('.integria-remote-setup-integria_pass').hide();
     }
 
     var showUserPass = function () {
-        $('#integria-remote-setup-integria_user').show();
-        $('#integria-remote-setup-integria_pass').show();
+        $('.integria-remote-setup-integria_user').show();
+        $('.integria-remote-setup-integria_pass').show();
     }
 
     var handleEnable = function (event) {
diff --git a/pandora_console/godmode/setup/setup_netflow.php b/pandora_console/godmode/setup/setup_netflow.php
index 48a2947bb2..fbecfa766d 100644
--- a/pandora_console/godmode/setup/setup_netflow.php
+++ b/pandora_console/godmode/setup/setup_netflow.php
@@ -14,7 +14,7 @@
  * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
  *
  * ============================================================================
- * Copyright (c) 2005-2022 Artica Soluciones Tecnologicas
+ * Copyright (c) 2005-2023 Artica Soluciones Tecnologicas
  * Please see http://pandorafms.org for full contribution list
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -37,46 +37,66 @@ $update = (bool) get_parameter('update');
 
 $table = new stdClass();
 $table->width = '100%';
+$table->class = 'databox filter-table-adv';
 $table->border = 0;
-$table->cellspacing = 3;
-$table->cellpadding = 5;
-$table->class = 'databox filters';
-
 $table->data = [];
 
-$table->data[0][0] = '<b>'.__('Data storage path').'</b>';
-$table->data[0][1] = html_print_input_text('netflow_path', $config['netflow_path'], false, 50, 200, true);
+$table->data[0][] = html_print_label_input_block(
+    __('Data storage path'),
+    html_print_input_text('netflow_path', $config['netflow_path'], false, 50, 200, true)
+);
 
-$table->data[1][0] = '<b>'.__('Daemon interval').'</b>';
-$table->data[1][1] = html_print_input_text('netflow_interval', $config['netflow_interval'], false, 50, 200, true);
+$table->data[0][] = html_print_label_input_block(
+    __('Daemon interval'),
+    html_print_input_text('netflow_interval', $config['netflow_interval'], false, 50, 200, true)
+);
 
-$table->data[2][0] = '<b>'.__('Daemon binary path').'</b>';
-$table->data[2][1] = html_print_input_text('netflow_daemon', $config['netflow_daemon'], false, 50, 200, true);
+$table->data[1][] = html_print_label_input_block(
+    __('Daemon binary path'),
+    html_print_input_text('netflow_daemon', $config['netflow_daemon'], false, 50, 200, true)
+);
 
-$table->data[3][0] = '<b>'.__('Nfdump binary path').'</b>';
-$table->data[3][1] = html_print_input_text('netflow_nfdump', $config['netflow_nfdump'], false, 50, 200, true);
+$table->data[1][] = html_print_label_input_block(
+    __('Nfdump binary path'),
+    html_print_input_text('netflow_nfdump', $config['netflow_nfdump'], false, 50, 200, true)
+);
 
-$table->data[4][0] = '<b>'.__('Nfexpire binary path').'</b>';
-$table->data[4][1] = html_print_input_text('netflow_nfexpire', $config['netflow_nfexpire'], false, 50, 200, true);
+$table->data[2][] = html_print_label_input_block(
+    __('Nfexpire binary path'),
+    html_print_input_text('netflow_nfexpire', $config['netflow_nfexpire'], false, 50, 200, true)
+);
 
-$table->data[5][0] = '<b>'.__('Maximum chart resolution').'</b>';
-$table->data[5][1] = html_print_input_text('netflow_max_resolution', $config['netflow_max_resolution'], false, 50, 200, true);
+$table->data[2][] = html_print_label_input_block(
+    __('Maximum chart resolution'),
+    html_print_input_text('netflow_max_resolution', $config['netflow_max_resolution'], false, 50, 200, true)
+);
 
-$table->data[6][0] = '<b>'.__('Disable custom live view filters').'</b>';
-$table->data[6][1] = html_print_checkbox_switch('netflow_disable_custom_lvfilters', 1, $config['netflow_disable_custom_lvfilters'], true);
-$table->data[7][0] = '<b>'.__('Netflow max lifetime').'</b>';
-$table->data[7][1] = html_print_input_text('netflow_max_lifetime', $config['netflow_max_lifetime'], false, 50, 200, true);
+$table->data[3][] = html_print_label_input_block(
+    __('Disable custom live view filters'),
+    html_print_checkbox_switch('netflow_disable_custom_lvfilters', 1, $config['netflow_disable_custom_lvfilters'], true)
+);
+
+$table->data[3][] = html_print_label_input_block(
+    __('Netflow max lifetime'),
+    html_print_input_text('netflow_max_lifetime', $config['netflow_max_lifetime'], false, 50, 200, true)
+);
 
-$table->data[8][0] = '<b>'.__('Name resolution for IP address').'</b>';
 $onclick = "if (!confirm('".__('Warning').'. '.__('IP address resolution can take a lot of time')."')) return false;";
-$table->data[8][1] = html_print_checkbox_switch_extended('netflow_get_ip_hostname', 1, $config['netflow_get_ip_hostname'], false, $onclick, '', true);
-
-echo '<form id="netflow_setup" method="post">';
+$table->data[4][] = html_print_label_input_block(
+    __('Name resolution for IP address'),
+    html_print_checkbox_switch_extended('netflow_get_ip_hostname', 1, $config['netflow_get_ip_hostname'], false, $onclick, '', true)
+);
 
+echo '<form class="max_floating_element_size" id="netflow_setup" method="post">';
 html_print_table($table);
-
-// Update button.
-echo '<div class="action-buttons w100p">';
-    html_print_input_hidden('update_config', 1);
-    html_print_submit_button(__('Update'), 'upd_button', false, 'class="sub upd"');
-echo '</div></form>';
+html_print_input_hidden('update_config', 1);
+html_print_action_buttons(
+    html_print_submit_button(
+        __('Update'),
+        'upd_button',
+        false,
+        ['icon' => 'update'],
+        true
+    )
+);
+echo '</form>';
diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php
index 5fb042fe66..e6dd22eb2d 100755
--- a/pandora_console/godmode/setup/setup_visuals.php
+++ b/pandora_console/godmode/setup/setup_visuals.php
@@ -1,16 +1,31 @@
 <?php
+/**
+ * Setup of Visual Styles.
+ *
+ * @category   Setup
+ * @package    Pandora FMS
+ * @subpackage Community
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2005-2023 Artica Soluciones Tecnologicas
+ * Please see http://pandorafms.org for full contribution list
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation for version 2.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * ============================================================================
+ */
 
-// Pandora FMS - http://pandorafms.com
-// ==================================================
-// Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
-// Please see http://pandorafms.org for full contribution list
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation for version 2.
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
 // Load global vars.
 global $config;
 
@@ -50,7 +65,7 @@ require_once 'include/functions_themes.php';
 require_once 'include/functions_gis.php';
 
 $row = 0;
-echo '<form id="form_setup" method="post">';
+echo '<form id="form_setup" class="max_floating_element_size" method="post">';
 html_print_input_hidden('update_config', 1);
 
 $performance_variables_control = (array) json_decode(io_safe_output($config['performance_variables_control']));
@@ -58,28 +73,6 @@ $performance_variables_control = (array) json_decode(io_safe_output($config['per
 // ----------------------------------------------------------------------
 // BEHAVIOUR CONFIGURATION
 // ----------------------------------------------------------------------
-$table_behaviour = new stdClass();
-$table_behaviour->width = '100%';
-$table_behaviour->class = 'databox filters';
-$table_behaviour->style[0] = 'font-weight: bold;';
-$table_behaviour->size[0] = '50%';
-$table_behaviour->data = [];
-
-$table_behaviour->data[$row][0] = __('Block size for pagination');
-$table_behaviour->data[$row][1] = html_print_input(
-    [
-        'type'   => 'number',
-        'size'   => 5,
-        'max'    => $performance_variables_control['block_size']->max,
-        'name'   => 'block_size',
-        'value'  => $config['global_block_size'],
-        'return' => true,
-        'min'    => $performance_variables_control['block_size']->min,
-        'style'  => 'width:50px',
-    ]
-);
-$row++;
-
 $values = [];
 $values[5] = human_time_description_raw(5);
 $values[30] = human_time_description_raw(30);
@@ -89,178 +82,87 @@ $values[SECONDS_5MINUTES] = human_time_description_raw(SECONDS_5MINUTES);
 $values[SECONDS_10MINUTES] = human_time_description_raw(SECONDS_10MINUTES);
 $values[SECONDS_30MINUTES] = human_time_description_raw(SECONDS_30MINUTES);
 
-$table_behaviour->data[$row][0] = __('Paginated module view');
-$table_behaviour->data[$row][1] = html_print_checkbox_switch(
-    'paginate_module',
-    1,
-    $config['paginate_module'],
-    true
+$table_behaviour = new stdClass();
+$table_behaviour->width = '100%';
+$table_behaviour->class = 'filter-table-adv';
+$table_behaviour->size[0] = '50%';
+$table_behaviour->data = [];
+
+$table_behaviour->data[$row][] = html_print_label_input_block(
+    __('Block size for pagination'),
+    html_print_input(
+        [
+            'type'   => 'number',
+            'size'   => 5,
+            'max'    => $performance_variables_control['block_size']->max,
+            'name'   => 'block_size',
+            'value'  => $config['global_block_size'],
+            'return' => true,
+            'min'    => $performance_variables_control['block_size']->min,
+            'style'  => 'width:50px',
+        ]
+    )
+);
+
+$table_behaviour->data[$row][] = html_print_label_input_block(
+    __('Click to display lateral menus'),
+    html_print_checkbox_switch(
+        'click_display',
+        1,
+        $config['click_display'],
+        true
+    )
+);
+
+$row++;
+
+$table_behaviour->data[$row][] = html_print_label_input_block(
+    __('Paginated module view'),
+    html_print_checkbox_switch(
+        'paginate_module',
+        1,
+        $config['paginate_module'],
+        true
+    )
+);
+$table_behaviour->data[$row][] = html_print_label_input_block(
+    __('Display data of proc modules in other format'),
+    html_print_checkbox_switch(
+        'render_proc',
+        1,
+        $config['render_proc'],
+        true
+    )
 );
 $row++;
 
-$table_behaviour->data[$row][0] = __('Display data of proc modules in other format');
-$table_behaviour->data[$row][1] = html_print_checkbox_switch(
-    'render_proc',
-    1,
-    $config['render_proc'],
-    true
+$table_behaviour->data[$row][] = html_print_label_input_block(
+    __('Display text proc modules have state is ok'),
+    html_print_input_text('render_proc_ok', $config['render_proc_ok'], '', 25, 25, true)
 );
-$row++;
-
-$table_behaviour->data[$row][0] = __('Display text proc modules have state is ok');
-$table_behaviour->data[$row][1] = html_print_input_text('render_proc_ok', $config['render_proc_ok'], '', 25, 25, true);
-$row++;
-
-$table_behaviour->data[$row][0] = __('Display text when proc modules have state critical');
-$table_behaviour->data[$row][1] = html_print_input_text('render_proc_fail', $config['render_proc_fail'], '', 25, 25, true);
-$row++;
-
-$table_behaviour->data[$row][0] = __('Click to display lateral menus');
-$table_behaviour->data[$row][1] = html_print_checkbox_switch(
-    'click_display',
-    1,
-    $config['click_display'],
-    true
+$table_behaviour->data[$row][] = html_print_label_input_block(
+    __('Display text when proc modules have state critical'),
+    html_print_input_text('render_proc_fail', $config['render_proc_fail'], '', 25, 25, true)
 );
 $row++;
 
 if (enterprise_installed() === true) {
-    $table_behaviour->data[$row][0] = __('Service label font size');
-    $table_behaviour->data[$row][1] = html_print_input_text('service_label_font_size', $config['service_label_font_size'], '', 5, 5, true);
-    $row++;
-
-    $table_behaviour->data[$row][0] = __('Space between items in Service maps');
-    $table_behaviour->data[$row][1] = html_print_input_text('service_item_padding_size', $config['service_item_padding_size'], '', 5, 5, true, false, false, 'onChange="change_servicetree_nodes_padding()"');
     $row++;
+    $table_behaviour->data[$row][] = html_print_label_input_block(
+        __('Service label font size'),
+        html_print_input_text('service_label_font_size', $config['service_label_font_size'], '', 5, 5, true)
+    );
+    $table_behaviour->data[$row][] = html_print_label_input_block(
+        __('Space between items in Service maps'),
+        html_print_input_text('service_item_padding_size', $config['service_item_padding_size'], '', 5, 5, true, false, false, 'onChange="change_servicetree_nodes_padding()"')
+    );
 }
 
+
 // ----------------------------------------------------------------------
 // ----------------------------------------------------------------------
 // STYLE CONFIGURATION
 // ----------------------------------------------------------------------
-$table_styles = new stdClass();
-$table_styles->width = '100%';
-$table_styles->class = 'databox filters';
-$table_styles->style[0] = 'font-weight: bold;';
-$table_styles->style[1] = 'display: flex; align-items: center;';
-$table_styles->size[0] = '50%';
-$table_styles->data = [];
-
-
-$table_styles->data[$row][0] = __('Style template');
-$table_styles->data[$row][1] = html_print_select(
-    themes_get_css(),
-    'style',
-    $config['style'].'.css',
-    '',
-    '',
-    '',
-    true
-);
-$row++;
-
-$table_styles->data[$row][0] = __('Status icon set');
-$iconsets['default'] = __('Colors');
-$iconsets['faces'] = __('Faces');
-$iconsets['color_text'] = __('Colors and text');
-$table_styles->data[$row][1] = html_print_select(
-    $iconsets,
-    'status_images_set',
-    $config['status_images_set'],
-    '',
-    '',
-    '',
-    true
-);
-$table_styles->data[$row][1] .= html_print_button(
-    __('View'),
-    'status_set_preview',
-    false,
-    '',
-    [
-        'icon'  => 'camera',
-        'mode'  => 'link',
-        'class' => 'logo_preview',
-    ],
-    true
-);
-$row++;
-
-// Divs to show icon status Colours (Default).
-$icon_unknown_ball = ui_print_status_image(STATUS_AGENT_UNKNOWN_BALL, '', true);
-$icon_unknown = ui_print_status_image(STATUS_AGENT_UNKNOWN, '', true);
-$icon_ok_ball = ui_print_status_image(STATUS_AGENT_OK_BALL, '', true);
-$icon_ok = ui_print_status_image(STATUS_AGENT_OK, '', true);
-$icon_warning_ball = ui_print_status_image(STATUS_AGENT_WARNING_BALL, '', true);
-$icon_warning = ui_print_status_image(STATUS_AGENT_WARNING, '', true);
-$icon_bad_ball = ui_print_status_image(STATUS_AGENT_CRITICAL_BALL, '', true);
-$icon_bad = ui_print_status_image(STATUS_AGENT_CRITICAL, '', true);
-// End - Divs to show icon status Colours (Default).
-$table_styles->data[$row][0] = __('Login background');
-$backgrounds_list_jpg = list_files('images/backgrounds', 'jpg', 1, 0);
-$backgrounds_list_gif = list_files('images/backgrounds', 'gif', 1, 0);
-$backgrounds_list_png = list_files('images/backgrounds', 'png', 1, 0);
-$backgrounds_list = array_merge($backgrounds_list_jpg, $backgrounds_list_png);
-$backgrounds_list = array_merge($backgrounds_list, $backgrounds_list_gif);
-asort($backgrounds_list);
-
-$open = false;
-if (enterprise_installed() === false) {
-    $open = true;
-}
-
-// Custom favicon.
-$files = list_files('images/custom_favicon', 'ico', 1, 0);
-$table_styles->data[$row][0] = __('Custom favicon');
-$table_styles->data[$row][1] = html_print_select(
-    $files,
-    'custom_favicon',
-    $config['custom_favicon'],
-    'setup_visuals_change_favicon();',
-    __('Default'),
-    '',
-    true,
-    false,
-    true,
-    '',
-    false,
-    'width:240px'
-);
-$table_styles->data[$row][1] .= '&nbsp;&nbsp;&nbsp;'.html_print_image(
-    ui_get_favicon(),
-    true,
-    ['id' => 'favicon_preview']
-);
-$row++;
-
-$table_styles->data[$row][0] = __('Custom background logo');
-$table_styles->data[$row][1] = html_print_select(
-    $backgrounds_list,
-    'login_background',
-    $config['login_background'],
-    '',
-    __('Default'),
-    '',
-    true,
-    false,
-    true,
-    '',
-    false,
-    'width:240px'
-);
-$table_styles->data[$row][1] .= html_print_button(
-    __('View'),
-    'login_background_preview',
-    false,
-    '',
-    [
-        'icon'  => 'camera',
-        'mode'  => 'link',
-        'class' => 'logo_preview',
-    ],
-    true
-);
-$row++;
 
 
 /**
@@ -311,1369 +213,7 @@ function logo_custom_enterprise($name, $logo)
 }
 
 
-$table_styles->data[$row][0] = __('Custom logo (menu)');
-$table_styles->data[$row][1] = logo_custom_enterprise('custom_logo', $config['custom_logo']);
-$table_styles->data[$row][1] .= '&nbsp;'.html_print_button(
-    __('View'),
-    'custom_logo_preview',
-    $open,
-    '',
-    [
-        'icon'  => 'camera',
-        'mode'  => 'link',
-        'class' => 'logo_preview',
-    ],
-    true,
-    false,
-    $open,
-    'visualmodal'
-);
-$row++;
-
-$table_styles->data[$row][0] = __('Custom logo collapsed (menu)');
-$table_styles->data[$row][1] = logo_custom_enterprise('custom_logo_collapsed', $config['custom_logo_collapsed']);
-$table_styles->data[$row][1] .= '&nbsp;'.html_print_button(
-    __('View'),
-    'custom_logo_collapsed_preview',
-    $open,
-    '',
-    [
-        'icon'  => 'camera',
-        'mode'  => 'link',
-        'class' => 'logo_preview',
-    ],
-    true,
-    false,
-    $open,
-    'visualmodal'
-);
-$row++;
-
-$table_styles->data[$row][0] = __('Custom logo (header white background)');
-if (enterprise_installed() === true) {
-    $ent_files = list_files('enterprise/images/custom_logo', 'png', 1, 0);
-    $open_files = list_files('images/custom_logo', 'png', 1, 0);
-
-    $table_styles->data[$row][1] = html_print_select(
-        array_merge($open_files, $ent_files),
-        'custom_logo_white_bg',
-        $config['custom_logo_white_bg'],
-        '',
-        '',
-        '',
-        true,
-        false,
-        true,
-        '',
-        $open,
-        'width:240px'
-    );
-} else {
-    $table_styles->data[$row][1] = html_print_select(
-        list_files('images/custom_logo', 'png', 1, 0),
-        'custom_logo_white_bg',
-        $config['custom_logo_white_bg'],
-        '',
-        '',
-        '',
-        true,
-        false,
-        true,
-        '',
-        $open,
-        'width:240px'
-    );
-}
-
-$table_styles->data[$row][1] .= '&nbsp;'.html_print_button(
-    __('View'),
-    'custom_logo_white_bg_preview',
-    $open,
-    '',
-    [
-        'icon'  => 'camera',
-        'mode'  => 'link',
-        'class' => 'logo_preview',
-    ],
-    true,
-    false,
-    $open,
-    'visualmodal'
-);
-$row++;
-
-$table_styles->data[$row][0] = __('Custom logo (login)');
-
-if (enterprise_installed()) {
-    $table_styles->data[$row][1] = html_print_select(
-        list_files('enterprise/images/custom_logo_login', 'png', 1, 0),
-        'custom_logo_login',
-        $config['custom_logo_login'],
-        '',
-        '',
-        '',
-        true,
-        false,
-        true,
-        '',
-        $open,
-        'width:240px'
-    );
-} else {
-    $table_styles->data[$row][1] = html_print_select(
-        '',
-        'custom_logo_login',
-        $config['custom_logo_login'],
-        '',
-        '',
-        '',
-        true,
-        false,
-        true,
-        '',
-        $open,
-        'width:240px'
-    );
-}
-
-$table_styles->data[$row][1] .= '&nbsp;'.html_print_button(
-    __('View'),
-    'custom_logo_login_preview',
-    $open,
-    '',
-    [
-        'icon'  => 'camera',
-        'mode'  => 'link',
-        'class' => 'logo_preview',
-    ],
-    true,
-    false,
-    $open,
-    'visualmodal'
-);
-$row++;
-
-// Splash login.
-if (enterprise_installed() === true) {
-    $table_styles->data[$row][0] = __('Custom Splash (login)');
-
-    $table_styles->data[$row][1] = html_print_select(
-        list_files('enterprise/images/custom_splash_login', 'png', 1, 0),
-        'custom_splash_login',
-        $config['custom_splash_login'],
-        '',
-        __('Default'),
-        'default',
-        true,
-        false,
-        true,
-        '',
-        $open,
-        'width:240px'
-    );
-
-    $table_styles->data[$row][1] .= '&nbsp;'.html_print_button(
-        __('View'),
-        'custom_splash_login_preview',
-        $open,
-        '',
-        [
-            'icon'  => 'camera',
-            'mode'  => 'link',
-            'class' => 'logo_preview',
-        ],
-        true,
-        false,
-        $open,
-        'visualmodal'
-    );
-    $row++;
-}
-
-if (enterprise_installed() === true) {
-    // Get all the custom logos.
-    $files = list_files('enterprise/images/custom_general_logos', 'png', 1, 0);
-
-    // Custom docs icon.
-    $table_styles->data[$row][0] = __('Custom documentation logo');
-
-    $table_styles->data[$row][1] = html_print_select(
-        $files,
-        'custom_docs_logo',
-        $config['custom_docs_logo'],
-        '',
-        __('None'),
-        '',
-        true,
-        false,
-        true,
-        '',
-        false,
-        'width:240px'
-    );
-    $table_styles->data[$row][1] .= '&nbsp;'.html_print_button(
-        __('View'),
-        'custom_docs_logo_preview',
-        $open,
-        '',
-        [
-            'icon'  => 'camera',
-            'mode'  => 'link',
-            'class' => 'logo_preview',
-        ],
-        true,
-        false,
-        $open,
-        'visualmodal'
-    );
-    $row++;
-
-    // Custom support icon.
-    $table_styles->data[$row][0] = __('Custom support logo');
-    $table_styles->data[$row][1] = html_print_select(
-        $files,
-        'custom_support_logo',
-        $config['custom_support_logo'],
-        '',
-        __('None'),
-        '',
-        true,
-        false,
-        true,
-        '',
-        false,
-        'width:240px'
-    );
-    $table_styles->data[$row][1] .= '&nbsp;'.html_print_button(
-        __('View'),
-        'custom_support_logo_preview',
-        $open,
-        '',
-        [
-            'icon'  => 'camera',
-            'mode'  => 'link',
-            'class' => 'logo_preview',
-        ],
-        true,
-        false,
-        $open,
-        'visualmodal'
-    );
-    $row++;
-
-    // Custom center networkmap icon.
-    $table_styles->data[$row][0] = __('Custom networkmap center logo');
-    $table_styles->data[$row][1] = html_print_select(
-        $files,
-        'custom_network_center_logo',
-        $config['custom_network_center_logo'],
-        '',
-        __('Default'),
-        '',
-        true,
-        false,
-        true,
-        '',
-        false,
-        'width:240px'
-    );
-    $table_styles->data[$row][1] .= '&nbsp;'.html_print_button(
-        __('View'),
-        'custom_network_center_logo_preview',
-        $open,
-        '',
-        [
-            'icon'  => 'camera',
-            'mode'  => 'link',
-            'class' => 'logo_preview',
-        ],
-        true,
-        false,
-        $open,
-        'visualmodal'
-    );
-    $row++;
-
-    // Custom center mobile console icon.
-    $table_styles->data[$row][0] = __('Custom mobile console icon');
-    $table_styles->data[$row][1] = html_print_select(
-        $files,
-        'custom_mobile_console_logo',
-        $config['custom_mobile_console_logo'],
-        '',
-        __('Default'),
-        '',
-        true,
-        false,
-        true,
-        '',
-        false,
-        'width:240px'
-    );
-    $table_styles->data[$row][1] .= '&nbsp;'.html_print_button(
-        __('View'),
-        'custom_mobile_console_logo_preview',
-        $open,
-        '',
-        [
-            'icon'  => 'camera',
-            'mode'  => 'link',
-            'class' => 'logo_preview',
-        ],
-        true,
-        false,
-        $open,
-        'visualmodal'
-    );
-    $row++;
-}
-
-// Title Header.
-$table_styles->data[$row][0] = __('Title (header)');
-$table_styles->data[$row][1] = html_print_input_text('custom_title_header', $config['custom_title_header'], '', 50, 40, true);
-$row++;
-
-// Subtitle Header.
-$table_styles->data[$row][0] = __('Subtitle (header)');
-$table_styles->data[$row][1] = html_print_input_text('custom_subtitle_header', $config['custom_subtitle_header'], '', 50, 40, true);
-$row++;
-
-// Login title1.
-if (enterprise_installed() === true) {
-    $table_styles->data[$row][0] = __('Title 1 (login)');
-    $table_styles->data[$row][1] = html_print_input_text('custom_title1_login', $config['custom_title1_login'], '', 50, 50, true);
-    $row++;
-}
-
-// Login text2.
-if (enterprise_installed() === true) {
-    $table_styles->data[$row][0] = __('Title 2 (login)');
-    $table_styles->data[$row][1] = html_print_input_text('custom_title2_login', $config['custom_title2_login'], '', 50, 50, true);
-    $row++;
-}
-
-if (enterprise_installed() === true) {
-    $table_styles->data[$row][0] = __('Docs URL (login)');
-    $table_styles->data[$row][1] = html_print_input_text('custom_docs_url', $config['custom_docs_url'], '', 50, 50, true);
-    $row++;
-}
-
-if (enterprise_installed() === true) {
-    $table_styles->data[$row][0] = __('Support URL (login)');
-    $table_styles->data[$row][1] = html_print_input_text('custom_support_url', $config['custom_support_url'], '', 50, 50, true);
-    $row++;
-}
-
-if (enterprise_installed() === true) {
-    $table_styles->data[$row][0] = __('Product name');
-    $table_styles->data[$row][1] = html_print_input_text('rb_product_name', get_product_name(), '', 30, 255, true);
-    $row++;
-}
-
-if (enterprise_installed() === true) {
-    $table_styles->data[$row][0] = __('Copyright notice');
-    $table_styles->data[$row][1] = html_print_input_text('rb_copyright_notice', get_copyright_notice(), '', 30, 255, true);
-    $row++;
-}
-
-if (enterprise_installed() === true) {
-    $table_styles->data[$row][0] = __('Background opacity % (login)');
-    $table_styles->data[$row][1] = "<input type='number' value=".$config['background_opacity']." size='5' name='background_opacity' min='0' max='99'>";
-    $row++;
-}
-
-if (enterprise_installed() === true) {
-    $table_styles->data[$row][0] = __('Disable logo in graphs');
-    $table_styles->data[$row][1] = html_print_checkbox_switch(
-        'fixed_graph',
-        1,
-        $config['fixed_graph'],
-        true
-    );
-    $row++;
-}
-
-    /*
-        Hello there! :)
-        We added some of what seems to be "buggy" messages to the openSource version recently. This is not to force open-source users to move to the enterprise version, this is just to inform people using Pandora FMS open source that it requires skilled people to maintain and keep it running smoothly without professional support. This does not imply open-source version is limited in any way. If you check the recently added code, it contains only warnings and messages, no limitations except one: we removed the option to add custom logo in header. In the Update Manager section, it warns about the 'danger’ of applying automated updates without a proper backup, remembering in the process that the Enterprise version comes with a human-tested package. Maintaining an OpenSource version with more than 500 agents is not so easy, that's why someone using a Pandora with 8000 agents should consider asking for support. It's not a joke, we know of many setups with a huge number of agents, and we hate to hear that “its becoming unstable and slow” :(
-        You can of course remove the warnings, that's why we include the source and do not use any kind of trick. And that's why we added here this comment, to let you know this does not reflect any change in our opensource mentality of does the last 14 years.
-    */
-
-$table_styles->data[$row][0] = __('Disable helps');
-$table_styles->data[$row][1] = html_print_checkbox_switch(
-    'disable_help',
-    1,
-    $config['disable_help'],
-    true
-);
-$row++;
-
-$table_styles->data[$row][0] = __('Fixed header');
-$table_styles->data[$row][1] = html_print_checkbox_switch(
-    'fixed_header',
-    1,
-    $config['fixed_header'],
-    true
-);
-$row++;
-
-
-// For 5.1 Autohidden menu feature.
-$table_styles->data['autohidden'][0] = __('Automatically hide submenu');
-$table_styles->data['autohidden'][1] = html_print_checkbox_switch(
-    'autohidden_menu',
-    1,
-    $config['autohidden_menu'],
-    true
-);
-
-$table_styles->data[$row][0] = __('Visual effects and animation');
-$table_styles->data[$row][1] = html_print_checkbox_switch(
-    'visual_animation',
-    1,
-    $config['visual_animation'],
-    true
-);
-$row++;
-
-$table_styles->data[$row][0] = __('Random background (login)');
-$table_styles->data[$row][1] = html_print_checkbox_switch(
-    'random_background',
-    1,
-    $config['random_background'],
-    true
-);
-$row++;
-
-
-// ----------------------------------------------------------------------
-// ----------------------------------------------------------------------
-// GIS CONFIGURATION
-// ----------------------------------------------------------------------
-$table_gis = new stdClass();
-$table_gis->width = '100%';
-$table_gis->class = 'databox filters';
-$table_gis->style[0] = 'font-weight: bold;';
-$table_gis->style[1] = 'display: flex; align-items: center;';
-$table_gis->size[0] = '50%';
-$table_gis->data = [];
-
-$table_gis->data[$row][0] = __('GIS Labels');
-$table_gis->data[$row][1] = html_print_checkbox_switch(
-    'gis_label',
-    1,
-    $config['gis_label'],
-    true
-);
-$row++;
-
-$listIcons = gis_get_array_list_icons();
-$arraySelectIcon = [];
-foreach ($listIcons as $index => $value) {
-    $arraySelectIcon[$index] = $index;
-}
-
-$table_gis->data[$row][0] = __('Default icon in GIS');
-$table_gis->data[$row][1] = html_print_select(
-    $arraySelectIcon,
-    'gis_default_icon',
-    $config['gis_default_icon'],
-    '',
-    __('Agent icon group'),
-    '',
-    true
-);
-$table_gis->data[$row][1] .= '&nbsp;'.html_print_button(
-    __('View'),
-    'gis_icon_preview',
-    false,
-    '',
-    [
-        'icon'  => 'camera',
-        'mode'  => 'link',
-        'class' => 'logo_preview',
-    ],
-    true
-);
-$row++;
-
-// ----------------------------------------------------------------------
-// ----------------------------------------------------------------------
-// FONT AND TEXT CONFIGURATION
-// ----------------------------------------------------------------------
-$table_font = new stdClass();
-$table_font->width = '100%';
-$table_font->class = 'databox filters';
-$table_font->style[0] = 'font-weight: bold;';
-$table_font->size[0] = '50%';
-$table_font->data = [];
-
-$table_font->data[$row][0] = __('Graphs font size');
-
-$font_size_array = [
-    1  => 1,
-    2  => 2,
-    3  => 3,
-    4  => 4,
-    5  => 5,
-    6  => 6,
-    7  => 7,
-    8  => 8,
-    9  => 9,
-    10 => 10,
-    11 => 11,
-    12 => 12,
-    13 => 13,
-    14 => 14,
-    15 => 15,
-];
-
-$table_font->data[$row][1] = html_print_select(
-    $font_size_array,
-    'font_size',
-    $config['font_size'],
-    '',
-    '',
-    0,
-    true
-);
-$row++;
-
-$table_font->data[$row][0] = __('Agent size text');
-$table_font->data[$row][1] = __('Small:').html_print_input_text('agent_size_text_small', $config['agent_size_text_small'], '', 3, 3, true);
-$table_font->data[$row][1] .= ' '.__('Normal:').html_print_input_text('agent_size_text_medium', $config['agent_size_text_medium'], '', 3, 3, true);
-$row++;
-
-$table_font->data[$row][0] = __('Module size text');
-$table_font->data[$row][1] = __('Small:').html_print_input_text('module_size_text_small', $config['module_size_text_small'], '', 3, 3, true);
-$table_font->data[$row][1] .= ' '.__('Normal:').html_print_input_text('module_size_text_medium', $config['module_size_text_medium'], '', 3, 3, true);
-$row++;
-
-$table_font->data[$row][0] = __('Description size text');
-$table_font->data[$row][1] = html_print_input_text('description_size_text', $config['description_size_text'], '', 3, 3, true);
-$row++;
-
-$table_font->data[$row][0] = __('Item title size text');
-$table_font->data[$row][1] = html_print_input_text(
-    'item_title_size_text',
-    $config['item_title_size_text'],
-    '',
-    3,
-    3,
-    true
-);
-$row++;
-
-$table_font->data[$row][0] = __('Show unit along with value in reports');
-$table_font->data[$row][1] = html_print_checkbox_switch(
-    'simple_module_value',
-    1,
-    $config['simple_module_value'],
-    true
-);
-$row++;
-
-// ----------------------------------------------------------------------
-// ----------------------------------------------------------------------
-// CHARS CONFIGURATION
-// ----------------------------------------------------------------------
-$table_chars = new stdClass();
-$table_chars->width = '100%';
-$table_chars->class = 'databox filters';
-$table_chars->style[0] = 'font-weight: bold;';
-$table_chars->style[1] = 'display: flex;';
-$table_chars->size[0] = '50%';
-$table_chars->data = [];
-
-$graphColorAmount = 10;
-
-for ($i = 1; $i <= $graphColorAmount; $i++) {
-    $table_chars->data[$row][0] = __('Graph color #'.$i);
-    $table_chars->data[$row][1] = html_print_input_text(
-        'graph_color'.$i,
-        $config['graph_color'.$i],
-        '',
-        10,
-        8,
-        true
-    );
-    $row++;
-}
-
-$table_chars->data[$row][0] = __('Value to interface graphics');
-$table_chars->data[$row][1] = html_print_input_text(
-    'interface_unit',
-    $config['interface_unit'],
-    '',
-    20,
-    20,
-    true
-);
-$row++;
-
-$disabled_graph_precision = false;
-if (enterprise_installed() === false) {
-    $disabled_graph_precision = true;
-}
-
-$table_chars->data[$row][0] = __('Data precision');
-$table_chars->data[$row][1] = html_print_input(
-    [
-        'type'                                        => 'number',
-        'size'                                        => 5,
-        'max'                                         => $performance_variables_control['graph_precision']->max,
-        'name'                                        => 'graph_precision',
-        'value'                                       => $config['graph_precision'],
-        'return'                                      => true,
-        'min'                                         => $performance_variables_control['graph_precision']->min,
-        'style'                                       => 'width:50px',
-        ($disabled_graph_precision) ? 'readonly' : '' => 'readonly',
-        'onchange'                                    => 'change_precision()',
-    ]
-);
-$row++;
-
-if (isset($config['short_module_graph_data']) === false) {
-    $config['short_module_graph_data'] = true;
-}
-
-$table_chars->data[$row][0] = __('Data precision in graphs');
-$table_chars->data[$row][1] = html_print_input(
-    [
-        'type'                                        => 'number',
-        'size'                                        => 5,
-        'max'                                         => $performance_variables_control['short_module_graph_data']->max,
-        'name'                                        => 'short_module_graph_data',
-        'value'                                       => $config['short_module_graph_data'],
-        'return'                                      => true,
-        'min'                                         => $performance_variables_control['short_module_graph_data']->min,
-        'style'                                       => 'width:50px',
-        ($disabled_graph_precision) ? 'readonly' : '' => 'readonly',
-        'onchange'                                    => 'change_precision()',
-    ]
-);
-
-$row++;
-
-$table_chars->data[$row][0] = __(
-    'Default line thickness for the Custom Graph.'
-);
-$table_chars->data[$row][1] = html_print_input_text(
-    'custom_graph_width',
-    $config['custom_graph_width'],
-    '',
-    5,
-    5,
-    true
-);
-$row++;
-
-$table_chars->data[$row][0] = __('Number of elements in Custom Graph');
-$table_chars->data[$row][1] = html_print_input_text(
-    'items_combined_charts',
-    $config['items_combined_charts'],
-    '',
-    5,
-    5,
-    true,
-    false,
-    false,
-    ''
-);
-$row++;
-
-$table_chars->data[$row][0] = __('Use round corners');
-$table_chars->data[$row][1] = html_print_checkbox_switch(
-    'round_corner',
-    1,
-    $config['round_corner'],
-    true
-);
-$row++;
-
-$table_chars->data[$row][0] = __('Chart fit to content');
-$table_chars->data[$row][1] = html_print_checkbox_switch(
-    'maximum_y_axis',
-    1,
-    $config['maximum_y_axis'],
-    true
-);
-$row++;
-
-$table_chars->data[$row][0] = __('Type of module charts');
-$table_chars->data[$row][1] = __('Area').'&nbsp;'.html_print_radio_button(
-    'type_module_charts',
-    'area',
-    '',
-    $config['type_module_charts'] == 'area',
-    true
-).'&nbsp;&nbsp;';
-$table_chars->data[$row][1] .= __('Line').'&nbsp;'.html_print_radio_button(
-    'type_module_charts',
-    'line',
-    '',
-    $config['type_module_charts'] != 'area',
-    true
-);
-$row++;
-
-$table_chars->data[$row][0] = __('Type of interface charts');
-$table_chars->data[$row][1] = __('Area').'&nbsp;'.html_print_radio_button(
-    'type_interface_charts',
-    'area',
-    '',
-    $config['type_interface_charts'] == 'area',
-    true
-).'&nbsp;&nbsp;';
-$table_chars->data[$row][1] .= __('Line').'&nbsp;'.html_print_radio_button(
-    'type_interface_charts',
-    'line',
-    '',
-    $config['type_interface_charts'] != 'area',
-    true
-);
-$row++;
-
-$table_chars->data[$row][0] = __('Percentile');
-$table_chars->data[$row][1] = html_print_input_text(
-    'percentil',
-    $config['percentil'],
-    '',
-    20,
-    20,
-    true
-);
-$row++;
-
-$table_chars->data[$row][0] = __('Graph TIP view:');
-
-$options_full_escale    = [];
-$options_full_escale[0] = __('None');
-$options_full_escale[1] = __('All');
-$options_full_escale[2] = __('On Boolean graphs');
-
-$table_chars->data[$row][1] = html_print_select(
-    $options_full_escale,
-    'full_scale_option',
-    (isset($config['full_scale_option']) === true) ? $config['full_scale_option'] : 0,
-    '',
-    '',
-    0,
-    true,
-    false,
-    false
-);
-$row++;
-
-
-$table_chars->data[$row][0] = __('Graph mode');
-
-$options_soft_graphs    = [];
-$options_soft_graphs[0] = __('Show only average by default');
-$options_soft_graphs[1] = __('Show MAX/AVG/MIN by default');
-
-$table_chars->data[$row][1] = html_print_select(
-    $options_soft_graphs,
-    'type_mode_graph',
-    (isset($config['type_mode_graph']) === true) ? $config['type_mode_graph'] : 0,
-    '',
-    '',
-    0,
-    true,
-    false,
-    false
-);
-$row++;
-
-$table_chars->data[$row][0] = __('Zoom graphs:');
-
-$options_zoom_graphs    = [];
-$options_zoom_graphs[1] = 'x1';
-$options_zoom_graphs[2] = 'x2';
-$options_zoom_graphs[3] = 'x3';
-$options_zoom_graphs[4] = 'x4';
-$options_zoom_graphs[5] = 'x5';
-
-$table_chars->data[$row][1] = html_print_select(
-    $options_zoom_graphs,
-    'zoom_graph',
-    $config['zoom_graph'],
-    '',
-    '',
-    0,
-    true,
-    false,
-    false
-);
-$row++;
-
-// ----------------------------------------------------------------------
-// ----------------------------------------------------------------------
-// Visual Consoles
-// ----------------------------------------------------------------------
-$table_vc = new stdClass();
-$table_vc->width = '100%';
-$table_vc->class = 'databox filters';
-$table_vc->style[0] = 'font-weight: bold';
-$table_vc->size[0] = '50%';
-$table_vc->data = [];
-
-// Remove when the new view reaches rock solid stability.
-$table_vc->data[$row][0] = __('Legacy Visual Console View');
-$table_vc->data[$row][1] = html_print_checkbox_switch(
-    'legacy_vc',
-    1,
-    (bool) $config['legacy_vc'],
-    true
-);
-$row++;
-
-$intervals = [
-    10   => '10 '.__('seconds'),
-    30   => '30 '.__('seconds'),
-    60   => '1 '.__('minutes'),
-    300  => '5 '.__('minutes'),
-    900  => '15 '.__('minutes'),
-    1800 => '30 '.__('minutes'),
-    3600 => '1 '.__('hour'),
-];
-$table_vc->data[$row][0] = __('Default cache expiration');
-$table_vc->data[$row][1] = html_print_extended_select_for_time(
-    'vc_default_cache_expiration',
-    $config['vc_default_cache_expiration'],
-    '',
-    __('No cache'),
-    0,
-    false,
-    true,
-    false,
-    false,
-    '',
-    false,
-    $intervals
-);
-$row++;
-
-$table_vc->data[$row][0] = __('Default interval for refresh on Visual Console');
-$table_vc->data[$row][1] = html_print_select(
-    $values,
-    'vc_refr',
-    (int) $config['vc_refr'],
-    '',
-    'N/A',
-    0,
-    true,
-    false,
-    false
-);
-$row++;
-
-$vc_favourite_view_array[0] = __('Classic view');
-$vc_favourite_view_array[1] = __('View of favorites');
-$table_vc->data[$row][0] = __('Type of view of visual consoles');
-$table_vc->data[$row][1] = html_print_select(
-    $vc_favourite_view_array,
-    'vc_favourite_view',
-    $config['vc_favourite_view'],
-    '',
-    '',
-    0,
-    true
-);
-$row++;
-
-$table_vc->data[$row][0] = __('Number of favorite visual consoles to show in the menu');
-$table_vc->data[$row][1] = "<input ' value=".$config['vc_menu_items']." size='5' name='vc_menu_items' min='0' max='25'>";
-$row++;
-
-$table_vc->data[$row][0] = __('Default line thickness for the Visual Console');
-$table_vc->data[$row][1] = html_print_input_text(
-    'vc_line_thickness',
-    (int) $config['vc_line_thickness'],
-    '',
-    5,
-    5,
-    true
-);
-
-$table_vc->data[$row][0] = __('Mobile view not allow visual console orientation');
-$table_vc->data[$row][1] = html_print_checkbox_switch(
-    'mobile_view_orientation_vc',
-    1,
-    (bool) $config['mobile_view_orientation_vc'],
-    true
-);
-$row++;
-
-
-// ----------------------------------------------------------------------
-// Services
-// ----------------------------------------------------------------------
-$table_ser = new stdClass();
-$table_ser->width = '100%';
-$table_ser->class = 'databox filters';
-$table_ser->style[0] = 'font-weight: bold';
-$table_ser->size[0] = '50%';
-$table_ser->data = [];
-
-$table_ser->data['number'][0] = __('Number of favorite services to show in the menu');
-$table_ser->data['number'][1] = "<input ' value=".$config['ser_menu_items']." size='5' name='ser_menu_items' min='0' max='25'>";
-
-// ----------------------------------------------------------------------
-// Reports
-// ----------------------------------------------------------------------
-$table_report = new stdClass();
-$table_report->width = '100%';
-$table_report->class = 'databox filters';
-$table_report->style[0] = 'font-weight: bold;';
-$table_report->size[0] = '20%';
-
-$table_report->data = [];
-
-$table_report->data[$row][0] = __('Show report info with description');
-$table_report->data[$row][1] = html_print_checkbox_switch(
-    'custom_report_info',
-    1,
-    $config['custom_report_info'],
-    true
-);
-$row++;
-
-$table_report->data[$row][0] = __('Custom report front page');
-$table_report->data[$row][1] = html_print_checkbox_switch(
-    'custom_report_front',
-    1,
-    $config['custom_report_front'],
-    true
-);
-
-$row++;
-
-$table_report->data[$row][0] = __('PDF font size (px)');
-$table_report->data[$row][1] = "<input ' value=".$config['global_font_size_report']." name='global_font_size_report' min='1' max='50' step='1'>";
-
-$row++;
-
-$table_report->data[$row][0] = __('HTML font size for SLA (em)');
-$table_report->data[$row][1] = "<input ' value=".$config['font_size_item_report']." name='font_size_item_report' min='1' max='9' step='0.1'>";
-
-$row++;
-
-$table_report->data[$row][0] = __('Graph image height for HTML reports');
-$table_report->data[$row][1] = html_print_input_text('graph_image_height', $config['graph_image_height'], '', 20, 20, true);
-
-$row++;
-
-$interval_description = [
-    'large' => 'Long',
-    'tiny'  => 'Short',
-];
-$table_report->data[$row][0] = __('Interval description');
-$table_report->data[$row][1] = html_print_select(
-    $interval_description,
-    'interval_description',
-    (isset($config['interval_description']) === true) ? $config['interval_description'] : 'large',
-    '',
-    '',
-    '',
-    true,
-    false,
-    false
-);
-
-$row++;
-
-// ----------------------------------------------------------------------
-$dirItems = scandir($config['homedir'].'/images/custom_logo');
-foreach ($dirItems as $entryDir) {
-    if (strstr($entryDir, '.jpg') !== false || strstr($entryDir, '.png') !== false) {
-        $customLogos['images/custom_logo/'.$entryDir] = $entryDir;
-    }
-}
-
-// Logo.
-$table_report->data['custom_report_front-logo'][0] = __('Custom report front').' - '.__('Custom logo').ui_print_help_tip(
-    __("The dir of custom logos is in your www Console in 'images/custom_logo'. You can upload more files (ONLY JPEG AND PNG) in upload tool in console."),
-    true
-);
-
-$table_report->data['custom_report_front-logo'][1] = html_print_select(
-    $customLogos,
-    'custom_report_front_logo',
-    io_safe_output($config['custom_report_front_logo']),
-    'showPreview()',
-    __('Default'),
-    '',
-    true
-);
-// Preview.
-$table_report->data['custom_report_front-preview'][0] = __('Custom report front').' - '.'Preview';
-if (empty($config['custom_report_front_logo'])) {
-    $config['custom_report_front_logo'] = 'images/pandora_logo_white.jpg';
-}
-
-$table_report->data['custom_report_front-preview'][1] = '<span id="preview_image">'.html_print_image($config['custom_report_front_logo'], true).'</span>';
-
-// Header.
-$table_report->data['custom_report_front-header'][0] = __('Custom report front').' - '.__('Header');
-
-// Do not remove io_safe_output in textarea. TinyMCE avoids XSS injection.
-$table_report->data['custom_report_front-header'][1] = html_print_textarea(
-    'custom_report_front_header',
-    5,
-    15,
-    io_safe_output($config['custom_report_front_header']),
-    'class="w90p height_300px"',
-    true
-);
-
-// First page.
-// Do not remove io_safe_output in textarea. TinyMCE avoids XSS injection.
-if ($config['custom_report_front']) {
-    $firstpage_content = $config['custom_report_front_firstpage'];
-} else {
-    $firstpage_content = io_safe_output($config['custom_report_front_firstpage']);
-}
-
-$table_report->data['custom_report_front-first_page'][0] = __('Custom report front').' - '.__('First page');
-$custom_report_front_firstpage = str_replace(
-    '(_URLIMAGE_)',
-    ui_get_full_url(false, true, false, false),
-    io_safe_output($firstpage_content)
-);
-$table_report->data['custom_report_front-first_page'][1] = html_print_textarea(
-    'custom_report_front_firstpage',
-    15,
-    15,
-    $custom_report_front_firstpage,
-    'class="w90p height_300px"',
-    true
-);
-
-// Footer.
-$table_report->data['custom_report_front-footer'][0] = __('Custom report front').' - '.__('Footer');
-
-// Do not remove io_safe_output in textarea. TinyMCE avoids XSS injection.
-$table_report->data['custom_report_front-footer'][1] = html_print_textarea(
-    'custom_report_front_footer',
-    5,
-    15,
-    io_safe_output($config['custom_report_front_footer']),
-    'class="w90p height_300px""',
-    true
-);
-
-
-// ----------------------------------------------------------------------
-// OTHER CONFIGURATION
-// ----------------------------------------------------------------------
-$table_other = new stdClass();
-$table_other->width = '100%';
-$table_other->class = 'databox filters';
-$table_other->style[0] = 'font-weight: bold;';
-$table_other->size[0] = '50%';
-$table_other->size[1] = '26%';
-$table_other->size[2] = '12%';
-$table_other->size[3] = '12%';
-$table_other->data = [];
-
-$row++;
-
-$table_other->data[$row][0] = __('Networkmap max width');
-$table_other->data[$row][1] = html_print_input_text(
-    'networkmap_max_width',
-    $config['networkmap_max_width'],
-    '',
-    10,
-    20,
-    true
-);
-$row++;
-
-$table_other->data[$row][0] = __('Show only the group name');
-$table_other->data[$row][1] = html_print_checkbox_switch(
-    'show_group_name',
-    1,
-    $config['show_group_name'],
-    true
-);
-$row++;
-
-$table_other->data[$row][0] = __('Show empty groups in group view');
-$table_other->data[$row][1] = html_print_checkbox_switch(
-    'show_empty_groups',
-    1,
-    $config['show_empty_groups'],
-    true
-);
-$row++;
-
-$table_other->data[$row][0] = __('Date format string');
-$table_other->data[$row][1] = '<em>'.__('Example').'</em> '.date($config['date_format']);
-$table_other->data[$row][1] .= html_print_input_text('date_format', $config['date_format'], '', 30, 100, true);
-$row++;
-
-$decimal_separators = [
-    ',' => ',',
-    '.' => '.',
-];
-
-$table_other->data[$row][0] = __('Decimal separator');
-$table_other->data[$row][1] = html_print_select(
-    $decimal_separators,
-    'decimal_separator',
-    $config['decimal_separator'],
-    '',
-    '',
-    '',
-    true,
-    false,
-    false
-);
-
-$row++;
-
-$table_other->data[$row][0] = __('Visible time of successful notifiations');
-$table_other->data[$row][1] .= html_print_input_text('notification_autoclose_time', $config['notification_autoclose_time'], '', 10, 10, true);
-$row++;
-
-if ($config['prominent_time'] === 'comparation') {
-    $timestamp = false;
-    $comparation = true;
-    $compact = false;
-} else if ($config['prominent_time'] === 'timestamp') {
-    $timestamp = true;
-    $comparation = false;
-    $compact = false;
-} else if ($config['prominent_time'] === 'compact') {
-    $timestamp = false;
-    $comparation = false;
-    $compact = true;
-}
-
-$table_other->data[$row][0] = __('Timestamp, time comparison, or compact mode');
-$table_other->data[$row][1] = '<div class="switch_radio_button">';
-$table_other->data[$row][1] .= html_print_radio_button('prominent_time', 'comparation', __('Comparation in rollover'), $comparation, true);
-$table_other->data[$row][1] .= html_print_radio_button('prominent_time', 'timestamp', __('Timestamp in rollover'), $timestamp, true);
-$table_other->data[$row][1] .= html_print_radio_button('prominent_time', 'compact', __('Compact mode'), $compact, true);
-$table_other->data[$row][1] .= '</div>';
-
-$row++;
-
-// ----------------------------------------------------------------------
-// CUSTOM VALUES POST PROCESS
-// ----------------------------------------------------------------------
-$table_other->data[$row][0] = __('Custom values post process');
-$table_other->data[$row][1] = __('Value').':&nbsp;'.html_print_input_text('custom_value', '', '', 25, 50, true);
-$table_other->data[$row][2] = __('Text').':&nbsp;'.html_print_input_text('custom_text', '', '', 15, 50, true);
-$table_other->data[$row][2] .= '&nbsp;';
-$table_other->data[$row][2] .= html_print_input_hidden(
-    'custom_value_add',
-    '',
-    true
-);
-$table_other->data[$row][3] = html_print_button(
-    __('Add'),
-    'custom_value_add_btn',
-    false,
-    '',
-    [
-        'icon' => 'next',
-        'mode' => 'link',
-    ],
-    true
-);
-
-$row++;
-
-$table_other->data[$row][0] = '';
-$table_other->data[$row][1] = __('Delete custom values').': ';
-$table_other->data[$row][2] = html_print_select(
-    post_process_get_custom_values(),
-    'custom_values',
-    '',
-    '',
-    '',
-    '',
-    true
-);
-$count_custom_postprocess = post_process_get_custom_values();
-$table_other->data[$row][3] = html_print_button(
-    __('Delete'),
-    'custom_values_del_btn',
-    empty($count_custom_postprocess),
-    '',
-    [
-        'icon' => 'delete',
-        'mode' => 'link',
-    ],
-    true
-);
-// This hidden field will be filled from jQuery before submit.
-$table_other->data[$row][1] .= html_print_input_hidden(
-    'custom_value_to_delete',
-    '',
-    true
-);
-$table_other->data[$row][3] .= '<br><br>';
-
-// ----------------------------------------------------------------------
-// ----------------------------------------------------------------------
-// CUSTOM INTERVAL VALUES
-// ----------------------------------------------------------------------
-$row++;
-$table_other->data[$row][0] = __('Interval values');
-$units = [
-    1               => __('seconds'),
-    SECONDS_1MINUTE => __('minutes'),
-    SECONDS_1HOUR   => __('hours'),
-    SECONDS_1DAY    => __('days'),
-    SECONDS_1MONTH  => __('months'),
-    SECONDS_1YEAR   => __('years'),
-];
-$table_other->data[$row][1] = __('Value').': ';
-$table_other->data[$row][1] .= html_print_input_text('interval_value', '', '', 5, 5, true);
-$table_other->data[$row][2] = html_print_select($units, 'interval_unit', 1, '', '', '', true, false, false);
-$table_other->data[$row][3] = html_print_button(
-    __('Add'),
-    'interval_add_btn',
-    false,
-    '',
-    [
-        'icon' => 'next',
-        'mode' => 'link',
-    ],
-    true
-);
-
-$row++;
-
-$table_other->data[$row][0] = '';
-$table_other->data[$row][1] = __('Delete interval').': ';
-$table_other->data[$row][2] = html_print_select(get_periods(false, false), 'intervals', '', '', '', '', true);
-$table_other->data[$row][3] = html_print_button(
-    __('Delete'),
-    'interval_del_btn',
-    empty($config['interval_values']),
-    '',
-    [
-        'icon' => 'delete',
-        'mode' => 'link',
-    ],
-    true
-);
-
-$table_other->data[$row][1] .= html_print_input_hidden('interval_values', $config['interval_values'], true);
-// This hidden field will be filled from jQuery before submit.
-$table_other->data[$row][1] .= html_print_input_hidden('interval_to_delete', '', true);
-$table_other->data[$row][3] .= '<br><br>';
-// ----------------------------------------------------------------------
-$row++;
-
-$table_other->data[$row][0] = __('Module units');
-$table_other->data[$row][1] = __('Value').': ';
-$table_other->data[$row][1] .= html_print_input_text('custom_module_unit', '', '', 15, 50, true);
-$table_other->data[$row][2] = '';
-$table_other->data[$row][3] = html_print_button(
-    __('Add'),
-    'module_unit_add_btn',
-    false,
-    '',
-    [
-        'icon' => 'next',
-        'mode' => 'link',
-    ],
-    true
-);
-
-$row++;
-$table_other->data[$row][0] = '';
-$table_other->data[$row][1] = __('Delete custom values').': ';
-$table_other->data[$row][2] = html_print_select(get_custom_module_units(), 'module_units', '', '', '', '', true, false, true, 'w100p');
-$table_other->data[$row][3] = html_print_button(
-    __('Delete'),
-    'custom_module_unit_del_btn',
-    empty($count_custom_postprocess),
-    '',
-    [
-        'icon' => 'delete',
-        'mode' => 'link',
-    ],
-    true
-);
-
-$table_other->data[$row][3] .= html_print_input_hidden(
-    'custom_module_unit_to_delete',
-    '',
-    true
-);
-
-$row++;
-
-$common_dividers = [
-    ';' => ';',
-    ',' => ',',
-    '|' => '|',
-];
-$table_other->data[$row][0] = __('CSV divider');
-if ($config['csv_divider'] != ';' && $config['csv_divider'] != ',' && $config['csv_divider'] != '|') {
-    $table_other->data[$row][1] = html_print_input_text(
-        'csv_divider',
-        $config['csv_divider'],
-        '',
-        20,
-        255,
-        true
-    );
-    $table_other->data[$row][1] .= '<a id="csv_divider_custom" onclick="javascript: edit_csv_divider();">'.html_print_image(
-        'images/logs@svg.svg',
-        true,
-        [
-            'id'    => 'select',
-            'class' => 'main_menu_icon invert_filter',
-        ]
-    ).'</a>';
-} else {
-    $table_other->data[$row][1] = html_print_select(
-        $common_dividers,
-        'csv_divider',
-        $config['csv_divider'],
-        '',
-        '',
-        '',
-        true,
-        false,
-        false
-    );
-    $table_other->data[$row][1] .= '<a id="csv_divider_custom" onclick="javascript: edit_csv_divider();">'.html_print_image(
-        'images/edit.svg',
-        true,
-        [
-            'id'    => 'pencil',
-            'class' => 'main_menu_icon invert_filter',
-        ]
-    ).'</a>';
-}
-
-$row++;
-
-$decimal_separator = [
-    '.' => '.',
-    ',' => ',',
-];
-$table_other->data[$row][0] = __('CSV decimal separator');
-$table_other->data[$row][1] = html_print_select($decimal_separator, 'csv_decimal_separator', $config['csv_decimal_separator'], '', '', '', true, false, false);
-
-$row++;
-
-$table_other->data[$row][0] = __('Data multiplier to use in graphs/data');
-$options_data_multiplier = [];
-$options_data_multiplier[0] = __('Use 1024 when module unit are bytes');
-$options_data_multiplier[1] = __('Use always 1000');
-$options_data_multiplier[2] = __('Use always 1024');
-
-
-$table_other->data[$row][1] = html_print_select($options_data_multiplier, 'use_data_multiplier', $config['use_data_multiplier'], '', '', 1, true, false, false);function load_fonts()
+function load_fonts()
 {
     global $config;
 
@@ -1692,68 +232,1907 @@ $table_other->data[$row][1] = html_print_select($options_data_multiplier, 'use_d
 }
 
 
+$iconsets['default'] = __('Colors');
+$iconsets['faces'] = __('Faces');
+$iconsets['color_text'] = __('Colors and text');
+
+// Divs to show icon status Colours (Default).
+$icon_unknown_ball = ui_print_status_image(STATUS_AGENT_UNKNOWN_BALL, '', true);
+$icon_unknown = ui_print_status_image(STATUS_AGENT_UNKNOWN, '', true);
+$icon_ok_ball = ui_print_status_image(STATUS_AGENT_OK_BALL, '', true);
+$icon_ok = ui_print_status_image(STATUS_AGENT_OK, '', true);
+$icon_warning_ball = ui_print_status_image(STATUS_AGENT_WARNING_BALL, '', true);
+$icon_warning = ui_print_status_image(STATUS_AGENT_WARNING, '', true);
+$icon_bad_ball = ui_print_status_image(STATUS_AGENT_CRITICAL_BALL, '', true);
+$icon_bad = ui_print_status_image(STATUS_AGENT_CRITICAL, '', true);
+// End - Divs to show icon status Colours (Default).
+$backgrounds_list_jpg = list_files('images/backgrounds', 'jpg', 1, 0);
+$backgrounds_list_gif = list_files('images/backgrounds', 'gif', 1, 0);
+$backgrounds_list_png = list_files('images/backgrounds', 'png', 1, 0);
+$backgrounds_list = array_merge($backgrounds_list_jpg, $backgrounds_list_png);
+$backgrounds_list = array_merge($backgrounds_list, $backgrounds_list_gif);
+asort($backgrounds_list);
+
+$open = false;
+if (enterprise_installed() === false) {
+    $open = true;
+}
+
+if (enterprise_installed() === true) {
+    // Get all the custom logos.
+    $filesCustomLogos = list_files('enterprise/images/custom_general_logos', 'png', 1, 0);
+
+    $ent_files = list_files('enterprise/images/custom_logo', 'png', 1, 0);
+    $open_files = list_files('images/custom_logo', 'png', 1, 0);
+
+    $entOpenFilesInput = html_print_select(
+        array_merge($open_files, $ent_files),
+        'custom_logo_white_bg',
+        $config['custom_logo_white_bg'],
+        '',
+        '',
+        '',
+        true,
+        false,
+        true,
+        '',
+        $open,
+        'width:240px'
+    );
+
+    $customLogoLoginInput = html_print_select(
+        list_files('enterprise/images/custom_logo_login', 'png', 1, 0),
+        'custom_logo_login',
+        $config['custom_logo_login'],
+        '',
+        '',
+        '',
+        true,
+        false,
+        true,
+        '',
+        $open,
+        'width:240px'
+    );
+} else {
+    $entOpenFilesInput = html_print_select(
+        list_files('images/custom_logo', 'png', 1, 0),
+        'custom_logo_white_bg',
+        $config['custom_logo_white_bg'],
+        '',
+        '',
+        '',
+        true,
+        false,
+        true,
+        '',
+        $open,
+        'width:240px'
+    );
+
+    $customLogoLoginInput = html_print_select(
+        '',
+        'custom_logo_login',
+        $config['custom_logo_login'],
+        '',
+        '',
+        '',
+        true,
+        false,
+        true,
+        '',
+        $open,
+        'width:240px'
+    );
+}
+
+// Custom favicon.
+$filesFavicon = list_files('images/custom_favicon', 'ico', 1, 0);
+
+$table_styles = new stdClass();
+$table_styles->width = '100%';
+$table_styles->class = 'filter-table-adv';
+$table_styles->size[0] = '50%';
+$table_styles->data = [];
+
+$table_styles->data[$row][] = html_print_label_input_block(
+    __('Style template'),
+    html_print_select(
+        themes_get_css(),
+        'style',
+        $config['style'].'.css',
+        '',
+        '',
+        '',
+        true,
+        false,
+        true,
+        '',
+        false,
+        'width: 100%'
+    )
+);
+
+$table_styles->data[$row][] = html_print_label_input_block(
+    __('Status icon set'),
+    html_print_div(
+        [
+            'class'   => 'select-with-sibling',
+            'content' => html_print_select(
+                $iconsets,
+                'status_images_set',
+                $config['status_images_set'],
+                '',
+                '',
+                '',
+                true,
+                false,
+                true,
+                '',
+                false,
+                'width: 240px'
+            ).html_print_button(
+                __('View'),
+                'status_set_preview',
+                false,
+                '',
+                [
+                    'icon'  => 'camera',
+                    'mode'  => 'link',
+                    'class' => 'logo_preview',
+                ],
+                true
+            ),
+        ],
+        true
+    )
+);
+
+$row++;
+$table_styles->data[$row][] = html_print_label_input_block(
+    __('Custom favicon'),
+    html_print_div(
+        [
+            'class'   => 'select-with-sibling',
+            'content' => html_print_select(
+                $filesFavicon,
+                'custom_favicon',
+                $config['custom_favicon'],
+                'setup_visuals_change_favicon();',
+                __('Default'),
+                '',
+                true,
+                false,
+                true,
+                '',
+                false,
+                'width:240px'
+            ).html_print_image(
+                ui_get_favicon(),
+                true,
+                [
+                    'id'    => 'favicon_preview',
+                    'style' => 'margin-left: 10px',
+                ]
+            ),
+        ],
+        true
+    )
+);
+
+$table_styles->data[$row][] = html_print_label_input_block(
+    __('Custom background logo'),
+    html_print_div(
+        [
+            'class'   => 'select-with-sibling',
+            'content' => html_print_select(
+                $backgrounds_list,
+                'login_background',
+                $config['login_background'],
+                '',
+                __('Default'),
+                '',
+                true,
+                false,
+                true,
+                '',
+                false,
+                'width:240px'
+            ).html_print_button(
+                __('View'),
+                'login_background_preview',
+                false,
+                '',
+                [
+                    'icon'  => 'camera',
+                    'mode'  => 'link',
+                    'class' => 'logo_preview',
+                ],
+                true
+            ),
+        ],
+        true
+    )
+);
+$row++;
+
+$table_styles->data[$row][] = html_print_label_input_block(
+    __('Custom logo (menu)'),
+    html_print_div(
+        [
+            'class'   => 'select-with-sibling',
+            'content' => logo_custom_enterprise('custom_logo', $config['custom_logo']).html_print_button(
+                __('View'),
+                'custom_logo_preview',
+                $open,
+                '',
+                [
+                    'icon'  => 'camera',
+                    'mode'  => 'link',
+                    'class' => 'logo_preview',
+                ],
+                true,
+                false,
+                $open,
+                'visualmodal'
+            ),
+        ],
+        true
+    )
+);
+
+$table_styles->data[$row][] = html_print_label_input_block(
+    __('Custom logo collapsed (menu)'),
+    html_print_div(
+        [
+            'class'   => 'select-with-sibling',
+            'content' => logo_custom_enterprise('custom_logo_collapsed', $config['custom_logo_collapsed']).html_print_button(
+                __('View'),
+                'custom_logo_collapsed_preview',
+                $open,
+                '',
+                [
+                    'icon'  => 'camera',
+                    'mode'  => 'link',
+                    'class' => 'logo_preview',
+                ],
+                true,
+                false,
+                $open,
+                'visualmodal'
+            ),
+        ],
+        true
+    )
+);
+$row++;
+
+$table_styles->data[$row][] = html_print_label_input_block(
+    __('Custom logo (header white background)'),
+    html_print_div(
+        [
+            'class'   => 'select-with-sibling',
+            'content' => $entOpenFilesInput.html_print_button(
+                __('View'),
+                'custom_logo_white_bg_preview',
+                $open,
+                '',
+                [
+                    'icon'  => 'camera',
+                    'mode'  => 'link',
+                    'class' => 'logo_preview',
+                ],
+                true,
+                false,
+                $open,
+                'visualmodal'
+            ),
+        ],
+        true
+    )
+);
+
+$table_styles->data[$row][] = html_print_label_input_block(
+    __('Custom logo (login)'),
+    html_print_div(
+        [
+            'class'   => 'select-with-sibling',
+            'content' => $customLogoLoginInput.html_print_button(
+                __('View'),
+                'custom_logo_login_preview',
+                $open,
+                '',
+                [
+                    'icon'  => 'camera',
+                    'mode'  => 'link',
+                    'class' => 'logo_preview',
+                ],
+                true,
+                false,
+                $open,
+                'visualmodal'
+            ),
+        ],
+        true
+    )
+);
+$row++;
+
+// Splash login.
+if (enterprise_installed() === true) {
+    $table_styles->data[$row][] = html_print_label_input_block(
+        __('Custom Splash (login)'),
+        html_print_div(
+            [
+                'class'   => 'select-with-sibling',
+                'content' => html_print_select(
+                    list_files('enterprise/images/custom_splash_login', 'png', 1, 0),
+                    'custom_splash_login',
+                    $config['custom_splash_login'],
+                    '',
+                    __('Default'),
+                    'default',
+                    true,
+                    false,
+                    true,
+                    '',
+                    $open,
+                    'width:240px'
+                ).html_print_button(
+                    __('View'),
+                    'custom_splash_login_preview',
+                    $open,
+                    '',
+                    [
+                        'icon'  => 'camera',
+                        'mode'  => 'link',
+                        'class' => 'logo_preview',
+                    ],
+                    true,
+                    false,
+                    $open,
+                    'visualmodal'
+                ),
+            ],
+            true
+        )
+    );
+
+    $table_styles->data[$row][] = html_print_label_input_block(
+        __('Custom documentation logo'),
+        html_print_div(
+            [
+                'class'   => 'select-with-sibling',
+                'content' => html_print_select(
+                    $filesCustomLogos,
+                    'custom_docs_logo',
+                    $config['custom_docs_logo'],
+                    '',
+                    __('None'),
+                    '',
+                    true,
+                    false,
+                    true,
+                    '',
+                    false,
+                    'width:240px'
+                ).html_print_button(
+                    __('View'),
+                    'custom_docs_logo_preview',
+                    $open,
+                    '',
+                    [
+                        'icon'  => 'camera',
+                        'mode'  => 'link',
+                        'class' => 'logo_preview',
+                    ],
+                    true,
+                    false,
+                    $open,
+                    'visualmodal'
+                ),
+            ],
+            true
+        )
+    );
+    $row++;
+
+    // Custom support icon.
+    $table_styles->data[$row][] = html_print_label_input_block(
+        __('Custom support logo'),
+        html_print_div(
+            [
+                'class'   => 'select-with-sibling',
+                'content' => html_print_select(
+                    $filesCustomLogos,
+                    'custom_support_logo',
+                    $config['custom_support_logo'],
+                    '',
+                    __('None'),
+                    '',
+                    true,
+                    false,
+                    true,
+                    '',
+                    false,
+                    'width:240px'
+                ).html_print_button(
+                    __('View'),
+                    'custom_support_logo_preview',
+                    $open,
+                    '',
+                    [
+                        'icon'  => 'camera',
+                        'mode'  => 'link',
+                        'class' => 'logo_preview',
+                    ],
+                    true,
+                    false,
+                    $open,
+                    'visualmodal'
+                ),
+            ],
+            true
+        )
+    );
+
+    $table_styles->data[$row][] = html_print_label_input_block(
+        __('Custom networkmap center logo'),
+        html_print_div(
+            [
+                'class'   => 'select-with-sibling',
+                'content' => html_print_select(
+                    $filesCustomLogos,
+                    'custom_network_center_logo',
+                    $config['custom_network_center_logo'],
+                    '',
+                    __('Default'),
+                    'bola_pandora_network_maps.png',
+                    true,
+                    false,
+                    true,
+                    '',
+                    false,
+                    'width:240px'
+                ).html_print_button(
+                    __('View'),
+                    'custom_network_center_logo_preview',
+                    $open,
+                    '',
+                    [
+                        'icon'  => 'camera',
+                        'mode'  => 'link',
+                        'class' => 'logo_preview',
+                    ],
+                    true,
+                    false,
+                    $open,
+                    'visualmodal'
+                ),
+            ],
+            true
+        )
+    );
+    $row++;
+
+    // Custom center mobile console icon.
+    $table_styles->data[$row][] = html_print_label_input_block(
+        __('Custom mobile console icon'),
+        html_print_div(
+            [
+                'class'   => 'select-with-sibling',
+                'content' => html_print_select(
+                    $filesCustomLogos,
+                    'custom_mobile_console_logo',
+                    $config['custom_mobile_console_logo'],
+                    '',
+                    __('Default'),
+                    '',
+                    true,
+                    false,
+                    true,
+                    '',
+                    false,
+                    'width:240px'
+                ).html_print_button(
+                    __('View'),
+                    'custom_mobile_console_logo_preview',
+                    $open,
+                    '',
+                    [
+                        'icon'  => 'camera',
+                        'mode'  => 'link',
+                        'class' => 'logo_preview',
+                    ],
+                    true,
+                    false,
+                    $open,
+                    'visualmodal'
+                ),
+            ],
+            true
+        )
+    );
+}
+
+$row++;
+
+// Title Header.
+$table_styles->data[$row][] = html_print_label_input_block(
+    __('Title (header)'),
+    html_print_input_text('custom_title_header', $config['custom_title_header'], '', 50, 40, true)
+);
+
+// Subtitle Header.
+$table_styles->data[$row][] = html_print_label_input_block(
+    __('Subtitle (header)'),
+    html_print_input_text('custom_subtitle_header', $config['custom_subtitle_header'], '', 50, 40, true)
+);
+$row++;
+
+if (enterprise_installed() === true) {
+    // Login title1.
+    $table_styles->data[$row][] = html_print_label_input_block(
+        __('Title 1 (login)'),
+        html_print_input_text('custom_title1_login', $config['custom_title1_login'], '', 50, 50, true)
+    );
+    // Login text2.
+    $table_styles->data[$row][] = html_print_label_input_block(
+        __('Title 2 (login)'),
+        html_print_input_text('custom_title2_login', $config['custom_title2_login'], '', 50, 50, true)
+    );
+    $row++;
+
+    $table_styles->data[$row][] = html_print_label_input_block(
+        __('Docs URL (login)'),
+        html_print_input_text('custom_docs_url', $config['custom_docs_url'], '', 50, 50, true)
+    );
+
+    $table_styles->data[$row][] = html_print_label_input_block(
+        __('Support URL (login)'),
+        html_print_input_text('custom_support_url', $config['custom_support_url'], '', 50, 50, true)
+    );
+    $row++;
+
+    $table_styles->data[$row][] = html_print_label_input_block(
+        __('Product name'),
+        html_print_input_text('rb_product_name', get_product_name(), '', 30, 255, true)
+    );
+
+    $table_styles->data[$row][] = html_print_label_input_block(
+        __('Copyright notice'),
+        html_print_input_text('rb_copyright_notice', get_copyright_notice(), '', 30, 255, true)
+    );
+    $row++;
+
+    $table_styles->data[$row][] = html_print_label_input_block(
+        __('Background opacity % (login)'),
+        "<input type='number' value=".$config['background_opacity']." size='5' name='background_opacity' min='0' max='99'>"
+    );
+
+    $table_styles->data[$row][] = html_print_label_input_block(
+        __('Disable logo in graphs'),
+        html_print_checkbox_switch(
+            'fixed_graph',
+            1,
+            $config['fixed_graph'],
+            true
+        )
+    );
+    $row++;
+}
+
+/*
+    Hello there! :)
+    We added some of what seems to be "buggy" messages to the openSource version recently. This is not to force open-source users to move to the enterprise version, this is just to inform people using Pandora FMS open source that it requires skilled people to maintain and keep it running smoothly without professional support. This does not imply open-source version is limited in any way. If you check the recently added code, it contains only warnings and messages, no limitations except one: we removed the option to add custom logo in header. In the Update Manager section, it warns about the 'danger’ of applying automated updates without a proper backup, remembering in the process that the Enterprise version comes with a human-tested package. Maintaining an OpenSource version with more than 500 agents is not so easy, that's why someone using a Pandora with 8000 agents should consider asking for support. It's not a joke, we know of many setups with a huge number of agents, and we hate to hear that “its becoming unstable and slow” :(
+    You can of course remove the warnings, that's why we include the source and do not use any kind of trick. And that's why we added here this comment, to let you know this does not reflect any change in our opensource mentality of does the last 14 years.
+*/
+
+$table_styles->data[$row][] = html_print_label_input_block(
+    __('Disable helps'),
+    html_print_checkbox_switch(
+        'disable_help',
+        1,
+        $config['disable_help'],
+        true
+    )
+);
+
+$table_styles->data[$row][] = html_print_label_input_block(
+    __('Fixed header'),
+    html_print_checkbox_switch(
+        'fixed_header',
+        1,
+        $config['fixed_header'],
+        true
+    )
+);
+$row++;
+
+// For 5.1 Autohidden menu feature.
+$table_styles->data[$row][] = html_print_label_input_block(
+    __('Automatically hide submenu'),
+    html_print_checkbox_switch(
+        'autohidden_menu',
+        1,
+        $config['autohidden_menu'],
+        true
+    )
+);
+
+$table_styles->data[$row][] = html_print_label_input_block(
+    __('Visual effects and animation'),
+    html_print_checkbox_switch(
+        'visual_animation',
+        1,
+        $config['visual_animation'],
+        true
+    )
+);
+$row++;
+
+$table_styles->data[$row][] = html_print_label_input_block(
+    __('Random background (login)'),
+    html_print_checkbox_switch(
+        'random_background',
+        1,
+        $config['random_background'],
+        true
+    )
+);
+
+// ----------------------------------------------------------------------
+// ----------------------------------------------------------------------
+// GIS CONFIGURATION
+// ----------------------------------------------------------------------
+$listIcons = gis_get_array_list_icons();
+$arraySelectIcon = [];
+foreach ($listIcons as $index => $value) {
+    $arraySelectIcon[$index] = $index;
+}
+
+$table_gis = new stdClass();
+$table_gis->width = '100%';
+$table_gis->class = 'filter-table-adv';
+$table_gis->size[0] = '50%';
+$table_gis->data = [];
+
+$table_gis->data[$row][] = html_print_label_input_block(
+    __('GIS Labels'),
+    html_print_checkbox_switch(
+        'gis_label',
+        1,
+        $config['gis_label'],
+        true
+    )
+);
+
+$table_gis->data[$row][] = html_print_label_input_block(
+    __('Default icon in GIS'),
+    html_print_div(
+        [
+            'class'   => 'select-with-sibling',
+            'content' => html_print_select(
+                $arraySelectIcon,
+                'gis_default_icon',
+                $config['gis_default_icon'],
+                '',
+                __('Agent icon group'),
+                '',
+                true
+            ).html_print_button(
+                __('View'),
+                'gis_icon_preview',
+                false,
+                '',
+                [
+                    'icon'  => 'camera',
+                    'mode'  => 'link',
+                    'class' => 'logo_preview',
+                ],
+                true
+            ),
+        ],
+        true
+    )
+);
+$row++;
+
+// ----------------------------------------------------------------------
+// ----------------------------------------------------------------------
+// FONT AND TEXT CONFIGURATION
+// ----------------------------------------------------------------------
+$font_size_array = [
+    1  => 1,
+    2  => 2,
+    3  => 3,
+    4  => 4,
+    5  => 5,
+    6  => 6,
+    7  => 7,
+    8  => 8,
+    9  => 9,
+    10 => 10,
+    11 => 11,
+    12 => 12,
+    13 => 13,
+    14 => 14,
+    15 => 15,
+];
+
+$table_font = new stdClass();
+$table_font->width = '100%';
+$table_font->class = 'filter-table-adv';
+$table_font->size[0] = '50%';
+$table_font->data = [];
+
+$table_font->data[$row][] = html_print_label_input_block(
+    __('Graphs font size'),
+    html_print_select(
+        $font_size_array,
+        'font_size',
+        $config['font_size'],
+        '',
+        '',
+        0,
+        true,
+        false,
+        true,
+        '',
+        false,
+        'width: 100%'
+    )
+);
+
+
+$table_font->data[$row][] = html_print_label_input_block(
+    __('Show unit along with value in reports'),
+    html_print_checkbox_switch(
+        'simple_module_value',
+        1,
+        $config['simple_module_value'],
+        true
+    )
+);
+$row++;
+
+$table_font->data[$row][] = html_print_label_input_block(
+    __('Agent size text'),
+    html_print_div(
+        [
+            'class'   => 'filter-table-adv-manual',
+            'content' => html_print_div(
+                [
+                    'class'   => 'w50p',
+                    'content' => __('Small').html_print_input_text('agent_size_text_small', $config['agent_size_text_small'], '', 10, 3, true),
+                ],
+                true
+            ).html_print_div(
+                [
+                    'class'   => 'w50p',
+                    'content' => __('Normal').html_print_input_text('agent_size_text_medium', $config['agent_size_text_medium'], '', 10, 3, true),
+                ],
+                true
+            ),
+        ],
+        true
+    )
+);
+$table_font->data[$row][] = html_print_label_input_block(
+    __('Module size text'),
+    html_print_div(
+        [
+            'class'   => 'filter-table-adv-manual',
+            'content' => html_print_div(
+                [
+                    'class'   => 'w50p',
+                    'content' => __('Small').html_print_input_text('module_size_text_small', $config['module_size_text_small'], '', 10, 3, true),
+                ],
+                true
+            ).html_print_div(
+                [
+                    'class'   => 'w50p',
+                    'content' => __('Normal').html_print_input_text('module_size_text_medium', $config['module_size_text_medium'], '', 10, 3, true),
+                ],
+                true
+            ),
+        ],
+        true
+    )
+);
+$row++;
+
+$table_font->data[$row][] = html_print_label_input_block(
+    __('Description size text'),
+    html_print_input_text(
+        'description_size_text',
+        $config['description_size_text'],
+        '',
+        3,
+        3,
+        true
+    )
+);
+$table_font->data[$row][] = html_print_label_input_block(
+    __('Item title size text'),
+    html_print_input_text(
+        'item_title_size_text',
+        $config['item_title_size_text'],
+        '',
+        3,
+        3,
+        true
+    )
+);
+$row++;
+
+
+// ----------------------------------------------------------------------
+// ----------------------------------------------------------------------
+// CHARS CONFIGURATION
+// ----------------------------------------------------------------------
+$disabled_graph_precision = false;
+if (enterprise_installed() === false) {
+    $disabled_graph_precision = true;
+}
+
+if (isset($config['short_module_graph_data']) === false) {
+    $config['short_module_graph_data'] = true;
+}
+
+$options_full_escale    = [];
+$options_full_escale[0] = __('None');
+$options_full_escale[1] = __('All');
+$options_full_escale[2] = __('On Boolean graphs');
+
+$options_soft_graphs    = [];
+$options_soft_graphs[0] = __('Show only average by default');
+$options_soft_graphs[1] = __('Show MAX/AVG/MIN by default');
+
+$options_zoom_graphs    = [];
+$options_zoom_graphs[1] = 'x1';
+$options_zoom_graphs[2] = 'x2';
+$options_zoom_graphs[3] = 'x3';
+$options_zoom_graphs[4] = 'x4';
+$options_zoom_graphs[5] = 'x5';
+
+$graphColorAmount = 10;
+$table_chars = new stdClass();
+$table_chars->width = '100%';
+$table_chars->class = 'filter-table-adv';
+$table_chars->size[0] = '50%';
+$table_chars->size[1] = '50%';
+$table_chars->data = [];
+
+for ($i = 1; $i <= $graphColorAmount; $i++) {
+    $table_chars->data[$row][] = html_print_label_input_block(
+        __('Graph color #'.$i),
+        html_print_input_color(
+            'graph_color'.$i,
+            $config['graph_color'.$i],
+            'graph_color'.$i,
+            'w50p',
+            true
+        )
+    );
+
+    $row = ($i % 2 === 0) ? ($row + 1) : $row;
+}
+
+$table_chars->data[$row][] = html_print_label_input_block(
+    __('Data precision'),
+    html_print_input(
+        [
+            'type'                                        => 'number',
+            'size'                                        => 5,
+            'max'                                         => $performance_variables_control['graph_precision']->max,
+            'name'                                        => 'graph_precision',
+            'value'                                       => $config['graph_precision'],
+            'return'                                      => true,
+            'min'                                         => $performance_variables_control['graph_precision']->min,
+            'style'                                       => 'width:50%',
+            ($disabled_graph_precision) ? 'readonly' : '' => 'readonly',
+            'onchange'                                    => 'change_precision()',
+        ]
+    )
+);
+
+$table_chars->data[$row][] = html_print_label_input_block(
+    __('Data precision in graphs'),
+    html_print_input(
+        [
+            'type'                                        => 'number',
+            'size'                                        => 5,
+            'max'                                         => $performance_variables_control['short_module_graph_data']->max,
+            'name'                                        => 'short_module_graph_data',
+            'value'                                       => $config['short_module_graph_data'],
+            'return'                                      => true,
+            'min'                                         => $performance_variables_control['short_module_graph_data']->min,
+            'style'                                       => 'width:50%',
+            ($disabled_graph_precision) ? 'readonly' : '' => 'readonly',
+            'onchange'                                    => 'change_precision()',
+        ]
+    )
+);
+$row++;
+
+$table_chars->data[$row][] = html_print_label_input_block(
+    __('Value to interface graphics'),
+    html_print_input_text(
+        'interface_unit',
+        $config['interface_unit'],
+        '',
+        20,
+        20,
+        true
+    )
+);
+
+$table_chars->data[$row][] = html_print_label_input_block(
+    __('Default line thickness for the Custom Graph.'),
+    html_print_input_text(
+        'custom_graph_width',
+        $config['custom_graph_width'],
+        '',
+        5,
+        5,
+        true
+    )
+);
+$row++;
+
+$table_chars->data[$row][] = html_print_label_input_block(
+    __('Number of elements in Custom Graph'),
+    html_print_input_text(
+        'items_combined_charts',
+        $config['items_combined_charts'],
+        '',
+        5,
+        5,
+        true,
+        false,
+        false,
+        ''
+    )
+);
+$table_chars->data[$row][] = html_print_label_input_block(
+    __('Use round corners'),
+    html_print_checkbox_switch(
+        'round_corner',
+        1,
+        $config['round_corner'],
+        true
+    )
+);
+$row++;
+
+$table_chars->data[$row][] = html_print_label_input_block(
+    __('Chart fit to content'),
+    html_print_checkbox_switch(
+        'maximum_y_axis',
+        1,
+        $config['maximum_y_axis'],
+        true
+    )
+);
+
+$table_chars->data[$row][] = html_print_label_input_block(
+    __('Type of module charts'),
+    html_print_div(
+        [
+            'class'   => '',
+            'content' => html_print_div(
+                [
+                    'class'   => '',
+                    'content' => __('Area').'&nbsp;'.html_print_radio_button(
+                        'type_module_charts',
+                        'area',
+                        '',
+                        $config['type_module_charts'] == 'area',
+                        true
+                    ),
+                ],
+                true
+            ).html_print_div(
+                [
+                    'class'   => '',
+                    'content' => __('Line').'&nbsp;'.html_print_radio_button(
+                        'type_module_charts',
+                        'line',
+                        '',
+                        $config['type_module_charts'] != 'area',
+                        true
+                    ),
+                ],
+                true
+            ),
+        ],
+        true
+    )
+);
+$row++;
+
+$table_chars->data[$row][] = html_print_label_input_block(
+    __('Percentile'),
+    html_print_input_text(
+        'percentil',
+        $config['percentil'],
+        '',
+        20,
+        20,
+        true
+    )
+);
+
+$table_chars->data[$row][] = html_print_label_input_block(
+    __('Graph TIP view'),
+    html_print_select(
+        $options_full_escale,
+        'full_scale_option',
+        (isset($config['full_scale_option']) === true) ? $config['full_scale_option'] : 0,
+        '',
+        '',
+        0,
+        true,
+        false,
+        false
+    )
+);
+$row++;
+
+$table_chars->data[$row][] = html_print_label_input_block(
+    __('Graph mode'),
+    html_print_select(
+        $options_soft_graphs,
+        'type_mode_graph',
+        (isset($config['type_mode_graph']) === true) ? $config['type_mode_graph'] : 0,
+        '',
+        '',
+        0,
+        true,
+        false,
+        false
+    )
+);
+
+$table_chars->data[$row][] = html_print_label_input_block(
+    __('Zoom graphs'),
+    html_print_select(
+        $options_zoom_graphs,
+        'zoom_graph',
+        $config['zoom_graph'],
+        '',
+        '',
+        0,
+        true,
+        false,
+        false
+    )
+);
+$row++;
+
+// ----------------------------------------------------------------------
+// ----------------------------------------------------------------------
+// Visual Consoles
+// ----------------------------------------------------------------------
+$intervals = [
+    10   => '10 '.__('seconds'),
+    30   => '30 '.__('seconds'),
+    60   => '1 '.__('minutes'),
+    300  => '5 '.__('minutes'),
+    900  => '15 '.__('minutes'),
+    1800 => '30 '.__('minutes'),
+    3600 => '1 '.__('hour'),
+];
+
+$vc_favourite_view_array[0] = __('Classic view');
+$vc_favourite_view_array[1] = __('View of favorites');
+
+$table_vc = new stdClass();
+$table_vc->width = '100%';
+$table_vc->class = 'filter-table-adv';
+$table_vc->style[0] = 'font-weight: bold';
+$table_vc->size[0] = '50%';
+$table_vc->data = [];
+
+// Remove when the new view reaches rock solid stability.
+$table_vc->data[$row][] = html_print_label_input_block(
+    __('Legacy Visual Console View'),
+    html_print_checkbox_switch(
+        'legacy_vc',
+        1,
+        (bool) $config['legacy_vc'],
+        true
+    )
+);
+
+$table_vc->data[$row][] = html_print_label_input_block(
+    __('Default cache expiration'),
+    html_print_extended_select_for_time(
+        'vc_default_cache_expiration',
+        $config['vc_default_cache_expiration'],
+        '',
+        __('No cache'),
+        0,
+        false,
+        true,
+        false,
+        false,
+        '',
+        false,
+        $intervals
+    )
+);
+$row++;
+
+$table_vc->data[$row][] = html_print_label_input_block(
+    __('Default interval for refresh on Visual Console'),
+    html_print_select(
+        $values,
+        'vc_refr',
+        (int) $config['vc_refr'],
+        '',
+        'N/A',
+        0,
+        true,
+        false,
+        false
+    )
+);
+
+$table_vc->data[$row][] = html_print_label_input_block(
+    __('Type of view of visual consoles'),
+    html_print_select(
+        $vc_favourite_view_array,
+        'vc_favourite_view',
+        $config['vc_favourite_view'],
+        '',
+        '',
+        0,
+        true
+    )
+);
+$row++;
+
+$table_vc->data[$row][] = html_print_label_input_block(
+    __('Number of favorite visual consoles to show in the menu'),
+    "<input ' value=".$config['vc_menu_items']." size='5' name='vc_menu_items' min='0' max='25'>"
+);
+
+$table_vc->data[$row][] = html_print_label_input_block(
+    __('Default line thickness for the Visual Console'),
+    html_print_input_text(
+        'vc_line_thickness',
+        (int) $config['vc_line_thickness'],
+        '',
+        5,
+        5,
+        true
+    )
+);
+$row++;
+
+$table_vc->data[$row][] = html_print_label_input_block(
+    __('Mobile view not allow visual console orientation'),
+    html_print_checkbox_switch(
+        'mobile_view_orientation_vc',
+        1,
+        (bool) $config['mobile_view_orientation_vc'],
+        true
+    )
+);
+$row++;
+
+
+// ----------------------------------------------------------------------
+// Services
+// ----------------------------------------------------------------------
+$table_ser = new stdClass();
+$table_ser->width = '100%';
+$table_ser->class = 'filter-table-adv';
+$table_ser->size[0] = '50%';
+$table_ser->data = [];
+
+$table_ser->data[0][] = html_print_label_input_block(
+    __('Number of favorite services to show in the menu'),
+    "<input ' value=".$config['ser_menu_items']." size='5' name='ser_menu_items' min='0' max='25'>"
+);
+
+// ----------------------------------------------------------------------
+// Reports
+// ----------------------------------------------------------------------
+$interval_description = [
+    'large' => 'Long',
+    'tiny'  => 'Short',
+];
+
+$dirItems = scandir($config['homedir'].'/images/custom_logo');
+$customLogos = [];
+foreach ($dirItems as $entryDir) {
+    if (strstr($entryDir, '.jpg') !== false || strstr($entryDir, '.png') !== false) {
+        $customLogos['images/custom_logo/'.$entryDir] = $entryDir;
+    }
+}
+
+if (empty($config['custom_report_front_logo'])) {
+    $config['custom_report_front_logo'] = 'images/pandora_logo_white.jpg';
+}
+
+// Do not remove io_safe_output in textarea. TinyMCE avoids XSS injection.
+if ($config['custom_report_front']) {
+    $firstpage_content = $config['custom_report_front_firstpage'];
+} else {
+    $firstpage_content = io_safe_output($config['custom_report_front_firstpage']);
+}
+
+$custom_report_front_firstpage = str_replace(
+    '(_URLIMAGE_)',
+    ui_get_full_url(false, true, false, false),
+    io_safe_output($firstpage_content)
+);
+
+$table_report = new stdClass();
+$table_report->width = '100%';
+$table_report->class = 'filter-table-adv';
+$table_report->size[0] = '50%';
+
+$table_report->data = [];
+
+$table_report->data[$row][] = html_print_label_input_block(
+    __('Show report info with description'),
+    html_print_checkbox_switch(
+        'custom_report_info',
+        1,
+        $config['custom_report_info'],
+        true
+    )
+);
+
+$table_report->data[$row][] = html_print_label_input_block(
+    __('Custom report front page'),
+    html_print_checkbox_switch(
+        'custom_report_front',
+        1,
+        $config['custom_report_front'],
+        true
+    )
+);
+$row++;
+
+$table_report->data[$row][] = html_print_label_input_block(
+    __('PDF font size (px)'),
+    "<input ' value=".$config['global_font_size_report']." name='global_font_size_report' min='1' max='50' step='1'>"
+);
+$table_report->data[$row][] = html_print_label_input_block(
+    __('HTML font size for SLA (em)'),
+    "<input ' value=".$config['font_size_item_report']." name='font_size_item_report' min='1' max='9' step='0.1'>"
+);
+$row++;
+
+$table_report->data[$row][] = html_print_label_input_block(
+    __('Graph image height for HTML reports'),
+    html_print_input_text('graph_image_height', $config['graph_image_height'], '', 20, 20, true)
+);
+$table_report->data[$row][] = html_print_label_input_block(
+    __('Interval description'),
+    html_print_select(
+        $interval_description,
+        'interval_description',
+        (isset($config['interval_description']) === true) ? $config['interval_description'] : 'large',
+        '',
+        '',
+        '',
+        true,
+        false,
+        false
+    )
+);
+$row++;
+
+// Logo.
+$table_report->data['custom_report_front-logo'][] = html_print_label_input_block(
+    __('Custom report front').' - '.__('Custom logo').ui_print_help_tip(
+        __("The dir of custom logos is in your www Console in 'images/custom_logo'. You can upload more files (ONLY JPEG AND PNG) in upload tool in console."),
+        true
+    ),
+    html_print_select(
+        $customLogos,
+        'custom_report_front_logo',
+        io_safe_output($config['custom_report_front_logo']),
+        'showPreview()',
+        __('Default'),
+        '',
+        true
+    )
+);
+$table_report->data['custom_report_front-preview'][] = html_print_label_input_block(
+    __('Custom report front').' - '.__('Preview'),
+    '<span id="preview_image">'.html_print_image($config['custom_report_front_logo'], true).'</span>'
+);
+
+$table_report->colspan['custom_report_front-header'][] = 2;
+$table_report->data['custom_report_front-header'][] = html_print_label_input_block(
+    __('Custom report front').' - '.__('Header'),
+    html_print_textarea(
+        'custom_report_front_header',
+        5,
+        15,
+        io_safe_output($config['custom_report_front_header']),
+        'class="w90p height_300px"',
+        true
+    )
+);
+
+$table_report->colspan['custom_report_front-first_page'][] = 2;
+$table_report->data['custom_report_front-first_page'][] = html_print_label_input_block(
+    __('Custom report front').' - '.__('First page'),
+    html_print_textarea(
+        'custom_report_front_firstpage',
+        15,
+        15,
+        $custom_report_front_firstpage,
+        'class="w90p height_300px"',
+        true
+    )
+);
+
+// Do not remove io_safe_output in textarea. TinyMCE avoids XSS injection.
+$table_report->colspan['custom_report_front-footer'][] = 2;
+$table_report->data['custom_report_front-footer'][] = html_print_label_input_block(
+    __('Custom report front').' - '.__('Footer'),
+    html_print_textarea(
+        'custom_report_front_footer',
+        5,
+        15,
+        io_safe_output($config['custom_report_front_footer']),
+        'class="w90p height_300px""',
+        true
+    )
+);
+
+
+// ----------------------------------------------------------------------
+// OTHER CONFIGURATION
+// ----------------------------------------------------------------------
+$decimal_separators = [
+    ',' => ',',
+    '.' => '.',
+];
+
+$common_dividers = [
+    ';' => ';',
+    ',' => ',',
+    '|' => '|',
+];
+
+$switchProminentTime = html_print_radio_button(
+    'prominent_time',
+    'comparation',
+    __('Comparation in rollover'),
+    ($config['prominent_time'] === 'comparation'),
+    true
+);
+$switchProminentTime .= html_print_radio_button(
+    'prominent_time',
+    'timestamp',
+    __('Timestamp in rollover'),
+    ($config['prominent_time'] === 'timestamp'),
+    true
+);
+$switchProminentTime .= html_print_radio_button(
+    'prominent_time',
+    'compact',
+    __('Compact mode'),
+    ($config['prominent_time'] === 'compact'),
+    true
+);
+
+$csvDividerIconEdit = 'images/edit.svg';
+$csvDividerIconFile = 'images/logs@svg.svg';
+
+$isCommonDivider = (in_array($config['csv_divider'], $common_dividers) === true);
+$csvDividerIcon = ($isCommonDivider === false) ? $csvDividerIconEdit : $csvDividerIconFile;
+
+$csvDividerInputsSub = html_print_div(
+    [
+        'class'   => ($isCommonDivider === false) ? 'invisible' : '',
+        'id'      => 'custom_divider_input',
+        'content' => html_print_input_text(
+            'csv_divider',
+            $config['csv_divider'],
+            '',
+            20,
+            255,
+            true,
+            false,
+            false,
+            '',
+            '',
+            '',
+            'off',
+            false,
+            '',
+            '',
+            '',
+            ($isCommonDivider === false)
+        ),
+    ],
+    true
+);
+
+$csvDividerInputsSub .= html_print_div(
+    [
+        'class'   => ($isCommonDivider === true) ? 'invisible' : '',
+        'id'      => 'common_divider_input',
+        'content' => html_print_select(
+            $common_dividers,
+            'csv_divider',
+            $config['csv_divider'],
+            '',
+            '',
+            '',
+            true,
+            false,
+            false,
+            '',
+            ($isCommonDivider === true),
+        ),
+    ],
+    true
+);
+
+$csvDividerInputs = html_print_div(
+    [
+        'class'   => 'mrgn_right_10px',
+        'content' => $csvDividerInputsSub,
+    ],
+    true
+);
+
+$csvDividerInputs .= html_print_image(
+    $csvDividerIcon,
+    true,
+    [
+        'id'    => 'select_csv_divider',
+        'class' => 'main_menu_icon invert_filter',
+    ]
+);
+
+$csvDividerBlock = html_print_div(
+    [
+        'class'   => 'flex-row-center',
+        'content' => $csvDividerInputs,
+    ],
+    true
+);
+
+$options_data_multiplier = [];
+$options_data_multiplier[0] = __('Use 1024 when module unit are bytes');
+$options_data_multiplier[1] = __('Use always 1000');
+$options_data_multiplier[2] = __('Use always 1024');
+
+$table_other = new stdClass();
+$table_other->width = '100%';
+$table_other->class = 'filter-table-adv';
+$table_other->size[0] = '50%';
+$table_other->size[1] = '50%';
+$table_other->data = [];
+
+$row++;
+
+$table_other->data[$row][] = html_print_label_input_block(
+    __('Networkmap max width'),
+    html_print_input_text(
+        'networkmap_max_width',
+        $config['networkmap_max_width'],
+        '',
+        10,
+        20,
+        true
+    )
+);
+
+$table_other->data[$row][] = html_print_label_input_block(
+    __('Show only the group name'),
+    html_print_checkbox_switch(
+        'show_group_name',
+        1,
+        $config['show_group_name'],
+        true
+    )
+);
+$row++;
+
+$table_other->data[$row][] = html_print_label_input_block(
+    __('Show empty groups in group view'),
+    html_print_checkbox_switch(
+        'show_empty_groups',
+        1,
+        $config['show_empty_groups'],
+        true
+    )
+);
+
+$table_other->data[$row][] = html_print_label_input_block(
+    __('Date format string'),
+    html_print_input_text(
+        'date_format',
+        $config['date_format'],
+        '',
+        30,
+        100,
+        true
+    ).ui_print_input_placeholder(
+        __('Example').': '.date($config['date_format']),
+        true
+    )
+);
+$row++;
+
+$table_other->data[$row][] = html_print_label_input_block(
+    __('Decimal separator'),
+    html_print_select(
+        $decimal_separators,
+        'decimal_separator',
+        $config['decimal_separator'],
+        '',
+        '',
+        '',
+        true,
+        false,
+        false
+    )
+);
+
+$table_other->data[$row][] = html_print_label_input_block(
+    __('Visible time of successful notifiations'),
+    html_print_input_text(
+        'notification_autoclose_time',
+        $config['notification_autoclose_time'],
+        '',
+        10,
+        10,
+        true
+    )
+);
+$row++;
+
+$table_other->data[$row][] = html_print_label_input_block(
+    __('Timestamp, time comparison, or compact mode'),
+    html_print_div(
+        [
+            'class'   => 'switch_radio_button',
+            'content' => $switchProminentTime,
+        ],
+        true
+    )
+);
+$row++;
+// ----------------------------------------------------------------------
+// CUSTOM VALUES POST PROCESS
+// ----------------------------------------------------------------------
+$count_custom_postprocess = post_process_get_custom_values();
+$table_other->data[$row][] = html_print_label_input_block(
+    __('Custom values post process'),
+    html_print_div(
+        [
+            'class'   => 'filter-table-adv-manual',
+            'content' => html_print_div(
+                [
+                    'class'   => '',
+                    'content' => __('Value').':&nbsp;'.html_print_input_text('custom_value', '', '', 25, 50, true),
+                ],
+                true
+            ).html_print_div(
+                [
+                    'class'   => '',
+                    'content' => __('Text').':&nbsp;'.html_print_input_text('custom_text', '', '', 15, 50, true),
+                ],
+                true
+            ).html_print_button(
+                __('Add'),
+                'custom_value_add_btn',
+                false,
+                '',
+                [
+                    'icon'  => 'next',
+                    'mode'  => 'link',
+                    'style' => 'display: flex; justify-content: flex-end; width: 100%;',
+                ],
+                true
+            ).html_print_input_hidden(
+                'custom_value_add',
+                '',
+                true
+            ),
+        ],
+        true
+    ).html_print_div(
+        [
+            'class'   => '',
+            'content' => html_print_div(
+                [
+                    'class'   => '',
+                    'content' => __('Delete custom values').html_print_select(
+                        post_process_get_custom_values(),
+                        'custom_values',
+                        '',
+                        '',
+                        '',
+                        '',
+                        true,
+                        false,
+                        true,
+                        '',
+                        false,
+                        'width: 100%'
+                    ),
+                ],
+                true
+            ).html_print_button(
+                __('Delete'),
+                'custom_values_del_btn',
+                empty($count_custom_postprocess),
+                '',
+                [
+                    'icon'  => 'delete',
+                    'mode'  => 'link',
+                    'style' => 'display: flex; justify-content: flex-end; width: 100%;',
+                ],
+                true
+            ).html_print_input_hidden(
+                'custom_value_to_delete',
+                '',
+                true
+            ),
+        ],
+        true
+    )
+);
+
+// ----------------------------------------------------------------------
+// ----------------------------------------------------------------------
+// CUSTOM INTERVAL VALUES
+// ----------------------------------------------------------------------
+$units = [
+    1               => __('seconds'),
+    SECONDS_1MINUTE => __('minutes'),
+    SECONDS_1HOUR   => __('hours'),
+    SECONDS_1DAY    => __('days'),
+    SECONDS_1MONTH  => __('months'),
+    SECONDS_1YEAR   => __('years'),
+];
+$table_other->data[$row][] = html_print_label_input_block(
+    __('Interval values'),
+    html_print_div(
+        [
+            'class'   => 'filter-table-adv-manual',
+            'content' => html_print_div(
+                [
+                    'class'   => '',
+                    'content' => __('Value').html_print_input_text('interval_value', '', '', 5, 5, true),
+                ],
+                true
+            ).html_print_div(
+                [
+                    'class'   => '',
+                    'content' => __('Interval').html_print_select($units, 'interval_unit', 1, '', '', '', true, false, false, '', false, 'width: 100%'),
+                ],
+                true
+            ).html_print_button(
+                __('Add'),
+                'interval_add_btn',
+                false,
+                '',
+                [
+                    'mode'  => 'link',
+                    'style' => 'display: flex; justify-content: flex-end; width: 100%;',
+                ],
+                true
+            ).html_print_input_hidden(
+                'interval_values',
+                $config['interval_values'],
+                true
+            ),
+        ],
+        true
+    ).html_print_div(
+        [
+            'class'   => empty($config['interval_values']) === true ? 'invisible' : '',
+            'content' => html_print_div(
+                [
+                    'class'   => '',
+                    'content' => __('Delete interval values').html_print_select(
+                        get_periods(
+                            false,
+                            false
+                        ),
+                        'intervals',
+                        '',
+                        '',
+                        '',
+                        '',
+                        true,
+                        false,
+                        true,
+                        '',
+                        false,
+                        'width: 100%'
+                    ),
+                ],
+                true
+            ).html_print_button(
+                __('Delete'),
+                'interval_del_btn',
+                empty($config['interval_values']),
+                '',
+                [
+                    'mode'  => 'link',
+                    'style' => 'display: flex; justify-content: flex-end; width: 100%;',
+                ],
+                true
+            ).html_print_input_hidden(
+                'interval_to_delete',
+                '',
+                true
+            ),
+        ],
+        true
+    )
+);
+$row++;
+
+
+
+$table_other->data[$row][] = html_print_label_input_block(
+    __('Module units'),
+    html_print_div(
+        [
+            'class'   => 'filter-table-adv-manual',
+            'content' => html_print_div(
+                [
+                    'class'   => '',
+                    'content' => __('Value').html_print_input_text('custom_module_unit', '', '', 15, 50, true),
+                ],
+                true
+            ).html_print_div(
+                [
+                    'class'   => '',
+                    'content' => __('Interval').html_print_select($units, 'interval_unit', 1, '', '', '', true, false, false, '', false, 'width: 100%'),
+                ],
+                true
+            ).html_print_button(
+                __('Add'),
+                'module_unit_add_btn',
+                false,
+                '',
+                [
+                    'style' => 'display: flex; justify-content: flex-end; width: 100%;',
+                    'mode'  => 'link',
+                ],
+                true
+            ),
+        ],
+        true
+    ).html_print_div(
+        [
+            'class'   => (empty($count_custom_postprocess) === true ? 'invisible' : ''),
+            'content' => html_print_div(
+                [
+                    'class'   => '',
+                    'content' => __('Delete custom values').html_print_select(
+                        get_custom_module_units(),
+                        'module_units',
+                        '',
+                        '',
+                        '',
+                        '',
+                        true,
+                        false,
+                        true,
+                        '',
+                        false,
+                        'width: 100%'
+                    ),
+                ],
+                true
+            ).html_print_button(
+                __('Delete'),
+                'custom_module_unit_del_btn',
+                empty($count_custom_postprocess),
+                '',
+                [
+                    'style' => 'display: flex; justify-content: flex-end; width: 100%;',
+                    'mode'  => 'link',
+                ],
+                true
+            ).html_print_input_hidden(
+                'custom_module_unit_to_delete',
+                '',
+                true
+            ),
+        ],
+        true
+    )
+);
+$row++;
+
+$table_other->data[$row][] = html_print_label_input_block(
+    __('CSV divider'),
+    $csvDividerBlock
+);
+
+$table_other->data[$row][] = html_print_label_input_block(
+    __('CSV decimal separator'),
+    html_print_select($decimal_separators, 'csv_decimal_separator', $config['csv_decimal_separator'], '', '', '', true, false, false)
+);
+$row++;
+
+$table_other->data[$row][] = html_print_label_input_block(
+    __('Data multiplier to use in graphs/data'),
+    html_print_select($options_data_multiplier, 'use_data_multiplier', $config['use_data_multiplier'], '', '', 1, true, false, false)
+);
+$row++;
+
 /*
  *
  * PAINT HTML.
  *
  */
 
-echo '<fieldset>';
+echo '<fieldset class="margin-bottom-10">';
 echo '<legend>'.__('Behaviour configuration').' '.ui_print_help_icon('behavoir_conf_tab', true).'</legend>';
 html_print_table($table_behaviour);
 echo '</fieldset>';
 
-echo '<fieldset>';
+echo '<fieldset class="margin-bottom-10">';
 echo '<legend>'.__('GIS configuration').' '.ui_print_help_icon('gis_conf_tab', true).'</legend>';
 html_print_table($table_gis);
 echo '</fieldset>';
 
-echo '<fieldset>';
+echo '<fieldset class="margin-bottom-10">';
 echo '<legend>'.__('Style configuration').' '.ui_print_help_icon('style_conf_tab', true).'</legend>';
 html_print_table($table_styles);
 echo '</fieldset>';
 
-echo '<fieldset>';
+echo '<fieldset class="margin-bottom-10">';
 echo '<legend>'.__('Charts configuration').' '.ui_print_help_icon('charts_conf_tab', true).'</legend>';
 html_print_table($table_chars);
 echo '</fieldset>';
 
-echo '<fieldset>';
+echo '<fieldset class="margin-bottom-10">';
 echo '<legend>'.__('Font and Text configuration').' '.ui_print_help_icon('front_and_text_conf_tab', true).'</legend>';
 html_print_table($table_font);
 echo '</fieldset>';
 
-echo '<fieldset>';
+echo '<fieldset class="margin-bottom-10">';
 echo '<legend>'.__('Visual consoles configuration').' '.ui_print_help_icon('visual_consoles_conf_tab', true).'</legend>';
 html_print_table($table_vc);
 echo '</fieldset>';
 
-echo '<fieldset>';
+echo '<fieldset class="margin-bottom-10">';
 echo '<legend>'.__('Reports configuration ').ui_print_help_icon('reports_configuration_tab', true).'</legend>';
 html_print_table($table_report);
 echo '</fieldset>';
 
-echo '<fieldset>';
+echo '<fieldset class="margin-bottom-10">';
 echo '<legend>'.__('Services configuration').' '.ui_print_help_icon('services_conf_tab', true).'</legend>';
 html_print_table($table_ser);
 echo '</fieldset>';
 
-echo '<fieldset>';
+echo '<fieldset class="margin-bottom-10">';
 echo '<legend>'.__('Other configuration').' '.ui_print_help_icon('other_conf_tab', true).'</legend>';
 html_print_table($table_other);
 echo '</fieldset>';
 
-html_print_div(
-    [
-        'class'   => 'action-buttons w100p',
-        'content' => html_print_submit_button(
-            __('Update'),
-            'update_button',
-            false,
-            [ 'icon' => 'next' ],
-            true
-        ),
-    ]
+html_print_action_buttons(
+    html_print_submit_button(
+        __('Update'),
+        'update_button',
+        false,
+        [ 'icon' => 'next' ],
+        true
+    )
 );
 
 echo '</form>';
@@ -1768,26 +2147,21 @@ ui_require_javascript_file('pandora');
 ?>
 <script language="javascript" type="text/javascript">
 
-function edit_csv_divider () {
-    if ($("#csv_divider_custom img").attr("id") == "pencil") {
-        $("#csv_divider_custom img").attr("src", "images/default_list.png");
-        $("#csv_divider_custom img").attr("id", "select");
-        var value = $("#csv_divider").val();
-        $("#csv_divider").replaceWith("<input id='text-csv_divider' name='csv_divider' type='text'>");
-        $("#text-csv_divider").val(value);
-    }
-    else {
-        $("#csv_divider_custom img").attr("src", "images/edit.svg");
-        $("#csv_divider_custom img").attr("id", "pencil");
-        $("#text-csv_divider").replaceWith("<select id='csv_divider' name='csv_divider'>");
-        var o = new Option(";", ";");
-        var o1 = new Option(",", ",");
-        var o2 = new Option("|", "|");
-        $("#csv_divider").append(o);
-        $("#csv_divider").append(o1);
-        $("#csv_divider").append(o2);
-    }
-}
+$(document).ready(function(){
+    var editIcon = "<?php echo $csvDividerIconEdit; ?>";
+    var listIcon = "<?php echo $csvDividerIconFile; ?>";
+
+    $("#select_csv_divider").click(function(){
+        $("#custom_divider_input").toggleClass('invisible');
+        $("#common_divider_input").toggleClass('invisible');
+        let iconPath = $("#select_csv_divider").attr("src");
+        if (iconPath.includes(editIcon)) {
+            $("#select_csv_divider").attr("src", listIcon);
+        } else {
+            $("#select_csv_divider").attr("src", editIcon);
+        }
+    })
+})
 
 // Juanma (07/05/2014) New feature: Custom front page for reports  
 function display_custom_report_front (show,table) {
@@ -1871,22 +2245,23 @@ $(document).ready (function () {
             $("select#vc_default_cache_expiration_select").closest("tr").show();
         }
     }).change();
-    
+
     var comfort = 0;
-    
+/*
     if(comfort == 0){
         $(':input,:radio,:checkbox,:file').change(function(){
-            $('#submit-update_button').css({'position':'fixed','right':'80px','bottom':'55px'});
+            $('#button-update_button').css({'position':'fixed','right':'80px','bottom':'55px'});
             var comfort = 1;
         });
         
         $("*").keydown(function(){
-            $('#submit-update_button').css({'position':'fixed','right':'80px','bottom':'55px'});
+            $('#button-update_button').css({'position':'fixed','right':'80px','bottom':'55px'});
             var comfort = 1;
         });
         
         $('#form_setup').after('<br>');    
-        }
+    }
+
     
     $("#form_setup #text-graph_color1").attachColorPicker();
     $("#form_setup #text-graph_color2").attachColorPicker();
@@ -1897,8 +2272,10 @@ $(document).ready (function () {
     $("#form_setup #text-graph_color7").attachColorPicker();
     $("#form_setup #text-graph_color8").attachColorPicker();
     $("#form_setup #text-graph_color9").attachColorPicker();
+
+    */
     $("#form_setup #text-graph_color10").attachColorPicker();
-    
+
     
     //------------------------------------------------------------------
     // CUSTOM VALUES POST PROCESS
@@ -1910,17 +2287,15 @@ $(document).ready (function () {
         $("input[name='custom_value']").val("");
         $("input[name='custom_text']").val("");
         
-        $('#submit-update_button').trigger('click');
+        $('#button-update_button').trigger('click');
     });
     
     $("#button-custom_value_add_btn").click( function() {
         $('#hidden-custom_value_add').val(1);
-        
-        $('#submit-update_button').trigger('click');
+        $('#button-update_button').trigger('click');
     });
     //------------------------------------------------------------------
-    
-    
+
     //------------------------------------------------------------------
     // CUSTOM INTERVAL VALUES
     //------------------------------------------------------------------
@@ -1931,21 +2306,22 @@ $(document).ready (function () {
     });
     
     $("#button-interval_add_btn").click( function() {
-        $('#submit-update_button').trigger('click');
+        $('#hidden-interval_values').val(1);
+        $('#button-update_button').trigger('click');
     });
     //------------------------------------------------------------------
-    
+
     //------------------------------------------------------------------
     // CUSTOM MODULE UNITS
     //------------------------------------------------------------------
     $("#button-custom_module_unit_del_btn").click( function()  {
         var unit_selected = $('#module_units option:selected').val();
         $('#hidden-custom_module_unit_to_delete').val(unit_selected);
-        $('#submit-update_button').trigger('click');
+        $('#button-update_button').trigger('click');
     });
 
     $("#button-module_unit_add_btn").click( function() {
-        $('#submit-update_button').trigger('click');
+        $('#button-update_button').trigger('click');
     });
     //------------------------------------------------------------------
 
@@ -1982,7 +2358,7 @@ $(".logo_preview").click (function(e) {
 
     var homeUrl = "<?php echo $config['homeurl']; ?>";
     var homeUrlEnt = homeUrl + "<?php echo enterprise_installed() ? 'enterprise/' : ''; ?>";
-    var elementToCheck = $('#'+e.target.id).parent().attr('id');
+    var elementToCheck = e.target.id;
     // Fill it seing the target has been clicked
     switch (elementToCheck) {
         case 'button-custom_logo_preview':
@@ -2040,6 +2416,7 @@ $(".logo_preview").click (function(e) {
 });
 
 $("#button-gis_icon_preview").click (function (e) {
+    var homeUrl = "<?php echo $config['homeurl']; ?>";
     var icon_prefix = $("select#gis_default_icon option:selected").val();
     var icon_path = homeUrl + "images/gis_map/icons/" + icon_prefix;
 
diff --git a/pandora_console/godmode/setup/setup_websocket_engine.php b/pandora_console/godmode/setup/setup_websocket_engine.php
index f6e05c09de..e042ae7788 100644
--- a/pandora_console/godmode/setup/setup_websocket_engine.php
+++ b/pandora_console/godmode/setup/setup_websocket_engine.php
@@ -14,7 +14,7 @@
  * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
  *
  * ============================================================================
- * Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
+ * Copyright (c) 2005-2023 Artica Soluciones Tecnologicas
  * Please see http://pandorafms.org for full contribution list
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -32,68 +32,70 @@ $url = ui_get_full_url(
     'index.php?sec=gsetup&sec2=godmode/setup/setup&amp;section=websocket_engine&amp;pure='.$config['pure']
 );
 
-echo '<form id="form_setup" method="post" action="'.$url.'">';
+echo '<form class="max_floating_element_size" id="form_setup" method="post" action="'.$url.'">';
 
-echo '<fieldset>';
+echo '<fieldset class="margin-bottom-10">';
 echo '<legend>'.__('WebSocket settings').'</legend>';
 
 $t = new StdClass();
 $t->data = [];
 $t->width = '100%';
-$t->class = 'databox filters';
+$t->class = 'databox filter-table-adv';
 $t->data = [];
-$t->style[0] = 'font-weight: bold';
 
-$t->data[0][0] = __('Bind address');
-$t->data[0][1] = html_print_input_text(
-    'ws_bind_address',
-    $config['ws_bind_address'],
-    '',
-    30,
-    100,
-    true
+$t->data[0][] = html_print_label_input_block(
+    __('Bind address'),
+    html_print_input_text(
+        'ws_bind_address',
+        $config['ws_bind_address'],
+        '',
+        30,
+        100,
+        true
+    )
 );
 
-$t->data[1][0] = __('Bind port');
-$t->data[1][2] = html_print_input_text(
-    'ws_port',
-    $config['ws_port'],
-    '',
-    30,
-    100,
-    true
+$t->data[0][] = html_print_label_input_block(
+    __('Bind port'),
+    html_print_input_text(
+        'ws_port',
+        $config['ws_port'],
+        '',
+        30,
+        100,
+        true
+    )
 );
 
-$t->data[2][0] = __('WebSocket proxy url');
-$t->data[2][2] = html_print_input_text(
-    'ws_proxy_url',
-    $config['ws_proxy_url'],
-    '',
-    30,
-    100,
-    true
+$t->data[1][] = html_print_label_input_block(
+    __('WebSocket proxy url'),
+    html_print_input_text(
+        'ws_proxy_url',
+        $config['ws_proxy_url'],
+        '',
+        30,
+        100,
+        true
+    )
 );
 
 html_print_input_hidden('update_config', 1);
 html_print_table($t);
 
-
 echo '</fieldset>';
 
 if (function_exists('quickShellSettings') === true) {
     quickShellSettings();
 }
 
-html_print_div(
-    [
-        'class'   => 'action-buttons w100p',
-        'content' => html_print_submit_button(
-            __('Update'),
-            'update_button',
-            false,
-            [ 'icon' => 'update' ],
-            true
-        ),
-    ]
+html_print_action_buttons(
+    html_print_submit_button(
+        __('Update'),
+        'update_button',
+        false,
+        [ 'icon' => 'update' ],
+        true
+    )
 );
+
 echo '</form>';
diff --git a/pandora_console/godmode/snmpconsole/snmp_alert.php b/pandora_console/godmode/snmpconsole/snmp_alert.php
index 72e695eb71..189cfe808e 100755
--- a/pandora_console/godmode/snmpconsole/snmp_alert.php
+++ b/pandora_console/godmode/snmpconsole/snmp_alert.php
@@ -1885,7 +1885,7 @@ if ($create_alert || $update_alert) {
     $table->cellpadding = 4;
     $table->cellspacing = 4;
     $table->width = '100%';
-    $table->class = 'databox data';
+    $table->class = 'info_table';
     $table->align = [];
 
     $table->head[0] = '<span title="'.__('Position').'">'.__('P.').'</span>';
@@ -1983,7 +1983,7 @@ if ($create_alert || $update_alert) {
                             [
                                 'alt'   => __('Duplicate'),
                                 'title' => __('Duplicate'),
-                                'class' => 'main_menu_icon invert_filter',
+                                'class' => 'main_menu_icon',
                             ]
                         ),
                     ],
@@ -2001,7 +2001,7 @@ if ($create_alert || $update_alert) {
                             [
                                 'alt'    => __('Update'),
                                 'border' => 0,
-                                'class'  => 'main_menu_icon invert_filter',
+                                'class'  => 'main_menu_icon',
                             ]
                         ),
                     ],
@@ -2031,6 +2031,7 @@ if ($create_alert || $update_alert) {
                             true,
                             [
                                 'title' => __('Delete action'),
+                                'class' => 'main_menu_icon',
                             ]
                         ),
                         'onClick' => 'delete_snmp_alert('.$row['id_as'].')',
diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php
index eef7062a9d..225dea16e2 100644
--- a/pandora_console/godmode/users/configure_user.php
+++ b/pandora_console/godmode/users/configure_user.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * User creation / update.
  *
@@ -60,7 +59,7 @@ if ($enterprise_include === true) {
 $id = get_parameter('id', get_parameter('id_user', ''));
 // Check if we are the same user for edit or we have a proper profile for edit users.
 if ($id !== $config['id_user']) {
-    if ((is_centralized() === true) || (bool) check_acl($config['id_user'], 0, 'UM') === false) {
+    if ((bool) check_acl($config['id_user'], 0, 'UM') === false) {
         db_pandora_audit(
             AUDIT_LOG_ACL_VIOLATION,
             'Trying to access User Management'
@@ -393,6 +392,7 @@ if ($create_user === true) {
     $values['timezone'] = (string) get_parameter('timezone');
     $values['default_event_filter'] = (int) get_parameter('default_event_filter');
     $values['default_custom_view'] = (int) get_parameter('default_custom_view');
+    $values['time_autorefresh'] = (int) get_parameter('time_autorefresh', 0);
     $dashboard = get_parameter('dashboard', '');
     $visual_console = get_parameter('visual_console', '');
 
@@ -654,6 +654,7 @@ if ($update_user) {
     $values['default_event_filter'] = (int) get_parameter('default_event_filter');
     $values['default_custom_view'] = (int) get_parameter('default_custom_view');
     $values['show_tips_startup'] = (int) get_parameter_switch('show_tips_startup');
+    $values['time_autorefresh'] = (int) get_parameter('time_autorefresh');
     // API Token information.
     $apiTokenRenewed = (bool) get_parameter('renewAPIToken');
     $values['api_token'] = ($apiTokenRenewed === true) ? api_token_generate() : users_get_API_token($values['id_user']);
@@ -996,28 +997,19 @@ if (!users_is_admin() && $config['id_user'] !== $id && $new_user === false) {
     }
 }
 
-if (is_metaconsole() === true) {
-    html_print_div(
-        [
-            'class'   => 'user_form_title',
-            'content' => ((bool) $id === true) ? sprintf('%s [ %s ]', __('Update User'), $id) : __('Create User'),
-        ]
-    );
-}
-
 if (!$new_user) {
     $user_id = '<div class="label_select_simple"><p class="edit_user_labels">'.__('User ID').': </p>';
     $user_id .= '<span>'.$id.'</span>';
     $user_id .= html_print_input_hidden('id_user', $id, true);
     $user_id .= '</div>';
 
-    $apiTokenContentElements[] = '<span style="height: 15px;font-size: 14px;">'.__('API Token').'</span>';
+    $apiTokenContentElements[] = '<span style="line-height: 15px; height: 15px;font-size: 14px;">'.__('API Token').'</span>';
     $apiTokenContentElements[] = html_print_button(
         __('Renew'),
         'renew_api_token',
         false,
         sprintf(
-            'javascript:renewAPIToken(\'%s\', \'%s\', \'%s\')',
+            'javascript:renewAPIToken("%s", "%s", "%s")',
             __('Warning'),
             __('The API token will be renewed. After this action, the last token you were using will not work. Are you sure?'),
             'user_profile_form',
@@ -1033,7 +1025,7 @@ if (!$new_user) {
         'show_api_token',
         false,
         sprintf(
-            'javascript:showAPIToken(\'%s\', \'%s\')',
+            'javascript:showAPIToken("%s", "%s")',
             __('API Token'),
             base64_encode(__('Your API Token is:').'&nbsp;<br><span class="font_12pt bolder">'.users_get_API_token($id).'</span><br>&nbsp;'.__('Please, avoid share this string with others.')),
         ),
@@ -1284,8 +1276,9 @@ if (is_metaconsole() === false) {
 if (is_metaconsole() === true) {
     $array_filters = get_filters_custom_fields_view(0, true);
 
-    $search_custom_fields_view = '<div class="label_select"><p class="edit_user_labels">'.__('Search custom field view').' '.ui_print_help_tip(__('Load by default the selected view in custom field view'), true).'</p>';
-    $search_custom_fields_view .= html_print_select(
+    $searchCustomFieldView = [];
+    $searchCustomFieldView[] = __('Search custom field view');
+    $searchCustomFieldView[] = html_print_select(
         $array_filters,
         'default_custom_view',
         $user_info['default_custom_view'],
@@ -1297,7 +1290,10 @@ if (is_metaconsole() === true) {
         true,
         '',
         false
-    ).'</div>';
+    ).ui_print_input_placeholder(
+        __('Load by default the selected view in custom field view'),
+        true
+    );
 }
 
 $values = [
@@ -1379,6 +1375,8 @@ $home_screen .= html_print_input_text(
     false
 );
 
+$home_screen = '';
+
 $size_pagination = '<div class="label_select_simple"><p class="edit_user_labels">'.__('Block size for pagination').'</p>';
 $size_pagination .= html_print_input_text(
     'block_size',
@@ -1397,19 +1395,20 @@ if ($id === $config['id_user']) {
     );
 }
 
-if (enterprise_installed() && is_metaconsole() === true) {
+if (enterprise_installed() === true && is_metaconsole() === true) {
     $user_info_metaconsole_access = 'only_console';
     if (isset($user_info['metaconsole_access'])) {
         $user_info_metaconsole_access = $user_info['metaconsole_access'];
     }
 
-    // TODO review help tips on meta.
-    $meta_access = '<div class="label_select"><p class="edit_user_labels">'.__('Metaconsole access').' './* ui_print_help_icon('meta_access', true). */ '</p>';
     $metaconsole_accesses = [
         'basic'    => __('Basic'),
         'advanced' => __('Advanced'),
     ];
-    $meta_access .= html_print_select(
+
+    $outputMetaAccess = [];
+    $outputMetaAccess[] = __('Metaconsole access');
+    $outputMetaAccess[] = html_print_select(
         $metaconsole_accesses,
         'metaconsole_access',
         $user_info_metaconsole_access,
@@ -1419,51 +1418,9 @@ if (enterprise_installed() && is_metaconsole() === true) {
         true,
         false,
         false
-    ).'</div>';
+    );
 }
 
-/*
-    $not_login = '<div class="label_select_simple"><p class="edit_user_labels">'.__('Not Login').'</p>';
-    $not_login .= ui_print_help_tip(
-    __('The user with not login set only can access to API.'),
-    true
-    );
-    $not_login .= html_print_checkbox_switch(
-    'not_login',
-    1,
-    $user_info['not_login'],
-    true
-    ).'</div>';
-
-    $local_user = '<div class="label_select_simple"><p class="edit_user_labels">'.__('Local user').'</p>';
-    $local_user .= ui_print_help_tip(
-    __('The user with local authentication enabled will always use local authentication.'),
-    true
-    );
-    $local_user .= html_print_checkbox_switch(
-    'local_user',
-    1,
-    $user_info['local_user'],
-    true
-    ).'</div>';
-
-    $session_time = '<div class="label_select_simple"><p class="edit_user_labels">'.__('Session Time');
-    $session_time .= ui_print_help_tip(
-    __('This is defined in minutes, If you wish a permanent session should putting -1 in this field.'),
-    true
-    ).'</p>';
-    $session_time .= html_print_input_text(
-    'session_time',
-    $user_info['session_time'],
-    '',
-    5,
-    5,
-    true.false,
-    false,
-    '',
-    'class="input_line_small"'
-    ).'</div>';
-*/
 $user_groups = implode(',', array_keys((users_get_groups($id, 'AR', $display_all_group))));
 
 if (empty($user_groups) === false) {
@@ -1584,31 +1541,6 @@ if (empty($doubleAuthElementsContent) === false) {
     $doubleAuthentication = '';
 }
 
-
-/*
-    if (isset($double_authentication)) {
-    $double_authentication .= '</div>';
-}*/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 $autorefresh_list_out = [];
 if (is_metaconsole() === false || is_centralized() === true) {
     $autorefresh_list_out['operation/agentes/estado_agente'] = 'Agent detail';
@@ -1634,8 +1566,8 @@ $autorefresh_list_out['operation/visual_console/render_view'] = 'Visual console'
 $autorefresh_list_out['operation/events/events'] = 'Events';
 
 
-if (isset($autorefresh_list) === false) {
-    $select = db_process_sql("SELECT autorefresh_white_list FROM tusuario WHERE id_user = '".$config['id_user']."'");
+if (isset($autorefresh_list) === false || empty($autorefresh_list) === true || empty($autorefresh_list[0]) === true) {
+    $select = db_process_sql("SELECT autorefresh_white_list FROM tusuario WHERE id_user = '".$id."'");
     $autorefresh_list = json_decode($select[0]['autorefresh_white_list']);
     if ($autorefresh_list === null) {
         $autorefresh_list[0] = __('None');
@@ -1667,31 +1599,32 @@ if (isset($autorefresh_list) === false) {
     }
 }
 
-
-
 if (is_metaconsole() === true) {
     enterprise_include_once('include/functions_metaconsole.php');
 
     $access_node = db_get_value('metaconsole_access_node', 'tusuario', 'id_user', $id);
 
-    $metaconsole_agents_manager = '<div class="label_select_simple" id="metaconsole_agents_manager_div"><p class="edit_user_labels">'.__('Enable agents managment').'</p>';
-    $metaconsole_agents_manager .= html_print_checkbox_switch(
+    $metaconsoleAgentManager = [];
+    $metaconsoleAgentManager[] = __('Enable agents managment');
+    $metaconsoleAgentManager[] = html_print_checkbox_switch(
         'metaconsole_agents_manager',
         1,
         $user_info['metaconsole_agents_manager'],
         true
-    ).'</div>';
+    );
 
-    $metaconsole_access_node = '<div class="label_select_simple" id="metaconsole_access_node_div"><p class="edit_user_labels">'.__('Enable node access').ui_print_help_tip(__('With this option enabled, the user will can access to nodes console'), true).'</p>';
-    $metaconsole_access_node .= html_print_checkbox(
+    $metaconsoleAgentManager[] = __('Enable node access').ui_print_help_tip(
+        __('With this option enabled, the user will can access to nodes console'),
+        true
+    );
+    $metaconsoleAgentManager[] = html_print_checkbox_switch(
         'metaconsole_access_node',
         1,
         $access_node,
         true
-    ).'</div>';
+    );
 }
 
-
 echo '<div class="max_floating_element_size">';
 echo '<form id="user_profile_form" name="user_profile_form" method="post" autocomplete="off" action="#">';
 
@@ -1703,137 +1636,8 @@ if (!$id) {
     $user_id_create = $user_id;
 }
 
-if (is_metaconsole() === true) {
-    $access_or_pagination = $meta_access;
-    if ($id != '' && !$is_err) {
-        $div_user_info = '<div class="edit_user_info_left">'.$avatar.$user_id_create.'</div>
-        <div class="edit_user_info_right">'.$user_id_update_view.$full_name.$new_pass.$new_pass_confirm.$own_pass_confirm.$global_profile.'</div>';
-    } else {
-        $div_user_info = '<div class="edit_user_info_left">'.$avatar.'</div>
-        <div class="edit_user_info_right">'.$user_id_create.$user_id_update_view.$full_name.$new_pass.$new_pass_confirm.$global_profile.'</div>';
-    }
-
-    echo '<div id="user_form">
-    <div class="user_edit_first_row">
-        <div class="edit_user_info white_box">'.$div_user_info.'</div>
-        <div class="edit_user_autorefresh white_box"><p class="bolder">Extra info</p>'.$email.$phone.$not_login.$local_user.$session_time.'</div>
-    </div>
-    <div class="user_edit_second_row white_box">
-        <div class="edit_user_options">'.$language.$access_or_pagination.$skin.$default_event_filter.$double_authentication.'</div>
-    
-        <div class="edit_user_timezone">'.$timezone;
-
-    echo $search_custom_fields_view.$metaconsole_agents_manager.$metaconsole_access_node;
-
-    $autorefresh_show = '<p class="edit_user_labels">'._('Autorefresh').ui_print_help_tip(
-        __('This will activate autorefresh in selected pages'),
-        true
-    ).'</p>';
-    $select_out = html_print_select(
-        $autorefresh_list_out,
-        'autorefresh_list_out[]',
-        '',
-        '',
-        '',
-        '',
-        true,
-        true,
-        true,
-        '',
-        false,
-        'width:100%'
-    );
-    $arrows = ' ';
-    $select_in = html_print_select(
-        $autorefresh_list,
-        'autorefresh_list[]',
-        '',
-        '',
-        '',
-        '',
-        true,
-        true,
-        true,
-        '',
-        false,
-        'width:100%'
-    );
-
-    $table_ichanges = '<div class="autorefresh_select">
-                            <div class="autorefresh_select_list_out">
-                                <p class="autorefresh_select_text">'.__('Full list of pages').': </p>
-                                <div>'.$select_out.'</div>
-                            </div>
-                            <div class="autorefresh_select_arrows" style="display:grid">
-                                <a href="javascript:">'.html_print_image(
-                                    'images/darrowright_green.png',
-                                    true,
-                                    [
-                                        'id'    => 'right_autorefreshlist',
-                                        'alt'   => __('Push selected pages into autorefresh list'),
-                                        'title' => __('Push selected pages into autorefresh list'),
-                                    ]
-                                ).'</a>
-                                <a href="javascript:">'.html_print_image(
-                                    'images/darrowleft_green.png',
-                                    true,
-                                    [
-                                        'id'    => 'left_autorefreshlist',
-                                        'alt'   => __('Pop selected pages out of autorefresh list'),
-                                        'title' => __('Pop selected pages out of autorefresh list'),
-                                    ]
-                                ).'</a>
-                            </div>    
-                            <div class="autorefresh_select_list">    
-                                <p class="autorefresh_select_text">'.__('List of pages with autorefresh').': </p>   
-                                <div>'.$select_in.'</div>
-                            </div>
-                        </div>';
-
-    $autorefresh_show .= $table_ichanges;
-
-    // Time autorefresh.
-    $times = get_refresh_time_array();
-    $time_autorefresh = '<div class="label_select"><p class="edit_user_labels">'.__('Time autorefresh');
-    $time_autorefresh .= ui_print_help_tip(
-        __('Interval of autorefresh of the elements, by default they are 30 seconds, needing to enable the autorefresh first'),
-        true
-    ).'</p>';
-    $time_autorefresh .= html_print_select(
-        $times,
-        'time_autorefresh',
-        $user_info['time_autorefresh'],
-        '',
-        '',
-        '',
-        true,
-        false,
-        false
-    ).'</div>';
-
-
-    echo '</div>
-    </div>
-    <div class="edit_user_autorefresh white_box">'.$autorefresh_show.$time_autorefresh.'</div>
-    <div class="user_edit_third_row white_box">
-        <div class="edit_user_comments">'.$comments.'</div>
-    </div>';
-
-    if (empty($ehorus) === false) {
-        html_print_div(
-            [
-                'class'   => 'user_edit_third_row white_box',
-                'content' => $ehorus,
-            ],
-            true
-        );
-    }
-} else {
-    $access_or_pagination = $size_pagination;
-    // WIP: Only for node.
-    include_once 'user_management.php';
-}
-
+// User management form.
+require_once 'user_management.php';
 
 if ((bool) $config['admin_can_add_user'] === true) {
     html_print_csrf_hidden();
@@ -1845,9 +1649,13 @@ if ($new_user === true) {
     html_print_input_hidden('json_profile', $json_profile);
 }
 
-echo '</div>';
-
 echo '</form>';
+
+// User Profile definition table. (Only where user is not creating).
+if ($new_user === false && ((bool) check_acl($config['id_user'], 0, 'UM') === true)) {
+    profile_print_profile_table($id, io_safe_output($json_profile), false, ($is_err === true));
+}
+
 echo '</div>';
 
 $actionButtons = [];
@@ -1914,7 +1722,7 @@ if (is_metaconsole() === false) {
         $(document).ready(function() {
             // Set up the picker to update target timezone and country select lists.
             $('#timezone-image').timezonePicker({
-                target: '#timezone',
+                target: '#timezone1',
             });
 
             // Optionally an auto-detect button to trigger JavaScript geolocation.
@@ -1936,23 +1744,13 @@ if (is_metaconsole() === false) {
     var json_profile = $('#hidden-json_profile');
     /* <![CDATA[ */
     $(document).ready(function() {
-
-        // Set up the picker to update target timezone and country select lists.
-        $('#timezone-image').timezonePicker({
-            target: '#timezone1',
-        });
-
-        // Optionally an auto-detect button to trigger JavaScript geolocation.
-        $('#timezone-detect').click(function() {
-            $('#timezone-image').timezonePicker('detectLocation');
-        });
-
         $("#right_autorefreshlist").click(function() {
             jQuery.each($("select[name='autorefresh_list_out[]'] option:selected"), function(key, value) {
                 imodule_name = $(value).html();
                 if (imodule_name != <?php echo "'".__('None')."'"; ?>) {
                     id_imodule = $(value).attr('value');
-                    $("select[name='autorefresh_list[]']").append($("<option></option>").val(id_imodule).html('<i>' + imodule_name + '</i>'));
+                    $("select[name='autorefresh_list[]'] option").each(function() { $(this).attr("selected", true) });
+                    $("select[name='autorefresh_list[]']").append($("<option></option>").val(id_imodule).html('<i>' + imodule_name + '</i>').attr("selected", true));
                     $("#autorefresh_list_out").find("option[value='" + id_imodule + "']").remove();
                     $("#autorefresh_list").find("option[value='']").remove();
                     $("#autorefresh_list").find("option[value='0']").remove();
@@ -1979,6 +1777,13 @@ if (is_metaconsole() === false) {
             });
         });
 
+        $("#button-uptbutton").click (function () {
+            console.log('aaaaaaaaaaaaa');
+            if($("#autorefresh_list option").length > 0) {
+                $('#autorefresh_list option').prop('selected', true);
+            }
+        });
+
         $("input#checkbox-double_auth").change(function(e) {
             e.preventDefault();
             if (this.checked) {
diff --git a/pandora_console/godmode/users/user_list.php b/pandora_console/godmode/users/user_list.php
index e4fe4225fa..a9f28ef4c6 100644
--- a/pandora_console/godmode/users/user_list.php
+++ b/pandora_console/godmode/users/user_list.php
@@ -395,8 +395,6 @@ if ($delete_user === true) {
                         __('There was a problem deleting the user from %s', io_safe_input($server['server_name']))
                     );
                 }
-
-                header('Refresh:1');
             }
         } else {
             ui_print_error_message(__('There was a problem deleting the user'));
@@ -453,9 +451,9 @@ if ($delete_user === true) {
     }
 }
 
-        $filter_group = (int) get_parameter('filter_group', 0);
-        $filter_search = get_parameter('filter_search', '');
-        $search = (bool) get_parameter('search', false);
+$filter_group = (int) get_parameter('filter_group', 0);
+$filter_search = get_parameter('filter_search', '');
+$search = (bool) get_parameter('search', false);
 
 if (($filter_group == 0) && ($filter_search == '')) {
     $search = false;
@@ -463,43 +461,72 @@ if (($filter_group == 0) && ($filter_search == '')) {
 
 $filterTable = new stdClass();
 $filterTable->width = '100%';
-$filterTable->class = 'fixed_filter_bar';
+$filterTable->class = 'filter-table-adv';
 $filterTable->rowclass[0] = '';
 $filterTable->cellstyle[0][0] = 'width:0';
 $filterTable->cellstyle[0][1] = 'width:0';
-$filterTable->data[0][0] = __('Group');
-$filterTable->data[1][0] = html_print_select_groups(
-    false,
-    'AR',
-    true,
-    'filter_group',
-    $filter_group,
-    '',
-    '',
-    0,
-    true
+$filterTable->data[0][] = html_print_label_input_block(
+    __('Group'),
+    html_print_select_groups(
+        false,
+        'AR',
+        true,
+        'filter_group',
+        $filter_group,
+        '',
+        '',
+        0,
+        true
+    )
 );
-$filterTable->data[0][1] = __('Search').ui_print_help_tip(__('Search by username, fullname or email'), true);
-$filterTable->data[1][1] = html_print_input_text(
-    'filter_search',
-    $filter_search,
-    __('Search by username, fullname or email'),
-    30,
-    90,
-    true
-);
-$filterTable->cellstyle[1][2] = 'vertical-align: bottom';
-$filterTable->data[1][2] = html_print_submit_button(
+
+$filterTable->data[0][] = html_print_label_input_block(
     __('Search'),
-    'search',
-    false,
+    html_print_input_text(
+        'filter_search',
+        $filter_search,
+        __('Search by username, fullname or email'),
+        30,
+        90,
+        true
+    ).ui_print_input_placeholder(
+        __('Search by username, fullname or email'),
+        true
+    )
+);
+
+$form_filter = "<form method='post'>";
+$form_filter .= html_print_table($filterTable, true);
+$form_filter .= html_print_div(
     [
-        'icon'  => 'search',
-        'class' => 'float-right',
-        'mode'  => 'secondary mini',
+        'class'   => 'action-buttons-right-forced',
+        'content' => html_print_submit_button(
+            __('Search'),
+            'search',
+            false,
+            [
+                'icon'  => 'search',
+                'class' => 'float-right',
+                'mode'  => 'secondary mini',
+            ],
+            true
+        ),
     ],
     true
 );
+$form_filter .= '</form>';
+
+ui_toggle(
+    $form_filter,
+    '<span class="subsection_header_title">'.__('Filter').'</span>',
+    __('Filter'),
+    'filter',
+    true,
+    false,
+    '',
+    'white-box-content no_border',
+    'filter-datatable-main box-flat white_table_graph fixed_filter_bar'
+);
 
 $is_management_allowed = true;
 if (is_metaconsole() === false && is_management_allowed() === false) {
@@ -520,20 +547,6 @@ if (is_metaconsole() === false && is_management_allowed() === false) {
     );
 }
 
-
-if (is_metaconsole() === true) {
-    $filterTable->width = '96%';
-    $form_filter = "<form class='filters_form' method='post'>";
-    $form_filter .= html_print_table($filterTable, true);
-    $form_filter .= '</form>';
-    ui_toggle($form_filter, __('Show Options'));
-} else {
-    $form_filter = "<form method='post'>";
-    $form_filter .= html_print_table($filterTable, true);
-    $form_filter .= '</form>';
-    echo $form_filter;
-}
-
 // Urls to sort the table.
 $url_up_id = '?sec='.$sec.'&sec2=godmode/users/user_list&sort_field=id_user&sort=up&pure='.$pure;
 $url_down_id = '?sec='.$sec.'&sec2=godmode/users/user_list&sort_field=id_user&sort=down&pure='.$pure;
@@ -790,7 +803,6 @@ foreach ($info as $user_id => $user_info) {
                 );
             }
 
-            $data[4] .= '<br/>';
             $data[4] .= '<br/>';
 
             $total_profile++;
diff --git a/pandora_console/godmode/users/user_management.php b/pandora_console/godmode/users/user_management.php
index 4e9d48f14e..fe847da5c2 100644
--- a/pandora_console/godmode/users/user_management.php
+++ b/pandora_console/godmode/users/user_management.php
@@ -325,53 +325,55 @@ if ($new_user === false) {
 
 $userManagementTable->data['passwordManage_table'] = html_print_table($passwordManageTable, true);
 
+if (users_is_admin() === true) {
+    $userManagementTable->rowclass['captions_loginErrorUser'] = 'field_half_width w50p';
+    $userManagementTable->cellclass['captions_loginErrorUser'][0] = 'wrap';
+    $userManagementTable->cellclass['captions_loginErrorUser'][1] = 'wrap';
+    $notLoginCheckContent = [];
+    $notLoginCheckContent[] = '<span>'.__('Not Login').'</span>';
+    $notLoginCheckContent[] = html_print_checkbox_switch(
+        'not_login',
+        1,
+        $user_info['not_login'],
+        true
+    );
 
-$userManagementTable->rowclass['captions_loginErrorUser'] = 'field_half_width w50p';
-$userManagementTable->cellclass['captions_loginErrorUser'][0] = 'wrap';
-$userManagementTable->cellclass['captions_loginErrorUser'][1] = 'wrap';
-$notLoginCheckContent = [];
-$notLoginCheckContent[] = '<span>'.__('Not Login').'</span>';
-$notLoginCheckContent[] = html_print_checkbox_switch(
-    'not_login',
-    1,
-    $user_info['not_login'],
-    true
-);
+    $userManagementTable->data['captions_loginErrorUser'][0] = html_print_div(
+        [
+            'class'   => 'margin-top-10',
+            'style'   => 'display: flex; flex-direction: row-reverse; align-items: center;',
+            'content' => implode('', $notLoginCheckContent),
+        ],
+        true
+    );
+    $userManagementTable->data['captions_loginErrorUser'][0] .= ui_print_input_placeholder(
+        __('The user with not login set only can access to API.'),
+        true
+    );
 
-$userManagementTable->data['captions_loginErrorUser'][0] = html_print_div(
-    [
-        'class'   => 'margin-top-10',
-        'style'   => 'display: flex; flex-direction: row-reverse; align-items: center;',
-        'content' => implode('', $notLoginCheckContent),
-    ],
-    true
-);
-$userManagementTable->data['captions_loginErrorUser'][0] .= ui_print_input_placeholder(
-    __('The user with not login set only can access to API.'),
-    true
-);
+    $localUserCheckContent = [];
+    $localUserCheckContent[] = '<span>'.__('Local User').'</span>';
+    $localUserCheckContent[] = html_print_checkbox_switch(
+        'local_user',
+        1,
+        $user_info['local_user'],
+        true
+    );
 
-$localUserCheckContent = [];
-$localUserCheckContent[] = '<span>'.__('Local User').'</span>';
-$localUserCheckContent[] = html_print_checkbox_switch(
-    'local_user',
-    1,
-    $user_info['local_user'],
-    true
-);
+    $userManagementTable->data['captions_loginErrorUser'][1] = html_print_div(
+        [
+            'class'   => 'margin-top-10',
+            'style'   => 'display: flex; flex-direction: row-reverse; align-items: center;',
+            'content' => implode('', $localUserCheckContent),
+        ],
+        true
+    );
+    $userManagementTable->data['captions_loginErrorUser'][1] .= ui_print_input_placeholder(
+        __('The user with local authentication enabled will always use local authentication.'),
+        true
+    );
+}
 
-$userManagementTable->data['captions_loginErrorUser'][1] = html_print_div(
-    [
-        'class'   => 'margin-top-10',
-        'style'   => 'display: flex; flex-direction: row-reverse; align-items: center;',
-        'content' => implode('', $localUserCheckContent),
-    ],
-    true
-);
-$userManagementTable->data['captions_loginErrorUser'][1] .= ui_print_input_placeholder(
-    __('The user with local authentication enabled will always use local authentication.'),
-    true
-);
 $userManagementTable->data['show_tips_startup'][0] = html_print_checkbox_switch('show_tips_startup', 1, ($user_info['show_tips_startup'] === null) ? true : $user_info['show_tips_startup'], true);
 $userManagementTable->data['show_tips_startup'][1] = '<span>'.__('Show usage tips at startup').'</span>';
 
@@ -551,10 +553,10 @@ $userManagementTable->data['fields_autorefreshTime'][0] .= ui_print_input_placeh
 // Title for Language and Appearance.
 $userManagementTable->data['title_lookAndFeel'] = html_print_subtitle_table(__('Language and Appearance'));
 // Language and color scheme.
-$userManagementTable->rowclass['captions_lang_colorscheme'] = 'field_half_width';
-$userManagementTable->rowclass['fields_lang_colorscheme'] = 'field_half_width';
-$userManagementTable->data['captions_lang_colorscheme'][0] = __('Language');
-$userManagementTable->data['fields_lang_colorscheme'][0] = html_print_select_from_sql(
+$userManagementTable->rowclass['line1_looknfeel'] = 'field_half_width';
+$userManagementTable->rowclass['line2_looknfeel'] = 'field_half_width';
+$userManagementTable->data['line1_looknfeel'][0] = __('Language');
+$userManagementTable->data['line2_looknfeel'][0] = html_print_select_from_sql(
     'SELECT id_language, name FROM tlanguage',
     'language',
     $user_info['language'],
@@ -563,9 +565,17 @@ $userManagementTable->data['fields_lang_colorscheme'][0] = html_print_select_fro
     'default',
     true
 );
-if (function_exists('skins_print_select')) {
-    $userManagementTable->data['captions_lang_colorscheme'][1] = __('User color scheme');
-    $userManagementTable->data['fields_lang_colorscheme'][1] = skins_print_select($id_usr, 'skin', $user_info['id_skin'], '', __('None'), 0, true);
+
+if (is_metaconsole() === true) {
+    if (users_is_admin() === true) {
+        $userManagementTable->data['line1_looknfeel'][1] = $outputMetaAccess[0];
+        $userManagementTable->data['line2_looknfeel'][1] = $outputMetaAccess[1];
+    }
+} else {
+    if (function_exists('skins_print_select')) {
+        $userManagementTable->data['line1_looknfeel'][1] = __('User color scheme');
+        $userManagementTable->data['line2_looknfeel'][1] = skins_print_select($id_usr, 'skin', $user_info['id_skin'], '', __('None'), 0, true);
+    }
 }
 
 $userManagementTable->rowclass['captions_blocksize_eventfilter'] = 'field_half_width';
@@ -592,41 +602,55 @@ $userManagementTable->data['fields_blocksize_eventfilter'][1] = html_print_selec
     false,
     false
 );
+if (is_metaconsole() === false) {
+    // Home screen table.
+    $homeScreenTable = new stdClass();
+    $homeScreenTable->class = 'w100p table_section full_section';
+    $homeScreenTable->id = 'home_screen_table';
+    $homeScreenTable->style = [];
+    $homeScreenTable->rowclass = [];
+    $homeScreenTable->data = [];
+    // Home screen.
+    $homeScreenTable->data['captions_homescreen'][0] = __('Home screen');
+    $homeScreenTable->colspan['captions_homescreen'][0] = 2;
+    $homeScreenTable->rowclass['captions_homescreen'] = 'field_half_width';
+    $homeScreenTable->rowclass['fields_homescreen'] = 'field_half_width flex';
+    $homeScreenTable->data['fields_homescreen'][0] = html_print_select(
+        $homeScreenValues,
+        'section',
+        io_safe_output($user_info['section']),
+        'show_data_section();',
+        '',
+        -1,
+        true,
+        false,
+        false
+    );
+    $homeScreenTable->data['fields_homescreen'][1] = html_print_div(
+        [
+            'class'   => 'w100p',
+            'content' => $customHomeScreenDataField,
+        ],
+        true
+    );
 
-// Home screen table.
-$homeScreenTable = new stdClass();
-$homeScreenTable->class = 'w100p table_section full_section';
-$homeScreenTable->id = 'home_screen_table';
-$homeScreenTable->style = [];
-$homeScreenTable->rowclass = [];
-$homeScreenTable->data = [];
+    $userManagementTable->rowclass['homescreen_table'] = 'w100p';
+    $userManagementTable->data['homescreen_table'] = html_print_table($homeScreenTable, true);
+}
 
-// Home screen.
-$homeScreenTable->data['captions_homescreen'][0] = __('Home screen');
-$homeScreenTable->colspan['captions_homescreen'][0] = 2;
-$homeScreenTable->rowclass['captions_homescreen'] = 'field_half_width';
-$homeScreenTable->rowclass['fields_homescreen'] = 'field_half_width flex';
-$homeScreenTable->data['fields_homescreen'][0] = html_print_select(
-    $homeScreenValues,
-    'section',
-    io_safe_output($user_info['section']),
-    'show_data_section();',
-    '',
-    -1,
-    true,
-    false,
-    false
-);
-$homeScreenTable->data['fields_homescreen'][1] = html_print_div(
-    [
-        'class'   => 'w100p',
-        'content' => $customHomeScreenDataField,
-    ],
-    true
-);
+if (is_metaconsole() === true && users_is_admin() === true) {
+    $userManagementTable->rowclass['search_custom1_looknfeel'] = 'field_half_width';
+    $userManagementTable->rowclass['search_custom2_looknfeel'] = 'field_half_width flex-column';
+    $userManagementTable->data['search_custom1_looknfeel'][0] = $searchCustomFieldView[0];
+    $userManagementTable->data['search_custom2_looknfeel'][0] = $searchCustomFieldView[1];
 
-$userManagementTable->rowclass['homescreen_table'] = 'w100p';
-$userManagementTable->data['homescreen_table'] = html_print_table($homeScreenTable, true);
+    $userManagementTable->rowclass['agent_manager1_looknfeel'] = 'field_half_width';
+    $userManagementTable->rowclass['agent_manager2_looknfeel'] = 'field_half_width flex-column';
+    $userManagementTable->data['agent_manager1_looknfeel'][0] = $metaconsoleAgentManager[0];
+    $userManagementTable->data['agent_manager1_looknfeel'][1] = $metaconsoleAgentManager[2];
+    $userManagementTable->data['agent_manager2_looknfeel'][0] = $metaconsoleAgentManager[1];
+    $userManagementTable->data['agent_manager2_looknfeel'][1] = $metaconsoleAgentManager[3];
+}
 
 // Timezone.
 $userManagementTable->rowclass['captions_timezone'] = 'field_half_width';
@@ -640,14 +664,15 @@ $userManagementTable->data['fields_timezone'][0] .= ui_print_input_placeholder(
     __('The timezone must be that of the associated server.'),
     true
 );
-
-$userManagementTable->data['fields_timezone'][1] = html_print_div(
-    [
-        'id'      => 'timezone-picker',
-        'content' => implode('', $timezoneContent),
-    ],
-    true
-);
+if (is_metaconsole() === false) {
+    $userManagementTable->data['fields_timezone'][1] = html_print_div(
+        [
+            'id'      => 'timezone-picker',
+            'content' => implode('', $timezoneContent),
+        ],
+        true
+    );
+}
 
 // Title for Language and Appearance.
 $userManagementTable->data['title_additionalSettings'] = html_print_subtitle_table(__('Additional settings'));
@@ -740,7 +765,3 @@ html_print_div(
 );
 
 html_print_table($userManagementTable);
-// User Profile definition table. (Only where user is not creating).
-if ($new_user === false && ((bool) check_acl($config['id_user'], 0, 'UM') === true)) {
-    profile_print_profile_table($id, io_safe_output($json_profile), false, ($is_err === true));
-}
diff --git a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
index 781ec7e536..120eeda293 100644
--- a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
+++ b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
@@ -731,7 +731,7 @@ class DiscoveryTaskList extends HTML
                     case DISCOVERY_CLOUD_AZURE_COMPUTE:
                         // Discovery Applications MySQL.
                         $data[6] = html_print_image(
-                            'images/plugin@svg.svg',
+                            'images/plugins@svg.svg',
                             true,
                             [
                                 'title' => __('Discovery Cloud Azure Compute'),
@@ -744,7 +744,7 @@ class DiscoveryTaskList extends HTML
                     case DISCOVERY_CLOUD_AWS_EC2:
                         // Discovery Applications MySQL.
                         $data[6] = html_print_image(
-                            'images/plugin@svg.svg',
+                            'images/plugins@svg.svg',
                             true,
                             [
                                 'title' => __('Discovery Cloud AWS EC2'),
@@ -835,7 +835,10 @@ class DiscoveryTaskList extends HTML
                         $data[6] = html_print_image(
                             'images/cluster@os.svg',
                             true,
-                            ['title' => __('Discovery Applications Microsoft SQL Server')]
+                            [
+                                'title' => __('Discovery Applications Microsoft SQL Server'),
+                                'class' => 'main_menu_icon invert_filter',
+                            ]
                         ).'&nbsp;&nbsp;';
                         $data[6] .= __('Discovery.App.Microsoft SQL Server');
                     break;
@@ -856,7 +859,7 @@ class DiscoveryTaskList extends HTML
                         } else {
                             // APP or external script recon task.
                             $data[6] = html_print_image(
-                                'images/plugin@svg.svg',
+                                'images/plugins@svg.svg',
                                 true,
                                 ['class' => 'main_menu_icon invert_filter']
                             ).'&nbsp;&nbsp;';
@@ -871,9 +874,9 @@ class DiscoveryTaskList extends HTML
                     $data[7] = ui_progress(
                         $task['status'],
                         '100%',
-                        1.9,
+                        1.2,
                         // Color.
-                        '#82b92e',
+                        '#ececec',
                         // Return.
                         true,
                         // Text.
@@ -888,7 +891,8 @@ class DiscoveryTaskList extends HTML
                                 'id'     => $task['id_rt'],
                                 'method' => 'taskProgress',
                             ],
-                        ]
+                        ],
+                        ''
                     );
                 }
 
@@ -1218,12 +1222,12 @@ class DiscoveryTaskList extends HTML
         $result .= progress_circular_bar(
             $task['id_rt'],
             ($task['status'] < 0) ? 100 : $task['status'],
-            200,
-            200,
-            '#7eb641',
+            150,
+            150,
+            '#3A3A3A',
             '%',
             '',
-            '#3A3A3A',
+            '#ececec',
             0
         );
 
@@ -1288,12 +1292,12 @@ class DiscoveryTaskList extends HTML
             $result .= progress_circular_bar(
                 $task['id_rt'].'_detail',
                 $task['stats']['c_network_percent'],
-                200,
-                200,
-                '#7eb641',
+                150,
+                150,
+                '#3A3A3A',
                 '%',
                 '',
-                '#3A3A3A',
+                '#ececec',
                 0
             );
             $result .= '</div></div>';
diff --git a/pandora_console/images/menu/fav_menu_gray.svg b/pandora_console/images/menu/fav_menu_gray.svg
new file mode 100644
index 0000000000..8a894d7948
--- /dev/null
+++ b/pandora_console/images/menu/fav_menu_gray.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 61.2 (89653) - https://sketch.com -->
+    <title>Dark / 20 / star@svg</title>
+    <desc>Created with Sketch.</desc>
+    <g id="Dark-/-20-/-star" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M10,16.5 L5.32783438,18.9563028 C4.83898979,19.2133036 4.23436264,19.0253571 3.97736183,18.5365125 C3.87502276,18.3418521 3.83970808,18.118884 3.87688493,17.9021263 L4.76918916,12.6995935 L4.76918916,12.6995935 L0.989327772,9.01513923 C0.593844194,8.62963801 0.585751887,7.99652475 0.971253099,7.60104117 C1.1247617,7.44355754 1.32590411,7.34107036 1.54354115,7.30944585 L6.76718111,6.55040653 L6.76718111,6.55040653 L9.10326392,1.81698575 C9.34768622,1.32173209 9.94731205,1.11839309 10.4425657,1.36281539 C10.6397783,1.46014562 10.7994058,1.61977315 10.8967361,1.81698575 L13.2328189,6.55040653 L13.2328189,6.55040653 L18.4564589,7.30944585 C19.0030037,7.38886347 19.3816852,7.89630632 19.3022676,8.44285118 C19.270643,8.66048821 19.1681559,8.86163062 19.0106722,9.01513923 L15.2308108,12.6995935 L15.2308108,12.6995935 L16.1231151,17.9021263 C16.2164761,18.4464628 15.8508883,18.9634187 15.3065518,19.0567797 C15.0897942,19.0939566 14.8668261,19.0586419 14.6721656,18.9563028 L10,16.5 L10,16.5 Z" id="Star" fill="#a6adb2"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/pandora_console/images/plus@svg.svg b/pandora_console/images/plus@svg.svg
new file mode 100644
index 0000000000..bb528c8ad7
--- /dev/null
+++ b/pandora_console/images/plus@svg.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 27.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 20 20" style="enable-background:new 0 0 20 20;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:#000000;}
+</style>
+
+    <g id="Dark-/-20-/-delete-v2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Group" transform="translate(10.000000, 10.000000) rotate(0.000000) translate(-10.000000, -10.000000) translate(4.000000, 4.000000)" fill="#3F3F3F">
+            <path d="M6,0 C6.51283584,0 6.93550716,0.38604019 6.99327227,0.883378875 L7,1 L7,5 L11,5 C11.5522847,5 12,5.44771525 12,6 C12,6.51283584 11.6139598,6.93550716 11.1166211,6.99327227 L11,7 L7,7 L7,11 C7,11.5522847 6.55228475,12 6,12 C5.48716416,12 5.06449284,11.6139598 5.00672773,11.1166211 L5,11 L5,7 L1,7 C0.44771525,7 0,6.55228475 0,6 C0,5.48716416 0.38604019,5.06449284 0.883378875,5.00672773 L1,5 L5,5 L5,1 C5,0.44771525 5.44771525,0 6,0 Z" id="Path-7"></path>
+        </g>
+        <path d="M10,0 C4.4771525,0 0,4.4771525 0,10 C0,15.5228475 4.4771525,20 10,20 C15.5228475,20 20,15.5228475 20,10 C20,4.4771525 15.5228475,0 10,0 Z M10,2 C14.418278,2 18,5.581722 18,10 C18,14.418278 14.418278,18 10,18 C5.581722,18 2,14.418278 2,10 C2,5.581722 5.581722,2 10,2 Z" id="Oval" fill="#3F3F3F"></path>
+    </g>
+
+</svg>
diff --git a/pandora_console/images/star_fav_menu.png b/pandora_console/images/star_fav_menu.png
new file mode 100644
index 0000000000..5d1521f202
Binary files /dev/null and b/pandora_console/images/star_fav_menu.png differ
diff --git a/pandora_console/images/status_dot.svg b/pandora_console/images/status_dot.svg
new file mode 100644
index 0000000000..3e9c8b2ead
--- /dev/null
+++ b/pandora_console/images/status_dot.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg  viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <g>
+        <circle cx="10" cy="10" r="10" fill="#3F3F3F"/>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/pandora_console/images/world@svg.svg b/pandora_console/images/world@svg.svg
new file mode 100644
index 0000000000..c71297eda4
--- /dev/null
+++ b/pandora_console/images/world@svg.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 61.2 (89653) - https://sketch.com -->
+    <title>Dark / 20 / web@svg</title>
+    <desc>Created with Sketch.</desc>
+    <g id="Dark-/-20-/-web" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M10,0 C4.4771525,0 0,4.4771525 0,10 C0,15.5228475 4.4771525,20 10,20 C15.5228475,20 20,15.5228475 20,10 C19.9945565,4.47940886 15.5205911,0.00544352451 10,0 Z M10.0288333,17.4971042 C10.0246667,17.4971042 10.0206042,17.4983125 10.0163333,17.4983125 C9.68185417,17.3901458 9.011375,16.3172917 8.56475,14.3237292 C9.04327083,14.3508125 9.52308333,14.375 10,14.375 C10.4774375,14.375 10.9581042,14.3508958 11.437375,14.3237292 C10.9950208,16.3143958 10.3361458,17.3863125 10.0288333,17.4971042 Z M10,11.875 C9.35577083,11.875 8.75960417,11.8472292 8.19702083,11.8032917 C8.15291667,11.2406875 8.125,10.6442292 8.125,10 C8.125,9.35577083 8.15277083,8.75960417 8.19670833,8.19702083 C8.7593125,8.15291667 9.35577083,8.125 10,8.125 C10.6442292,8.125 11.2403958,8.15277083 11.8029792,8.19670833 C11.8470833,8.7593125 11.875,9.35577083 11.875,10 C11.875,10.6442292 11.8472292,11.2403958 11.8032917,11.8029792 C11.2406875,11.8470833 10.6442292,11.875 10,11.875 Z M2.50289583,10.0288333 C2.50289583,10.0246667 2.5016875,10.0206042 2.5016875,10.0163333 C2.60985417,9.68185417 3.68270833,9.011375 5.67627083,8.56475 C5.64927083,9.04327083 5.625,9.52316667 5.625,10 C5.625,10.4774375 5.64910417,10.9581042 5.67627083,11.437375 C3.68560417,10.9950208 2.6136875,10.3361458 2.50289583,10.0288333 Z M9.97116667,2.50289583 C9.97533333,2.50289583 9.97939583,2.5016875 9.98366667,2.5016875 C10.3181458,2.60985417 10.988625,3.68270833 11.43525,5.67627083 C10.9567292,5.64927083 10.4768333,5.625 10,5.625 C9.5225625,5.625 9.04189583,5.64910417 8.562625,5.67627083 C9.00497917,3.68560417 9.66385417,2.6136875 9.97116667,2.50289583 Z M14.3237292,8.562625 C16.3143958,9.00497917 17.3862292,9.66385417 17.4971042,9.97116667 C17.4971042,9.97533333 17.4983125,9.97939583 17.4983125,9.98366667 C17.3901458,10.3181458 16.3172917,10.988625 14.3237292,11.43525 C14.3508125,10.9567292 14.375,10.4769167 14.375,10 C14.375,9.5225625 14.3508958,9.04189583 14.3237292,8.562625 Z M16.671,6.64397917 C15.8116964,6.34280615 14.9276165,6.11763659 14.0289375,5.9710625 C13.8823634,5.07238349 13.6571938,4.18830364 13.3560208,3.329 C14.7866526,4.05165344 15.9483466,5.21334744 16.671,6.64397917 L16.671,6.64397917 Z M6.64375,3.329 C6.34261768,4.18830554 6.11749674,5.07238609 5.97097917,5.9710625 C5.0723873,6.11755451 4.18838995,6.34264769 3.32916667,6.64375 C4.05172797,5.21324363 5.21327996,4.05163323 6.64375,3.329 L6.64375,3.329 Z M3.32916667,13.35625 C4.1884091,13.6574028 5.07243613,13.8825243 5.9710625,14.0290208 C6.11753664,14.9276164 6.34263021,15.8116153 6.64375,16.6708333 C5.21325958,15.948307 4.05169302,14.7867404 3.32916667,13.35625 Z M13.35625,16.6708333 C13.6573853,15.8115856 13.8825065,14.9275601 14.0290208,14.0289375 C14.9276665,13.8824423 15.8117189,13.6573493 16.671,13.35625 C15.9483668,14.78672 14.7867564,15.948272 13.35625,16.6708333 L13.35625,16.6708333 Z" id="Shape" fill="#3F3F3F"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/pandora_console/include/ajax/double_auth.ajax.php b/pandora_console/include/ajax/double_auth.ajax.php
index 3a995ce43a..54856a26c3 100644
--- a/pandora_console/include/ajax/double_auth.ajax.php
+++ b/pandora_console/include/ajax/double_auth.ajax.php
@@ -216,11 +216,8 @@ if ($get_double_auth_info_page) {
     $html .= '</p>';
     $html .= '</div>';
     $html .= '<br>';
-    $html .= '<div class="center_align">';
+    $html .= '<div class="flex flex-space-around">';
     $html .= html_print_button(__('Download the app'), 'google_authenticator_download', false, '', '', true);
-    $html .= '</div>';
-    $html .= '<br>';
-    $html .= '<div class="center_align">';
     $html .= html_print_button(__('Continue'), 'continue_to_generate', false, '', '', true);
     $html .= '</div>';
 
@@ -311,11 +308,11 @@ if ($get_double_auth_generation_page) {
     $html .= '<br>';
     $html .= __('QR').': <br>';
     $html .= '<div id="qr-container"></div>';
-    $html .= '<br>';
+    $html .= '<br><div class="flex flex-space-around">';
     $html .= html_print_button(__('Refresh code'), 'continue_to_generate', false, '', '', true);
-    $html .= '&nbsp;';
     $html .= html_print_button(__('Continue'), 'continue_to_validate', false, '', '', true);
     $html .= '</div>';
+    $html .= '</div>';
 
     ob_clean();
     ?>
@@ -453,7 +450,7 @@ if ($get_double_auth_validation_page) {
     $html .= html_print_input_text('code', '', '', 50, $secret_lenght, true);
     $html .= '<div id="code_input_message" class="red"></div>';
     $html .= '<br><br>';
-    $html .= '<div id="button-container">';
+    $html .= '<div id="button-container" class="flex flex-space-around">';
     $html .= html_print_button(__('Validate code'), 'continue_to_validate', false, '', '', true);
     $html .= html_print_image('images/spinner.gif', true);
     $html .= '</div>';
diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php
index 70d6cba47e..45ee2efd9c 100644
--- a/pandora_console/include/ajax/events.php
+++ b/pandora_console/include/ajax/events.php
@@ -91,9 +91,8 @@ $node_id = (int) get_parameter('node_id', 0);
 
 if ($get_comments === true) {
     $event = get_parameter('event', false);
-    $event_rep = (int) get_parameter('event_rep', 0);
-    $event_rep = get_parameter_post('event')['event_rep'];
-    $group_rep = get_parameter_post('event')['group_rep'];
+    $event_rep = (int) get_parameter_post('event')['event_rep'];
+    $group_rep = (int) get_parameter_post('event')['group_rep'];
 
     if ($event === false) {
         return __('Failed to retrieve comments');
@@ -126,7 +125,7 @@ if ($get_comments === true) {
     } else if ($group_rep === EVENT_GROUP_REP_EXTRAIDS) {
         $whereGrouped = sprintf(
             '`id_extra` = "%s"',
-            $event['id_extra']
+            io_safe_output($event['id_extra'])
         );
     } else {
         $whereGrouped = sprintf('`id_evento` = %d', $event['id_evento']);
diff --git a/pandora_console/include/ajax/fav_menu.ajax.php b/pandora_console/include/ajax/fav_menu.ajax.php
new file mode 100644
index 0000000000..0b837ec9b3
--- /dev/null
+++ b/pandora_console/include/ajax/fav_menu.ajax.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Fav menu
+ *
+ * @category   Ajax library.
+ * @package    Pandora FMS
+ * @subpackage Modules.
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
+ * Please see http://pandorafms.org for full contribution list
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation for version 2.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * ============================================================================
+ */
+
+// Begin.
+global $config;
+
+// Login check
+check_login();
+
+if (is_ajax() === false) {
+    exit;
+}
+
+$id_element = get_parameter('id_element', '');
+$url = io_safe_output(get_parameter('url', ''));
+$label = get_parameter('label', '');
+$section = get_parameter('section', '');
+$id_user = $config['id_user'];
+
+$exist = db_get_row_filter(
+    'tfavmenu_user',
+    [
+        'url'     => $url,
+        'id_user' => $config['id_user'],
+    ],
+    ['*']
+);
+$res = false;
+$action = '';
+if ($exist !== false) {
+    $res = db_process_sql_delete(
+        'tfavmenu_user',
+        [
+            'url'     => $url,
+            'id_user' => $config['id_user'],
+        ]
+    );
+    $action = 'delete';
+} else {
+    $res = db_process_sql_insert(
+        'tfavmenu_user',
+        [
+            'id_element' => $id_element,
+            'url'        => $url,
+            'label'      => $label,
+            'section'    => $section,
+            'id_user'    => $id_user,
+        ]
+    );
+    $action = 'create';
+}
+
+if ($res !== false) {
+    echo json_encode(['success' => true, 'action' => $action]);
+} else {
+    echo json_encode(['success' => false, 'action' => $action]);
+}
diff --git a/pandora_console/include/ajax/map_enterprise.ajax.php b/pandora_console/include/ajax/map_enterprise.ajax.php
index a0178457f5..4c5738f29a 100644
--- a/pandora_console/include/ajax/map_enterprise.ajax.php
+++ b/pandora_console/include/ajax/map_enterprise.ajax.php
@@ -25,6 +25,8 @@ if ((bool) is_metaconsole() === true) {
 
 if ($networkmap) {
     $networkmap_id = get_parameter('networkmap_id', 0);
+    $dashboard = get_parameter('dashboard', 0);
+    $size = get_parameter('size', []);
     $x_offset = get_parameter('x_offset', 0);
     $y_offset = get_parameter('y_offset', 0);
     $zoom_dash = get_parameter('zoom_dash', 0.5);
@@ -62,6 +64,15 @@ if ($networkmap) {
         global $id_networkmap;
         $id_networkmap = $networkmap['id'];
         $tab = 'radial_dynamic';
+        if (empty($size) === false) {
+            if ($size['width'] > $size['height']) {
+                $width = $size['height'];
+                $height = ($size['height'] - 10);
+            } else {
+                $width = $size['width'];
+                $height = ($size['width'] + 50);
+            }
+        }
 
         include_once 'operation/agentes/networkmap.dinamic.php';
     } else {
diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php
index bd356894ad..30b84be44f 100755
--- a/pandora_console/include/ajax/module.php
+++ b/pandora_console/include/ajax/module.php
@@ -1573,7 +1573,7 @@ if (check_login()) {
                             $value['thresholds']
                         );
 
-                        $resultData = '<span style="color:'.$status['color'].'">';
+                        $resultData = '<span class="widget-module-tabs-data" style="color:'.$status['color'].'">';
                         if ($vdata !== null && $vdata !== '' && $vdata !== false) {
                             if (isset($formatData) === true
                                 && (bool) $formatData === true
@@ -1750,7 +1750,9 @@ if (check_login()) {
                 INNER JOIN tagente
                     ON tagente_modulo.id_agente = tagente.id_agente 
                 INNER JOIN tagente_estado
-                    ON tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo'
+                    ON tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo
+                WHERE %s',
+                $where
             );
             $recordsTotal = db_get_value_sql($sql_count);
 
@@ -1795,6 +1797,32 @@ if (check_login()) {
                 }
             }
 
+            if (in_array(0, $servers_ids) === true) {
+                $sql = sprintf(
+                    'SELECT
+                    tagente_modulo.nombre,
+                    tagente.alias,
+                    tagente.id_agente,
+                    tagente_estado.last_status_change,
+                    tagente_estado.estado
+                    FROM tagente_modulo
+                    INNER JOIN tagente
+                        ON tagente_modulo.id_agente = tagente.id_agente 
+                    INNER JOIN tagente_estado
+                        ON tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo
+                    WHERE %s',
+                    $where
+                );
+
+                $res_sql = db_get_all_rows_sql($sql);
+
+                foreach ($res_sql as $row_sql) {
+                    $row_sql['server_name'] = __('Metaconsole');
+                    $row_sql['server_url'] = $config['homeurl'];
+                    array_push($data, $row_sql);
+                }
+            }
+
             // Drop temporary table if exist.
             db_process_sql('DROP TEMPORARY TABLE IF EXISTS temp_modules_status;');
 
@@ -1852,7 +1880,9 @@ if (check_login()) {
 
                 $sql_count = sprintf(
                     'SELECT COUNT(*) AS "total"
-                    FROM temp_modules_status'
+                    FROM temp_modules_status
+                    WHERE %s',
+                    $where
                 );
 
                 $recordsTotal = db_get_value_sql($sql_count);
@@ -2044,6 +2074,14 @@ if (check_login()) {
         if ($monitor_filters === false) {
             echo 'error';
         } else {
+            db_process_sql_delete(
+                'tfavmenu_user',
+                [
+                    'id_element' => $id,
+                    'section'    => 'Modules',
+                    'id_user'    => $config['id_user'],
+                ]
+            );
             echo 'ok';
         }
     }
diff --git a/pandora_console/include/chart_generator.php b/pandora_console/include/chart_generator.php
index 7bc4785011..2e9ec50479 100644
--- a/pandora_console/include/chart_generator.php
+++ b/pandora_console/include/chart_generator.php
@@ -27,8 +27,6 @@
  */
 
 // Begin.
-require_once 'config.php';
-
 require_once __DIR__.'/config.php';
 require_once __DIR__.'/functions.php';
 require_once __DIR__.'/functions_db.php';
@@ -87,7 +85,7 @@ if (check_login(false) === false) {
 </head>
 <body>
     <h1>Access is not granted</h1>
-    <div id="container-chart-generator-item" style="display:none; margin:0px;">
+    <div id="container-chart-generator-item" style="display:none; margin:0px;width:100px;height:100px;">
 </body>
 </html>
 
@@ -246,6 +244,9 @@ if (file_exists('languages/'.$user_language.'.mo') === true) {
         break;
 
         case 'slicebar':
+            // TO-DO Cambiar esto para que se pase por POST, NO SE PUEDE PASAR POR GET.
+            $params['graph_data'] = json_decode(io_safe_output($config[$params['tokem_config']]), true);
+            delete_config_token($params['tokem_config']);
             echo flot_slicesbar_graph(
                 $params['graph_data'],
                 $params['period'],
diff --git a/pandora_console/include/class/AgentWizard.class.php b/pandora_console/include/class/AgentWizard.class.php
index 9da08637a7..2580d17371 100644
--- a/pandora_console/include/class/AgentWizard.class.php
+++ b/pandora_console/include/class/AgentWizard.class.php
@@ -601,6 +601,7 @@ class AgentWizard extends HTML
             'action' => $this->sectionUrl,
             'id'     => 'form-main-wizard',
             'method' => 'POST',
+            'class'  => 'white_box pdd_20px filter-list-adv',
         ];
 
         // Inputs.
@@ -829,24 +830,22 @@ class AgentWizard extends HTML
             ];
         }
 
-        $inputs[] = [
-            'arguments' => [
-                'label'      => $this->actionLabel,
-                'name'       => 'sub-protocol',
-                'type'       => 'submit',
-                'attributes' => [
+        html_print_action_buttons(
+            html_print_submit_button(
+                $this->actionLabel,
+                'sub-protocol',
+                false,
+                [
                     'icon'    => 'cog',
-                    'onclick' => '$(\'#form-main-wizard\').submit();',
+                    'onclick' => '$("#form-main-wizard").submit();',
                 ],
-                'return'     => true,
-            ],
-        ];
+                true
+            )
+        );
 
         // Prints main form.
         html_print_div(
             [
-                'class'   => 'white_box',
-                'style'   => 'padding: 20px',
                 'content' => $this->printForm(
                     [
                         'form'      => $form,
@@ -1330,7 +1329,7 @@ class AgentWizard extends HTML
                 $table->rowstyle[$i] = 'color:#ccc;';
                 $data[0] .= ' ';
                 $data[0] .= html_print_image(
-                    'images/error.png',
+                    'images/alert-warning@svg.svg',
                     true,
                     ['title' => $msgError]
                 );
@@ -1348,7 +1347,7 @@ class AgentWizard extends HTML
             // Img Server.
             if ($this->serverType == SERVER_TYPE_ENTERPRISE_SATELLITE) {
                 $img_server = html_print_image(
-                    'images/satellite.png',
+                    'images/satellite@os.svg',
                     true,
                     [
                         'title' => __('Enterprise Satellite server'),
@@ -1358,7 +1357,7 @@ class AgentWizard extends HTML
             } else {
                 if ($module['execution_type'] == EXECUTION_TYPE_PLUGIN) {
                     $img_server = html_print_image(
-                        'images/plugin.png',
+                        'images/plugins@svg.svg',
                         true,
                         [
                             'title' => __('Plugin server'),
@@ -1368,7 +1367,7 @@ class AgentWizard extends HTML
                 } else {
                     if ($this->protocol === 'wmi') {
                         $img_server = html_print_image(
-                            'images/wmi.png',
+                            'images/WMI@svg.svg',
                             true,
                             [
                                 'title' => __('WMI server'),
@@ -1377,7 +1376,7 @@ class AgentWizard extends HTML
                         );
                     } else {
                         $img_server = html_print_image(
-                            'images/op_network.png',
+                            'images/network@svg.svg',
                             true,
                             [
                                 'title' => __('Network server'),
@@ -4091,7 +4090,7 @@ class AgentWizard extends HTML
                     $blockTitle .= '<b>'.$block['name'];
                     $blockTitle .= '&nbsp;&nbsp;';
                     $blockTitle .= html_print_image(
-                        'images/tip_help.png',
+                        'images/info@svg.svg',
                         true,
                         [
                             'title' => __('Modules selected'),
@@ -4111,7 +4110,7 @@ class AgentWizard extends HTML
 
                 $blockTitle .= '&nbsp;&nbsp;';
                 $blockTitle .= html_print_image(
-                    'images/tip_help.png',
+                    'images/info@svg.svg',
                     true,
                     [
                         'title' => __('Modules selected'),
@@ -4206,6 +4205,9 @@ class AgentWizard extends HTML
             $table->size[4] = '140px';
             $table->size[5] = '3%';
 
+            $table->align = [];
+            $table->align[1] = 'center';
+
             // If is needed show current value, we must correct the table.
             if ($showCurrentValue === true) {
                 // Correct headers.
@@ -4274,7 +4276,7 @@ class AgentWizard extends HTML
                         false,
                         false,
                         '',
-                        $md5IdBlock,
+                        $md5IdBlock.' w100p',
                         '',
                         '',
                         false,
@@ -4294,8 +4296,9 @@ class AgentWizard extends HTML
                         1,
                         20,
                         $module['description'],
-                        'form=\'form-create-modules\' class=\'min-height-50px\'',
-                        true
+                        'form=\'form-create-modules\'',
+                        true,
+                        'w100p'
                     );
                 }
 
@@ -4704,8 +4707,6 @@ class AgentWizard extends HTML
                     'toggle_class'      => '',
                     'container_class'   => 'white-box-content',
                     'main_class'        => $class,
-                    'img_a'             => 'images/arrow_down_green.png',
-                    'img_b'             => 'images/arrow_right_green.png',
                     'clean'             => false,
                     'reverseImg'        => $reverseImg,
                     'switch'            => $buttonSwitch,
@@ -5980,7 +5981,7 @@ class AgentWizard extends HTML
                 });
 
                 // Loading.
-                $('#submit-sub-protocol').click(function() {
+                $('#button-sub-protocol').click(function() {
                     $('.wizard-result').remove();
                     $('#form-create-modules').remove();
                     $('.textodialogo').remove();
diff --git a/pandora_console/include/class/Diagnostics.class.php b/pandora_console/include/class/Diagnostics.class.php
index aeb5a46400..2a041e63e8 100644
--- a/pandora_console/include/class/Diagnostics.class.php
+++ b/pandora_console/include/class/Diagnostics.class.php
@@ -1831,7 +1831,7 @@ class Diagnostics extends Wizard
 
                         if ($items[$key]['status'] === 2) {
                             $items[$key]['value'] = html_print_image(
-                                'images/icono-warning.png',
+                                'images/alert-yellow@svg.svg',
                                 true,
                                 [
                                     'title' => __('Warning'),
@@ -1840,7 +1840,7 @@ class Diagnostics extends Wizard
                             );
                         } else if ($items[$key]['status'] === 1) {
                             $items[$key]['value'] = html_print_image(
-                                'images/exito.png',
+                                'images/validate.svg',
                                 true,
                                 [
                                     'title' => __('Successfully'),
@@ -1849,7 +1849,7 @@ class Diagnostics extends Wizard
                             );
                         } else {
                             $items[$key]['value'] = html_print_image(
-                                'images/error_1.png',
+                                'images/fail@svg.svg',
                                 true,
                                 [
                                     'title' => __('Error'),
diff --git a/pandora_console/include/class/ExternalTools.class.php b/pandora_console/include/class/ExternalTools.class.php
index 67345a61f8..b086dd0419 100644
--- a/pandora_console/include/class/ExternalTools.class.php
+++ b/pandora_console/include/class/ExternalTools.class.php
@@ -14,7 +14,7 @@
  * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
  *
  * ============================================================================
- * Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
+ * Copyright (c) 2005-2023 Artica Soluciones Tecnologicas
  * Please see http://pandorafms.org for full contribution list
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -203,132 +203,161 @@ class ExternalTools extends HTML
             }
         }
 
+        html_print_div(['id' => 'layer_sound_alert']);
+        html_print_div(['id' => 'layer_sound_critical']);
+        html_print_div(['id' => 'layer_sound_warning']);
         // Make the table for show the form.
         $table = new stdClass();
         $table->width = '100%';
+        $table->class = 'filter-table-adv';
         $table->id = 'commandsTable';
 
         $table->data = [];
 
-        $table->data[$i][0] = __('Sound for Alert fired');
-        $table->data[$i][1] = html_print_select(
-            $sounds,
-            'sound_alert',
-            $config['sound_alert'],
-            'replaySound(\'alert\');',
-            '',
-            '',
-            true
-        );
-        $table->data[$i][1] .= html_print_anchor(
-            [
-                'href'    => 'javascript:toggleButton(\'alert\')',
-                'content' => html_print_image(
-                    'images/control_play_col.png',
-                    true,
-                    [
-                        'id'    => 'button_sound_warning',
-                        'style' => 'vertical-align: middle;',
-                        'width' => '16',
-                        'title' => __('Play sound'),
-                        'class' => 'invert_filter',
-
-                    ]
-                ),
-            ],
-            true
-        );
-        $table->data[$i++][1] .= '<div id="layer_sound_alert"></div>';
-
-        $table->data[$i][0] = __('Sound for Monitor critical');
-        $table->data[$i][1] = html_print_select(
-            $sounds,
-            'sound_critical',
-            $config['sound_critical'],
-            'replaySound(\'critical\');',
-            '',
-            '',
-            true
-        );
-        $table->data[$i][1] .= html_print_anchor(
-            [
-                'href'    => 'javascript:toggleButton(\'critical\')',
-                'content' => html_print_image(
-                    'images/control_play_col.png',
-                    true,
-                    [
-                        'id'    => 'button_sound_warning',
-                        'style' => 'vertical-align: middle;',
-                        'width' => '16',
-                        'title' => __('Play sound'),
-                        'class' => 'invert_filter',
-
-                    ]
-                ),
-            ],
-            true
-        );
-        $table->data[$i++][1] .= '<div id="layer_sound_critical"></div>';
-
-        $table->data[$i][0] = __('Sound for Monitor warning');
-        $table->data[$i][1] = html_print_select(
-            $sounds,
-            'sound_warning',
-            $config['sound_warning'],
-            'replaySound(\'warning\');',
-            '',
-            '',
-            true
-        );
-        $table->data[$i][1] .= html_print_anchor(
-            [
-                'href'    => 'javascript:toggleButton(\'warning\')',
-                'content' => html_print_image(
-                    'images/control_play_col.png',
-                    true,
-                    [
-                        'id'    => 'button_sound_warning',
-                        'style' => 'vertical-align: middle;',
-                        'width' => '16',
-                        'title' => __('Play sound'),
-                        'class' => 'invert_filter',
-
-                    ]
-                ),
-            ],
-            true
-        );
-        $table->data[$i++][1] .= '<div id="layer_sound_warning"></div>';
-
-        $table->data[$i][0] = __('Custom graphviz directory');
-        $table->data[$i++][1] = html_print_input_text(
-            'graphviz_bin_dir',
-            $config['graphviz_bin_dir'],
-            '',
-            25,
-            255,
-            true
+        $table->data[$i][] = html_print_label_input_block(
+            __('Sound for Alert fired'),
+            html_print_div(
+                [
+                    'class'   => '',
+                    'content' => html_print_select(
+                        $sounds,
+                        'sound_alert',
+                        $config['sound_alert'],
+                        'replaySound(\'alert\');',
+                        '',
+                        '',
+                        true
+                    ).html_print_anchor(
+                        [
+                            'href'    => 'javascript:toggleButton(\'alert\')',
+                            'content' => html_print_image(
+                                'images/change-active.svg',
+                                true,
+                                [
+                                    'id'    => 'button_sound_alert',
+                                    'style' => 'vertical-align: middle; margin-left: 10px',
+                                    'width' => '16',
+                                    'title' => __('Play sound'),
+                                    'class' => 'invert_filter',
+                                ]
+                            ),
+                        ],
+                        true
+                    ),
+                ],
+                true
+            ),
         );
 
-        $table->data[$i][0] = __('Traceroute path');
-        $table->data[$i++][1] = html_print_input_text('traceroute_path', $this->pathTraceroute, '', 40, 255, true);
+        $table->data[$i++][] = html_print_label_input_block(
+            __('Sound for Monitor critical'),
+            html_print_div(
+                [
+                    'class'   => '',
+                    'content' => html_print_select(
+                        $sounds,
+                        'sound_critical',
+                        $config['sound_critical'],
+                        'replaySound(\'critical\');',
+                        '',
+                        '',
+                        true
+                    ).html_print_anchor(
+                        [
+                            'href'    => 'javascript:toggleButton(\'critical\')',
+                            'content' => html_print_image(
+                                'images/change-active.svg',
+                                true,
+                                [
+                                    'id'    => 'button_sound_critical',
+                                    'style' => 'vertical-align: middle; margin-left: 10px',
+                                    'width' => '16',
+                                    'title' => __('Play sound'),
+                                    'class' => 'invert_filter',
+                                ]
+                            ),
+                        ],
+                        true
+                    ),
+                ],
+                true
+            ),
+        );
 
-        $table->data[$i][0] = __('Ping path');
-        $table->data[$i++][1] = html_print_input_text('ping_path', $this->pathPing, '', 40, 255, true);
+        $table->data[$i++][] = html_print_label_input_block(
+            __('Sound for Monitor warning'),
+            html_print_div(
+                [
+                    'class'   => '',
+                    'content' => html_print_select(
+                        $sounds,
+                        'sound_warning',
+                        $config['sound_warning'],
+                        'replaySound(\'warning\');',
+                        '',
+                        '',
+                        true
+                    ).html_print_anchor(
+                        [
+                            'href'    => 'javascript:toggleButton(\'warning\')',
+                            'content' => html_print_image(
+                                'images/change-active.svg',
+                                true,
+                                [
+                                    'id'    => 'button_sound_warning',
+                                    'style' => 'vertical-align: middle; margin-left: 10px',
+                                    'width' => '16',
+                                    'title' => __('Play sound'),
+                                    'class' => 'invert_filter',
+                                ]
+                            ),
+                        ],
+                        true
+                    ),
+                ],
+                true
+            ),
+        );
 
-        $table->data[$i][0] = __('Nmap path');
-        $table->data[$i++][1] = html_print_input_text('nmap_path', $this->pathNmap, '', 40, 255, true);
+        $table->data[$i][] = html_print_label_input_block(
+            __('Custom graphviz directory'),
+            html_print_input_text(
+                'graphviz_bin_dir',
+                $config['graphviz_bin_dir'],
+                '',
+                25,
+                255,
+                true
+            )
+        );
 
-        $table->data[$i][0] = __('Dig path');
-        $table->data[$i++][1] = html_print_input_text('dig_path', $this->pathDig, '', 40, 255, true);
+        $table->data[$i++][] = html_print_label_input_block(
+            __('Snmpget path'),
+            html_print_input_text('snmpget_path', $this->pathSnmpget, '', 40, 255, true)
+        );
 
-        $table->data[$i][0] = __('Snmpget path');
-        $table->data[$i++][1] = html_print_input_text('snmpget_path', $this->pathSnmpget, '', 40, 255, true);
+        $table->data[$i][] = html_print_label_input_block(
+            __('Traceroute path'),
+            html_print_input_text('traceroute_path', $this->pathTraceroute, '', 40, 255, true)
+        );
+        $table->data[$i++][] = html_print_label_input_block(
+            __('Ping path'),
+            html_print_input_text('ping_path', $this->pathPing, '', 40, 255, true)
+        );
+
+        $table->data[$i][] = html_print_label_input_block(
+            __('Nmap path'),
+            html_print_input_text('nmap_path', $this->pathNmap, '', 40, 255, true)
+        );
+        $table->data[$i++][] = html_print_label_input_block(
+            __('Dig path'),
+            html_print_input_text('dig_path', $this->pathDig, '', 40, 255, true)
+        );
 
         $table->data[$i][0] = html_print_div(
             [
                 'class'   => 'title_custom_commands bolder float-left',
-                'content' => __('Custom commands'),
+                'content' => '<label>'.__('Custom commands').'</label>',
             ],
             true
         );
@@ -336,13 +365,13 @@ class ExternalTools extends HTML
             [
                 'id'      => 'add_button_custom_command',
                 'content' => html_print_image(
-                    'images/add.png',
+                    'images/plus@svg.svg',
                     true,
                     [
                         'title'   => __('Add new custom command'),
                         'onclick' => 'manageCommandLines(event)',
                         'id'      => 'img_add_button_custom_command',
-                        'class'   => 'invert_filter',
+                        'class'   => 'main_menu_icon invert_filter',
 
                     ]
                 ),
@@ -350,8 +379,8 @@ class ExternalTools extends HTML
             true
         );
 
-        $table->data[$i][0] = __('Command');
-        $table->data[$i++][1] = __('Parameters').ui_print_help_tip(__('Adding `_address_` macro will use agent\'s IP when perform the execution'), true);
+        $table->data[$i][0] = '<div><label>'.__('Command').'</label></div>';
+        $table->data[$i++][1] = '<div style="flex-direction: row;justify-content: flex-start;"><label>'.__('Parameters').'</label>'.ui_print_help_tip(__('Adding `_address_` macro will use agent\'s IP when perform the execution'), true, '', false, 'margin-top: 2px').'</div>';
 
         $y = 1;
         $iRow = $i;
@@ -378,30 +407,27 @@ class ExternalTools extends HTML
             }
         }
 
-        $form = '<form id="form_setup" method="post" >';
+        $form = '<form class="max_floating_element_size" id="form_setup" method="POST" >';
         $form .= '<fieldset>';
         $form .= '<legend>'.__('Options').'</legend>';
         $form .= html_print_input_hidden('update_paths', 1, true);
         $form .= html_print_table($table, true);
         $form .= '</fieldset>';
-        $form .= html_print_div(
-            [
-                'id'      => '',
-                'class'   => 'action-buttons',
-                'style'   => 'width: 100%',
-                'content' => html_print_submit_button(
-                    __('Update'),
-                    'update_button',
-                    false,
-                    [ 'icon' => 'update' ],
-                    true
-                ),
-            ],
-            true
-        );
-
         $form .= '</form>';
 
+        html_print_action_buttons(
+            html_print_submit_button(
+                __('Update'),
+                'update_button',
+                false,
+                [
+                    'icon' => 'update',
+                    'form' => 'form_setup',
+                ],
+                true
+            )
+        );
+
         echo $form;
     }
 
@@ -436,15 +462,14 @@ class ExternalTools extends HTML
                 $output = html_print_div(
                     [
                         'id'      => 'delete_button_custom_'.$index,
-                        'class'   => '',
                         'content' => html_print_image(
-                            'images/delete.png',
+                            'images/delete.svg',
                             true,
                             [
                                 'title'   => __('Delete this custom command'),
                                 'onclick' => 'manageCommandLines(event)',
                                 'id'      => 'img_delete_button_custom_'.$index,
-                                'class'   => 'invert_filter',
+                                'class'   => 'main_menu_icon invert_filter',
                             ]
                         ),
                     ],
@@ -528,77 +553,103 @@ class ExternalTools extends HTML
 
         // Form table.
         $table = new StdClass();
-        $table->class = 'fixed_filter_bar';
+        $table->class = 'fixed_filter_bar filter-table-adv pdd_15px';
         $table->id = 'externalToolTable';
-        $table->cellstyle['captions'][0] = 'width: 0';
-        $table->cellstyle['captions'][1] = 'width: 0';
-        $table->cellstyle['captions'][2] = 'width: 0';
+        $table->size[0] = '25%';
+        $table->size[1] = '25%';
+        $table->size[2] = '25%';
+        $table->size[3] = '25%';
+        $table->colspan = [];
+        $table->colspan[1][0] = 4;
+        // $table->cellclass[0][2] = 'snmpcolumn';
+        // $table->cellclass[0][2] = 'snmpcolumn';
+        // $table->cellclass[0][3] = 'snmpcolumn';
+        // $table->cellclass[0][3] = 'snmpcolumn';
         $table->data = [];
 
-        $table->data['captions'][0] = __('Operation');
-
-        $table->data['inputs'][0] = html_print_select(
-            $commandList,
-            'operation',
-            $this->operation,
-            'mostrarColumns(this.value)',
-            __('Please select'),
-            0,
-            true
+        $table->data[0][0] = html_print_label_input_block(
+            __('Operation'),
+            html_print_select(
+                $commandList,
+                'operation',
+                $this->operation,
+                'mostrarColumns(this.value)',
+                __('Please select'),
+                0,
+                true,
+                false,
+                true,
+                'w100p',
+                false,
+                'width: 100%;'
+            )
         );
 
-        $table->data['captions'][1] = __('IP Adress');
-        $table->data['inputs'][1] = html_print_select(
-            $ipsSelect,
-            'select_ips',
-            $principal_ip,
-            '',
-            '',
-            0,
-            true
+        $table->data[0][1] = html_print_label_input_block(
+            __('IP Adress'),
+            html_print_select(
+                $ipsSelect,
+                'select_ips',
+                $principal_ip,
+                '',
+                '',
+                0,
+                true,
+                false,
+                true,
+                'w100p',
+                false,
+                'width: 100%;'
+            )
         );
 
-        $table->cellclass['captions'][2] = 'snmpcolumn';
-        $table->cellclass['inputs'][2] = 'snmpcolumn';
-        $table->data['captions'][2] = __('SNMP Version');
-        $table->data['inputs'][2] = html_print_select(
+        $table->data[0][2] = html_print_label_input_block(
+            __('SNMP Version'),
+            html_print_select(
+                [
+                    '1'  => 'v1',
+                    '2c' => 'v2c',
+                ],
+                'select_version',
+                $this->snmp_version,
+                '',
+                '',
+                0,
+                true,
+                false,
+                true,
+                'w100p',
+                false,
+                'width: 100%;'
+            ),
+            ['div_class' => 'snmpcolumn']
+        );
+
+        $table->data[0][3] = html_print_label_input_block(
+            __('SNMP Community'),
+            html_print_input_text(
+                'community',
+                $this->community,
+                '',
+                50,
+                255,
+                true,
+                false,
+                false,
+                '',
+                'w100p'
+            ),
+            ['div_class' => 'snmpcolumn']
+        );
+
+        $table->data[1][0] = html_print_submit_button(
+            __('Execute'),
+            'submit',
+            false,
             [
-                '1'  => 'v1',
-                '2c' => 'v2c',
-            ],
-            'select_version',
-            $this->snmp_version,
-            '',
-            '',
-            0,
-            true
-        );
-
-        $table->cellclass['captions'][3] = 'snmpcolumn';
-        $table->cellclass['inputs'][3] = 'snmpcolumn';
-        $table->data['captions'][3] = __('SNMP Community');
-        $table->data['inputs'][3] = html_print_input_text(
-            'community',
-            $this->community,
-            '',
-            50,
-            255,
-            true
-        );
-
-        $table->data['inputs'][4] = html_print_div(
-            [
-                'class'   => 'action-buttons',
-                'content' => html_print_submit_button(
-                    __('Execute'),
-                    'submit',
-                    false,
-                    [
-                        'icon' => 'cog',
-                        'mode' => 'mini',
-                    ],
-                    true
-                ),
+                'icon'  => 'cog',
+                'mode'  => 'mini',
+                'class' => 'float-right mrgn_right_10px',
             ],
             true
         );
@@ -716,7 +767,7 @@ class ExternalTools extends HTML
      */
     private function performExecution(string $command='', string $caption='')
     {
-        $output = '';
+        $output = '<div class="white_box max_floating_element_size no_border">';
 
         try {
             // If caption is not added, don't show anything.
@@ -736,7 +787,7 @@ class ExternalTools extends HTML
                 $output .= __('Command not response');
             }
 
-            $output .= '</pre>';
+            $output .= '</pre></div>';
 
             if ($resultCode !== 0) {
                 throw new Exception(
@@ -774,6 +825,8 @@ class ExternalTools extends HTML
     {
         $output = '';
 
+        echo '<div class="white_box max_floating_element_size no_border pdd_15px">';
+
         if (validate_address($ip) === false) {
             $output .= ui_print_error_message(
                 __('The ip or dns name entered cannot be resolved'),
@@ -938,6 +991,7 @@ class ExternalTools extends HTML
             }
         }
 
+        echo '</div>';
         return $output;
 
     }
diff --git a/pandora_console/include/class/ManageNetScanScripts.class.php b/pandora_console/include/class/ManageNetScanScripts.class.php
index a65f728ef1..adfedf3e26 100644
--- a/pandora_console/include/class/ManageNetScanScripts.class.php
+++ b/pandora_console/include/class/ManageNetScanScripts.class.php
@@ -453,7 +453,7 @@ class ManageNetScanScripts extends Wizard
                     'delete',
                     'images/delete.svg',
                     1,
-                    'width:40px;',
+                    '',
                     true,
                     [
                         'title' => __('Delete Script'),
diff --git a/pandora_console/include/class/ModuleTemplates.class.php b/pandora_console/include/class/ModuleTemplates.class.php
index 2e777bdf4c..bfb02c7ae8 100644
--- a/pandora_console/include/class/ModuleTemplates.class.php
+++ b/pandora_console/include/class/ModuleTemplates.class.php
@@ -868,7 +868,7 @@ class ModuleTemplates extends HTML
                 'delete_profile',
                 'images/delete.svg',
                 $row['id_np'],
-                'width:40px',
+                '',
                 true,
                 [
                     'onclick' => 'if (!confirm(\''.__('Are you sure?').'\')) return false;',
@@ -1156,7 +1156,7 @@ class ModuleTemplates extends HTML
                             'del_block_'.$id_group.'_',
                             'images/delete.svg',
                             1,
-                            'width: 40px',
+                            '',
                             true,
                             [
                                 'title'   => __('Delete this block'),
@@ -1253,7 +1253,7 @@ class ModuleTemplates extends HTML
                                 'del_module_'.$module['component_id'].'_',
                                 'images/delete.svg',
                                 1,
-                                'width:40px;',
+                                '',
                                 true,
                                 [
                                     'title'   => __('Delete this module'),
diff --git a/pandora_console/include/class/SatelliteAgent.class.php b/pandora_console/include/class/SatelliteAgent.class.php
index 18a4806bb5..07acb23c6c 100644
--- a/pandora_console/include/class/SatelliteAgent.class.php
+++ b/pandora_console/include/class/SatelliteAgent.class.php
@@ -393,7 +393,7 @@ class SatelliteAgent extends HTML
                                 true,
                                 [
                                     'border'  => '0',
-                                    'class'   => 'action_button_img mrgn_lft_05em invert_filter',
+                                    'class'   => 'main_menu_icon mrgn_lft_05em invert_filter',
                                     'onclick' => 'disable_agent(\''.$tmp->address.'\',\''.strip_tags($tmp->name).'\',\''.(int) $disable.'\',\''.$id_agente.'\')',
                                 ]
                             );
@@ -405,7 +405,7 @@ class SatelliteAgent extends HTML
                                 true,
                                 [
                                     'border'  => '0',
-                                    'class'   => 'action_button_img mrgn_lft_05em invert_filter',
+                                    'class'   => 'main_menu_icon mrgn_lft_05em invert_filter',
                                     'onclick' => 'delete_agent(\''.$tmp->address.'\',\''.strip_tags($tmp->name).'\',\''.(int) $delete.'\',\''.$id_agente.'\')',
                                 ]
                             );
diff --git a/pandora_console/include/class/SnmpConsole.class.php b/pandora_console/include/class/SnmpConsole.class.php
index ec7e3394dd..3f48eb2c22 100644
--- a/pandora_console/include/class/SnmpConsole.class.php
+++ b/pandora_console/include/class/SnmpConsole.class.php
@@ -181,113 +181,47 @@ class SnmpConsole extends HTML
 
         $default_refr = 300;
 
-        if (!isset($config['pure']) || $config['pure'] === false) {
-            $statistics['text'] = '<a href="index.php?sec=estado&sec2=operation/snmpconsole/snmp_statistics&pure='.$config['pure'].'">'.html_print_image(
-                'images/logs@svg.svg',
-                true,
-                [
-                    'title' => __('Statistics'),
-                    'class' => 'main_menu_icon invert_filter',
-                ]
-            ).'</a>';
-            $list['text'] = '<a href="index.php?sec=snmpconsole&sec2=operation/snmpconsole/snmp_view&pure=0">'.html_print_image(
-                'images/SNMP-network-numeric-data@svg.svg',
-                true,
-                [
-                    'title' => __('List'),
-                    'class' => 'main_menu_icon invert_filter',
-                ]
-            ).'</a>';
-            $list['active'] = true;
+        $statistics['text'] = '<a href="index.php?sec=estado&sec2=operation/snmpconsole/snmp_statistics&pure='.$config['pure'].'">'.html_print_image(
+            'images/logs@svg.svg',
+            true,
+            [
+                'title' => __('Statistics'),
+                'class' => 'main_menu_icon invert_filter',
+            ]
+        ).'</a>';
+        $list['text'] = '<a href="index.php?sec=snmpconsole&sec2=operation/snmpconsole/snmp_view&pure=0">'.html_print_image(
+            'images/SNMP-network-numeric-data@svg.svg',
+            true,
+            [
+                'title' => __('List'),
+                'class' => 'main_menu_icon invert_filter',
+            ]
+        ).'</a>';
+        $list['active'] = true;
 
-            $screen['text'] = '<a href="#" onClick="javascript:fullscreen(1)">'.html_print_image(
-                'images/fullscreen@svg.svg',
-                true,
+        // Header.
+        ui_print_standard_header(
+            __('SNMP Console'),
+            'images/op_snmp.png',
+            false,
+            'snmp_console',
+            false,
+            [
+                $screen,
+                $list,
+                $statistics,
+            ],
+            [
                 [
-                    'title' => __('View in full screen'),
-                    'class' => 'main_menu_icon invert_filter',
-                ]
-            ).'</a>';
-
-            // Header.
-            ui_print_standard_header(
-                __('SNMP Console'),
-                'images/op_snmp.png',
-                false,
-                'snmp_console',
-                false,
-                [
-                    $screen,
-                    $list,
-                    $statistics,
+                    'link'  => '',
+                    'label' => __('Monitoring'),
                 ],
                 [
-                    [
-                        'link'  => '',
-                        'label' => __('Monitoring'),
-                    ],
-                    [
-                        'link'  => '',
-                        'label' => __('SNMP'),
-                    ],
-                ]
-            );
-        } else {
-            echo '<div id="dashboard-controls">';
-
-            echo '<div id="menu_tab">';
-            echo '<ul class="mn">';
-            // Normal view button.
-            echo '<li class="nomn">';
-
-            echo '<a href="#" onClick="javascript:fullscreen(0)">';
-            echo html_print_image(
-                'images/exit_fullscreen@svg.svg',
-                true,
-                [
-                    'title' => __('Exit fullscreen'),
-                    'class' => 'main_menu_icon invert_filter',
-                ]
-            );
-            echo '</a>';
-            echo '</li>';
-
-            // Auto refresh control.
-            echo '<li class="nomn">';
-            echo '<div class="dashboard-refr mrgn_top_6px">';
-            echo '<div class="dashboard-countdown display_in"></div>';
-            $normal_url = 'index.php?sec=snmpconsole&sec2=operation/snmpconsole/snmp_view';
-
-            echo '<form id="refr-form" method="get" action="'.$normal_url.'"  >';
-            echo __('Refresh every').':';
-            echo html_print_select(get_refresh_time_array(), 'refresh', $this->refr, '', '', 0, true, false, false);
-            echo '</form>';
-            echo '</li>';
-
-            html_print_input_hidden('sec', 'snmpconsole');
-            html_print_input_hidden('sec2', 'operation/snmpconsole/snmp_view');
-            html_print_input_hidden('pure', 1);
-            html_print_input_hidden('refresh', (($this->refr > 0) ? $this->refr : $default_refr));
-
-            // Dashboard name.
-            echo '<li class="nomn">';
-            echo '<div class="dashboard-title">'.__('SNMP Traps').'</div>';
-            echo '</li>';
-
-            echo '</ul>';
-            echo '</div>';
-
-            echo '</div>';
-
-            ui_require_css_file('pandora_enterprise', ENTERPRISE_DIR.'/include/styles/');
-            ui_require_css_file('pandora_dashboard', ENTERPRISE_DIR.'/include/styles/');
-            ui_require_css_file('cluetip', 'include/styles/js/');
-
-            ui_require_jquery_file('countdown');
-            ui_require_javascript_file('pandora_dashboard', ENTERPRISE_DIR.'/include/javascript/');
-            ui_require_javascript_file('wz_jsgraphics');
-            ui_require_javascript_file('pandora_visual_console');
-        }
+                    'link'  => '',
+                    'label' => __('SNMP'),
+                ],
+            ]
+        );
 
         // Datatables list.
         try {
@@ -325,7 +259,10 @@ class SnmpConsole extends HTML
                     'class' => 'snmp-td',
                 ],
                 'alert',
-                'action',
+                [
+                    'text'  => 'action',
+                    'class' => 'table_action_buttons w120px',
+                ],
                 [
                     'text'  => 'm',
                     'class' => 'mw60px pdd_0px',
diff --git a/pandora_console/include/class/TipsWindow.class.php b/pandora_console/include/class/TipsWindow.class.php
index 6f159c8ec7..0dffdb7994 100644
--- a/pandora_console/include/class/TipsWindow.class.php
+++ b/pandora_console/include/class/TipsWindow.class.php
@@ -121,6 +121,10 @@ class TipsWindow
         }
 
         ui_require_css_file('tips_window');
+        if ($config['style'] === 'pandora_black' && is_metaconsole() === false) {
+            ui_require_css_file('pandora_black');
+        }
+
         ui_require_css_file('jquery.bxslider');
         ui_require_javascript_file('tipsWindow');
         ui_require_javascript_file('jquery.bxslider.min');
@@ -157,11 +161,12 @@ class TipsWindow
         View::render(
             'dashboard/tipsWindow',
             [
-                'title' => $initialTip['title'],
-                'text'  => $initialTip['text'],
-                'url'   => $initialTip['url'],
-                'files' => $initialTip['files'],
-                'id'    => $initialTip['id'],
+                'title'     => $initialTip['title'],
+                'text'      => $initialTip['text'],
+                'url'       => $initialTip['url'],
+                'files'     => $initialTip['files'],
+                'id'        => $initialTip['id'],
+                'totalTips' => $this->getTotalTipsShowUser(),
             ]
         );
     }
@@ -434,7 +439,14 @@ class TipsWindow
                 'title',
                 'text',
                 'enable',
-                'actions',
+                [
+                    'text'  => 'edit',
+                    'class' => 'table_action_buttons',
+                ],
+                [
+                    'text'  => 'delete',
+                    'class' => 'table_action_buttons',
+                ],
             ];
 
             $columnNames = [
@@ -442,7 +454,8 @@ class TipsWindow
                 __('Title'),
                 __('Text'),
                 __('Enable'),
-                __('Actions'),
+                __('Edit'),
+                __('Delete'),
             ];
 
             // Load datatables user interface.
@@ -450,7 +463,9 @@ class TipsWindow
                 [
                     'id'                  => 'list_tips_windows',
                     'class'               => 'info_table',
-                    'style'               => 'width: 100%',
+                    'style'               => 'width: 99%',
+                    'dom_elements'        => 'lpfti',
+                    'filter_main_class'   => 'box-flat white_table_graph fixed_filter_bar',
                     'columns'             => $columns,
                     'column_names'        => $columnNames,
                     'ajax_url'            => $this->ajaxController,
@@ -473,18 +488,19 @@ class TipsWindow
                     ],
                 ]
             );
-            echo '<div class="action-buttons w100p">';
-            echo '<a href="index.php?sec=gsetup&sec2=godmode/setup/setup&section=welcome_tips&view=create">';
-            html_print_submit_button(
+            echo '<div class="action-buttons w100p" style="width: 100%">';
+            $buttonCreate = html_print_button(
                 __('Create tip'),
                 'create',
                 false,
+                'window.location.replace("index.php?sec=gsetup&sec2=godmode/setup/setup&section=welcome_tips&view=create")',
                 [
                     'class' => 'sub',
-                    'icon'  => 'create_file',
-                ]
+                    'icon'  => 'plus',
+                ],
+                true
             );
-            echo '</a>';
+            html_print_action_buttons($buttonCreate);
             echo '</div>';
         } catch (Exception $e) {
             echo $e->getMessage();
@@ -584,16 +600,15 @@ class TipsWindow
                 $data[$key]['title'] = io_safe_output($row['title']);
                 $data[$key]['text'] = io_safe_output($row['text']);
                 $data[$key]['url'] = io_safe_output($row['url']);
-                $data[$key]['actions'] = '<div class="buttons_actions">';
-                $data[$key]['actions'] .= '<a href="index.php?sec=gsetup&sec2=godmode/setup/setup&section=welcome_tips&view=edit&idTip='.$row['id'].'">';
-                $data[$key]['actions'] .= html_print_image(
+                $data[$key]['edit'] = '<a href="index.php?sec=gsetup&sec2=godmode/setup/setup&section=welcome_tips&view=edit&idTip='.$row['id'].'">';
+                $data[$key]['edit'] .= html_print_image(
                     'images/edit.svg',
                     true,
                     ['class' => 'main_menu_icon']
                 );
-                $data[$key]['actions'] .= '</a>';
-                $data[$key]['actions'] .= '<form name="grupo" method="post" action="index.php?sec=gsetup&sec2=godmode/setup/setup&section=welcome_tips&action=delete">';
-                $data[$key]['actions'] .= html_print_input_image(
+                $data[$key]['edit'] .= '</a>';
+                $data[$key]['delete'] .= '<form name="grupo" method="post" class="rowPair table_action_buttons" action="index.php?sec=gsetup&sec2=godmode/setup/setup&section=welcome_tips&action=delete">';
+                $data[$key]['delete'] .= html_print_input_image(
                     'button_delete_tip',
                     'images/delete.svg',
                     '',
@@ -601,12 +616,11 @@ class TipsWindow
                     true,
                     [
                         'onclick' => 'if (!confirm(\''.__('Are you sure?').'\')) return false;',
-                        'class'   => 'main_menu_icon',
+                        'class'   => 'main_menu_icon invert_filter',
                     ]
                 );
-                $data[$key]['actions'] .= html_print_input_hidden('idTip', $row['id'], true);
-                $data[$key]['actions'] .= '</form>';
-                $data[$key]['actions'] .= '</div>';
+                $data[$key]['delete'] .= html_print_input_hidden('idTip', $row['id'], true);
+                $data[$key]['delete'] .= '</form>';
             }
 
             if (empty($data) === true) {
@@ -679,14 +693,50 @@ class TipsWindow
               </script>';
         $table = new stdClass();
         $table->width = '100%';
-        $table->class = 'databox filters';
+        $table->class = 'databox filter-table-adv';
 
-        $table->style[0] = 'font-weight: bold';
+        $table->style[0] = 'width: 50%';
 
         $table->data = [];
-        $table->data[0][0] = __('Images');
-        $table->data[0][1] .= html_print_div(['id' => 'inputs_images'], true);
-        $table->data[0][1] .= html_print_div(
+        $table->data[0][0] = html_print_label_input_block(
+            __('Language'),
+            html_print_select_from_sql(
+                'SELECT id_language, name FROM tlanguage',
+                'id_lang',
+                '',
+                '',
+                '',
+                '0',
+                true,
+                false,
+                true,
+                false,
+                'width: 100%;'
+            )
+        );
+        $table->data[0][1] = html_print_label_input_block(
+            __('Profile'),
+            html_print_select($profiles, 'id_profile', '0', '', __('All'), 0, true)
+        );
+        $table->data[1][0] = html_print_label_input_block(
+            __('Title'),
+            html_print_input_text('title', '', '', 35, 100, true)
+        );
+        $table->data[1][1] = html_print_label_input_block(
+            __('Url'),
+            html_print_input_text('url', '', '', 35, 100, true)
+        );
+        $table->data[2][0] = html_print_label_input_block(
+            __('Text'),
+            html_print_textarea('text', 5, 50, '', '', true),
+        );
+        $table->data[2][1] = html_print_label_input_block(
+            __('Enable'),
+            html_print_checkbox_switch('enable', true, true, true)
+        );
+
+        $inputImages = html_print_div(['id' => 'inputs_images'], true);
+        $inputImages .= html_print_div(
             [
                 'id'      => 'notices_images',
                 'class'   => 'invisible',
@@ -694,41 +744,36 @@ class TipsWindow
             ],
             true
         );
-        $table->data[0][1] .= html_print_button(__('Add image'), 'button_add_image', false, '', '', true);
-        $table->data[1][0] = __('Language');
-        $table->data[1][1] = html_print_select_from_sql(
-            'SELECT id_language, name FROM tlanguage',
-            'id_lang',
-            '',
-            '',
-            '',
-            '0',
+        $inputImages .= html_print_div(
+            [
+                'id'      => 'notices_images',
+                'class'   => 'invisible empty_input_images',
+                'content' => '<p>'.__('Please select a image').'</p>',
+            ],
             true
         );
-        $table->data[2][0] = __('Profile');
-        $table->data[2][1] = html_print_select($profiles, 'id_profile', '0', '', __('All'), 0, true);
-        $table->data[3][0] = __('Title');
-        $table->data[3][1] = html_print_input_text('title', '', '', 35, 100, true);
-        $table->data[4][0] = __('Text');
-        $table->data[4][1] = html_print_textarea('text', 5, 50, '', '', true);
-        $table->data[5][0] = __('Url');
-        $table->data[5][1] = html_print_input_text('url', '', '', 35, 100, true);
-        $table->data[6][0] = __('Enable');
-        $table->data[6][1] = html_print_checkbox_switch('enable', true, true, true);
+        $inputImages .= html_print_button(__('Add image'), 'button_add_image', false, '', ['class' => 'button-add-image'], true);
 
-        echo '<form name="grupo" method="post" action="index.php?sec=gsetup&sec2=godmode/setup/setup&section=welcome_tips&view=create&action=create" enctype="multipart/form-data">';
+        $table->data[3][0] = html_print_label_input_block(
+            __('Images'),
+            $inputImages
+        );
+
+        echo '<form method="post" class="max_floating_element_size" action="index.php?sec=gsetup&sec2=godmode/setup/setup&section=welcome_tips&view=create&action=create" enctype="multipart/form-data">';
         html_print_table($table);
         echo '<div class="action-buttons" style="width: '.$table->width.'">';
-        html_print_submit_button(
+
+        $actionButtons = html_print_submit_button(
             __('Send'),
             'submit_button',
             false,
             [
                 'class' => 'sub',
                 'icon'  => 'update',
-            ]
+            ],
+            true
         );
-        html_print_submit_button(
+        $actionButtons .= html_print_submit_button(
             __('Preview'),
             'preview_button',
             false,
@@ -736,8 +781,11 @@ class TipsWindow
                 'class' => 'sub preview',
                 'id'    => 'prev_button',
                 'icon'  => 'preview',
-            ]
+            ],
+            true
         );
+
+        html_print_action_buttons($actionButtons);
         echo '</div>';
         echo '</form>';
         html_print_div(['id' => 'tips_window_modal_preview']);
@@ -789,7 +837,7 @@ class TipsWindow
                     true,
                     [
                         'onclick' => 'deleteImage(this, \''.$value['id'].'\', \''.$namePath.'\')',
-                        'class'   => 'remove-image',
+                        'class'   => 'remove-image main_menu_icon',
                     ]
                 );
                 $outputImagesTip .= html_print_div(
@@ -811,16 +859,52 @@ class TipsWindow
               </script>';
         $table = new stdClass();
         $table->width = '100%';
-        $table->class = 'databox filters';
+        $table->class = 'databox filter-table-adv';
 
-        $table->style[0] = 'font-weight: bold';
+        $table->style[0] = 'width: 50%';
 
         $table->data = [];
-        $table->data[0][0] = __('Images');
-        $table->data[0][1] .= $outputImagesTip;
-        $table->data[0][1] .= html_print_div(['id' => 'inputs_images'], true);
-        $table->data[0][1] .= html_print_input_hidden('images_to_delete', '{}', true);
-        $table->data[0][1] .= html_print_div(
+
+        $table->data[0][0] = html_print_label_input_block(
+            __('Language'),
+            html_print_select_from_sql(
+                'SELECT id_language, name FROM tlanguage',
+                'id_lang',
+                $tip['id_lang'],
+                '',
+                '',
+                '0',
+                true,
+                false,
+                true,
+                false,
+                'width: 100%;'
+            )
+        );
+        $table->data[0][1] = html_print_label_input_block(
+            __('Profile'),
+            html_print_select($profiles, 'id_profile', $tip['id_profile'], '', __('All'), 0, true)
+        );
+        $table->data[1][0] = html_print_label_input_block(
+            __('Title'),
+            html_print_input_text('title', $tip['title'], '', 35, 100, true)
+        );
+        $table->data[1][1] = html_print_label_input_block(
+            __('Url'),
+            html_print_input_text('url', $tip['url'], '', 35, 100, true)
+        );
+        $table->data[2][0] = html_print_label_input_block(
+            __('Text'),
+            html_print_textarea('text', 5, 50, $tip['text'], '', true),
+        );
+        $table->data[2][1] = html_print_label_input_block(
+            __('Enable'),
+            html_print_checkbox_switch('enable', 1, ($tip['enable'] === '1') ? true : false, true)
+        );
+        $inputImages = $outputImagesTip;
+        $inputImages .= html_print_div(['id' => 'inputs_images'], true);
+        $inputImages .= html_print_input_hidden('images_to_delete', '{}', true);
+        $inputImages .= html_print_div(
             [
                 'id'      => 'notices_images',
                 'class'   => 'invisible',
@@ -828,41 +912,35 @@ class TipsWindow
             ],
             true
         );
-        $table->data[0][1] .= html_print_button(__('Add image'), 'button_add_image', false, '', '', true);
-        $table->data[1][0] = __('Language');
-        $table->data[1][1] = html_print_select_from_sql(
-            'SELECT id_language, name FROM tlanguage',
-            'id_lang',
-            $tip['id_lang'],
-            '',
-            '',
-            '0',
+        $inputImages .= html_print_div(
+            [
+                'id'      => 'notices_images',
+                'class'   => 'invisible empty_input_images',
+                'content' => '<p>'.__('Please select a image').'</p>',
+            ],
             true
         );
-        $table->data[2][0] = __('Profile');
-        $table->data[2][1] = html_print_select($profiles, 'id_profile', $tip['id_profile'], '', __('All'), 0, true);
-        $table->data[3][0] = __('Title');
-        $table->data[3][1] = html_print_input_text('title', $tip['title'], '', 35, 100, true);
-        $table->data[4][0] = __('Text');
-        $table->data[4][1] = html_print_textarea('text', 5, 50, $tip['text'], '', true);
-        $table->data[5][0] = __('Url');
-        $table->data[5][1] = html_print_input_text('url', $tip['url'], '', 35, 100, true);
-        $table->data[6][0] = __('Enable');
-        $table->data[6][1] = html_print_checkbox_switch('enable', 1, ($tip['enable'] === '1') ? true : false, true);
+        $inputImages .= html_print_button(__('Add image'), 'button_add_image', false, '', ['class' => 'button-add-image'], true);
 
-        echo '<form name="grupo" method="post" action="index.php?sec=gsetup&sec2=godmode/setup/setup&section=welcome_tips&view=edit&action=edit&idTip='.$tip['id'].'" enctype="multipart/form-data">';
+        $table->data[3][0] = html_print_label_input_block(
+            __('Images'),
+            $inputImages
+        );
+
+        echo '<form class="max_floating_element_size" name="grupo" method="post" action="index.php?sec=gsetup&sec2=godmode/setup/setup&section=welcome_tips&view=edit&action=edit&idTip='.$tip['id'].'" enctype="multipart/form-data">';
         html_print_table($table);
         echo '<div class="action-buttons" style="width: '.$table->width.'">';
-        html_print_submit_button(
+        $actionButtons = html_print_submit_button(
             __('Send'),
             'submit_button',
             false,
             [
                 'class' => 'sub',
                 'icon'  => 'update',
-            ]
+            ],
+            true
         );
-        html_print_submit_button(
+        $actionButtons .= html_print_submit_button(
             __('Preview'),
             'preview_button',
             false,
@@ -870,9 +948,12 @@ class TipsWindow
                 'class' => 'sub preview',
                 'id'    => 'prev_button',
                 'icon'  => 'preview',
-            ]
+            ],
+            true
         );
 
+        html_print_action_buttons($actionButtons);
+
         echo '</div>';
         echo '</form>';
         html_print_div(['id' => 'tips_window_modal_preview']);
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 9fa5ae55f2..4375ffa121 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 = 'PC230313';
+$build_version = 'PC230323';
 $pandora_version = 'v7.0NG.769';
 
 // Do not overwrite default timezone set if defined.
@@ -153,6 +153,19 @@ if (! defined('ENTERPRISE_DIR')) {
 }
 
 db_select_engine();
+
+if (empty($config['remote_config']) === false
+    && file_exists($config['remote_config'].'/conf/'.PANDORA_HA_FILE)
+    && filesize($config['remote_config'].'/conf/'.PANDORA_HA_FILE) > 0
+) {
+    $data = file_get_contents($config['remote_config'].'/conf/'.PANDORA_HA_FILE);
+    if (empty($data) === false) {
+        $ip_list = explode(',', $data);
+        // Connects to the first pandora_ha_dbs.conf database.
+        $config['dbhost'] = trim($ip_list[0]);
+    }
+}
+
 $config['dbconnection'] = db_connect();
 
 require_once $ownDir.'functions_config.php';
diff --git a/pandora_console/include/constants.php b/pandora_console/include/constants.php
index dc9fcd0b4d..6b86c50c6d 100644
--- a/pandora_console/include/constants.php
+++ b/pandora_console/include/constants.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Constants definitions.
  *
@@ -703,6 +704,11 @@ define('HA_ACTION_ENABLE', 6);
 define('HA_ACTION_CLEANUP', 7);
 define('HA_ACTION_RESYNC', 8);
 
+define('HA_RESYNC', 1);
+define('HA_DISABLE', 5);
+define('HA_ENABLE', 6);
+
+
 define('HA_UNINITIALIZED', 0);
 define('HA_ONLINE', 1);
 define('HA_PENDING', 2);
@@ -864,6 +870,8 @@ define(
 
 // Pandora FMS Enterprise license.
 define('LICENSE_FILE', 'customer_key');
+// Pandora HA database list.
+define('PANDORA_HA_FILE', 'pandora_ha_hosts.conf');
 
 // Home screen values for user definition.
 define('HOME_SCREEN_DEFAULT', 'default');
diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index 115bac66d6..3de5a2c36c 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -3548,6 +3548,18 @@ function update_config_token($cfgtoken, $cfgvalue)
 }
 
 
+function delete_config_token($cfgtoken)
+{
+    $delete = db_process_sql(sprintf('DELETE FROM tconfig WHERE token = "%s"', $cfgtoken));
+
+    if ($delete) {
+        return true;
+    } else {
+        return false;
+    }
+}
+
+
 function get_number_of_mr($package, $ent, $offline)
 {
     global $config;
@@ -4275,6 +4287,7 @@ function generator_chart_to_pdf(
         ];
     }
 
+    unset($data['data']['graph_data']);
     // If not install chromium avoid 500 convert tu images no data to show.
     $chromium_dir = io_safe_output($config['chromium_path']);
     $result_ejecution = exec($chromium_dir.' --version');
diff --git a/pandora_console/include/functions_agents.php b/pandora_console/include/functions_agents.php
index 0bca01f557..f8bb2fc024 100644
--- a/pandora_console/include/functions_agents.php
+++ b/pandora_console/include/functions_agents.php
@@ -2769,6 +2769,16 @@ function agents_delete_agent($id_agents, $disableACL=false)
         enterprise_include_once('include/functions_agents.php');
         enterprise_hook('agent_delete_from_cache', [$id_agent]);
 
+        // Delete agent from fav menu.
+        db_process_sql_delete(
+            'tfavmenu_user',
+            [
+                'id_element' => $id_agent,
+                'section'    => 'Agents',
+                'id_user'    => $config['id_user'],
+            ]
+        );
+
         // Break the loop on error.
         if ((bool) $error === true) {
             break;
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index 24d2de537d..571a572b22 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -456,6 +456,10 @@ function config_update_config()
                             $error_update[] = __('Enable Update Manager');
                         }
 
+                        if (config_update_value('legacy_database_ha', get_parameter('legacy_database_ha'), true) === false) {
+                            $error_update[] = __('Legacy database HA');
+                        }
+
                         if (config_update_value('ipam_ocuppied_critical_treshold', get_parameter('ipam_ocuppied_critical_treshold'), true) === false) {
                             $error_update[] = __('Ipam Ocuppied Manager Critical');
                         }
@@ -2237,6 +2241,10 @@ function config_process_config()
         config_update_value('enable_update_manager', 1);
     }
 
+    if (!isset($config['legacy_database_ha'])) {
+        config_update_value('legacy_database_ha', 0);
+    }
+
     if (!isset($config['disabled_newsletter'])) {
         config_update_value('disabled_newsletter', 0);
     }
@@ -2561,7 +2569,7 @@ function config_process_config()
     }
 
     if (!isset($config['custom_splash_login'])) {
-        config_update_value('custom_splash_login', 'default');
+        config_update_value('custom_splash_login', 'none.png');
     }
 
     if (!isset($config['custom_docs_logo'])) {
@@ -2597,11 +2605,11 @@ function config_process_config()
     }
 
     if (!isset($config['custom_title1_login'])) {
-        config_update_value('custom_title1_login', __('PANDORA FMS'));
+        config_update_value('custom_title1_login', __('ONE TOOL TO RULE THEM ALL'));
     }
 
     if (!isset($config['custom_title2_login'])) {
-        config_update_value('custom_title2_login', __('ONE TOOL TO MONITOR THEM ALL'));
+        config_update_value('custom_title2_login', '');
     }
 
     if (!isset($config['custom_docs_url'])) {
@@ -2649,11 +2657,11 @@ function config_process_config()
     }
 
     if (!isset($config['meta_custom_title1_login'])) {
-        config_update_value('meta_custom_title1_login', __('PANDORA FMS NEXT GENERATION'));
+        config_update_value('meta_custom_title1_login', __('ONE TOOL TO RULE THEM ALL'));
     }
 
     if (!isset($config['meta_custom_title2_login'])) {
-        config_update_value('meta_custom_title2_login', __('METACONSOLE'));
+        config_update_value('meta_custom_title2_login', __('COMMAND CENTER'));
     }
 
     if (!isset($config['vc_favourite_view'])) {
@@ -3218,7 +3226,7 @@ function config_process_config()
             // Try to update user table in order to refresh skin inmediatly.
             $is_user_updating = get_parameter('sec2', '');
 
-            if ($is_user_updating == 'operation/users/user_edit') {
+            if ($is_user_updating === 'godmode/users/configure_user') {
                 $id = get_parameter_get('id', $config['id_user']);
                 // ID given as parameter.
                 $user_info = get_user_info($id);
@@ -3482,7 +3490,7 @@ function config_process_config()
     }
 
     if (!isset($config['random_background'])) {
-        config_update_value('random_background', '');
+        config_update_value('random_background', 1);
     }
 
     if (!isset($config['meta_random_background'])) {
@@ -3746,7 +3754,7 @@ function config_user_set_custom_config()
         }
     }
 
-    if (defined('METACONSOLE')) {
+    if (is_metaconsole() === true) {
         $config['metaconsole_access'] = $userinfo['metaconsole_access'];
     }
 }
diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index 1c6740efff..304da5c7e6 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -2623,7 +2623,7 @@ function events_print_event_table(
                 $img,
                 true,
                 [
-                    'class' => 'image_status',
+                    'class' => 'image_status invert_filter main_menu_icon',
                     'title' => $title,
                 ]
             );
@@ -2668,7 +2668,7 @@ function events_print_type_img(
 
     switch ($type) {
         case 'alert_recovered':
-            $icon = 'images/alert@svg.svg';
+            $style .= ' alert_module_background_state icon_background_normal ';
         break;
 
         case 'alert_manual_validation':
@@ -2752,6 +2752,146 @@ function events_print_type_img(
 }
 
 
+/**
+ * Prints the event type image.
+ *
+ * @param string  $type   Event type from SQL.
+ * @param boolean $return Whether to return or print.
+ *
+ * @return string HTML with img.
+ */
+function events_print_type_img_pdf(
+    $type,
+    $return=false
+) {
+    $svg = '';
+
+    switch ($type) {
+        case 'alert_recovered':
+            $svg = '<svg  viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+                <title>Dark / 20 / alert@svg</title>
+                <desc>Created with Sketch.</desc>
+                <g id="Dark-/-20-/-alert" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+                    <path d="M10,20 C11.4190985,20 12.5702076,18.8808594 12.5702076,17.5 L7.42979244,17.5 C7.42979244,18.8808594 8.5809015,20 10,20 Z M18.6540098,14.1519531 C17.8777645,13.3410156 16.425318,12.1210937 16.425318,8.125 C16.425318,5.08984375 14.2364028,2.66015625 11.2849029,2.0640625 L11.2849029,1.25 C11.2849029,0.559765625 10.7095493,0 10,0 C9.29045075,0 8.71509711,0.559765625 8.71509711,1.25 L8.71509711,2.0640625 C5.76359722,2.66015625 3.57468198,5.08984375 3.57468198,8.125 C3.57468198,12.1210938 2.12223547,13.3410156 1.3459902,14.1519531 C1.10492023,14.4039062 0.998045886,14.7050781 1.00002702,15 C1.00447442,15.640625 1.52156948,16.25 2.28977909,16.25 L17.7102209,16.25 C18.4784305,16.25 18.9959274,15.640625 18.999973,15 C19.0019541,14.7050781 18.8950798,14.4035156 18.6540098,14.1519531 L18.6540098,14.1519531 Z" id="Shape" fill="#82b92e"></path>
+                </g>
+            </svg>';
+        break;
+
+        case 'alert_manual_validation':
+            $svg = '<svg  viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+                <title>Dark / 20 / validate@svg</title>
+                <desc>Created with Sketch.</desc>
+                <g id="Dark-/-20-/-validate" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
+                    <g id="Group" transform="translate(1.000000, 1.000000)" stroke="#3F3F3F" stroke-width="2">
+                        <circle id="Oval" cx="9" cy="9" r="9"></circle>
+                        <polyline id="Path-10" points="4.93746567 8.98550486 7 12 12.9374657 7.03800583"></polyline>
+                    </g>
+                </g>
+            </svg>';
+        break;
+
+        case 'going_down_critical':
+        case 'going_up_critical':
+            $svg = '<svg  viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+                <title>Dark / 20 / modules@svg</title>
+                <desc>Created with Sketch.</desc>
+                <g id="Dark-/-20-/-modules" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+                    <path d="M18.7929688,3.18164062 L10.8789062,0.162109375 C10.59375,0.0540234375 10.296875,0 10,0 C9.703125,0 9.40625,0.0540234375 9.12109375,0.161914062 L1.20664062,3.18164062 C0.480078125,3.45898438 0,4.15625 0,4.93359375 L0,15.0664062 C0,15.8441406 0.480078125,16.5410156 1.20664062,16.8183594 L9.12070313,19.8378906 C9.40625,19.9453125 9.703125,20 10,20 C10.296875,20 10.5949219,19.9459766 10.8777344,19.8380859 L18.7917969,16.8185547 C19.5195312,16.5429688 20,15.84375 20,15.0664062 L20,4.93359375 C20,4.15625 19.5195312,3.45898438 18.7929688,3.18164062 Z M10,2.50273437 L16.4921875,4.9796875 L10,7.4140625 L3.50664062,4.98046875 L10,2.50273437 Z M11.25,17.0273438 L11.25,9.6171875 L17.5,7.2734375 L17.5,14.6367188 L11.25,17.0273438 Z" id="Shape" fill="#e63c52"></path>
+                </g>
+            </svg>';
+        break;
+
+        case 'going_up_normal':
+        case 'going_down_normal':
+            $svg = '<svg  viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+                <title>Dark / 20 / modules@svg</title>
+                <desc>Created with Sketch.</desc>
+                <g id="Dark-/-20-/-modules" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+                    <path d="M18.7929688,3.18164062 L10.8789062,0.162109375 C10.59375,0.0540234375 10.296875,0 10,0 C9.703125,0 9.40625,0.0540234375 9.12109375,0.161914062 L1.20664062,3.18164062 C0.480078125,3.45898438 0,4.15625 0,4.93359375 L0,15.0664062 C0,15.8441406 0.480078125,16.5410156 1.20664062,16.8183594 L9.12070313,19.8378906 C9.40625,19.9453125 9.703125,20 10,20 C10.296875,20 10.5949219,19.9459766 10.8777344,19.8380859 L18.7917969,16.8185547 C19.5195312,16.5429688 20,15.84375 20,15.0664062 L20,4.93359375 C20,4.15625 19.5195312,3.45898438 18.7929688,3.18164062 Z M10,2.50273437 L16.4921875,4.9796875 L10,7.4140625 L3.50664062,4.98046875 L10,2.50273437 Z M11.25,17.0273438 L11.25,9.6171875 L17.5,7.2734375 L17.5,14.6367188 L11.25,17.0273438 Z" id="Shape" fill="#82b92e"></path>
+                </g>
+            </svg>';
+        break;
+
+        case 'going_up_warning':
+        case 'going_down_warning':
+            $svg = '<svg  viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+                <title>Dark / 20 / modules@svg</title>
+                <desc>Created with Sketch.</desc>
+                <g id="Dark-/-20-/-modules" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+                    <path d="M18.7929688,3.18164062 L10.8789062,0.162109375 C10.59375,0.0540234375 10.296875,0 10,0 C9.703125,0 9.40625,0.0540234375 9.12109375,0.161914062 L1.20664062,3.18164062 C0.480078125,3.45898438 0,4.15625 0,4.93359375 L0,15.0664062 C0,15.8441406 0.480078125,16.5410156 1.20664062,16.8183594 L9.12070313,19.8378906 C9.40625,19.9453125 9.703125,20 10,20 C10.296875,20 10.5949219,19.9459766 10.8777344,19.8380859 L18.7917969,16.8185547 C19.5195312,16.5429688 20,15.84375 20,15.0664062 L20,4.93359375 C20,4.15625 19.5195312,3.45898438 18.7929688,3.18164062 Z M10,2.50273437 L16.4921875,4.9796875 L10,7.4140625 L3.50664062,4.98046875 L10,2.50273437 Z M11.25,17.0273438 L11.25,9.6171875 L17.5,7.2734375 L17.5,14.6367188 L11.25,17.0273438 Z" id="Shape" fill="#fcab10"></path>
+                </g>
+            </svg>';
+        break;
+
+        case 'going_unknown':
+            $svg = '<svg  viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+                <title>Dark / 20 / modules@svg</title>
+                <desc>Created with Sketch.</desc>
+                <g id="Dark-/-20-/-modules" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+                    <path d="M18.7929688,3.18164062 L10.8789062,0.162109375 C10.59375,0.0540234375 10.296875,0 10,0 C9.703125,0 9.40625,0.0540234375 9.12109375,0.161914062 L1.20664062,3.18164062 C0.480078125,3.45898438 0,4.15625 0,4.93359375 L0,15.0664062 C0,15.8441406 0.480078125,16.5410156 1.20664062,16.8183594 L9.12070313,19.8378906 C9.40625,19.9453125 9.703125,20 10,20 C10.296875,20 10.5949219,19.9459766 10.8777344,19.8380859 L18.7917969,16.8185547 C19.5195312,16.5429688 20,15.84375 20,15.0664062 L20,4.93359375 C20,4.15625 19.5195312,3.45898438 18.7929688,3.18164062 Z M10,2.50273437 L16.4921875,4.9796875 L10,7.4140625 L3.50664062,4.98046875 L10,2.50273437 Z M11.25,17.0273438 L11.25,9.6171875 L17.5,7.2734375 L17.5,14.6367188 L11.25,17.0273438 Z" id="Shape" fill="#808080"></path>
+                </g>
+            </svg>';
+        break;
+
+        case 'system':
+            $svg = '<svg  viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+                <title>Dark / 20 / configuration@svg</title>
+                <desc>Created with Sketch.</desc>
+                <g id="Dark-/-20-/-configuration" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+                    <path d="M18.7953273,7.94064046 L18.0028475,7.94064046 C17.3563508,7.94064046 16.8141278,7.38349388 16.8141278,6.72220776 C16.8141278,6.38896121 16.9548972,6.08695652 17.205154,5.8630565 L17.7160949,5.36318667 C18.2218222,4.86331684 18.2218222,4.0458214 17.7160949,3.54595158 L16.5534436,2.39520958 C16.3240416,2.16610258 15.9851522,2.03072117 15.6410491,2.03072117 C15.296946,2.03072117 14.9632703,2.16610258 14.7286546,2.39520958 L14.2385684,2.88466545 C14.0039526,3.14501432 13.6911316,3.28560271 13.3522422,3.28560271 C12.6848908,3.28560271 12.1270267,2.74407706 12.1270267,2.10361885 L12.1270267,1.30695131 C12.1270267,0.604009373 11.5587353,0 10.8496744,0 L9.26471474,0 C8.55565385,0 7.99257608,0.598802395 7.99257608,1.30695131 L7.99257608,2.09841187 C7.99257608,2.73887009 7.434712,3.28039573 6.76736057,3.28039573 C6.43368486,3.28039573 6.12607756,3.13980734 5.90188919,2.89507941 L5.39616194,2.39520958 C5.16675988,2.1608956 4.82787048,2.03072117 4.48376741,2.03072117 C4.13966433,2.03072117 3.80598861,2.16610258 3.57137287,2.39520958 L2.39829419,3.5407446 C1.89778062,4.04061442 1.89778062,4.85810987 2.39829419,5.35277272 L2.8883804,5.84222859 C3.14906455,6.07654257 3.29504767,6.38896121 3.29504767,6.72220776 C3.29504767,7.38870086 2.75282464,7.94064046 2.10632794,7.94064046 L1.31384812,7.94064046 C0.599573548,7.94064046 0,8.49778703 0,9.20593595 L0,9.99739651 L0,10.7888571 C0,11.491799 0.599573548,12.0541526 1.31384812,12.0541526 L2.10632794,12.0541526 C2.75282464,12.0541526 3.29504767,12.6112991 3.29504767,13.2725853 C3.29504767,13.6058318 3.14906455,13.9182505 2.8883804,14.1525644 L2.39829419,14.6368133 C1.89778062,15.1366832 1.89778062,15.9541786 2.39829419,16.4488414 L3.56094551,17.6047904 C3.79034756,17.8391044 4.12923696,17.9692788 4.47334004,17.9692788 C4.81744312,17.9692788 5.15111883,17.8338974 5.38573457,17.6047904 L5.89146182,17.1049206 C6.11043651,16.8601927 6.42325749,16.7196043 6.75693321,16.7196043 C7.42428463,16.7196043 7.98214872,17.2611299 7.98214872,17.9015881 L7.98214872,18.6930487 C7.98214872,19.3959906 8.54522648,20 9.25950106,20 L10.8444607,20 C11.5535216,20 12.1165994,19.4011976 12.1165994,18.6930487 L12.1165994,17.9015881 C12.1165994,17.2611299 12.6744634,16.7196043 13.3418149,16.7196043 C13.6754906,16.7196043 13.9883116,16.8653996 14.228141,17.1205415 L14.7182272,17.6099974 C14.9528429,17.8391044 15.2865186,17.9744858 15.6306217,17.9744858 C15.9747248,17.9744858 16.3084005,17.8391044 16.5430163,17.6099974 L17.7056676,16.4540484 C18.2061811,15.9541786 18.2061811,15.1366832 17.7056676,14.6368133 L17.1947266,14.1369435 C16.9444698,13.9130435 16.8037004,13.6058318 16.8037004,13.2777922 C16.8037004,12.6112991 17.3459234,12.0593595 17.9924201,12.0593595 L18.7849,12.0593595 C19.4939608,12.0593595 19.9998464,11.502213 19.9998464,10.794064 L19.9998464,9.99739651 L19.9998464,9.20593595 C20.0101155,8.49778703 19.5043882,7.94064046 18.7953273,7.94064046 Z M14.2229273,9.99739651 L14.2229273,9.99739651 C14.2229273,12.2936735 12.3616425,14.1629784 10.0519809,14.1629784 C7.7423193,14.1629784 5.88103446,12.2936735 5.88103446,9.99739651 L5.88103446,9.99739651 L5.88103446,9.99739651 C5.88103446,7.7011195 7.7423193,5.83181463 10.0519809,5.83181463 C12.3616425,5.83181463 14.2229273,7.7011195 14.2229273,9.99739651 L14.2229273,9.99739651 Z" id="Path-2" fill="#3F3F3F"></path>
+                </g>
+            </svg>';
+        break;
+
+        case 'new_agent':
+            $svg = '<svg viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+                <title>Dark / 20 / agents@svg</title>
+                <desc>Created with Sketch.</desc>
+                <g id="Dark-/-20-/-agents" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+                    <g id="Group" transform="translate(0.000000, 1.000000)">
+                        <rect id="Rectangle" fill="#3F3F3F" x="0" y="6" width="10" height="6" rx="1"></rect>
+                        <polyline id="Path-43" stroke="#3F3F3F" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" points="3 4 6.9967103 -2.30926389e-14 15 -2.30926389e-14 19 4 19 14 15 18 6.9967103 18 3 14.0223656"></polyline>
+                    </g>
+                </g>
+            </svg>';
+        break;
+
+        case 'configuration_change':
+            $svg = '<svg  viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+                <!-- Generator: Sketch 61.2 (89653) - https://sketch.com -->
+                <title>Dark / 20 / configuration@svg</title>
+                <desc>Created with Sketch.</desc>
+                <g id="Dark-/-20-/-configuration" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+                    <path d="M18.7953273,7.94064046 L18.0028475,7.94064046 C17.3563508,7.94064046 16.8141278,7.38349388 16.8141278,6.72220776 C16.8141278,6.38896121 16.9548972,6.08695652 17.205154,5.8630565 L17.7160949,5.36318667 C18.2218222,4.86331684 18.2218222,4.0458214 17.7160949,3.54595158 L16.5534436,2.39520958 C16.3240416,2.16610258 15.9851522,2.03072117 15.6410491,2.03072117 C15.296946,2.03072117 14.9632703,2.16610258 14.7286546,2.39520958 L14.2385684,2.88466545 C14.0039526,3.14501432 13.6911316,3.28560271 13.3522422,3.28560271 C12.6848908,3.28560271 12.1270267,2.74407706 12.1270267,2.10361885 L12.1270267,1.30695131 C12.1270267,0.604009373 11.5587353,0 10.8496744,0 L9.26471474,0 C8.55565385,0 7.99257608,0.598802395 7.99257608,1.30695131 L7.99257608,2.09841187 C7.99257608,2.73887009 7.434712,3.28039573 6.76736057,3.28039573 C6.43368486,3.28039573 6.12607756,3.13980734 5.90188919,2.89507941 L5.39616194,2.39520958 C5.16675988,2.1608956 4.82787048,2.03072117 4.48376741,2.03072117 C4.13966433,2.03072117 3.80598861,2.16610258 3.57137287,2.39520958 L2.39829419,3.5407446 C1.89778062,4.04061442 1.89778062,4.85810987 2.39829419,5.35277272 L2.8883804,5.84222859 C3.14906455,6.07654257 3.29504767,6.38896121 3.29504767,6.72220776 C3.29504767,7.38870086 2.75282464,7.94064046 2.10632794,7.94064046 L1.31384812,7.94064046 C0.599573548,7.94064046 0,8.49778703 0,9.20593595 L0,9.99739651 L0,10.7888571 C0,11.491799 0.599573548,12.0541526 1.31384812,12.0541526 L2.10632794,12.0541526 C2.75282464,12.0541526 3.29504767,12.6112991 3.29504767,13.2725853 C3.29504767,13.6058318 3.14906455,13.9182505 2.8883804,14.1525644 L2.39829419,14.6368133 C1.89778062,15.1366832 1.89778062,15.9541786 2.39829419,16.4488414 L3.56094551,17.6047904 C3.79034756,17.8391044 4.12923696,17.9692788 4.47334004,17.9692788 C4.81744312,17.9692788 5.15111883,17.8338974 5.38573457,17.6047904 L5.89146182,17.1049206 C6.11043651,16.8601927 6.42325749,16.7196043 6.75693321,16.7196043 C7.42428463,16.7196043 7.98214872,17.2611299 7.98214872,17.9015881 L7.98214872,18.6930487 C7.98214872,19.3959906 8.54522648,20 9.25950106,20 L10.8444607,20 C11.5535216,20 12.1165994,19.4011976 12.1165994,18.6930487 L12.1165994,17.9015881 C12.1165994,17.2611299 12.6744634,16.7196043 13.3418149,16.7196043 C13.6754906,16.7196043 13.9883116,16.8653996 14.228141,17.1205415 L14.7182272,17.6099974 C14.9528429,17.8391044 15.2865186,17.9744858 15.6306217,17.9744858 C15.9747248,17.9744858 16.3084005,17.8391044 16.5430163,17.6099974 L17.7056676,16.4540484 C18.2061811,15.9541786 18.2061811,15.1366832 17.7056676,14.6368133 L17.1947266,14.1369435 C16.9444698,13.9130435 16.8037004,13.6058318 16.8037004,13.2777922 C16.8037004,12.6112991 17.3459234,12.0593595 17.9924201,12.0593595 L18.7849,12.0593595 C19.4939608,12.0593595 19.9998464,11.502213 19.9998464,10.794064 L19.9998464,9.99739651 L19.9998464,9.20593595 C20.0101155,8.49778703 19.5043882,7.94064046 18.7953273,7.94064046 Z M14.2229273,9.99739651 L14.2229273,9.99739651 C14.2229273,12.2936735 12.3616425,14.1629784 10.0519809,14.1629784 C7.7423193,14.1629784 5.88103446,12.2936735 5.88103446,9.99739651 L5.88103446,9.99739651 L5.88103446,9.99739651 C5.88103446,7.7011195 7.7423193,5.83181463 10.0519809,5.83181463 C12.3616425,5.83181463 14.2229273,7.7011195 14.2229273,9.99739651 L14.2229273,9.99739651 Z" id="Path-2" fill="#3F3F3F"></path>
+                </g>
+            </svg>';
+        break;
+
+        case 'unknown':
+        default:
+            $svg = '<svg  viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+                <title>Dark / 20 / event@svg</title>
+                <desc>Created with Sketch.</desc>
+                <g id="Dark-/-20-/-event" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+                    <g>
+                        <rect id="Rectangle" x="0" y="0" width="20" height="20"></rect>
+                        <path d="M15.9503156,6.25 L10.901623,6.25 L12.7653518,1.1796875 C12.9403498,0.5859375 12.4372305,0 11.7503633,0 L5.45043493,0 C4.9254409,0 4.47919597,0.34765625 4.40919676,0.8125 L3.00921267,10.1875 C2.92608862,10.75 3.41608305,11.25 4.05045084,11.25 L9.24351682,11.25 L7.22666474,18.8476562 C7.06916653,19.4414062 7.57666077,20 8.24602816,20 C8.61352398,20 8.96352,19.828125 9.15601782,19.53125 L16.8559303,7.65625 C17.2628007,7.03515625 16.7596814,6.25 15.9503156,6.25 Z" id="Path" fill="#3F3F3F"></path>
+                    </g>
+                </g>
+            </svg>';
+        break;
+    }
+
+    $output = '<div style="width:20px;height:20px">'.$svg.'</div>';
+
+    if ($return) {
+        return $output;
+    }
+
+    echo $output;
+}
+
+
 /**
  * Prints the event type description
  *
@@ -4356,7 +4496,7 @@ function events_page_details($event, $server_id=0)
 
             $graph_params_str = http_build_query($graph_params);
 
-            $link = "winopeng_var('".$url.'?'.$graph_params_str."','".$win_handle."', 800, 480)";
+            $link = 'winopeng_var("'.$url.'?'.$graph_params_str.'","'.$win_handle.'", 800, 480)';
             $data[1] = html_print_button(__('View graph'), 'view_graph_button', false, $link, ['mode' => 'link'], true);
             $table_details->data[] = $data;
         }
@@ -5180,10 +5320,6 @@ function events_page_comments($event, $ajax=false, $groupedComments=[])
             true
         );
         $comments_form .= '</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.')
-        );
     }
 
     if ($ajax === true) {
@@ -5208,9 +5344,10 @@ function events_clean_tags($tags)
     }
 
     $event_tags = tags_get_tags_formatted($tags, false);
+    $event_tags = str_replace(' ', '', $event_tags);
     $event_tags = io_safe_input($event_tags);
 
-    return explode(',', str_replace(' ', '', $event_tags));
+    return explode(',', $event_tags);
 }
 
 
diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index 977076824b..0d5b38f668 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -4816,7 +4816,7 @@ function graph_nodata_image($options)
         $height = $options['height'];
     }
 
-    $width_style = '';
+    $width_style = 'width: 200px';
     if (isset($options['width']) === true
         && empty($options['width']) === false
     ) {
@@ -4835,7 +4835,7 @@ function graph_nodata_image($options)
         true,
         [
             'title' => __('No data'),
-            'style' => 'height:'.$height.'px;'.$width_style,
+            'style' => $width_style,
         ]
     );
 }
diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index 2be81a9800..49db1aea24 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -3261,6 +3261,7 @@ function html_print_input_image($name, $src, $value, $style='', $return=false, $
         'onkeyup',
         'class',
         'form',
+        'disabled',
     ];
 
     foreach ($attrs as $attribute) {
@@ -3630,10 +3631,9 @@ function html_print_button($label='OK', $name='', $disabled=false, $script='', $
         $classes .= ' buttonButton';
     }
 
-    if ($disabled === true) {
-        $classes .= ' disabled_action_button';
-    }
-
+    // if ($disabled === true) {
+    // $classes .= ' disabled_action_button';
+    // }
     if (empty($buttonAttributes) === true) {
         $parameters = [];
         $parameters[] = 'class="'.$classes.'"';
@@ -4565,12 +4565,6 @@ function html_print_image(
     // Dont use safe_input here or the performance will dead.
     $style = '';
 
-    if (empty($options) === false && isset($options['class']) === true) {
-        $options['class'] .= ' main_menu_icon';
-    } else {
-        $options['class'] = 'main_menu_icon invert_filter';
-    }
-
     if (!empty($options)) {
         // Deprecated or value-less attributes.
         if (isset($options['align'])) {
@@ -6104,6 +6098,8 @@ function html_print_autocomplete_users_from_integria(
         $attrs['class'] = $class;
     }
 
+    ui_print_help_tip(__('Type at least two characters to search the user.'), false);
+
     html_print_input_text_extended(
         $name,
         $default,
@@ -6117,8 +6113,6 @@ function html_print_autocomplete_users_from_integria(
     );
     html_print_input_hidden($name.'_hidden', $id_agent_module);
 
-    ui_print_help_tip(__('Type at least two characters to search the user.'), false);
-
     $javascript_ajax_page = ui_get_full_url('ajax.php', false, false, false, false);
     ?>
     <script type="text/javascript">
@@ -6205,7 +6199,8 @@ function html_print_tabs(array $tabs)
         $result .= "<li><a href='".$value['href']."' id='".$value['id']."'>";
         $result .= html_print_image(
             'images/'.$value['img'],
-            true
+            true,
+            ['class' => 'main_menu_icon invert_filter']
         );
         $result .= '<span>'.$value['name'].'</span>';
         $result .= '</a></li>';
diff --git a/pandora_console/include/functions_integriaims.php b/pandora_console/include/functions_integriaims.php
index ff30e799e5..3f0fe77d9c 100644
--- a/pandora_console/include/functions_integriaims.php
+++ b/pandora_console/include/functions_integriaims.php
@@ -31,7 +31,7 @@ require_once $config['homedir'].'/include/functions.php';
  * @param string $active_tab Current tab or false for View page.
  * @param number $view       Id of incident. Show View tab.
  *
- * @return string HTML code. Print tabs in header.
+ * @return array HTML code. Print tabs in header.
  */
 function integriaims_tabs($active_tab, $view=false)
 {
diff --git a/pandora_console/include/functions_menu.php b/pandora_console/include/functions_menu.php
index 2708b8016e..14c43a5c14 100644
--- a/pandora_console/include/functions_menu.php
+++ b/pandora_console/include/functions_menu.php
@@ -58,6 +58,16 @@ function menu_print_menu(&$menu)
     $sec2 = (string) get_parameter('sec2');
     if ($sec2 === 'operation/agentes/ver_agente') {
         $sec2 = 'godmode/agentes/configurar_agente';
+    } else if ($sec2 === 'godmode/alerts/configure_alert_template') {
+        $sec2 = 'godmode/alerts/alert_templates';
+    } else if ($sec2 === 'godmode/events/events') {
+        $sec2 = 'godmode/events/events&section=filter';
+    } else if ($sec2 === 'godmode/alerts/configure_alert_action') {
+        $sec2 = 'godmode/alerts/alert_actions';
+    } else if ($sec2 === 'godmode/alerts/configure_alert_command') {
+        $sec2 = 'godmode/alerts/alert_commands';
+    } else if ($sec2 === 'enterprise/godmode/setup/edit_skin') {
+        $sec2 = 'enterprise/godmode/setup/setup_skins';
     } else if ($sec2 === 'godmode/servers/discovery') {
         $wiz = (string) get_parameter('wiz');
         $sec2 = 'godmode/servers/discovery&wiz='.$wiz;
@@ -842,7 +852,7 @@ if (is_ajax()) {
         $fragmentation_status = '';
         if ($db_fragmentation->data->tablesFragmentationStatus->status === 1) {
             $fragmentation_status = html_print_image(
-                'images/exito.png',
+                'images/validate.svg',
                 true,
                 [
                     'title' => __('Successfully'),
@@ -851,7 +861,7 @@ if (is_ajax()) {
             );
         } else {
             $fragmentation_status = html_print_image(
-                'images/error_1.png',
+                'images/fail@svg.svg',
                 true,
                 [
                     'title' => __('Error'),
diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php
index dbb988782a..6b6815b755 100755
--- a/pandora_console/include/functions_modules.php
+++ b/pandora_console/include/functions_modules.php
@@ -1153,6 +1153,27 @@ function modules_get_raw_data($id_agent_module, $date_init, $date_end)
 }
 
 
+function module_get_min_max_tagente_datos($id_agent_module, $date_init, $date_end)
+{
+    $table = modules_get_table_data($id_agent_module, null);
+
+    $datelimit = ($date_init - $date_end);
+    $search_in_history_db = db_search_in_history_db($datelimit);
+
+    $data = db_get_all_rows_sql(
+        '
+		SELECT max(datos) as max, min(datos) as min
+		FROM '.$table.'
+		WHERE id_agente_modulo = '.$id_agent_module.'
+			AND utimestamp >= '.$date_init.'
+			AND utimestamp <= '.$date_end,
+        $search_in_history_db
+    );
+
+    return $data;
+}
+
+
 function modules_get_agent_groups($id_agent_module)
 {
     $return = false;
diff --git a/pandora_console/include/functions_netflow.php b/pandora_console/include/functions_netflow.php
index e4ac71e690..3ee11508b0 100644
--- a/pandora_console/include/functions_netflow.php
+++ b/pandora_console/include/functions_netflow.php
@@ -202,7 +202,7 @@ function netflow_stat_table($data, $start_date, $end_date, $aggregate)
     $table = new stdClass();
     $table->width = '100%';
     $table->cellspacing = 0;
-    $table->class = 'databox';
+    $table->class = 'info_table';
     $table->data = [];
     $j = 0;
     $x = 0;
@@ -270,7 +270,7 @@ function netflow_data_table($data, $start_date, $end_date, $aggregate, $pdf=fals
         $table->size = ['100%'];
     }
 
-    $table->class = 'databox w100p';
+    $table->class = 'info_table w100p';
     $table->cellspacing = 0;
     $table->data = [];
 
@@ -339,7 +339,7 @@ function netflow_top_n_table(array $data, int $total_bytes)
 
     $values = [];
     $table = new stdClass();
-    $table->class = 'w100p';
+    $table->class = 'info_table w100p';
     $table->cellspacing = 0;
     $table->data = [];
 
@@ -405,7 +405,7 @@ function netflow_summary_table($data)
     $values = [];
     $table = new stdClass();
     $table->cellspacing = 0;
-    $table->class = 'databox';
+    $table->class = 'info_table';
     $table->styleTable = 'width: 100%';
     $table->data = [];
 
@@ -1323,7 +1323,7 @@ function netflow_draw_item(
             }
 
             if ($output === 'HTML' || $output === 'PDF') {
-                $html = '<table class="w100p">';
+                $html = '<table class="databox w100p">';
                 $html .= '<tr>';
                 $html .= '<td class="w50p">';
                 $html .= netflow_summary_table($data_summary);
diff --git a/pandora_console/include/functions_network.php b/pandora_console/include/functions_network.php
index c503945c87..1945b5428b 100644
--- a/pandora_console/include/functions_network.php
+++ b/pandora_console/include/functions_network.php
@@ -68,10 +68,10 @@ function network_print_explorer_header(
     $cell = '<div class="flex_center">';
     $cell .= $title;
     $cell .= html_print_link_with_params(
-        'images/arrow-down-white.png',
+        'images/arrow@svg.svg',
         array_merge($hidden_data, ['order_by' => $order]),
         'image',
-        ($selected === $order) ? 'opacity: 0.5' : ''
+        'rotate: 270deg; width: 20px; margin-top: 4px;'.(($selected === $order) ? '' : 'opacity: 0.5')
     );
     $cell .= '</div>';
 
diff --git a/pandora_console/include/functions_profile.php b/pandora_console/include/functions_profile.php
index d656cdeff2..57c821375b 100644
--- a/pandora_console/include/functions_profile.php
+++ b/pandora_console/include/functions_profile.php
@@ -191,15 +191,9 @@ function profile_print_profile_table($id, $json_profile=false, $return=false, $c
     $table->id = 'table_profiles';
     $table->width = '100%';
     $table->class = 'info_table';
-    if (is_metaconsole() === true) {
-        $table->head_colspan[0] = 0;
-        $table->width = '100%';
-        $table->class = 'databox_tactical data';
-        $table->title = $title;
-    } else {
-        echo '<div id="edit_user_profiles" class="floating_form white_box">';
-        echo '<p class="subsection_header_title padding-lft-10">'.$title.'</p>';
-    }
+
+    echo '<div id="edit_user_profiles" class="max_floating_element_size white_box">';
+    echo '<p class="subsection_header_title padding-lft-10">'.$title.'</p>';
 
     $table->data = [];
     $table->head = [];
@@ -318,12 +312,12 @@ function profile_print_profile_table($id, $json_profile=false, $return=false, $c
                 true,
                 [
                     'onclick' => 'delete_profile(event, this)',
-                    'class'   => 'invert_filter',
+                    'class'   => 'main_menu_icon invert_filter',
                 ]
             );
         } else {
             $data['actions'] = '<form method="post" onsubmit="if (!confirm (\''.__('Are you sure?').'\')) return false">';
-            $data['actions'] .= html_print_input_image('del', 'images/delete.svg', 1, 'width:40px; height: 28px', true);
+            $data['actions'] .= html_print_input_image('del', 'images/delete.svg', 1, '', true, ['class' => 'main_menu_icon invert_filter']);
             $data['actions'] .= html_print_input_hidden('delete_profile', 1, true);
             $data['actions'] .= html_print_input_hidden('id_user_profile', $profile['id_up'], true);
             $data['actions'] .= html_print_input_hidden('id_user', $id, true);
@@ -397,7 +391,7 @@ function profile_print_profile_table($id, $json_profile=false, $return=false, $c
 
     $data['last_hierarchy'] = html_print_checkbox('no_hierarchy', 1, false, true);
 
-    $data['last_actions'] = html_print_input_image('add', 'images/validate.svg', 1, 'width: 40px; height: 28px', true);
+    $data['last_actions'] = html_print_input_image('add', 'images/validate.svg', 1, '', true, ['class' => 'main_menu_icon invert_filter']);
     $data['last_actions'] .= html_print_input_hidden('id', $id, true);
     $data['last_actions'] .= html_print_input_hidden('add_profile', 1, true);
     $data['last_actions'] .= '</form>';
@@ -405,9 +399,7 @@ function profile_print_profile_table($id, $json_profile=false, $return=false, $c
     array_push($table->data, $data);
     html_print_table($table, $return);
 
-    if (is_metaconsole() === false) {
-        echo '</div>';
-    }
+    echo '</div>';
 
     unset($table);
 }
diff --git a/pandora_console/include/functions_reporting_html.php b/pandora_console/include/functions_reporting_html.php
index 59140ac1a2..8b5cb3d917 100644
--- a/pandora_console/include/functions_reporting_html.php
+++ b/pandora_console/include/functions_reporting_html.php
@@ -1053,17 +1053,17 @@ function reporting_html_event_report_group($table, $item, $pdf=0)
         $table1->head = [];
         if ($item['show_summary_group']) {
             $table1->head[0] = __('Status');
-            $table1->head[1] = __('Count');
-            $table1->head[2] = __('Name');
-            $table1->head[3] = __('Type');
+            $table1->head[1] = __('Type');
+            $table1->head[2] = __('Count');
+            $table1->head[3] = __('Name');
             $table1->head[4] = __('Agent');
             $table1->head[5] = __('Severity');
             $table1->head[6] = __('Val. by');
             $table1->head[7] = __('Timestamp');
         } else {
             $table1->head[0] = __('Status');
-            $table1->head[1] = __('Name');
-            $table1->head[2] = __('Type');
+            $table1->head[1] = __('Type');
+            $table1->head[2] = __('Name');
             $table1->head[3] = __('Agent');
             $table1->head[4] = __('Severity');
             $table1->head[5] = __('Val. by');
@@ -1075,24 +1075,6 @@ function reporting_html_event_report_group($table, $item, $pdf=0)
         }
 
         foreach ($item['data'] as $k => $event) {
-            // First pass along the class of this row.
-            if ($item['show_summary_group']) {
-                $table1->cellclass[$k][1] = get_priority_class($event['criticity']);
-                $table1->cellclass[$k][2] = get_priority_class($event['criticity']);
-                $table1->cellclass[$k][4] = get_priority_class($event['criticity']);
-                $table1->cellclass[$k][5] = get_priority_class($event['criticity']);
-                $table1->cellclass[$k][6] = get_priority_class($event['criticity']);
-                $table1->cellclass[$k][7] = get_priority_class($event['criticity']);
-                $table1->cellclass[$k][8] = get_priority_class($event['criticity']);
-            } else {
-                $table1->cellclass[$k][1] = get_priority_class($event['criticity']);
-                $table1->cellclass[$k][3] = get_priority_class($event['criticity']);
-                $table1->cellclass[$k][4] = get_priority_class($event['criticity']);
-                $table1->cellclass[$k][5] = get_priority_class($event['criticity']);
-                $table1->cellclass[$k][6] = get_priority_class($event['criticity']);
-                $table1->cellclass[$k][7] = get_priority_class($event['criticity']);
-            }
-
             $data = [];
 
             // Colored box.
@@ -1125,6 +1107,12 @@ function reporting_html_event_report_group($table, $item, $pdf=0)
                 ]
             );
 
+            if ($pdf) {
+                $data[] = events_print_type_img_pdf($event['event_type'], true);
+            } else {
+                $data[] = events_print_type_img($event['event_type'], true);
+            }
+
             if ($item['show_summary_group']) {
                 $data[] = $event['event_rep'];
             }
@@ -1136,8 +1124,6 @@ function reporting_html_event_report_group($table, $item, $pdf=0)
                 true
             );
 
-            $data[] = events_print_type_img($event['event_type'], true);
-
             if (empty($event['alias']) === false) {
                 $alias = $event['alias'];
                 if (is_metaconsole() === true) {
@@ -1313,20 +1299,20 @@ function reporting_html_event_report_module($table, $item, $pdf=0)
                 $table1->class = 'info_table';
                 $table1->data = [];
                 $table1->head = [];
-                $table1->align = [];
-                $table1->align[2] = 'center';
+                $table1->align = 'left';
+
                 if ($show_summary_group) {
                     $table1->head[0]  = __('Status');
-                    $table1->head[1]  = __('Event name');
-                    $table1->head[2]  = __('Type');
+                    $table1->head[1]  = __('Type');
+                    $table1->head[2]  = __('Event name');
                     $table1->head[3]  = __('Severity');
                     $table1->head[4]  = __('Count');
                     $table1->head[5]  = __('Timestamp');
                     $table1->style[0] = 'text-align: center;';
                 } else {
                     $table1->head[0]  = __('Status');
-                    $table1->head[1]  = __('Event name');
-                    $table1->head[2]  = __('Type');
+                    $table1->head[1]  = __('Type');
+                    $table1->head[2]  = __('Event name');
                     $table1->head[3]  = __('Severity');
                     $table1->head[4]  = __('Timestamp');
                     $table1->style[0] = 'text-align: center;';
@@ -1343,20 +1329,6 @@ function reporting_html_event_report_module($table, $item, $pdf=0)
                 if (is_array($item_data) || is_object($item_data)) {
                     foreach ($item_data as $i => $event) {
                         $data = [];
-                        if ($show_summary_group) {
-                            $table1->cellclass[$i][1] = get_priority_class($event['criticity']);
-                            $table1->cellclass[$i][2] = get_priority_class($event['criticity']);
-                            $table1->cellclass[$i][3] = get_priority_class($event['criticity']);
-                            $table1->cellclass[$i][4] = get_priority_class($event['criticity']);
-                            $table1->cellclass[$i][5] = get_priority_class($event['criticity']);
-                            $table1->cellclass[$i][6] = get_priority_class($event['criticity']);
-                        } else {
-                            $table1->cellclass[$i][1] = get_priority_class($event['criticity']);
-                            $table1->cellclass[$i][3] = get_priority_class($event['criticity']);
-                            $table1->cellclass[$i][4] = get_priority_class($event['criticity']);
-                            $table1->cellclass[$i][6] = get_priority_class($event['criticity']);
-                        }
-
                         // Colored box.
                         switch ($event['estado']) {
                             case 0:
@@ -1386,8 +1358,14 @@ function reporting_html_event_report_module($table, $item, $pdf=0)
                                 'id'    => 'status_img_'.$event['id_evento'],
                             ]
                         );
-                        $data[1] = io_safe_output($event['evento']);
-                        $data[2] = events_print_type_img($event['event_type'], true);
+
+                        if ($pdf) {
+                            $data[1] = events_print_type_img_pdf($event['event_type'], true);
+                        } else {
+                            $data[1] = events_print_type_img($event['event_type'], true);
+                        }
+
+                        $data[2] = io_safe_output($event['evento']);
                         $data[3] = get_priority_name($event['criticity']);
                         if ($show_summary_group) {
                             $data[4] = $event['event_rep'];
@@ -2178,7 +2156,7 @@ function reporting_html_agent_module($table, $item)
                 if ($module === null) {
                     $table_data .= '<td></td>';
                 } else {
-                    $table_data .= "<td class='center'>";
+                    $table_data .= '<td style="text-align: left;">';
                     if (isset($row['show_type']) === true && $row['show_type'] === '1') {
                         $table_data .= $module;
                     } else {
@@ -2657,12 +2635,12 @@ function reporting_html_event_report_agent($table, $item, $pdf=0)
 
         $table1->head = [];
         $table1->head[0] = __('Status');
+        $table1->head[3] = __('Type');
         if ($item['show_summary_group']) {
             $table1->head[1] = __('Count');
         }
 
         $table1->head[2] = __('Name');
-        $table1->head[3] = __('Type');
         $table1->head[4] = __('Severity');
         $table1->head[5] = __('Val. by');
         $table1->head[6] = __('Timestamp');
@@ -2671,21 +2649,6 @@ function reporting_html_event_report_agent($table, $item, $pdf=0)
         }
 
         foreach ($item['data'] as $i => $event) {
-            if ($item['show_summary_group']) {
-                $table1->cellclass[$i][1] = get_priority_class($event['criticity']);
-                $table1->cellclass[$i][2] = get_priority_class($event['criticity']);
-                $table1->cellclass[$i][4] = get_priority_class($event['criticity']);
-                $table1->cellclass[$i][5] = get_priority_class($event['criticity']);
-                $table1->cellclass[$i][6] = get_priority_class($event['criticity']);
-                $table1->cellclass[$i][7] = get_priority_class($event['criticity']);
-            } else {
-                $table1->cellclass[$i][1] = get_priority_class($event['criticity']);
-                $table1->cellclass[$i][3] = get_priority_class($event['criticity']);
-                $table1->cellclass[$i][4] = get_priority_class($event['criticity']);
-                $table1->cellclass[$i][5] = get_priority_class($event['criticity']);
-                $table1->cellclass[$i][6] = get_priority_class($event['criticity']);
-            }
-
             $data = [];
             // Colored box.
             switch ($event['status']) {
@@ -2716,6 +2679,12 @@ function reporting_html_event_report_agent($table, $item, $pdf=0)
                 ]
             );
 
+            if ($pdf) {
+                $data[] = events_print_type_img_pdf($event['type'], true);
+            } else {
+                $data[] = events_print_type_img($event['type'], true);
+            }
+
             if ($item['show_summary_group']) {
                 $data[] = $event['count'];
             }
@@ -2727,8 +2696,6 @@ function reporting_html_event_report_agent($table, $item, $pdf=0)
                 true
             );
 
-            $data[] = events_print_type_img($event['type'], true);
-
             $data[] = get_priority_name($event['criticity']);
             if (empty($event['validated_by']) && $event['status'] == EVENT_VALIDATE) {
                 $data[] = '<i>'.__('System').'</i>';
@@ -3283,12 +3250,20 @@ function reporting_html_alert_report_actions($table, $item, $pdf=0)
 function get_alert_table($data)
 {
     $table = new StdCLass();
-    $table->width = '100%';
+    $table->width = '99%';
+    $table->class = 'info_table';
     $table->data = [];
     $table->head = [];
     $table->headstyle = [];
     $table->cellstyle = [];
     $table->headstyle[0] = 'text-align:left;';
+    $table->size[0] = '25%';
+    $table->size[1] = '12%';
+    $table->size[2] = '12%';
+    $table->size[3] = '12%';
+    $table->size[4] = '12%';
+    $table->size[5] = '12%';
+    $table->size[6] = '12%';
 
     $head = reset($data);
     foreach (array_reverse(array_keys($head)) as $name) {
@@ -3527,7 +3502,7 @@ function reporting_html_alert_report($table, $item, $pdf=0)
 
     $table->data['alerts']['cell'] = html_print_table($table1, true);
     if ($pdf) {
-        $table1->class = 'pdf_alert_table';
+        $table1->class = 'info_table';
         return html_print_table($table1, true);
     }
 }
@@ -3691,7 +3666,7 @@ function reporting_html_agent_configuration(
 
     $row = [];
     $row['name'] = $item['data']['name'];
-    $row['group'] = $item['data']['group_icon'];
+    $row['group'] = groups_get_name($item['data']['group'], true);
     $row['address'] = $item['data']['os_icon'];
     $row['os'] = $item['data']['address'];
     $row['description'] = $item['data']['description'];
@@ -3732,36 +3707,21 @@ function reporting_html_agent_configuration(
         $table1->width = '99%';
         $table1->head = [];
         $table1->head['name'] = __('Name');
-        $table1->head['type'] = __('Type');
-        $table1->head['warning_critical'] = __('Warning<br/>Critical');
         $table1->head['threshold'] = __('Threshold');
-        $table1->head['group_icon'] = __('Group');
         $table1->head['description'] = __('Description');
         $table1->head['interval'] = __('Interval');
         $table1->head['unit'] = __('Unit');
         $table1->head['status'] = __('Status');
         $table1->head['tags'] = __('Tags');
         $table1->align = [];
-        $table1->align['name'] = 'left';
-        $table1->align['type'] = 'center';
-        $table1->align['warning_critical'] = 'right';
-        $table1->align['threshold'] = 'right';
-        $table1->align['group_icon'] = 'center';
-        $table1->align['description'] = 'left';
-        $table1->align['interval'] = 'right';
-        $table1->align['unit'] = 'left';
-        $table1->align['status'] = 'center';
-        $table1->align['tags'] = 'left';
+        $table1->align[] = 'left';
         $table1->data = [];
 
         foreach ($item['data']['modules'] as $module) {
             $row = [];
 
             $row['name'] = $module['name'];
-            $row['type'] = $module['type_icon'];
-            $row['warning_critical'] = $module['max_warning'].' / '.$module['min_warning'].'<br>'.$module['max_critical'].' / '.$module['min_critical'];
             $row['threshold'] = $module['threshold'];
-            $row['group_icon'] = ui_print_group_icon($item['data']['group'], true);
             $row['description'] = $module['description'];
             $row['interval'] = $module['interval'];
             $row['unit'] = $module['unit'];
@@ -3927,6 +3887,8 @@ function reporting_html_value(
         if ($item['visual_format'] != 2) {
             $table1 = new stdClass();
             $table1->width = '100%';
+            $table1->headstyle[0] = 'text-align:left';
+            $table1->headstyle[1] = 'text-align:left';
             switch ($item['type']) {
                 case 'max_value':
                     $table1->head = [
@@ -6040,6 +6002,7 @@ function reporting_get_last_activity()
     $table = new stdClass();
     $table->width = '100%';
     $table->data = [];
+    $table->class = 'info_table';
     $table->size = [];
     $table->size[2] = '150px';
     $table->size[3] = '130px';
@@ -6053,37 +6016,13 @@ function reporting_get_last_activity()
     $table->head[5] = __('Comments');
     $table->title = '<span>'.__('Last activity in %s console', get_product_name()).'</span>';
 
-    switch ($config['dbtype']) {
-        case 'mysql':
-            $sql = sprintf(
-                'SELECT id_usuario,accion,fecha,ip_origen,descripcion,utimestamp
-                FROM tsesion
-                WHERE (`utimestamp` > UNIX_TIMESTAMP(NOW()) - '.SECONDS_1WEEK.") 
-                    AND `id_usuario` = '%s' ORDER BY `utimestamp` DESC LIMIT 5",
-                $config['id_user']
-            );
-        break;
-
-        case 'postgresql':
-            $sql = sprintf(
-                "SELECT \"id_usuario\", accion, fecha, \"ip_origen\", descripcion, utimestamp
-                FROM tsesion
-                WHERE (\"utimestamp\" > ceil(date_part('epoch', CURRENT_TIMESTAMP)) - ".SECONDS_1WEEK.") 
-                    AND \"id_usuario\" = '%s' ORDER BY \"utimestamp\" DESC LIMIT 5",
-                $config['id_user']
-            );
-        break;
-
-        case 'oracle':
-            $sql = sprintf(
-                "SELECT id_usuario, accion, fecha, ip_origen, descripcion, utimestamp
-                FROM tsesion
-                WHERE ((utimestamp > ceil((sysdate - to_date('19700101000000','YYYYMMDDHH24MISS')) * (".SECONDS_1DAY.')) - '.SECONDS_1WEEK.") 
-                    AND id_usuario = '%s') AND rownum <= 10 ORDER BY utimestamp DESC",
-                $config['id_user']
-            );
-        break;
-    }
+    $sql = sprintf(
+        'SELECT id_usuario,accion,fecha,ip_origen,descripcion,utimestamp
+        FROM tsesion
+        WHERE (`utimestamp` > UNIX_TIMESTAMP(NOW()) - '.SECONDS_1WEEK.") 
+            AND `id_usuario` = '%s' ORDER BY `utimestamp` DESC LIMIT 5",
+        $config['id_user']
+    );
 
     $sessions = db_get_all_rows_sql($sql);
 
@@ -6094,18 +6033,8 @@ function reporting_get_last_activity()
     foreach ($sessions as $session) {
         $data = [];
 
-        switch ($config['dbtype']) {
-            case 'mysql':
-            case 'oracle':
-                $session_id_usuario = $session['id_usuario'];
-                $session_ip_origen = $session['ip_origen'];
-            break;
-
-            case 'postgresql':
-                $session_id_usuario = $session['id_usuario'];
-                $session_ip_origen = $session['ip_origen'];
-            break;
-        }
+        $session_id_usuario = $session['id_usuario'];
+        $session_ip_origen = $session['ip_origen'];
 
         $data[0] = '<strong>'.$session_id_usuario.'</strong>';
         $data[1] = ui_print_session_action_icon($session['accion'], true);
@@ -6117,10 +6046,6 @@ function reporting_get_last_activity()
         array_push($table->data, $data);
     }
 
-    if (defined('METACONSOLE')) {
-        $table->class = 'databox_tactical';
-    }
-
     return html_print_table($table, true);
 
 }
diff --git a/pandora_console/include/functions_reports.php b/pandora_console/include/functions_reports.php
index 41356e9455..0b343d449d 100755
--- a/pandora_console/include/functions_reports.php
+++ b/pandora_console/include/functions_reports.php
@@ -221,6 +221,8 @@ function reports_update_report($id_report, $values)
  */
 function reports_delete_report($id_report)
 {
+    global $config;
+
     $id_report = safe_int($id_report);
     if (empty($id_report)) {
         return false;
@@ -231,6 +233,16 @@ function reports_delete_report($id_report)
         return false;
     }
 
+    // Delete report from fav menu.
+    db_process_sql_delete(
+        'tfavmenu_user',
+        [
+            'id_element' => $id_report,
+            'section'    => 'Reporting',
+            'id_user'    => $config['id_user'],
+        ]
+    );
+
     @db_process_sql_delete('treport_content', ['id_report' => $id_report]);
     return @db_process_sql_delete('treport', ['id_report' => $id_report]);
 }
diff --git a/pandora_console/include/functions_treeview.php b/pandora_console/include/functions_treeview.php
index e93910ec15..f2323fd13c 100755
--- a/pandora_console/include/functions_treeview.php
+++ b/pandora_console/include/functions_treeview.php
@@ -657,7 +657,7 @@ function treeview_printTable($id_agente, $server_data=[], $no_head=false)
     $table->data['description'] = $row;
 
     // Last contact.
-    $last_contact = ui_print_timestamp($agent['ultimo_contacto'], true, ['class' => 'font_11']);
+    $last_contact = ui_print_timestamp($agent['ultimo_contacto'], true, ['style' => 'font-size: 13px;']);
 
     if ($agent['ultimo_contacto_remoto'] === '01-01-1970 00:00:00') {
         $last_remote_contact = __('Never');
@@ -689,8 +689,7 @@ function treeview_printTable($id_agente, $server_data=[], $no_head=false)
         '#ececec',
         true,
         '',
-        false,
-        'line-height: 13px;'
+        false
     );
     $table->data['next_contact'] = $row;
 
@@ -703,6 +702,7 @@ function treeview_printTable($id_agente, $server_data=[], $no_head=false)
     $eventsGraph = html_print_div(
         [
             'style'   => 'height: 150px;',
+            'class'   => 'max-graph-tree-view',
             'content' => graph_graphic_agentevents(
                 $id_agente,
                 '500px;',
@@ -727,8 +727,8 @@ function treeview_printTable($id_agente, $server_data=[], $no_head=false)
         false,
         false,
         '',
-        'white-box-content',
-        'white_table_flex margin-bottom-10 border-bottom-gray'
+        'white-box-content mrgn_top_0 mrgn_btn_0px',
+        'white_table_flex'
     );
 
     if ($config['agentaccess']) {
@@ -747,8 +747,8 @@ function treeview_printTable($id_agente, $server_data=[], $no_head=false)
             true,
             false,
             '',
-            'white-box-content border-bottom-gray',
-            'white_table_flex margin-top-10 margin-bottom-10'
+            'white-box-content mrgn_top_0 mrgn_btn_0px border-bottom-gray',
+            'white_table_flex'
         );
     }
 
@@ -920,8 +920,8 @@ function treeview_printTable($id_agente, $server_data=[], $no_head=false)
         true,
         false,
         '',
-        'white-box-content border-bottom-gray',
-        'white_table_flex margin-top-10 margin-bottom-10'
+        'white-box-content mrgn_top_0 mrgn_btn_0px border-bottom-gray',
+        'white_table_flex'
     );
 
     if (empty($server_data) === false && is_metaconsole() === true) {
@@ -935,5 +935,18 @@ function treeview_printTable($id_agente, $server_data=[], $no_head=false)
  
             }
 
+            $('.max-graph-tree-view').ready(function() {
+                widthGraph();
+            });
+
+            $(window).resize(function() {
+                widthGraph();
+            });
+
+            function widthGraph () {
+                var parentWidth = $('.max-graph-tree-view').parent().width();
+                $('.max-graph-tree-view').children().width(parentWidth + 5);
+            }
+
         </script>";
 }
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index d272ee224a..8eebebe339 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -283,6 +283,14 @@ function ui_print_message($message, $class='', $attributes='', $return=false, $t
         if (empty($message['force_class']) === false) {
             $force_class = $message['force_class'];
         }
+
+        if (isset($message['autoclose']) === true) {
+            if ($message['autoclose'] === true) {
+                $autoclose = true;
+            } else {
+                $autoclose = false;
+            }
+        }
     } else {
         $text_message = $message;
     }
@@ -385,7 +393,12 @@ function ui_print_message($message, $class='', $attributes='', $return=false, $t
     $messageCreated = html_print_table($messageTable, true);
     $autocloseTime = ((int) $config['notification_autoclose_time'] * 1000);
 
-    $classes[] = 'info_box_container';
+    if (empty($message['div_class']) === false) {
+        $classes[] = $message['div_class'];
+    } else {
+        $classes[] = 'info_box_container';
+    }
+
     $classes[] = (($autoclose === true) && ($autocloseTime > 0)) ? ' info_box_autoclose' : '';
 
     // This session var is defined in index.
@@ -718,7 +731,23 @@ function ui_print_group_icon($id_group, $return=false, $path='', $style='', $lin
         $output .= '<span title="'.groups_get_name($id_group, true).'">'.groups_get_name($id_group, true).'&nbsp;</span>';
     } else {
         if (empty($icon) === true) {
-            $output .= '<span title="'.groups_get_name($id_group, true).'">&nbsp;&nbsp;</span>';
+            $output .= '<span title="'.groups_get_name($id_group, true).'">';
+            $output .= '</span>';
+            $output .= html_print_image(
+                'images/unknown@groups.svg',
+                true,
+                [
+                    'style' => $style,
+                    'class' => 'main_menu_icon invert_filter '.$class,
+                    'alt'   => groups_get_name($id_group, true),
+                    'title' => groups_get_name($id_group, true),
+                ],
+                false,
+                false,
+                false,
+                true
+            );
+            $output .= '</span>';
         } else {
             if (empty($class) === true) {
                 $class = 'bot';
@@ -734,7 +763,7 @@ function ui_print_group_icon($id_group, $return=false, $path='', $style='', $lin
                 true,
                 [
                     'style' => $style,
-                    'class' => 'main_menu_icon '.$class,
+                    'class' => 'main_menu_icon invert_filter '.$class,
                     'alt'   => groups_get_name($id_group, true),
                     'title' => groups_get_name($id_group, true),
                 ],
@@ -841,7 +870,7 @@ function ui_print_os_icon(
     }
 
     if (isset($options['class']) === false) {
-        $options['class'] = 'main_menu_icon';
+        $options['class'] = 'main_menu_icon invert_filter';
     }
 
     $no_in_meta = (is_metaconsole() === false);
@@ -930,15 +959,39 @@ function ui_print_type_agent_icon(
     if ((int) $id_os === SATELLITE_OS_ID) {
         // Satellite.
         $options['title'] = __('Satellite');
-        $output = html_print_image('images/satellite@os.svg', true, ['class' => 'main_menu_icon invert_filter'], false, false, false, true);
+        $output = html_print_image(
+            'images/satellite@os.svg',
+            true,
+            ['class' => 'main_menu_icon invert_filter'],
+            false,
+            false,
+            false,
+            true
+        );
     } else if ($remote_contact === $contact && $remote === 0 && empty($version) === true) {
         // Network.
         $options['title'] = __('Network');
-        $output = html_print_image('images/network-server@os.svg', true, ['class' => 'main_menu_icon invert_filter'], false, false, false, true);
+        $output = html_print_image(
+            'images/network-server@os.svg',
+            true,
+            ['class' => 'main_menu_icon invert_filter'],
+            false,
+            false,
+            false,
+            true
+        );
     } else {
         // Software.
         $options['title'] = __('Software');
-        $output = html_print_image('images/data-server@svg.svg', true, ['class' => 'main_menu_icon invert_filter'], false, false, false, true);
+        $output = html_print_image(
+            'images/data-server@svg.svg',
+            true,
+            ['class' => 'main_menu_icon invert_filter'],
+            false,
+            false,
+            false,
+            true
+        );
     }
 
     return $output;
@@ -3873,6 +3926,31 @@ function ui_print_datatable(array $parameters)
                 }';
     }
 
+    $js .= 'if ($("#'.$table_id.' tr td").length == 1) {
+                $(".datatable-msg-info-'.$table_id.'").show();
+                $(".datatable-msg-info-'.$table_id.'").removeClass(\'invisible_important\');
+                $("table#'.$table_id.'").hide();
+                $("div.dataTables_paginate").hide();
+                $("div.dataTables_info").hide();
+                $("div.dataTables_length").hide();
+                $("div.dt-buttons").hide();
+
+                if (dt_'.$table_id.'.page.info().pages > 1) {
+                    $(".dataTables_paginate.paging_simple_numbers").show()
+                }
+            } else {
+                $(".datatable-msg-info-'.$table_id.'").hide();
+                $("table#'.$table_id.'").show();
+                $("div.dataTables_paginate").show();
+                $("div.dataTables_info").show();
+                $("div.dataTables_length").show();
+                $("div.dt-buttons").show();
+
+                if (dt_'.$table_id.'.page.info().pages == 1) {
+                    $(".dataTables_paginate.paging_simple_numbers").hide()
+                }
+            }';
+
     if (isset($parameters['drawCallback'])) {
         $js .= $parameters['drawCallback'];
     }
@@ -3996,8 +4074,13 @@ function ui_print_datatable(array $parameters)
     $js .= '</script>';
 
     // Order.
+    $info_msg_arr = [];
+    $info_msg_arr['message'] = $emptyTable;
+    $info_msg_arr['div_class'] = 'info_box_container invisible_important datatable-msg-info-'.$table_id;
+
+    $info_msg = '<div>'.ui_print_info_message($info_msg_arr).'</div>';
     $err_msg = '<div id="error-'.$table_id.'"></div>';
-    $output = $err_msg.$filter.$extra.$table.$js;
+    $output = $info_msg.$err_msg.$filter.$extra.$table.$js;
     if (is_ajax() === false) {
         ui_require_css_file('datatables.min', 'include/styles/js/');
         ui_require_css_file('tables');
@@ -4323,28 +4406,6 @@ function ui_toggle(
     $rotateA = '90deg';
     $rotateB = '180deg';
 
-    if (empty($img_a) === false) {
-        $image_a = html_print_image(
-            $img_a,
-            true,
-            [ 'style' => 'rotate: '.$rotateA ],
-            true
-        );
-    } else {
-        $image_a = '';
-    }
-
-    if (empty($img_b) === false) {
-        $image_b = html_print_image(
-            $img_b,
-            true,
-            [ 'style' => 'rotate: '.$rotateB ],
-            true
-        );
-    } else {
-        $image_b = '';
-    }
-
     // Options.
     $style = 'overflow:hidden;width: -webkit-fill-available;width: -moz-available;';
     $style = 'overflow:hidden;';
@@ -4401,7 +4462,7 @@ function ui_toggle(
                 $original,
                 true,
                 [
-                    'class' => 'float-left main_menu_icon',
+                    'class' => 'float-left main_menu_icon mrgn_right_10px invert_filter',
                     'style' => 'object-fit: contain; margin-right:10px; rotate:'.$imageRotate,
                     'title' => $title,
                     'id'    => 'image_'.$uniqid,
@@ -4433,7 +4494,7 @@ function ui_toggle(
                 $original,
                 true,
                 [
-                    'class' => 'main_menu_icon',
+                    'class' => 'main_menu_icon mrgn_right_10px invert_filter',
                     'style' => 'object-fit: contain; float:right; margin-right:10px; rotate:'.$imageRotate,
                     'title' => $title,
                     'id'    => 'image_'.$uniqid,
@@ -4957,7 +5018,8 @@ function ui_print_standard_header(
     string $help='',
     bool $godmode=false,
     array $options=[],
-    array $breadcrumbs=[]
+    array $breadcrumbs=[],
+    array $fav_menu_config=[]
 ) {
     // For standard breadcrumbs.
     ui_require_css_file('discovery');
@@ -4982,28 +5044,22 @@ function ui_print_standard_header(
         $applyBreadcrumbs,
         true
     );
-    // Create the header.
-    // if (is_metaconsole() === true) {
-    // $output = ui_meta_print_header(
-    // $title,
-    // false,
-    // $options
-    // );
-    // } else {
-        $output = ui_print_page_header(
-            $title,
-            $icon,
-            true,
-            $help,
-            $godmode,
-            $options,
-            false,
-            '',
-            GENERIC_SIZE_TEXT,
-            '',
-            $headerInformation->printHeader(true)
-        );
-    // }
+
+    $output = ui_print_page_header(
+        $title,
+        $icon,
+        true,
+        $help,
+        $godmode,
+        $options,
+        false,
+        '',
+        GENERIC_SIZE_TEXT,
+        '',
+        $headerInformation->printHeader(true),
+        false,
+        $fav_menu_config
+    );
     if ($return !== true) {
         echo $output;
     } else {
@@ -5042,8 +5098,11 @@ function ui_print_page_header(
     $numChars=GENERIC_SIZE_TEXT,
     $alias='',
     $breadcrumbs='',
-    $hide_left_small=false
+    $hide_left_small=false,
+    $fav_menu_config=[]
 ) {
+    global $config;
+
     $title = io_safe_input_html($title);
     if (($icon == '') && ($godmode == true)) {
         $icon = 'images/gm_setup.png';
@@ -5057,13 +5116,18 @@ function ui_print_page_header(
         $type = 'view';
         $type2 = 'menu_tab_frame_view';
         $separator_class = 'separator';
+        $div_style = '';
     } else {
         $type = 'view';
         $type2 = 'menu_tab_frame_view';
         $separator_class = 'separator_view';
+        $div_style = '';
+        if ($config['pure'] === true) {
+            $div_style = 'top:0px;';
+        }
     }
 
-    $buffer = '<div id="'.$type2.'"  >';
+    $buffer = '<div id="'.$type2.'" style="'.$div_style.'" >';
 
     if (!empty($breadcrumbs)) {
         $buffer .= '<div class="menu_tab_left_bc">';
@@ -5099,6 +5163,17 @@ function ui_print_page_header(
         }
     }
 
+    if (is_array($fav_menu_config) === true && is_metaconsole() === false) {
+        if (count($fav_menu_config) > 0) {
+            $buffer .= ui_print_fav_menu(
+                $fav_menu_config['id_element'],
+                $fav_menu_config['url'],
+                $fav_menu_config['label'],
+                $fav_menu_config['section']
+            );
+        }
+    }
+
     $buffer .= '</span>';
 
     if (is_metaconsole() === true) {
@@ -5935,14 +6010,14 @@ function ui_print_agent_autocomplete_input($parameters)
     $javascript_function_change .= '
         function setInputBackground(inputId, image) {
             $("#"+inputId)
-            .attr("style", "background-image: url(\'"+image+"\'); background-repeat: no-repeat; background-position: 97% center; background-size: 20px; '.$inputStyles.'");
+            .attr("style", "background-image: url(\'"+image+"\'); background-repeat: no-repeat; background-position: 97% center; background-size: 20px; width:100%; '.$inputStyles.'");
         }
 
         $(document).ready(function () {
             $("#'.$input_id.'").focusout(function (e) {
                 setTimeout(() => {
                     let iconImage = "'.$icon_image.'";
-                    $("#'.$input_id.'").attr("style", "background-image: url(\'"+iconImage+"\'); background-repeat: no-repeat; background-position: 97% center; background-size: 20px; '.$inputStyles.'");
+                    $("#'.$input_id.'").attr("style", "background-image: url(\'"+iconImage+"\'); background-repeat: no-repeat; background-position: 97% center; background-size: 20px; width:100%; '.$inputStyles.'");
                 }, 100);
             });
         });
@@ -6216,7 +6291,7 @@ function ui_print_agent_autocomplete_input($parameters)
 			if (select_item_click) {
                 select_item_click = 0;
                 $("#'.$input_id.'")
-                .attr("style", "background-image: url(\"'.$spinner_image.'\"); background-repeat: no-repeat; background-position: 97% center; background-size: 20px; '.$inputStyles.'");
+                .attr("style", "background-image: url(\"'.$spinner_image.'\"); background-repeat: no-repeat; background-position: 97% center; background-size: 20px; width:100%; '.$inputStyles.'");
 				return;
 			} else {
                 // Clear selectbox if item is not selected.
@@ -6231,7 +6306,7 @@ function ui_print_agent_autocomplete_input($parameters)
 
 			//Set loading
 			$("#'.$input_id.'")
-                .attr("style", "background-image: url(\"'.$spinner_image.'\"); background-repeat: no-repeat; background-position: 97% center; background-size: 20px; '.$inputStyles.'");
+                .attr("style", "background-image: url(\"'.$spinner_image.'\"); background-repeat: no-repeat; background-position: 97% center; background-size: 20px; width:100%; '.$inputStyles.'");
 			var term = input_value; //Word to search
 			
 			'.$javascript_change_ajax_params_text.'
@@ -6248,7 +6323,7 @@ function ui_print_agent_autocomplete_input($parameters)
 				success: function (data) {
 						if (data.length < 2) {
 							//Set icon
-							$("#'.$input_id.'").attr("style", "background-image: url(\"'.$spinner_image.'\"); background-repeat: no-repeat; background-position: 97% center; background-size: 20px; '.$inputStyles.'");
+							$("#'.$input_id.'").attr("style", "background-image: url(\"'.$spinner_image.'\"); background-repeat: no-repeat; background-position: 97% center; background-size: 20px; width:100%; '.$inputStyles.'");
 							return;
 						}
 
@@ -6298,7 +6373,7 @@ function ui_print_agent_autocomplete_input($parameters)
 
 						//Set icon
 						$("#'.$input_id.'")
-                            .attr("style", "background: url(\"'.$icon_image.'\") 97% center no-repeat; background-size: 20px; '.$inputStyles.'")
+                            .attr("style", "background: url(\"'.$icon_image.'\") 97% center no-repeat; background-size: 20px; width:100%; '.$inputStyles.'")
 						return;
 					}
 				});
@@ -6317,7 +6392,7 @@ function ui_print_agent_autocomplete_input($parameters)
     }
 
     $attrs = [];
-    $attrs['style'] = 'background-image: url('.$icon_image.'); background-repeat: no-repeat; background-position: 97% center; background-size: 20px; '.$text_color.' '.$inputStyles.'';
+    $attrs['style'] = 'background-image: url('.$icon_image.'); background-repeat: no-repeat; background-position: 97% center; background-size: 20px; width:100%; '.$text_color.' '.$inputStyles.'';
 
     if (!$disabled_javascript_on_blur_function) {
         $attrs['onblur'] = $javascript_on_blur_function_name.'()';
@@ -7025,20 +7100,6 @@ function ui_query_result_editor($name='default')
         true
     );
 
-    $editorSubContainer .= html_print_div(
-        [
-            'class'   => 'action-buttons edit-button',
-            'content' => html_print_submit_button(
-                __('Execute query'),
-                'execute_query',
-                false,
-                ['icon' => 'next'],
-                true
-            ),
-        ],
-        true
-    );
-
     $editorContainer = html_print_div(
         [
             'id'      => $name.'_editor_container',
@@ -7096,6 +7157,11 @@ function ui_query_result_editor($name='default')
             'content' => ui_get_full_url(false, false, false, false),
         ]
     );
+
+    $buttons = html_print_submit_button(__('Execute query'), 'execute_query', false, ['icon' => 'update'], true);
+    html_print_action_buttons(
+        $buttons
+    );
 }
 
 
@@ -7267,22 +7333,19 @@ function ui_get_inventory_module_add_form(
     $table = new stdClass();
     $table->id = 'inventory-module-form';
     $table->width = '100%';
-    $table->class = 'databox filters';
-    $table->style['module-title'] = 'font-weight: bold;';
-    $table->style['interval-title'] = 'font-weight: bold;';
-    $table->style['target-title'] = 'font-weight: bold;';
-    $table->style['chkbx-custom-fields-title'] = 'font-weight: bold;';
-    $table->style['username-title'] = 'font-weight: bold;';
-    $table->style['password-title'] = 'font-weight: bold;';
+    $table->class = 'databox filters filter-table-adv';
+    $table->size['module'] = '50%';
+    $table->size['interval'] = '50%';
+    $table->size['target'] = '50%';
+    $table->size['chkbx-custom-fields'] = '50%';
+    $table->size['username'] = '50%';
+    $table->size['password'] = '50%';
     $table->rowstyle = [];
     $table->rowstyle['hidden-custom-field-row'] = 'display: none;';
-    $table->colspan = [];
-    $table->colspan['custom-fields-row'] = [];
-    $table->colspan['custom-fields-row']['custom-fields-column'] = 4;
+    $table->rowstyle['custom-fields-button'] = 'display: none;';
     $table->data = [];
 
     $row = [];
-    $row['module-title'] = __('Module');
     if (empty($inventory_module_id)) {
         if (empty($os_id)) {
             $sql = 'SELECT mi.id_module_inventory AS id, mi.name AS name, co.name AS os
@@ -7314,33 +7377,111 @@ function ui_get_inventory_module_add_form(
             }
         }
 
-        $row['module-input'] = html_print_select($inventory_modules, 'id_module_inventory', 0, '', __('Select inventory module'), 0, true, false, false);
+        $row['module'] = html_print_label_input_block(
+            __('Module'),
+            html_print_select(
+                $inventory_modules,
+                'id_module_inventory',
+                0,
+                '',
+                __('Select inventory module'),
+                0,
+                true,
+                false,
+                false,
+                'w100p',
+                false,
+                'width: 100%'
+            )
+        );
     } else {
-        $row['module-input'] = db_get_sql('SELECT name FROM tmodule_inventory WHERE id_module_inventory = '.$inventory_module_id);
+        $row['module'] = html_print_label_input_block(
+            __('Module'),
+            db_get_sql('SELECT name FROM tmodule_inventory WHERE id_module_inventory = '.$inventory_module_id)
+        );
     }
 
-    $row['interval-title'] = __('Interval');
-    $row['interval-input'] = html_print_extended_select_for_time('interval', $interval, '', '', '', false, true);
+    $row['interval'] = html_print_label_input_block(
+        __('Interval'),
+        html_print_extended_select_for_time(
+            'interval',
+            $interval,
+            '',
+            '',
+            '',
+            false,
+            true,
+            false,
+            true,
+            'w100p'
+        )
+    );
 
     $table->data['first-row'] = $row;
 
     $row = [];
 
     if ($target !== false) {
-        $row['target-title'] = __('Target');
-        $row['target-input'] = html_print_input_text('target', $target, '', 25, 40, true);
+        $row['target'] = html_print_label_input_block(
+            __('Target'),
+            html_print_input_text(
+                'target',
+                $target,
+                '',
+                25,
+                40,
+                true,
+                false,
+                false,
+                '',
+                'w100p'
+            )
+        );
     }
 
-    $row['chkbx-custom-fields-title'] = __('Use custom fields');
-    $row['chkbx-custom-fields-input'] = html_print_checkbox('custom_fields_enabled', 1, $custom_fields_enabled, true);
+    $row['chkbx-custom-fields'] = html_print_label_input_block(
+        __('Use custom fields'),
+        html_print_checkbox(
+            'custom_fields_enabled',
+            1,
+            $custom_fields_enabled,
+            true
+        )
+    );
 
     $table->data['second-row'] = $row;
 
     $row = [];
-    $row['username-title'] = __('Username');
-    $row['username-input'] = html_print_input_text('username', $username, '', 25, 40, true);
-    $row['password-title'] = __('Password');
-    $row['password-input'] = html_print_input_password('password', $password, '', 25, 40, true);
+    $row['username'] = html_print_label_input_block(
+        __('Username'),
+        html_print_input_text(
+            'username',
+            $username,
+            '',
+            25,
+            40,
+            true,
+            false,
+            false,
+            '',
+            'w100p'
+        )
+    );
+
+    $row['password'] = html_print_label_input_block(
+        __('Password'),
+        html_print_input_password(
+            'password',
+            $password,
+            '',
+            25,
+            40,
+            true,
+            false,
+            false,
+            'w100p'
+        )
+    );
 
     $table->data['userpass-row'] = $row;
 
@@ -7348,8 +7489,18 @@ function ui_get_inventory_module_add_form(
     $row['hidden-title'] = '';
     $row['hidden-input'] = html_print_input_hidden('hidden-custom-field-name', '', true);
     $row['hidden-input'] .= html_print_input_hidden('hidden-custom-field-is-secure', 0, true);
-    $row['hidden-input'] .= html_print_input_text('hidden-custom-field-input', '', '', 25, 40, true);
-    $row['hidden-input'] .= '<span>&nbsp;</span>';
+    $row['hidden-input'] .= html_print_input_text(
+        'hidden-custom-field-input',
+        '',
+        '',
+        25,
+        40,
+        true,
+        false,
+        false,
+        '',
+        'w93p'
+    );
     $row['hidden-input'] .= html_print_image(
         'images/delete.svg',
         true,
@@ -7414,19 +7565,51 @@ function ui_get_inventory_module_add_form(
     }
 
     $row = [];
-    $row['custom-fields-column'] = '<b>'.__('Field name').'</b>'.'&nbsp;&nbsp;'.html_print_input_text('field-name', '', '', 25, 40, true).'&nbsp;&nbsp;&nbsp;'.html_print_checkbox('field-is-password', 1, false, true).__("It's a password").'&nbsp;&nbsp;&nbsp;'.html_print_button(__('Add field'), 'add-field', false, '', 'class="sub add"', true);
+    $row['custom-fields-column'] = html_print_label_input_block(
+        __('Field name'),
+        '<div class="flex">'.html_print_input_text(
+            'field-name',
+            '',
+            '',
+            25,
+            40,
+            true,
+            false,
+            false,
+            '',
+            'w60p mrgn_right_10px'
+        ).html_print_checkbox(
+            'field-is-password',
+            1,
+            false,
+            true
+        ).'&nbsp;'.__("It's a password").'</div>'
+    );
 
     $table->data['custom-fields-row'] = $row;
 
+    $row = [];
+    $row['custom-fields-button-title'] = '';
+    $row['custom-fields-button'] = html_print_button(
+        __('Add field'),
+        'add-field',
+        false,
+        '',
+        [
+            'class' => 'mini float-right',
+            'icon'  => 'plus',
+        ],
+        true
+    );
+
+    $table->data['custom-fields-button'] = $row;
+
     ob_start();
 
-    echo '<form name="modulo" method="post" action="'.$form_action.'">';
+    echo '<form id="policy_inventory_module_edit_form" name="modulo" method="post" action="'.$form_action.'" class="max_floating_element_size">';
     echo html_print_table($table);
-    echo '<div class="action-buttons w100p">';
     echo $form_buttons;
-    echo '</div>';
     echo '</form>';
-
     ?>
 
 <script type="text/javascript">
@@ -7617,4 +7800,48 @@ function ui_print_status_div($status)
     }
 
     return $return;
+}
+
+
+function ui_print_fav_menu($id_element, $url, $label, $section)
+{
+    global $config;
+    $label = io_safe_output($label);
+    if (strlen($label) > 18) {
+        $label = io_safe_input(substr($label, 0, 18).'...');
+    }
+
+    $fav = db_get_row_filter(
+        'tfavmenu_user',
+        [
+            'url'     => $url,
+            'id_user' => $config['id_user'],
+        ],
+        ['*']
+    );
+    $config_fav_menu = [
+        'id_element' => $id_element,
+        'url'        => $url,
+        'label'      => $label,
+        'section'    => $section,
+    ];
+
+    $output = '<span class="fav-menu">';
+    $output .= html_print_input_image(
+        'fav-menu-action',
+        (($fav !== false) ? 'images/star_fav_menu.png' : 'images/star_dark.png'),
+        base64_encode(json_encode($config_fav_menu)),
+        '',
+        true,
+        [
+            'onclick' => 'favMenuAction(this)',
+            'class'   => (($fav !== false) ? 'active' : ''),
+        ]
+    );
+    $output .= '</span>';
+    $output .= '<div id="dialog-fav-menu">';
+    $output .= '<p><b>'.__('Title').'</b></p>';
+    $output .= html_print_input_text('label_fav_menu', '', '', 25, 255, true, false, true);
+    $output .= '</div>';
+    return $output;
 }
\ No newline at end of file
diff --git a/pandora_console/include/graphs/fgraph.php b/pandora_console/include/graphs/fgraph.php
index 46436167d1..db068d2140 100644
--- a/pandora_console/include/graphs/fgraph.php
+++ b/pandora_console/include/graphs/fgraph.php
@@ -696,7 +696,7 @@ function get_build_setup_charts($type, $options, $data)
         $legend->setAlign($legendAlign);
 
         // Defaults fonts legends.
-        $legend->labels()->getFonts()->setFamily((empty($config['fontpath']) === true) ? 'Lato' : $config['fontpath']);
+        $legend->labels()->getFonts()->setFamily((empty($config['fontpath']) === true) ? 'lato' : $config['fontpath']);
         $legend->labels()->getFonts()->setStyle('normal');
         $legend->labels()->getFonts()->setWeight(600);
         $legend->labels()->getFonts()->setSize(((int) $config['font_size'] + 2));
@@ -835,7 +835,7 @@ function get_build_setup_charts($type, $options, $data)
         $dataLabel->setFormatter($dataLabelFormatter);
 
         // Defaults fonts datalabel.
-        $dataLabel->getFonts()->setFamily((empty($config['fontpath']) === true) ? 'Lato' : $config['fontpath']);
+        $dataLabel->getFonts()->setFamily((empty($config['fontpath']) === true) ? 'lato' : $config['fontpath']);
         $dataLabel->getFonts()->setStyle('normal');
         $dataLabel->getFonts()->setWeight(600);
         $dataLabel->getFonts()->setSize(((int) $config['font_size'] + 2));
@@ -944,14 +944,14 @@ function get_build_setup_charts($type, $options, $data)
 
         // Defaults scalesFont X.
         $scalesXFonts = $scales->getX()->ticks()->getFonts();
-        $scalesXFonts->setFamily((empty($config['fontpath']) === true) ? 'Lato' : $config['fontpath']);
+        $scalesXFonts->setFamily((empty($config['fontpath']) === true) ? 'lato' : $config['fontpath']);
         $scalesXFonts->setStyle('normal');
         $scalesXFonts->setWeight(600);
         $scalesXFonts->setSize(((int) $config['font_size'] + 2));
 
         // Defaults scalesFont Y.
         $scalesYFonts = $scales->getY()->ticks()->getFonts();
-        $scalesYFonts->setFamily((empty($config['fontpath']) === true) ? 'Lato' : $config['fontpath']);
+        $scalesYFonts->setFamily((empty($config['fontpath']) === true) ? 'lato' : $config['fontpath']);
         $scalesYFonts->setStyle('normal');
         $scalesYFonts->setWeight(600);
         $scalesYFonts->setSize(((int) $config['font_size'] + 2));
diff --git a/pandora_console/include/graphs/functions_flot.php b/pandora_console/include/graphs/functions_flot.php
index dc32be4b9b..94bb58b260 100644
--- a/pandora_console/include/graphs/functions_flot.php
+++ b/pandora_console/include/graphs/functions_flot.php
@@ -730,8 +730,9 @@ function flot_slicesbar_graph(
     global $config;
 
     if ($ttl == 2) {
+        $tokem_config = uniqid('slicebar');
         $params = [
-            'graph_data'         => $graph_data,
+            'tokem_config'       => $tokem_config,
             'period'             => $period,
             'width'              => $width,
             'height'             => $height,
@@ -753,6 +754,8 @@ function flot_slicesbar_graph(
             'date_to'            => $date_to,
             'server_id'          => $server_id,
         ];
+        // TO-DO Cambiar esto para que se pase por POST, NO SE PUEDE PASAR POR GET.
+        update_config_token($tokem_config, json_encode($graph_data));
 
         $graph = '<img src="data:image/png;base64,';
         $graph .= generator_chart_to_pdf('slicebar', $params);
diff --git a/pandora_console/include/graphs/pandora.d3.js b/pandora_console/include/graphs/pandora.d3.js
index 3e181edceb..09150de658 100644
--- a/pandora_console/include/graphs/pandora.d3.js
+++ b/pandora_console/include/graphs/pandora.d3.js
@@ -2167,7 +2167,7 @@ function print_circular_progress_bar(
 
   var numberText = circle
     .append("text")
-    .attr("fill", label_color)
+    .attr("fill", "#333333")
     .style("font-weight", "bold")
     .style("font-size", numberSize)
     .attr("text-anchor", "middle")
@@ -2175,7 +2175,7 @@ function print_circular_progress_bar(
 
   var percentText = circle
     .append("text")
-    .attr("fill", label_color)
+    .attr("fill", "#333333")
     .style("font-weight", "bold")
     .style("font-size", unitSize)
     .text(unit)
diff --git a/pandora_console/include/javascript/elasticsearch_queryResult.js b/pandora_console/include/javascript/elasticsearch_queryResult.js
index 6a57e266bc..c50f8955b3 100644
--- a/pandora_console/include/javascript/elasticsearch_queryResult.js
+++ b/pandora_console/include/javascript/elasticsearch_queryResult.js
@@ -9,7 +9,7 @@ view.renderer.setShowGutter(false);
 view.setReadOnly(true);
 view.setShowPrintMargin(false);
 
-$("#submit-execute_query").click(function() {
+$("#button-execute_query").click(function() {
   view.setValue("");
   let text;
   let selectText = editor.getSelectedText();
diff --git a/pandora_console/include/javascript/jquery.pandora.controls.js b/pandora_console/include/javascript/jquery.pandora.controls.js
index bbb33af07d..92cd39c3ff 100644
--- a/pandora_console/include/javascript/jquery.pandora.controls.js
+++ b/pandora_console/include/javascript/jquery.pandora.controls.js
@@ -296,7 +296,7 @@
   $.extend({
     pandoraSelectGroupIcon: new (function() {
       this.defaults = {
-        alertSelect: "select#id_group",
+        alertSelect: "select#grupo",
         spanPreview: "#group_preview",
         debug: false
       };
@@ -315,25 +315,26 @@
 
           $(this).change(function() {
             var id_group = this.value;
+            let href = $("a", config.spanPreview).attr("href");
+            let hrefPosition = href.search("group_id=");
+            let hrefNew = href.slice(0, hrefPosition) + "group_id=" + id_group;
 
-            $(config.spanPreview).fadeOut("fast", function() {
-              $("img", config.spanPreview).remove();
-              jQuery.post(
-                "ajax.php",
-                {
-                  page: "godmode/groups/group_list",
-                  get_group_json: 1,
-                  id_group: id_group
-                },
-                function(data) {
-                  var img = $("<img />").attr("src", "images/" + data["icon"]);
-                  $(config.spanPreview)
-                    .append(img)
-                    .fadeIn("fast");
-                },
-                "json"
-              );
-            });
+            jQuery.post(
+              "ajax.php",
+              {
+                page: "godmode/groups/group_list",
+                get_group_json: 1,
+                id_group: id_group
+              },
+              function(data) {
+                $("img", config.spanPreview).attr(
+                  "src",
+                  "images/" + data["icon"]
+                );
+                $("a", config.spanPreview).attr("href", hrefNew);
+              },
+              "json"
+            );
           });
         });
       };
diff --git a/pandora_console/include/javascript/jquery.pandora.js b/pandora_console/include/javascript/jquery.pandora.js
index 31e31c9183..5b39a98631 100644
--- a/pandora_console/include/javascript/jquery.pandora.js
+++ b/pandora_console/include/javascript/jquery.pandora.js
@@ -226,8 +226,8 @@ $(document).ready(function() {
       resizable: false,
       draggable: true,
       modal: true,
-      height: 450,
-      width: 620,
+      height: 410,
+      width: 390,
       overlay: {
         opacity: 0.5,
         background: "black"
diff --git a/pandora_console/include/javascript/pandora_dashboards.js b/pandora_console/include/javascript/pandora_dashboards.js
index 7ffafd974f..6fcaf24c16 100644
--- a/pandora_console/include/javascript/pandora_dashboards.js
+++ b/pandora_console/include/javascript/pandora_dashboards.js
@@ -806,7 +806,9 @@ function dashboardLoadNetworkMap(settings) {
       auth_hash: settings.auth_hash,
       id_user: settings.id_user,
       ignore_acl: 1,
-      node: settings.node
+      node: settings.node,
+      dashboard: 1,
+      size: settings.size
     },
     dataType: "html",
     success: function(data) {
diff --git a/pandora_console/include/javascript/pandora_events.js b/pandora_console/include/javascript/pandora_events.js
index e3f4040205..2f657779a6 100644
--- a/pandora_console/include/javascript/pandora_events.js
+++ b/pandora_console/include/javascript/pandora_events.js
@@ -972,6 +972,9 @@ function openSoundEventModal(settings) {
       width: 600,
       height: 600,
       open: function() {
+        $(".ui-widget-overlay")
+          .css("background", "black")
+          .css("opacity", 0.5);
         $.ajax({
           method: "post",
           url: settings.url,
diff --git a/pandora_console/include/javascript/pandora_ui.js b/pandora_console/include/javascript/pandora_ui.js
index f8252e79ac..95ffe898b0 100644
--- a/pandora_console/include/javascript/pandora_ui.js
+++ b/pandora_console/include/javascript/pandora_ui.js
@@ -352,10 +352,10 @@ function load_modal(settings) {
         }
       } else {
         // No onsumbit configured. Directly close.
-        d.dialog("close");
         if (document.getElementById(settings.form) != undefined) {
           document.getElementById(settings.form).submit();
         }
+        d.dialog("close");
       }
     };
 
@@ -834,3 +834,55 @@ function unblockSubmit(button) {
   expireCookie("downloadReady");
   attempts = 30;
 }
+
+function favMenuAction(e) {
+  var data = JSON.parse(atob(e.value));
+  if (data.label === "" && $(e).hasClass("active") === false) {
+    $("#dialog-fav-menu").dialog({
+      title: "Please choose a title",
+      width: 330,
+      buttons: [
+        {
+          class:
+            "ui-widget ui-state-default ui-corner-all ui-button-text-only sub upd submit-next",
+          text: "Confirm",
+          click: function() {
+            data.label = $("#text-label_fav_menu").val();
+            if (data.label.length > 18) {
+              data.label = data.label.slice(0, 18) + "...";
+            }
+
+            $(e).val(btoa(JSON.stringify(data)));
+            favMenuAction(e);
+            $(this).dialog("close");
+            $("input[name='label_fav_menu']").val("");
+          }
+        }
+      ]
+    });
+    return;
+  }
+  $.ajax({
+    method: "POST",
+    url: "ajax.php",
+    dataType: "json",
+    data: {
+      page: "include/ajax/fav_menu.ajax",
+      id_element: data["id_element"],
+      url: data["url"],
+      label: data["label"],
+      section: data["section"]
+    },
+    success: function(res) {
+      if (res.success) {
+        if (res.action === "create") {
+          $("#image-fav-menu-action1").attr("src", "images/star_fav_menu.png");
+          $("#image-fav-menu-action1").addClass("active");
+        } else {
+          $("#image-fav-menu-action1").attr("src", "images/star_dark.png");
+          $("#image-fav-menu-action1").removeClass("active");
+        }
+      }
+    }
+  });
+}
diff --git a/pandora_console/include/javascript/tipsWindow.js b/pandora_console/include/javascript/tipsWindow.js
index 1f63c2bbe2..94d28c9339 100644
--- a/pandora_console/include/javascript/tipsWindow.js
+++ b/pandora_console/include/javascript/tipsWindow.js
@@ -2,15 +2,16 @@
 $(document).ready(function() {
   $("#button-button_add_image").on("click", function() {
     var numberImages = $("#inputs_images").children().length;
+    $(".input-file").each(function(index) {
+      $(this).attr("name", "file_" + index);
+    });
     var div_image = document.createElement("div");
     $(div_image).attr("class", "action_image");
     $(div_image).append(
-      `<input type="file" accept="image/png,image/jpeg,image/gif" name="file_${numberImages +
-        1}"  onchange="checkImage(this)"/>`
+      `<input type="file" accept="image/png,image/jpeg,image/gif" class="input-file" name="file_${numberImages}"  onchange="checkImage(this)" required/>`
     );
     $(div_image).append(
-      `<input type="image" src="images/delete.svg" onclick="removeInputImage('file_${numberImages +
-        1}');" class="remove-image" value="-"/>`
+      `<input type="image" src="images/delete.svg" onclick="removeInputImage(this);" class="remove-image main_menu_icon" value="-"/>`
     );
     $("#inputs_images").append(div_image);
   });
@@ -72,8 +73,8 @@ function activeCarousel() {
     $(".carousel .images").bxSlider({ controls: true });
   }
 }
-function removeInputImage(name) {
-  $(`input[name=${name}]`)
+function removeInputImage(e) {
+  $(e)
     .parent()
     .remove();
   if ($(".action_image").length === 0) {
@@ -314,7 +315,7 @@ function previewTip() {
 
   //Images in client
   var totalInputsFiles = $("input[type=file]").length;
-  if (totalInputsFiles > 0) {
+  if (totalInputsFiles > 0 && validateImages()) {
     extradata["totalFiles64"] = totalInputsFiles;
     $("input[type=file]").each(function(index) {
       var reader = new FileReader();
@@ -352,3 +353,15 @@ function previewTip() {
     });
   }
 }
+
+function validateImages() {
+  $(".empty_input_images").addClass("invisible");
+  let validate = true;
+  $("input[type=file]").each(function() {
+    if (this.files.length == 0) {
+      $(".empty_input_images").removeClass("invisible");
+      validate = false;
+    }
+  });
+  return validate;
+}
diff --git a/pandora_console/include/lib/ClusterViewer/ClusterWizard.php b/pandora_console/include/lib/ClusterViewer/ClusterWizard.php
index df7385eabf..4cc04e2318 100644
--- a/pandora_console/include/lib/ClusterViewer/ClusterWizard.php
+++ b/pandora_console/include/lib/ClusterViewer/ClusterWizard.php
@@ -1250,7 +1250,10 @@ class ClusterWizard extends \HTML
                 'name'       => 'next',
                 'label'      => $str,
                 'type'       => 'submit',
-                'attributes' => 'class="sub next"',
+                'attributes' => [
+                    'icon' => 'wand',
+                    'mode' => 'primary',
+                ],
                 'return'     => true,
             ],
         ];
diff --git a/pandora_console/include/lib/Dashboard/Manager.php b/pandora_console/include/lib/Dashboard/Manager.php
index c36a3116af..db8235681a 100644
--- a/pandora_console/include/lib/Dashboard/Manager.php
+++ b/pandora_console/include/lib/Dashboard/Manager.php
@@ -568,6 +568,16 @@ class Manager implements PublicLogin
                 'tdashboard',
                 ['id' => $this->dashboardId]
             );
+
+            // Delete dashboard from fav menu.
+            \db_process_sql_delete(
+                'tfavmenu_user',
+                [
+                    'id_element' => $this->dashboardId,
+                    'section'    => 'Dashboard_',
+                    'id_user'    => $config['id_user'],
+                ]
+            );
         }
 
         // Audit.
diff --git a/pandora_console/include/lib/Dashboard/Widgets/AvgSumMaxMinModule.php b/pandora_console/include/lib/Dashboard/Widgets/AvgSumMaxMinModule.php
index c1ea70eaba..033761afdf 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/AvgSumMaxMinModule.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/AvgSumMaxMinModule.php
@@ -316,6 +316,10 @@ class AvgSumMaxMinModule extends Widget
             $values['unit'] = $decoder['unit'];
         }
 
+        if (isset($decoder['horizontal']) === true) {
+            $values['horizontal'] = $decoder['horizontal'];
+        }
+
         return $values;
     }
 
@@ -501,6 +505,18 @@ class AvgSumMaxMinModule extends Widget
             ],
         ];
 
+        // Horizontal.
+        $inputs[] = [
+            'label'     => __('Horizontal').ui_print_help_tip(__('If not, layout is vertical'), true),
+            'arguments' => [
+                'wrapper' => 'div',
+                'name'    => 'horizontal',
+                'type'    => 'switch',
+                'value'   => $values['horizontal'],
+                'return'  => true,
+            ],
+        ];
+
         return $inputs;
     }
 
@@ -525,6 +541,7 @@ class AvgSumMaxMinModule extends Widget
         $values['sizeLabel'] = \get_parameter_switch('sizeLabel');
         $values['text_color'] = \get_parameter('text_color', 0);
         $values['unit'] = \get_parameter_switch('unit');
+        $values['horizontal'] = \get_parameter_switch('horizontal');
 
         return $values;
     }
@@ -601,13 +618,13 @@ class AvgSumMaxMinModule extends Widget
             break;
 
             case 2:
-                $rows = modules_get_min_max_data($id_module, $to);
+                $rows = module_get_min_max_tagente_datos($id_module, $to, $now);
 
                 $data = $rows[0]['max'];
             break;
 
             case 3:
-                $rows = modules_get_min_max_data($id_module, $to);
+                $rows = module_get_min_max_tagente_datos($id_module, $to, $now);
 
                 $data = $rows[0]['min'];
             break;
@@ -621,11 +638,22 @@ class AvgSumMaxMinModule extends Widget
         $sizeLabel = (isset($this->values['sizeLabel']) === true) ? $this->values['sizeLabel'] : 40;
         $sizeValue = (isset($this->values['sizeValue']) === true) ? $this->values['sizeValue'] : 40;
 
-        $output .= '<div class="container-center">';
+        $uuid = uniqid();
+
+        $output .= '<div class="container-center" id="container-'.$uuid.'">';
+
+        $orientation = '';
+        if ((int) $this->values['horizontal'] === 1) {
+            $orientation = 'flex aligni_center';
+        } else {
+            $orientation = 'grid';
+        }
+
         // General div.
-        $output .= '<div class="container-icon">';
+        $output .= '<div class="'.$orientation.'" id="general-'.$uuid.'">';
+
         // Div value.
-        $output .= '<div style="flex: 0 1 '.$sizeValue.'px; font-size:'.$sizeValue.'px;'.$text_color.'">';
+        $output .= '<div class="pdd_l_15px pdd_r_15px mrgn_btn_20px" style="line-height: '.$sizeValue.'px; font-size:'.$sizeValue.'px;'.$text_color.'">';
 
         if (is_numeric($data) === true) {
             $dataDatos = remove_right_zeros(
@@ -651,11 +679,22 @@ class AvgSumMaxMinModule extends Widget
 
         if (empty($label) === false) {
             // Div Label.
-            $output .= '<div style="flex: 1 1 '.$sizeLabel.'px; font-size:'.$sizeLabel.'px;'.$text_color.'">'.$label.'</div>';
+            $output .= '<div class="pdd_l_15px pdd_r_15px" style="line-height: '.$sizeLabel.'px; font-size:'.$sizeLabel.'px;'.$text_color.'">'.$label.'</div>';
         }
 
         $output .= '</div>';
         $output .= '</div>';
+
+        $output .= '<script>
+        var containerWidth = document.querySelector("#container-'.$uuid.'").offsetWidth;
+        var generalWidth = document.querySelector("#general-'.$uuid.'").offsetWidth;
+
+        if (generalWidth >= containerWidth) {
+            $("#container-'.$uuid.'").css("align-items", "flex-start");
+        } else {
+            $("#container-'.$uuid.'").css("align-items", "center");
+        }
+        </script>';
         return $output;
     }
 
diff --git a/pandora_console/include/lib/Dashboard/Widgets/DataMatrix.php b/pandora_console/include/lib/Dashboard/Widgets/DataMatrix.php
index f4b27a5830..1f3ed213c7 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/DataMatrix.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/DataMatrix.php
@@ -520,7 +520,7 @@ class DataMatrix extends Widget
                     [
                         'id'                  => $tableId,
                         'class'               => 'info_table',
-                        'style'               => 'width: 100%',
+                        'style'               => 'width: 99%',
                         'columns'             => $columns,
                         'column_names'        => $column_names,
                         'ajax_url'            => 'include/ajax/module',
@@ -539,6 +539,7 @@ class DataMatrix extends Widget
                             'direction' => 'desc',
                         ],
                         'csv'                 => 0,
+                        'dom_elements'        => 'frtilp',
                     ]
                 );
             } catch (\Exception $e) {
@@ -643,7 +644,14 @@ class DataMatrix extends Widget
             }
 
             $columns_sort[] = ($key + 1);
-            $column_names[] = $name;
+            $column_names[] = \ui_print_truncate_text(
+                \io_safe_output($name),
+                'agent_small',
+                false,
+                true,
+                false,
+                '...'
+            );
         }
 
         $data = [
diff --git a/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php b/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php
index 21fa53d21c..2944663135 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php
@@ -179,7 +179,7 @@ class ModulesByStatus extends Widget
         // This forces at least a first configuration.
         // This forces at least a first configuration.
         $this->configurationRequired = false;
-        if (empty($this->values['status']) === true) {
+        if (empty($this->values['status']) === true && $this->values['status'] !== '0') {
             $this->configurationRequired = true;
         }
 
@@ -311,6 +311,8 @@ class ModulesByStatus extends Widget
                 $nodes_fields[$server['id']] = $server['server_name'];
             }
 
+            $nodes_fields[0] = __('Metaconsola');
+
             $nodes_selected = explode(',', $values['nodes']);
 
             (isset($values['nodes']) === false) ? $nodes_selected = $servers_ids : '';
@@ -369,6 +371,8 @@ class ModulesByStatus extends Widget
     {
         $this->size = parent::getSize();
 
+        global $config;
+
         $output = '';
 
         if (is_metaconsole() === true) {
@@ -413,7 +417,7 @@ class ModulesByStatus extends Widget
                     [
                         'id'                 => $tableId,
                         'class'              => 'info_table align-left-important',
-                        'style'              => 'width: 100%',
+                        'style'              => 'width: 99%',
                         'columns'            => $columns,
                         'column_names'       => $column_names,
                         'ajax_url'           => 'include/ajax/module',
@@ -430,6 +434,26 @@ class ModulesByStatus extends Widget
                             'direction' => 'desc',
                         ],
                         'csv'                => 0,
+                        'pagination_options' => [
+                            [
+                                5,
+                                10,
+                                25,
+                                100,
+                                200,
+                                500,
+                                1000,
+                            ],
+                            [
+                                5,
+                                10,
+                                25,
+                                100,
+                                200,
+                                500,
+                                1000,
+                            ],
+                        ],
                     ]
                 );
             } catch (\Exception $e) {
diff --git a/pandora_console/include/lib/Dashboard/Widgets/agent_module.php b/pandora_console/include/lib/Dashboard/Widgets/agent_module.php
index fbc4165b4d..9d6cb524f7 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/agent_module.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/agent_module.php
@@ -424,9 +424,9 @@ class AgentModuleWidget extends Widget
         array $visualData,
         array $allModules
     ):string {
-        $style = 'display:flex; width:96%; margin-top: 10px;';
+        $style = 'display:flex; width:100%; margin-top: 10px;';
         $table_data = '<div style="'.$style.'">';
-        $table_data .= '<table class="widget_agent_module transparent mrgn_0px" cellpadding="1" cellspacing="0" border="0">';
+        $table_data .= '<table class="info_table transparent" cellpadding="1" cellspacing="0" border="0">';
 
         if (empty($visualData) === false) {
             $table_data .= '<th>'.__('Agents').' / '.__('Modules').'</th>';
@@ -450,29 +450,24 @@ class AgentModuleWidget extends Widget
                 switch ($row['agent_status']) {
                     case AGENT_STATUS_ALERT_FIRED:
                         $rowcolor = COL_ALERTFIRED;
-                        $textcolor = '#000';
                     break;
 
                     case AGENT_STATUS_CRITICAL:
                         $rowcolor = COL_CRITICAL;
-                        $textcolor = '#FFF';
                     break;
 
                     case AGENT_STATUS_WARNING:
                         $rowcolor = COL_WARNING;
-                        $textcolor = '#000';
                     break;
 
                     case AGENT_STATUS_NORMAL:
                         $rowcolor = COL_NORMAL;
-                        $textcolor = '#FFF';
                     break;
 
                     case AGENT_STATUS_UNKNOWN:
                     case AGENT_STATUS_ALL:
                     default:
                         $rowcolor = COL_UNKNOWN;
-                        $textcolor = '#FFF';
                     break;
                 }
 
@@ -484,8 +479,10 @@ class AgentModuleWidget extends Widget
                     false,
                     '...'
                 );
-                $table_data .= "<td style='background-color: ".$rowcolor.";'>";
+                $table_data .= '<td>';
+                $table_data .= '<div class="flex"><div class="div-state-agent" style="background-color: '.$rowcolor.';"></div>';
                 $table_data .= $file_name;
+                $table_data .= '</div>';
                 $table_data .= '</td>';
 
                 if ($row['modules'] === null) {
@@ -494,7 +491,7 @@ class AgentModuleWidget extends Widget
 
                 foreach ($row['modules'] as $module_name => $module) {
                     if ($this->values['mTypeShow'] === '1') {
-                        $style = 'text-align: center;';
+                        $style = 'text-align: left;';
                         $style .= ' background-color: transparent;';
                         $table_data .= "<td style='".$style."'>";
                         $table_data .= $module;
@@ -509,7 +506,7 @@ class AgentModuleWidget extends Widget
                                 continue;
                             }
                         } else {
-                            $style = 'text-align: center;';
+                            $style = 'text-align: left;';
                             $style .= ' background-color: transparent;';
                             $table_data .= "<td style='".$style."'>";
                             switch ($module) {
diff --git a/pandora_console/include/lib/Dashboard/Widgets/alerts_fired.php b/pandora_console/include/lib/Dashboard/Widgets/alerts_fired.php
index 68107388b4..48eeefac75 100755
--- a/pandora_console/include/lib/Dashboard/Widgets/alerts_fired.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/alerts_fired.php
@@ -284,11 +284,16 @@ class AlertsFiredWidget extends Widget
 
         if (isset($groups) === true && is_array($groups) === true) {
             $table = new \StdClass();
-            $table->class = 'databox data';
+            $table->class = 'databox data centered';
             $table->cellspacing = '0';
-            $table->width = '90%';
+            $table->width = '100%';
             $table->data = [];
             $table->size = [];
+            $table->style = [];
+            $table->style[0] = 'text-align: left;';
+            $table->style[1] = 'text-align: left;';
+            $table->style[2] = 'text-align: left;';
+            $table->style[3] = 'text-align: left;';
 
             $url = $config['homeurl'];
             $url .= 'index.php?sec=estado&sec2=operation/agentes/alerts_status';
@@ -335,7 +340,7 @@ class AlertsFiredWidget extends Widget
             if ($flag === true) {
                 $height = (count($table->data) * 30);
                 $style = 'min-width:300px; min-height:'.$height.'px;';
-                $output .= '<div class="container-center" style="'.$style.'">';
+                $output .= '<div class="" style="'.$style.'">';
                 $output .= html_print_table($table, true);
                 $output .= '</div>';
             } else {
diff --git a/pandora_console/include/lib/Dashboard/Widgets/custom_graph.php b/pandora_console/include/lib/Dashboard/Widgets/custom_graph.php
index b639780490..bc7b891a54 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/custom_graph.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/custom_graph.php
@@ -521,7 +521,7 @@ class CustomGraphWidget extends Widget
 
         $params = [
             'period'          => $this->values['period'],
-            'width'           => ($size['width'] - 10),
+            'width'           => ($size['width']),
             'height'          => $height,
             'only_image'      => false,
             'homeurl'         => $config['homeurl'],
diff --git a/pandora_console/include/lib/Dashboard/Widgets/events_list.php b/pandora_console/include/lib/Dashboard/Widgets/events_list.php
index 58c947f4bf..0b090f6988 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/events_list.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/events_list.php
@@ -663,7 +663,7 @@ class EventsListWidget extends Widget
             [
                 'id'                             => $table_id,
                 'class'                          => 'info_table events',
-                'style'                          => 'width: 100%;',
+                'style'                          => 'width: 99%;',
                 'ajax_url'                       => 'operation/events/events',
                 'ajax_data'                      => [
                     'get_events'     => 1,
@@ -697,6 +697,7 @@ class EventsListWidget extends Widget
                 'ajax_return_operation_function' => 'process_buffers',
                 'return'                         => true,
                 'csv'                            => 0,
+                'dom_elements'                   => 'frtilp',
             ]
         );
 
diff --git a/pandora_console/include/lib/Dashboard/Widgets/module_icon.php b/pandora_console/include/lib/Dashboard/Widgets/module_icon.php
index 5523a851ef..6790d70616 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/module_icon.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/module_icon.php
@@ -305,6 +305,10 @@ class ModuleIconWidget extends Widget
             $values['imageSrc'] = $decoder['imageSrc'];
         }
 
+        if (isset($decoder['horizontal']) === true) {
+            $values['horizontal'] = $decoder['horizontal'];
+        }
+
         return $values;
     }
 
@@ -482,6 +486,18 @@ class ModuleIconWidget extends Widget
             ],
         ];
 
+        // Horizontal.
+        $inputs[] = [
+            'label'     => __('Horizontal').ui_print_help_tip(__('If not, layout is vertical'), true),
+            'arguments' => [
+                'wrapper' => 'div',
+                'name'    => 'horizontal',
+                'type'    => 'switch',
+                'value'   => $values['horizontal'],
+                'return'  => true,
+            ],
+        ];
+
         return $inputs;
     }
 
@@ -504,6 +520,7 @@ class ModuleIconWidget extends Widget
         $values['sizeValue'] = \get_parameter('sizeValue', 0);
         $values['sizeLabel'] = \get_parameter_switch('sizeLabel');
         $values['sizeIcon'] = \get_parameter_switch('sizeIcon');
+        $values['horizontal'] = \get_parameter_switch('horizontal');
 
         return $values;
     }
@@ -533,39 +550,84 @@ class ModuleIconWidget extends Widget
             $this->values['moduleId']
         );
 
+        $unit = \modules_get_unit($this->values['moduleId']);
+
         $icon = $this->values['imageSrc'];
         $label = $this->values['label'];
         $sizeLabel = (($this->values['sizeLabel'] !== 0) ? $this->values['sizeLabel'] : 20);
         $sizeValue = (($this->values['sizeValue'] !== 0) ? $this->values['sizeValue'] : 20);
         $sizeIcon = (($this->values['sizeIcon'] !== 0) ? $this->values['sizeIcon'] : 100);
 
-        $output .= '<div class="container-center">';
+        $uuid = uniqid();
+
+        $output .= '<div class="container-center" id="container-'.$uuid.'">';
+
+        $orientation = '';
+        if ((int) $this->values['horizontal'] === 1) {
+            $orientation = 'flex aligni_center';
+        } else {
+            $orientation = 'grid';
+        }
+
         // General div.
-        $output .= '<div class="container-icon">';
+        $output .= '<div class="'.$orientation.'" id="general-'.$uuid.'">';
+
+        $sql = 'SELECT min_warning,
+        max_warning,
+        min_critical,
+        max_critical,
+        str_warning,
+        str_critical 
+        FROM tagente_modulo
+        WHERE id_agente_modulo = '.(int) $this->values['moduleId'];
+        $sql_data = db_get_row_sql($sql);
+
+        $last = modules_get_last_value($this->values['moduleId']);
+
+        $color_icon = '_ok';
+        if (($last >= $sql_data['min_warning']) && ($last < $sql_data['max_warning'])) {
+            $color_icon = '_warning';
+        }
+
+        if ($last >= $sql_data['max_warning']) {
+            $color_icon = '_bad';
+        }
 
         // Div image.
-        $output .= '<div style="flex: 0 1 '.$sizeIcon.'px;">';
+        $style_icon = 'flex: 0 1 '.$sizeIcon.'px;';
+
+        $output .= '<div class="pdd_l_15px pdd_r_15px mrgn_btn_25px" style="flex: 0 1 '.$sizeIcon.'px; height: '.$sizeIcon.'px;">';
         $output .= html_print_image(
-            'images/console/icons/'.$icon.'.png',
+            'images/console/icons/'.$icon.$color_icon.'.png',
             true,
             ['width' => $sizeIcon]
         );
         $output .= '</div>';
-
         // Div value.
-        $output .= '<div style="flex: 0 1 10px; font-size:'.$sizeValue.'px;">';
+        $output .= '<div class="mrgn_btn_15px" style="flex: 0 1 10px; line-height: '.$sizeValue.'px; font-size:'.$sizeValue.'px;">';
         $output .= remove_right_zeros(
             number_format($data_module, $config['graph_precision'], $config['decimal_separator'], $config['thousand_separator'])
-        );
+        ).$unit;
         $output .= '</div>';
 
         if (empty($label) === false) {
             // Div Label.
-            $output .= '<div style="flex: 1; font-size:'.$sizeLabel.'px;">'.$label.'</div>';
+            $output .= '<div class="pdd_l_15px pdd_r_15px" style="flex: 1; line-height: '.$sizeLabel.'px; font-size:'.$sizeLabel.'px;">'.$label.'</div>';
         }
 
         $output .= '</div>';
         $output .= '</div>';
+
+        $output .= '<script>
+        var containerWidth = document.querySelector("#container-'.$uuid.'").offsetWidth;
+        var generalWidth = document.querySelector("#general-'.$uuid.'").offsetWidth;
+
+        if (generalWidth >= containerWidth) {
+            $("#container-'.$uuid.'").css("align-items", "flex-start");
+        } else {
+            $("#container-'.$uuid.'").css("align-items", "center");
+        }
+        </script>';
         return $output;
     }
 
diff --git a/pandora_console/include/lib/Dashboard/Widgets/module_status.php b/pandora_console/include/lib/Dashboard/Widgets/module_status.php
index 6a1b2f1ebb..a9e72fd528 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/module_status.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/module_status.php
@@ -300,6 +300,10 @@ class ModuleStatusWidget extends Widget
             $values['imageSrc'] = $decoder['imageSrc'];
         }
 
+        if (isset($decoder['horizontal']) === true) {
+            $values['horizontal'] = $decoder['horizontal'];
+        }
+
         return $values;
     }
 
@@ -461,6 +465,18 @@ class ModuleStatusWidget extends Widget
             ],
         ];
 
+        // Horizontal.
+        $inputs[] = [
+            'label'     => __('Horizontal').ui_print_help_tip(__('If not, layout is vertical'), true),
+            'arguments' => [
+                'wrapper' => 'div',
+                'name'    => 'horizontal',
+                'type'    => 'switch',
+                'value'   => $values['horizontal'],
+                'return'  => true,
+            ],
+        ];
+
         return $inputs;
     }
 
@@ -483,6 +499,7 @@ class ModuleStatusWidget extends Widget
         $values['sizeValue'] = \get_parameter('sizeValue', 0);
         $values['sizeLabel'] = \get_parameter_switch('sizeLabel');
         $values['sizeIcon'] = \get_parameter_switch('sizeIcon');
+        $values['horizontal'] = \get_parameter_switch('horizontal');
 
         return $values;
     }
@@ -538,12 +555,22 @@ class ModuleStatusWidget extends Widget
             break;
         }
 
-        $output .= '<div class="container-center">';
+        $uuid = uniqid();
+
+        $output .= '<div class="container-center" id="container-'.$uuid.'">';
+
+        $orientation = '';
+        if ((int) $this->values['horizontal'] === 1) {
+            $orientation = 'flex aligni_center';
+        } else {
+            $orientation = 'grid';
+        }
+
         // General div.
-        $output .= '<div class="container-icon">';
+        $output .= '<div class="'.$orientation.'" id="general-'.$uuid.'">';
 
         // Div image.
-        $output .= '<div style="flex: 0 1 '.$sizeIcon.'px;">';
+        $output .= '<div class="pdd_l_15px pdd_r_15px mrgn_btn_25px" style="flex: 0 1 '.$sizeIcon.'px; height: '.$sizeIcon.'px;">';
         $output .= html_print_image(
             'images/console/icons/'.$icon,
             true,
@@ -553,11 +580,22 @@ class ModuleStatusWidget extends Widget
 
         if (empty($label) === false) {
             // Div Label.
-            $output .= '<div style="flex: 1 1 '.$sizeLabel.'px; font-size:'.$sizeLabel.'px;">'.$label.'</div>';
+            $output .= '<div class="pdd_l_15px pdd_r_15px" style="flex: 1 1 '.$sizeLabel.'px; line-height: '.$sizeLabel.'px; font-size:'.$sizeLabel.'px;">'.$label.'</div>';
         }
 
         $output .= '</div>';
         $output .= '</div>';
+
+        $output .= '<script>
+        var containerWidth = document.querySelector("#container-'.$uuid.'").offsetWidth;
+        var generalWidth = document.querySelector("#general-'.$uuid.'").offsetWidth;
+
+        if (generalWidth >= containerWidth) {
+            $("#container-'.$uuid.'").css("align-items", "flex-start");
+        } else {
+            $("#container-'.$uuid.'").css("align-items", "center");
+        }
+        </script>';
         return $output;
     }
 
diff --git a/pandora_console/include/lib/Dashboard/Widgets/module_value.php b/pandora_console/include/lib/Dashboard/Widgets/module_value.php
index 6577ad3c89..83521f6b25 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/module_value.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/module_value.php
@@ -284,6 +284,10 @@ class ModuleValueWidget extends Widget
             $values['sizeLabel'] = $decoder['sizeLabel'];
         }
 
+        if (isset($decoder['horizontal']) === true) {
+            $values['horizontal'] = $decoder['horizontal'];
+        }
+
         return $values;
     }
 
@@ -385,6 +389,18 @@ class ModuleValueWidget extends Widget
             ],
         ];
 
+        // Horizontal.
+        $inputs[] = [
+            'label'     => __('Horizontal').ui_print_help_tip(__('If not, layout is vertical'), true),
+            'arguments' => [
+                'wrapper' => 'div',
+                'name'    => 'horizontal',
+                'type'    => 'switch',
+                'value'   => $values['horizontal'],
+                'return'  => true,
+            ],
+        ];
+
         return $inputs;
     }
 
@@ -405,6 +421,7 @@ class ModuleValueWidget extends Widget
         $values['moduleId'] = \get_parameter('moduleId', 0);
         $values['sizeValue'] = \get_parameter('sizeValue', 0);
         $values['sizeLabel'] = \get_parameter_switch('sizeLabel');
+        $values['horizontal'] = \get_parameter_switch('horizontal');
 
         return $values;
     }
@@ -422,6 +439,7 @@ class ModuleValueWidget extends Widget
         $output = '';
 
         $id_module = $this->values['moduleId'];
+        $unit = modules_get_unit($this->values['moduleId']);
 
         $data_module = \modules_get_last_value($id_module);
 
@@ -429,11 +447,41 @@ class ModuleValueWidget extends Widget
         $sizeLabel = (isset($this->values['sizeLabel']) === true) ? $this->values['sizeLabel'] : 40;
         $sizeValue = (isset($this->values['sizeValue']) === true) ? $this->values['sizeValue'] : 40;
 
-        $output .= '<div class="container-center">';
+        $sql = 'SELECT min_warning,
+        max_warning,
+        min_critical,
+        max_critical,
+        str_warning,
+        str_critical 
+        FROM tagente_modulo
+        WHERE id_agente_modulo = '.(int) $this->values['moduleId'];
+        $sql_data = db_get_row_sql($sql);
+
+        $last = modules_get_last_value($this->values['moduleId']);
+
+        if (($last >= $sql_data['min_warning']) && ($last < $sql_data['max_warning'])) {
+            $color = COL_WARNING;
+        }
+
+        if ($last >= $sql_data['max_warning']) {
+            $color = COL_CRITICAL;
+        }
+
+        $uuid = uniqid();
+        $output .= '<div class="container-center" id="container-'.$uuid.'">';
+
+        $orientation = '';
+        if ((int) $this->values['horizontal'] === 1) {
+            $orientation = 'flex aligni_center';
+        } else {
+            $orientation = 'grid';
+        }
+
         // General div.
-        $output .= '<div class="container-icon">';
+        $output .= '<div class="'.$orientation.'" id="general-'.$uuid.'">';
+
         // Div value.
-        $output .= '<div style="flex: 0 1 '.$sizeValue.'px; font-size:'.$sizeValue.'px;">';
+        $output .= '<div class="pdd_l_15px pdd_r_15px mrgn_btn_20px" style="flex: 0 1 '.$sizeValue.'px; line-height: '.$sizeValue.'px; font-size:'.$sizeValue.'px; color: '.$color.'">';
 
         if (is_numeric($data_module) === true) {
             $dataDatos = remove_right_zeros(
@@ -443,7 +491,7 @@ class ModuleValueWidget extends Widget
                     $config['decimal_separator'],
                     $config['thousand_separator']
                 )
-            );
+            ).$unit;
         } else {
             $dataDatos = trim($data_module);
         }
@@ -454,11 +502,22 @@ class ModuleValueWidget extends Widget
 
         if (empty($label) === false) {
             // Div Label.
-            $output .= '<div style="flex: 1 1 '.$sizeLabel.'px; font-size:'.$sizeLabel.'px;">'.$label.'</div>';
+            $output .= '<div class="pdd_l_15px pdd_r_15px" style="flex: 1 1 '.$sizeLabel.'px; line-height: '.$sizeLabel.'px; font-size:'.$sizeLabel.'px;">'.$label.'</div>';
         }
 
         $output .= '</div>';
         $output .= '</div>';
+
+        $output .= '<script>
+        var containerWidth = document.querySelector("#container-'.$uuid.'").offsetWidth;
+        var generalWidth = document.querySelector("#general-'.$uuid.'").offsetWidth;
+
+        if (generalWidth >= containerWidth) {
+            $("#container-'.$uuid.'").css("align-items", "flex-start");
+        } else {
+            $("#container-'.$uuid.'").css("align-items", "center");
+        }
+        </script>';
         return $output;
     }
 
diff --git a/pandora_console/include/lib/Dashboard/Widgets/network_map.php b/pandora_console/include/lib/Dashboard/Widgets/network_map.php
index 32de5683a9..b291e599c8 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/network_map.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/network_map.php
@@ -492,6 +492,7 @@ class NetworkMapWidget extends Widget
                 'auth_class'    => 'PandoraFMS\Dashboard\Manager',
                 'auth_hash'     => Manager::generatePublicHash(),
                 'node'          => $node,
+                'size'          => $size,
             ]
         );
 
diff --git a/pandora_console/include/lib/Dashboard/Widgets/os_quick_report.php b/pandora_console/include/lib/Dashboard/Widgets/os_quick_report.php
index 892d1f219a..cd500e2972 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/os_quick_report.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/os_quick_report.php
@@ -282,10 +282,10 @@ class OsQuickReportWidget extends Widget
             $table->head = [];
             $table->head[0] = __('OS');
             $table->head[1] = __('OS name');
-            $table->head[2] = ucfirst(__('total agents'));
-            $table->head[3] = ucfirst(__('normal agents'));
-            $table->head[4] = ucfirst(__('critical agents'));
-            $table->head[5] = ucfirst(__('unknown agents'));
+            $table->head[2] = ucfirst(__('total'));
+            $table->head[3] = ucfirst(__('normal'));
+            $table->head[4] = ucfirst(__('critical'));
+            $table->head[5] = ucfirst(__('unknown'));
 
             $table->headstyle = [];
             $table->headstyle[0] = 'text-align:center;background-color: '.$values['background'];
@@ -296,22 +296,24 @@ class OsQuickReportWidget extends Widget
             $table->headstyle[5] = 'text-align:center;background-color: '.$values['background'];
 
             $table->style = [];
-            $table->style[0] = 'background-color: '.$values['background'];
-            $table->style[1] = 'background-color: '.$values['background'];
-            $table->style[2] = 'font-size: 22px;background-color: '.$values['background'];
-            $table->style[3] = 'font-size: 22px;background-color: '.$values['background'];
-            $table->style[4] = 'font-size: 22px;background-color: '.$values['background'];
-            $table->style[5] = 'font-size: 22px;background-color: '.$values['background'];
+            $table->style[0] = 'background-color: '.$values['background'].';';
+            $table->style[1] = 'background-color: '.$values['background'].';';
+            $table->style[2] = 'background-color: '.$values['background'].'; font-size: 1.5em; font-weight: bolder;';
+            $table->style[3] = 'background-color: '.$values['background'].'; font-size: 1.5em; font-weight: bolder;';
+            $table->style[4] = 'background-color: '.$values['background'].';';
+            $table->style[5] = 'background-color: '.$values['background'].';';
 
             foreach ($result as $id => $os) {
                 $data = [];
+                ($os['critical'] > 0) ? $color_critical = 'color: '.COL_CRITICAL.';' : $color_critical = '';
+                ($os['unknown'] > 0) ? $color_unknown = 'color: '.COL_UNKNOWN.';' : $color_unknown = '';
 
                 $data[0] = ui_print_os_icon($id, false, true);
                 $data[1] = $os['name'];
                 $data[2] = $os['total'];
                 $data[3] = $os['normal'];
-                $data[4] = $os['critical'];
-                $data[5] = $os['unknown'];
+                $data[4] = '<span class="widget-module-tabs-data" style="'.$color_critical.'">'.$os['critical'].'</span>';
+                $data[5] = '<span class="widget-module-tabs-data" style="'.$color_unknown.'">'.$os['unknown'].'</span>';
 
                 $table->data[] = $data;
             }
diff --git a/pandora_console/include/lib/Dashboard/Widgets/service_view.php b/pandora_console/include/lib/Dashboard/Widgets/service_view.php
index 51804e5a61..bbd7c1b9bc 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/service_view.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/service_view.php
@@ -367,7 +367,7 @@ class ServiceViewWidget extends Widget
                 'AR'
             );
 
-            $output .= '<div class="white_box mgn_btt_20px mrgn_top_20px pddng_50px services_table" >';
+            $output .= '<div class="services_table" >';
             $output .= '<div id="table_services_dashboard">';
             foreach ($services as $service) {
                 switch ($service['status']) {
@@ -404,40 +404,6 @@ class ServiceViewWidget extends Widget
                     </div>
                     </a>';
             }
-
-            $output .= '</div>';
-                $output .= '<table cellspacing="0" cellpadding="0">';
-                    $output .= '<tr>';
-                        $output .= '<td>';
-                            $output .= '<div class="service_status" style=" background: '.COL_UNKNOWN.';"></div>';
-                        $output .= '</td>';
-                        $output .= '<td>';
-                            $output .= '<div class="service_status" style="background: '.COL_NORMAL.';"></div>';
-                        $output .= '</td>';
-                        $output .= '<td>';
-                            $output .= '<div class="service_status" style="background: '.COL_WARNING.';"></div>';
-                        $output .= '</td>';
-                        $output .= '<td>';
-                            $output .= '<div class="service_status" style="background: '.COL_CRITICAL.';"></div>';
-                        $output .= '</td>';
-
-                        $output .= '</tr><tr>';
-
-                        $output .= '<td>';
-                            $output .= '<div class="pdd_r_15px"><span class="font_12px">Unknown</span></div>';
-                        $output .= '</td>';
-                        $output .= '<td >';
-                            $output .= '<div class="pdd_r_15px"><span class="font_12px">Normal</span></div>';
-                        $output .= '</div>';
-                        $output .= '<td>';
-                            $output .= '<div class="pdd_r_15px"><span class="font_12px">Warning</span></div>';
-                        $output .= '</td>';
-                        $output .= '<td>';
-                            $output .= '<div><span class="font_12px">Critical</span></div>';
-                        $output .= '</td>';
-                    $output .= '</tr>';
-                $output .= '</table>';
-            $output .= '</div>';
         }
 
         return $output;
diff --git a/pandora_console/include/lib/Dashboard/Widgets/single_graph.php b/pandora_console/include/lib/Dashboard/Widgets/single_graph.php
index e6372c49f4..09f1c15a16 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/single_graph.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/single_graph.php
@@ -418,7 +418,7 @@ class SingleGraphWidget extends Widget
             'dashboard'       => true,
         ];
 
-        $output = '<div class="container-center">';
+        $output = '<div class="container-center widget-mrgn-0px">';
         $output .= \grafico_modulo_sparse($params);
         $output .= '</div>';
         return $output;
diff --git a/pandora_console/include/lib/Dashboard/Widgets/sla_percent.php b/pandora_console/include/lib/Dashboard/Widgets/sla_percent.php
index 4cd9bd7f0d..2e7483d58e 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/sla_percent.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/sla_percent.php
@@ -289,6 +289,10 @@ class SLAPercentWidget extends Widget
             $values['period'] = $decoder['period'];
         }
 
+        if (isset($decoder['horizontal']) === true) {
+            $values['horizontal'] = $decoder['horizontal'];
+        }
+
         return $values;
     }
 
@@ -404,6 +408,18 @@ class SLAPercentWidget extends Widget
             ],
         ];
 
+        // Horizontal.
+        $inputs[] = [
+            'label'     => __('Horizontal').ui_print_help_tip(__('If not, layout is vertical'), true),
+            'arguments' => [
+                'wrapper' => 'div',
+                'name'    => 'horizontal',
+                'type'    => 'switch',
+                'value'   => $values['horizontal'],
+                'return'  => true,
+            ],
+        ];
+
         return $inputs;
     }
 
@@ -425,6 +441,7 @@ class SLAPercentWidget extends Widget
         $values['period'] = \get_parameter('period', 0);
         $values['sizeValue'] = \get_parameter('sizeValue', '');
         $values['sizeLabel'] = \get_parameter('sizeLabel', '');
+        $values['horizontal'] = \get_parameter_switch('horizontal');
 
         return $values;
     }
@@ -494,21 +511,42 @@ class SLAPercentWidget extends Widget
         $sizeLabel = (isset($this->values['sizeLabel']) === true) ? $this->values['sizeLabel'] : 30;
         $sizeValue = (isset($this->values['sizeValue']) === true) ? $this->values['sizeValue'] : 30;
 
-        $output .= '<div class="container-center">';
+        $uuid = uniqid();
+
+        $output .= '<div class="container-center" id="container-'.$uuid.'">';
+
+        $orientation = '';
+        if ((int) $this->values['horizontal'] === 1) {
+            $orientation = 'flex aligni_center';
+        } else {
+            $orientation = 'grid';
+        }
+
         // General div.
-        $output .= '<div class="container-icon">';
+        $output .= '<div class="'.$orientation.'" id="general-'.$uuid.'">';
         // Div value.
-        $output .= '<div style="flex: 0 1 '.$sizeValue.'px; font-size:'.$sizeValue.'px;">';
+        $output .= '<div class="pdd_l_15px pdd_r_15px mrgn_btn_20px" style="flex: 0 1 '.$sizeValue.'px; line-height: '.$sizeValue.'px; font-size:'.$sizeValue.'px;">';
         $output .= $sla_array['sla_fixed'].'%';
         $output .= '</div>';
 
         if (empty($label) === false) {
             // Div Label.
-            $output .= '<div style="flex: 1 1; font-size:'.$sizeLabel.'px; text-align: left;">'.$label.'</div>';
+            $output .= '<div class="pdd_l_15px pdd_r_15px" style="flex: 1 1; line-height: '.$sizeLabel.'px; font-size:'.$sizeLabel.'px; text-align: left;">'.$label.'</div>';
         }
 
         $output .= '</div>';
         $output .= '</div>';
+
+        $output .= '<script>
+        var containerWidth = document.querySelector("#container-'.$uuid.'").offsetWidth;
+        var generalWidth = document.querySelector("#general-'.$uuid.'").offsetWidth;
+
+        if (generalWidth >= containerWidth) {
+            $("#container-'.$uuid.'").css("align-items", "flex-start");
+        } else {
+            $("#container-'.$uuid.'").css("align-items", "center");
+        }
+        </script>';
         return $output;
     }
 
diff --git a/pandora_console/include/lib/Dashboard/Widgets/system_group_status.php b/pandora_console/include/lib/Dashboard/Widgets/system_group_status.php
index ac2d5654fd..4b8924d668 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/system_group_status.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/system_group_status.php
@@ -477,7 +477,7 @@ class SystemGroupStatusWidget extends Widget
         $this->values['groupId'] = $selected_groups;
         $this->values['status'] = explode(',', $this->values['status'][0]);
 
-        $style = 'font-size: 12px; text-align: center;';
+        $style = 'font-size: 1.5em; font-weight: bolder;text-align: center;';
 
         $table = new \stdClass();
         $table->class = 'group_modules_status_box';
diff --git a/pandora_console/include/lib/Dashboard/Widgets/wux_transaction.php b/pandora_console/include/lib/Dashboard/Widgets/wux_transaction.php
index 3572844c76..1be52fd052 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/wux_transaction.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/wux_transaction.php
@@ -364,21 +364,6 @@ class WuxWidget extends Widget
                 }
 
                 $output .= '<div>';
-                $output .= '<div>';
-                $output .= "<p class='font_20px'>";
-                if ($have_errors === true) {
-                    $output .= __('Global status').': ';
-                    $output .= "<span class='color: #e63c52; font_20px'>";
-                    $output .= __('Failed');
-                    $output .= '</span>';
-                } else {
-                    $output .= __('Global status').': ';
-                    $output .= "<span class='pandora_green_bg font_20px'>";
-                    $output .= __('Ok');
-                    $output .= '</span>';
-                }
-
-                $output .= '</div>';
 
                 $output .= '<div>';
                 $output .= \ux_console_phases_donut(
diff --git a/pandora_console/include/rest-api/index.php b/pandora_console/include/rest-api/index.php
index bb0ed77120..399851d301 100644
--- a/pandora_console/include/rest-api/index.php
+++ b/pandora_console/include/rest-api/index.php
@@ -360,11 +360,14 @@ if ($getVisualConsole === true) {
 
     $removeBtn = [
         'name'       => 'Remove',
-        'label'      => '',
+        'label'      => __('Remove'),
         'type'       => 'button',
-        'attributes' => 'class="remove-item-img"',
+        'attributes' => [
+            'mode' => 'mini secondary',
+            'icon' => 'delete',
+        ],
         'return'     => true,
-        'script'     => 'removeColorRange(\''.$uniqId.'\')',
+        'script'     => 'removeColorRange("'.$uniqId.'")',
     ];
 
     $classRangeColor = 'interval-color-ranges flex-row flex-start w100p';
@@ -377,8 +380,7 @@ if ($getVisualConsole === true) {
     $liRangeColor .= '<div>';
     $liRangeColor .= html_print_input($rangeColor);
     $liRangeColor .= '</div>';
-    $liRangeColor .= '<label></label>';
-    $liRangeColor .= html_print_input($removeBtn);
+    $liRangeColor .= html_print_input($removeBtn, 'div', true);
     $liRangeColor .= '<li>';
 
     echo $liRangeColor;
diff --git a/pandora_console/include/rest-api/models/VisualConsole/Items/ColorCloud.php b/pandora_console/include/rest-api/models/VisualConsole/Items/ColorCloud.php
index 8620e5bd49..9da5159111 100644
--- a/pandora_console/include/rest-api/models/VisualConsole/Items/ColorCloud.php
+++ b/pandora_console/include/rest-api/models/VisualConsole/Items/ColorCloud.php
@@ -480,11 +480,14 @@ final class ColorCloud extends Item
                     [
                         'arguments' => [
                             'name'       => 'add',
-                            'label'      => '',
+                            'label'      => __('Add'),
                             'type'       => 'button',
-                            'attributes' => 'class="add-item-img"',
+                            'attributes' => [
+                                'mode' => 'mini secondary',
+                                'icon' => 'next',
+                            ],
                             'return'     => true,
-                            'script'     => 'createColorRange(\''.$baseUrl.'\',\''.$values['vCId'].'\')',
+                            'script'     => 'createColorRange("'.$baseUrl.'","'.$values['vCId'].'")',
                         ],
                     ],
                 ],
@@ -540,13 +543,14 @@ final class ColorCloud extends Item
                             [
                                 'arguments' => [
                                     'name'       => 'remove-'.$uniqId,
-                                    'label'      => '',
+                                    'label'      => __('Remove'),
                                     'type'       => 'button',
-                                    'attributes' => 'class="remove-item-img"',
+                                    'attributes' => [
+                                        'mode' => 'mini secondary',
+                                        'icon' => 'delete',
+                                    ],
                                     'return'     => true,
-                                    'script'     => 'removeColorRange(
-                                        \''.$uniqId.'\'
-                                    )',
+                                    'script'     => 'removeColorRange("'.$uniqId.'")',
                                 ],
                             ],
                         ],
diff --git a/pandora_console/include/rest-api/models/VisualConsole/Items/ModuleGraph.php b/pandora_console/include/rest-api/models/VisualConsole/Items/ModuleGraph.php
index cadd9e91ac..bb29f3d7ff 100644
--- a/pandora_console/include/rest-api/models/VisualConsole/Items/ModuleGraph.php
+++ b/pandora_console/include/rest-api/models/VisualConsole/Items/ModuleGraph.php
@@ -538,7 +538,7 @@ final class ModuleGraph extends Item
             // Choose Type module graph if graph normal or custom.
             $inputs[] = [
                 'wrapper'       => 'div',
-                'class'         => 'flex-row-vcenter',
+                'class'         => 'flex',
                 'direct'        => 1,
                 'block_content' => [
                     [
diff --git a/pandora_console/include/styles/dashboards.css b/pandora_console/include/styles/dashboards.css
index ec43f4befc..3ac49172d4 100644
--- a/pandora_console/include/styles/dashboards.css
+++ b/pandora_console/include/styles/dashboards.css
@@ -127,6 +127,8 @@ h1 {
 .grid-stack-item .grid-stack-item-content .header-widget div:first-child {
   flex: 1;
   text-align: center;
+  font-family: "lato-bold";
+  font-size: 14px;
 }
 
 .grid-stack-item .grid-stack-item-content .header-widget div:not(:first-child) {
@@ -791,3 +793,61 @@ form.modal-dashboard
 .select2-selection__rendered {
   max-height: 75px !important;
 }
+
+.content-widget .info_table {
+  margin-bottom: 0px;
+}
+
+.div-state-agent {
+  width: 5px;
+  height: 20px;
+  border-radius: 3px;
+  margin-right: 5px;
+}
+
+.dataTables_length > label > select {
+  height: 30px;
+  min-height: 30px;
+  margin: 5px;
+}
+
+.dataTables_paginate.paging_simple_numbers {
+  margin-top: 10px;
+  height: 40px;
+}
+
+.info_table.events tr > td {
+  height: 1em !important;
+  text-align: initial;
+}
+
+.event.flex-row.h100p.nowrap .mini-criticity {
+  margin-left: 7px;
+}
+
+.tree-controller-recipient {
+  width: -webkit-fill-available !important;
+}
+
+.services_table {
+  padding: 0px;
+  background-color: #fff;
+  border: 0px;
+  width: 90%;
+}
+
+div.widget-mrgn-0px > div.parent_graph {
+  margin: 0px;
+}
+
+div.widget-mrgn-0px > div.parent_graph > div[id^="graph_"] {
+  width: calc(100% + 14px) !important;
+}
+
+div.content-widget
+  > div.container-center
+  > div.centered.w90p
+  > div#container_show_stats
+  > canvas {
+  height: 310px;
+}
diff --git a/pandora_console/include/styles/discovery.css b/pandora_console/include/styles/discovery.css
index 04879e9eda..4bb7b200c6 100644
--- a/pandora_console/include/styles/discovery.css
+++ b/pandora_console/include/styles/discovery.css
@@ -315,3 +315,15 @@ div.ui-tooltip.ui-corner-all.ui-widget-shadow.ui-widget.ui-widget-content.uitool
   bottom: -20px;
   top: auto;
 }
+#dialog-fav-menu {
+  display: none;
+}
+#dialog-fav-menu p {
+  margin: 0px;
+  padding-top: 40px;
+}
+.fav-menu input {
+  padding: 0px;
+  max-width: 20px !important;
+  max-height: 20px;
+}
diff --git a/pandora_console/include/styles/events.css b/pandora_console/include/styles/events.css
index 02611196c4..7635280e29 100644
--- a/pandora_console/include/styles/events.css
+++ b/pandora_console/include/styles/events.css
@@ -482,6 +482,11 @@ div.multi-response-buttons {
   -webkit-mask: url(../../images/modules@svg.svg) no-repeat center / contain;
 }
 
+.alert_module_background_state {
+  mask: url(../../images/alert@svg.svg) no-repeat center / contain;
+  -webkit-mask: url(../../images/alert@svg.svg) no-repeat center / contain;
+}
+
 .icon_background_critical {
   background-color: #e63c52;
 }
diff --git a/pandora_console/include/styles/login.css b/pandora_console/include/styles/login.css
index 33361436f0..c08d4a0908 100644
--- a/pandora_console/include/styles/login.css
+++ b/pandora_console/include/styles/login.css
@@ -26,7 +26,7 @@ div#error_buttons a {
   /* Set rules to fill background */
   /* background-color:#000 !important; */
   min-height: 100%;
-  min-width: 1200px;
+  /* min-width: 1200px; */
   width: 100%;
   position: absolute;
   background-repeat: repeat;
@@ -68,7 +68,7 @@ div#login_f {
 
 #ver_num {
   width: 100%;
-  color: #878787;
+  color: #dddddd;
   text-align: center;
   font-weight: 350;
   font-size: 10px;
@@ -83,12 +83,13 @@ div#login_f {
 
 /* --- Login page - header --- */
 div#header_login {
-  background-color: rgba(0, 0, 0, 0.6);
+  /* background-color: rgba(0, 0, 0, 0.6); */
   position: absolute;
   height: 30px;
   margin-top: 1.04%;
   margin-left: 1.04%;
   border-radius: 8px;
+  z-index: 1;
 }
 
 div#list_icon_docs_support {
@@ -104,7 +105,7 @@ div#list_icon_docs_support ul {
 
 div#list_icon_docs_support ul li {
   display: inline-block;
-  color: white;
+  color: #fff;
   vertical-align: middle;
   margin-right: 5px;
   font-size: 10pt;
@@ -138,26 +139,25 @@ li#li_margin_support {
   padding-right: 5px;
 }
 
-/* --- Login page - form --- */
-div.container_login {
-  margin-top: 13.89vw;
-  /* margin-left: 19.95vw; */
-}
-
 div.login_page {
-  background-color: rgba(0, 0, 0, 0.5);
-  border-radius: 8px;
-  width: 363px;
-  height: auto;
+  /* background-color: rgba(0, 0, 0, 0.8); */
+  /* background-color: rgba(255, 255, 255, 0.2); */
+  background-color: var(--login-background-color);
+  width: 40vw;
+  min-width: 300px;
+  height: 100vh;
   float: left;
-  margin-left: 19.95vw;
+  display: flex;
+  flex-direction: column;
+  flex-wrap: nowrap;
+  justify-content: center;
 }
 
-@media only screen and (max-width: 1280px) {
+/* @media only screen and (max-width: 1280px) {
   div.login_page {
     margin-left: 9.95vw;
   }
-}
+} */
 
 div.login_logo_icon {
   margin: 4.18% 5.51% 40px;
@@ -166,42 +166,51 @@ div.login_logo_icon {
 
 div.login_logo_icon img {
   margin: 0 auto;
-  max-width: 100%;
+  max-height: 185px;
+  max-width: 300px;
 }
 
 div.login_double_auth_code,
 div.login_nick,
 div.login_pass {
   margin: 0 auto;
-  width: 70%;
+  width: 300px;
   height: 40px;
   margin-bottom: 20px;
-  min-width: 260px;
-  background-color: #fff;
-  opacity: 0.77;
-  box-shadow: 1px 1px 3px rgba(0, 0, 0, 0.1);
   border-radius: 3px;
 }
 
 div.login_nick input,
 div.login_pass input {
-  background-color: #f6f7fb;
+  background: transparent;
   border: 0px;
-  color: #343434;
-  border-radius: 3px;
+  border-radius: 0px;
+  border-bottom: 1px solid #c5c5c5;
+  color: #fff;
   width: 100%;
   height: 40px;
-  font-size: 10pt;
-  padding: 0px 0px 0px 8%;
+  font-size: 12pt;
+  padding: 0px;
   background-repeat: no-repeat;
   background-size: 27px;
   background-position: right 10px bottom 50%;
   box-sizing: border-box;
 }
 
+input {
+  background-color: transparent;
+}
+
+input:not([type="image"]):focus,
+textarea:focus,
+select:focus {
+  border: 0px;
+  border-radius: 0px;
+  border-bottom: 1px solid #e7e7e7;
+}
+
 div.login_button button {
   width: 100%;
-  height: 40px;
   box-shadow: none;
 }
 
@@ -224,10 +233,15 @@ div.login_pass input:focus {
   outline: none;
 }
 
+div.login_nick,
 div.login_pass {
   position: relative;
 }
 
+div.login_nick {
+  margin-bottom: 30px;
+}
+
 #show-hide-pass {
   position: absolute;
   right: 0px;
@@ -256,17 +270,11 @@ div.login_pass input:-webkit-autofill:active {
   width: 89%;
 }
 
-div.login_nick input::-webkit-input-placeholder,
-div.login_pass input::-webkit-input-placeholder {
-  color: #343434;
-}
-
 div.login_button,
 div.login_button_saml {
   margin: 0 auto;
-  width: 40%;
+  width: 300px;
   height: 40px;
-  min-width: 260px;
   margin-bottom: 20px;
 }
 
@@ -304,7 +312,7 @@ div.login_button_saml input:hover {
 }
 
 .login_back {
-  margin-top: 60px !important;
+  margin-top: 30px !important;
 }
 
 .login_back input {
@@ -318,51 +326,43 @@ div.login_button_saml input:hover {
 }
 
 div.login_data {
-  max-width: 40.21vw;
-  max-height: 21.82%;
-  float: left;
-  margin-left: 100px;
-  margin-right: 0px;
-  margin-top: 30px;
-  padding-right: 0px;
+  height: 100vh;
+  padding-left: 40px;
+  display: flex;
+  flex-direction: column;
+  flex-wrap: nowrap;
+  justify-content: center;
+  align-items: flex-start;
 }
 
 div.text_banner_login {
   width: 100%;
-  margin-bottom: 60px;
-  color: white;
-  text-align: center;
-}
-
-div.text_banner_login span {
-  width: 100%;
+  color: #fff;
+  margin-top: 40px;
+  display: flex;
+  flex-direction: column;
 }
 
 span.span1 {
-  font-size: 38px;
-  letter-spacing: -0.38px;
-  font-weight: bold;
-  color: white;
-  line-height: 49pt;
+  display: block;
+  max-width: 700px;
+  font-size: 80pt;
+  line-height: 80pt;
+  font-family: "lato-bolder";
+  color: #fff;
 }
 
 span.span2 {
-  font-size: 20px;
-  letter-spacing: -0.26px;
-  font-weight: 350;
-  color: #c1ccdc;
-  line-height: 32pt;
-}
-
-div.img_banner_login {
-  text-align: center;
+  display: block;
+  max-width: 700px;
+  font-size: 30pt;
+  line-height: 30pt;
+  font-family: "lato-bolder";
+  color: #fff;
 }
 
 div.img_banner_login img {
-  max-width: 70%;
-  min-width: 70%;
-  max-height: 50%;
-  min-height: 50%;
+  width: 80%;
 }
 
 .reset_password {
@@ -380,20 +380,22 @@ div.img_banner_login img {
   font-weight: bold;
 }
 
-@media all and (max-width: 1200px) {
+@media all and (max-width: 1266px) {
   span.span1 {
-    font-size: 38px;
-    letter-spacing: -0.38px;
+    display: block;
+    max-width: 500px;
+    font-size: 60pt;
+    line-height: 60pt;
     font-weight: bold;
-    color: white;
-    line-height: 49pt;
+    color: #fff;
   }
   span.span2 {
-    font-size: 20px;
-    letter-spacing: -0.26px;
-    font-weight: 350;
-    color: #c1ccdc;
-    line-height: 32pt;
+    display: block;
+    max-width: 500px;
+    font-size: 20pt;
+    line-height: 20pt;
+    font-family: "lato-bolder";
+    color: #fff;
   }
 }
 
@@ -453,7 +455,7 @@ div.form_message_alert {
   width: 90%;
   clear: both;
   padding-top: 20px;
-  padding-left: 40px;
+  padding-left: 20px;
 }
 
 div.form_message_alert ul li {
@@ -502,7 +504,8 @@ div.button_message_alert_form input {
   background-position: center center;
   width: 508px;
   height: 246px;
-  margin-left: 1vw;
+  transform: scale(0.8);
+  margin-left: -50px;
 }
 
 /* Horizontal lines */
@@ -686,7 +689,7 @@ div.button_message_alert_form input {
   bottom: 10px;
   /* background: transparent; */
   background: #f1f1f1;
-  border: solid white 10px;
+  border: solid #fff 10px;
   border-radius: 50%;
 }
 
@@ -708,8 +711,105 @@ div.login_pass input:-webkit-autofill,
 div.login_pass input:-webkit-autofill:hover,
 div.login_pass input:-webkit-autofill:focus,
 div.login_pass input:-webkit-autofill:active {
+  -webkit-text-fill-color: #c5c5c5;
+  border: 0px;
+  border-bottom: 1px solid #c5c5c5;
+  border-radius: 0px;
+  width: 100%;
+  height: 40px;
+  font-size: 12pt;
+  background-repeat: no-repeat;
+  background-size: 27px;
+  background-position: right 10px bottom 50%;
+  box-sizing: border-box;
+  -webkit-box-shadow: 0 0 0 30px rgba(0, 0, 0, 0) inset !important;
+}
+
+div.login_pass input:-webkit-autofill,
+div.login_pass input:-webkit-autofill:hover,
+div.login_pass input:-webkit-autofill:focus,
+div.login_pass input:-webkit-autofill:active {
+  background-image: url("../../images/eye-closed-input.png");
+}
+
+.content_alert {
+  margin: 0 !important;
+}
+
+button.submitButton {
+  display: flex;
+  justify-content: center;
+  flex-direction: row;
+  min-width: 110px;
+  height: 50px;
+  font-size: 14px;
+  font-family: Arial, Helvetica, sans-serif;
+  align-items: center;
+  line-height: 24px;
+  box-shadow: 0px 3px 6px #c7c7c7;
+  color: #fff;
+  border: 0px;
+  border-radius: 15px;
+  padding: 0 10px;
+  cursor: pointer;
+  z-index: 100;
+  font-weight: bold;
+}
+
+button.buttonButton:not(.secondary):not(.link):not(.mini),
+button.submitButton:not(.secondary):not(.link):not(.mini) {
+  background: linear-gradient(90deg, #81b82f 0%, #1d7873 100%);
+}
+
+button.submitButton:hover {
+  background-position: 0 !important;
+}
+
+button.submitButton:not(.mini) > span {
+  font-family: Arial, Helvetica, sans-serif;
+  font-size: 15pt;
+}
+
+.input-container {
+  height: 50px;
+  position: relative;
+  width: 100%;
+}
+
+.placeholder {
+  color: #c5c5c5;
+  top: 15px;
+  left: 0px;
+  font-size: 12pt;
+  line-height: 14px;
+  pointer-events: none;
+  position: absolute;
+  /* transform-origin: 0 100%; */
+  /* transition: transform 2000ms, color 2000ms; */
+}
+
+/* .input:focus ~ .placeholder,
+.input:not(:placeholder-shown) ~ .placeholder {
+  transform: translateY(0px) scale(0.75);
+} */
+
+.input:not(:placeholder-shown) ~ .placeholder {
+  color: #c5c5c5;
+  font-size: 9pt;
+  top: -10px;
+}
+
+.input:focus ~ .placeholder {
+  color: #fff;
+  font-size: 9pt;
+  top: -10px;
+}
+
+div.login_nick.white-theme input,
+div.login_pass.white-theme input {
   background-color: #f6f7fb;
   border: 0px;
+  color: #343434;
   border-radius: 3px;
   width: 100%;
   height: 40px;
@@ -721,33 +821,45 @@ div.login_pass input:-webkit-autofill:active {
   box-sizing: border-box;
 }
 
-div.login_pass input:-webkit-autofill,
-div.login_pass input:-webkit-autofill:hover,
-div.login_pass input:-webkit-autofill:focus,
-div.login_pass input:-webkit-autofill:active {
-  background-image: url("../../images/eye-closed-input.png");
+div.white-theme > .placeholder {
+  color: #8b8b8b;
+  left: 24px;
 }
 
-button.submitButton {
-  display: flex;
-  justify-content: center;
-  flex-direction: row;
-  min-width: 110px;
-  height: 42px;
-  font-size: 14px;
-  font-family: "Pandora-Regular";
-  align-items: center;
-  line-height: 24px;
-  box-shadow: 0px 3px 6px #c7c7c7;
-  color: #fff;
-  border: 2px solid var(--primary-color);
-  border-radius: 8px;
-  padding: 0 10px;
-  cursor: pointer;
-  z-index: 100;
-  font-weight: bold;
+div.white-theme > .input:not(:placeholder-shown) ~ .placeholder {
+  top: 15px;
+  color: transparent;
 }
 
-.content_alert {
-  margin: 0 !important;
+div.white-theme > .input:focus ~ .placeholder {
+  top: 15px;
+  color: transparent;
+}
+
+div.white-theme input:-webkit-autofill,
+div.white-theme input:-webkit-autofill:hover,
+div.white-theme input:-webkit-autofill:focus,
+div.white-theme input:-webkit-autofill:active {
+  -webkit-text-fill-color: #343434;
+  border: 0px;
+  border-bottom: 0px;
+  border-radius: 3px;
+  width: 100%;
+  height: 40px;
+  font-size: 12pt;
+  background-repeat: no-repeat;
+  background-size: 27px;
+  background-position: right 10px bottom 50%;
+  box-sizing: border-box;
+  -webkit-box-shadow: 0 0 0 30px rgba(0, 0, 0, 0) inset !important;
+}
+
+div.white-theme input:not([type="image"]):focus,
+textarea:focus,
+select:focus {
+  border: 2px solid #8a96a6;
+}
+
+div#header_login.white-theme {
+  background-color: rgba(0, 0, 0, 0.5);
 }
diff --git a/pandora_console/include/styles/menu.css b/pandora_console/include/styles/menu.css
index 0a777074ed..9038aee34b 100644
--- a/pandora_console/include/styles/menu.css
+++ b/pandora_console/include/styles/menu.css
@@ -248,6 +248,10 @@
   background: url(../../images/menu/events.svg) no-repeat 50% 50%;
   background-size: 18px;
 }
+.icon_fav-menu {
+  background: url(../../images/menu/fav_menu_gray.svg) no-repeat 50% 50%;
+  background-size: 18px;
+}
 
 /* users */
 .icon_oper-users {
@@ -474,7 +478,7 @@ ul li {
 
 .logo_green {
   background-color: #fff;
-  min-height: 60px;
+  min-height: 61px;
   display: flex;
   justify-content: space-around;
   align-items: center;
@@ -597,7 +601,7 @@ ul li {
   display: flex;
   align-items: center;
   justify-content: space-evenly;
-  min-height: 50px;
+  min-height: 51px;
 }
 
 .tabs_li {
@@ -700,3 +704,7 @@ ul li {
   width: 215px !important;
   height: auto !important;
 }
+
+.fav-menu {
+  margin-left: 9px;
+}
diff --git a/pandora_console/include/styles/omnishell.css b/pandora_console/include/styles/omnishell.css
index 7d97fdd866..5c6f6413c5 100644
--- a/pandora_console/include/styles/omnishell.css
+++ b/pandora_console/include/styles/omnishell.css
@@ -555,3 +555,7 @@ ul.datatable_filter > li > div.action-buttons > button {
 .ui-dialog.ui-corner-all.ui-widget.ui-widget-content {
   z-index: 10000 !important;
 }
+
+.action_buttons_right_content {
+  z-index: 1 !important;
+}
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 73f140bcef..c830e01adf 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -30,6 +30,7 @@
 :root {
   --primary-color: #14524f;
   --secondary-color: #ffffff;
+  --input-border: #c0ccdc;
 }
 
 /*
@@ -300,9 +301,15 @@ td input[type="checkbox"] {
   height: 15px;
 }
 
+input[type="radio"] {
+  height: 15px;
+}
+
 input[type="image"] {
   border: 0px;
   background-color: transparent;
+  height: auto;
+  padding: 0px;
 }
 
 .container-div-input-password input {
@@ -502,6 +509,10 @@ select:-internal-list-box {
   width: 400px;
 }
 
+.w400px-important {
+  width: 400px !important;
+}
+
 .w450px {
   width: 450px;
 }
@@ -704,6 +715,10 @@ select:-internal-list-box {
   width: 60%;
 }
 
+.w67p {
+  width: 67%;
+}
+
 .w70p {
   width: 70%;
 }
@@ -967,6 +982,10 @@ select:-internal-list-box {
   padding-left: 2em !important;
 }
 
+.padding10 {
+  padding: 10px;
+}
+
 .margin-soft {
   margin: 0.3em 1em;
 }
@@ -1420,7 +1439,7 @@ div#menu_container {
 div#menu {
   width: 45px;
   float: left;
-  z-index: 2;
+  z-index: 3;
   position: absolute;
 }
 
@@ -1435,7 +1454,7 @@ div#head {
   min-width: 882px;
   background-color: #fff;
   color: #000;
-  z-index: 2;
+  z-index: 3;
 }
 
 .fixed_header {
@@ -1792,7 +1811,7 @@ div.title_line {
 #menu_tab_frame_view_bc {
   position: sticky;
   top: 61px;
-  z-index: 1;
+  z-index: 2;
   display: flex;
   align-items: flex-end;
   justify-content: space-between;
@@ -3809,7 +3828,7 @@ div.div_groups_status {
   background-color: white;
   border: 1px solid #ececec;
   border-radius: 5px;
-  margin: 20px;
+  margin: 5px;
   float: left;
 }
 
@@ -5822,7 +5841,7 @@ div.label_select_child_left > span {
   width: 100%;
   display: flex;
   overflow: hidden;
-  height: 42px;
+  height: 48px;
 }
 
 .switch_radio_button input {
@@ -5834,25 +5853,25 @@ div.label_select_child_left > span {
   overflow: hidden;
 }
 
-div.switch_radio_button label {
-  background-color: #fff;
+div.switch_radio_button > label {
+  background-color: var(--secondary-color);
   color: rgba(0, 0, 0, 0.6);
-  line-height: 6px !important;
-  text-align: center;
-  padding: 14px 10px;
-  margin-right: -1px;
-  border: 1px solid #cbcbcb;
+  text-align: center !important;
+  padding: 8px 10px;
+  margin-right: -2px;
+  border: 2px solid var(--input-border);
   transition: all 0.1s ease-in-out;
+  background: transparent;
 }
 
 div.switch_radio_button label:first-of-type {
-  border-top-left-radius: 4px !important;
-  border-bottom-left-radius: 4px !important;
+  border-top-left-radius: 6px !important;
+  border-bottom-left-radius: 6px !important;
 }
 
 div.switch_radio_button label:last-of-type {
-  border-top-right-radius: 4px !important;
-  border-bottom-right-radius: 4px !important;
+  border-top-right-radius: 6px !important;
+  border-bottom-right-radius: 6px !important;
   margin-right: 0px;
 }
 
@@ -5862,9 +5881,9 @@ div.switch_radio_button label:last-of-type {
 
 .switch_radio_button input:checked + label,
 .switch_radio_button input:checked:has(.custom_checkbox) {
-  background-color: #1d7873;
+  background-color: var(--primary-color);
   box-shadow: none;
-  color: #fff !important;
+  color: var(--secondary-color) !important;
 }
 
 /*
@@ -6547,6 +6566,7 @@ table.table_modal_alternate tr td:first-child {
 .flot-text .flot-x-axis div {
   white-space: normal;
   word-break: break-all;
+  line-height: 1.3;
 }
 
 /*Font header feedback*/
@@ -8142,7 +8162,7 @@ div.graph div.legend table {
   overflow: hidden;
   background-color: var(--secondary-color);
   min-height: calc(100vh - 200px);
-  border: 1px solid #cacaca;
+  /* border: 1px solid #cacaca; */
 }
 
 /*
@@ -8253,6 +8273,11 @@ div.graph div.legend table {
   justify-content: center;
 }
 
+.flex_justify_end {
+  display: flex;
+  justify-content: end;
+}
+
 .span_priority {
   width: 20px;
   height: 10px;
@@ -9304,7 +9329,7 @@ div.stat-win-spinner img {
   color: #fff !important;
   font-size: 1.2em;
   margin-right: 5px !important;
-  margin-top: -4px;
+  margin-top: 1px;
 }
 
 .select2-results
@@ -10165,8 +10190,8 @@ button.submitButton > div.mini {
   height: 1.5rem;
 }
 
-button.buttonButton:not(.secondary):not(.link),
-button.submitButton:not(.secondary):not(.link) {
+button.buttonButton:not(.secondary):not(.link):not(.onlyIcon),
+button.submitButton:not(.secondary):not(.link):not(.onlyIcon) {
   background: linear-gradient(
     90deg,
     var(--primary-color) 0%,
@@ -10199,18 +10224,22 @@ button.submitButton > div {
 
 button.buttonButton.onlyIcon,
 button.submitButton.onlyIcon {
-  /*
-  min-width: 32px;
-  height: 32px;
-  */
   padding: 0 !important;
-  min-width: 2em !important;
-  width: 2em !important;
-  height: 2em !important;
+  min-width: 1.7em !important;
+  width: 1.7em !important;
+  height: 1.7em !important;
   border: none;
   box-shadow: none;
 }
 
+button.buttonButton.onlyIcon {
+  background-color: #333;
+}
+
+button.buttonButton.onlyIcon:disabled {
+  background-color: #cacaca;
+}
+
 button.buttonButton.onlyIcon.pending,
 button.submitButton.onlyIcon.pending {
   mask: url(../../images/validate.svg) no-repeat right / contain;
@@ -10260,6 +10289,12 @@ button.submitButton.onlyIcon.auto_sla_graph_min {
   -webkit-mask: url(../../images/event-history.svg) no-repeat right / contain;
 }
 
+button.buttonButton.onlyIcon.basic_chart_min,
+button.submitButton.onlyIcon.basic_chart_min {
+  mask: url(../../images/event-history.svg) no-repeat right / contain;
+  -webkit-mask: url(../../images/event-history.svg) no-repeat right / contain;
+}
+
 button.buttonButton.onlyIcon.binary_min,
 button.submitButton.onlyIcon.binary_min {
   mask: url(../../images/simple-value.svg) no-repeat right / contain;
@@ -10463,6 +10498,10 @@ button div.upd {
   -webkit-mask: url(../../images/validate.svg) no-repeat center / contain;
 }
 
+button div.mail {
+  mask: url(../../images/mail@svg.svg) no-repeat center / contain;
+  -webkit-mask: url(../../images/mail@svg.svg) no-repeat center / contain;
+}
 button div.sound {
   mask: url(../../images/sound_console@svg.svg) no-repeat center / contain;
   -webkit-mask: url(../../images/sound_console@svg.svg) no-repeat center /
@@ -10531,10 +10570,27 @@ button div.preview {
   -webkit-mask: url(../../images/eye.png) no-repeat center / contain;
 }
 
+button div.plus {
+  mask: url(../../images/plus-black.svg) no-repeat center / contain;
+  -webkit-mask: url(../../images/plus-black.svg) no-repeat center / contain;
+}
+
 button div.cog.rotation {
   animation: rotation 4s infinite linear;
 }
 
+div.status_dot {
+  mask: url(../../images/status_dot.svg) no-repeat center / contain;
+  -webkit-mask: url(../../images/status_dot.svg) no-repeat center / contain;
+}
+
+.status_dot.ok {
+  background-color: #82b92e;
+}
+
+.status_dot.critical {
+  background-color: #e63c52;
+}
 @keyframes rotation {
   from {
     transform: rotate(0deg);
@@ -11234,13 +11290,14 @@ img.main_menu_icon[src$=".svg"] {
 }
 
 input.main_menu_icon[src$=".svg"] {
-  width: 22px;
-  height: 22px;
+  width: 20px;
+  height: 20px;
+  padding: 0px;
 }
 
 .header_help_icon {
-  width: 16px;
-  height: 16px;
+  width: 16px !important;
+  height: 16px !important;
 }
 .main_menu_icon.arrow_up {
   transform: rotate(90deg);
@@ -11249,6 +11306,15 @@ input.main_menu_icon[src$=".svg"] {
 .main_menu_icon.arrow_down {
   transform: rotate(270deg);
 }
+
+.main_menu_icon.arrow_left {
+  transform: rotate(0deg);
+}
+
+.main_menu_icon.arrow_right {
+  transform: rotate(180deg);
+}
+
 .after_input_icon {
   width: 32px;
   margin-left: 10px;
@@ -11263,12 +11329,17 @@ span.subsection_header_title {
   height: 18px;
 }
 
+.agent_details_header span.subsection_header_title {
+  font-weight: 700;
+  color: #000;
+}
 .subsection_header_title.secondary {
   font-size: 14px;
 }
 
 span.subsection_header_title.secondary {
   height: 14px;
+  line-height: 14px;
 }
 
 .regular_font {
@@ -11505,6 +11576,18 @@ div[role="dialog"] {
   margin: 0 auto;
 }
 
+.policy_background_state {
+  mask: url(../../images/policy@svg.svg) no-repeat center / contain;
+  -webkit-mask: url(../../images/policy@svg.svg) no-repeat center / contain;
+  margin: 0 auto;
+}
+
+.database_background_state {
+  mask: url(../../images/database@groups.svg) no-repeat center / contain;
+  -webkit-mask: url(../../images/database@groups.svg) no-repeat center / contain;
+  margin: 0 auto;
+}
+
 .filter-list-adv .wizard li {
   display: grid;
 }
@@ -11630,7 +11713,56 @@ ul.tag-editor {
 }
 
 .select2-container--default .select2-search--inline .select2-search__field {
-  height: 20px;
+  height: 12px;
   padding-left: 5px !important;
-  font-size: 20px !important;
+  font-size: 12px !important;
+}
+
+div.ui-dialog-buttonset > button.ui-button.ui-corner-all.ui-widget {
+  background-color: var(--primary-color);
+  color: #fff;
+  border: 1px solid var(--primary-color);
+  border-radius: 8px;
+  font-size: 11pt;
+}
+
+div.ui-dialog-buttonset > button.ui-button.ui-corner-all.ui-widget:hover {
+  background-color: #1d7873;
+  border-color: #1d7873;
+}
+
+div.ui-dialog-buttonset > button.ui-button.ui-corner-all.ui-widget:active {
+  background-color: #0d312f;
+  border-color: #0d312f;
+}
+
+div#menu_full > div#menu_tabs > ul.tabs_ul {
+  margin-bottom: 0px;
+}
+
+.filter-adapted-table-adv {
+}
+
+.filter-adapted-table-adv tr {
+  display: flex;
+  flex-direction: column;
+}
+
+div.relative > div > div#ui-datepicker-div {
+  top: 55px !important;
+  left: 5px !important;
+}
+
+.ui-widget-overlay {
+  background: #aaa;
+  opacity: 0.3 !important;
+}
+
+.ui-dialog .ui-widget-content.ui-autocomplete {
+  border-radius: 0px;
+  margin-left: 10px;
+}
+
+.container-div-input-password:has(.w400px-important) {
+  width: 400px;
 }
diff --git a/pandora_console/include/styles/pandoraPDF.css b/pandora_console/include/styles/pandoraPDF.css
index 334c47428f..151ee4ea8f 100644
--- a/pandora_console/include/styles/pandoraPDF.css
+++ b/pandora_console/include/styles/pandoraPDF.css
@@ -28,6 +28,10 @@
  * ============================================================================
  */
 
+body {
+  background-color: white !important;
+}
+
 table.header_table {
   width: 100%;
 }
@@ -38,7 +42,7 @@ table.header_table tr td {
 }
 
 table thead tr th {
-  background-color: #919191;
+  background-color: #e5e5e5;
 }
 
 table thead tr th.title_table_pdf {
@@ -211,3 +215,20 @@ table tbody td.cellBorder1 {
 table tbody td.cellBig {
   font-size: 18px;
 }
+
+table.info_table {
+  border-collapse: collapse;
+}
+
+table.info_table thead tr th,
+table.info_table thead tr td {
+  background-color: white !important;
+}
+
+table.info_table thead tr th {
+  border-bottom: 1px solid #333333;
+}
+
+table.info_table tbody tr td {
+  border-bottom: 1px solid #e5e5e5;
+}
diff --git a/pandora_console/include/styles/pandora_black.css b/pandora_console/include/styles/pandora_black.css
index 4ff0e5b7ce..9c1fca7462 100644
--- a/pandora_console/include/styles/pandora_black.css
+++ b/pandora_console/include/styles/pandora_black.css
@@ -31,7 +31,7 @@ ul.subsubmenu li,
 input.search_input,
 .filters input,
 input#text-id_parent.ac_input,
-input,
+input:not(div.login_pass > input):not(div.login_nick > input),
 textarea,
 select,
 .edit_user_comments #textarea_comments,
@@ -466,12 +466,6 @@ ul.tree-group
   filter: invert(100%);
 }
 
-/* login.css */
-div.login_nick input,
-div.login_pass input {
-  background-color: #111 !important;
-}
-
 /* user edit */
 .edit_user_info_right input {
   border-bottom: 1px solid #5f5f5f;
@@ -1116,6 +1110,7 @@ select,
   border: 1px solid #707070;
   background-color: #222 !important;
   color: #fff !important;
+  border-radius: 0;
 }
 
 .white_table_graph {
@@ -1248,8 +1243,7 @@ a.pandora_pagination:hover {
   background-color: #555 !important;
 }
 .dt-button.buttons-csv.buttons-html5 {
-  filter: invert(100%);
-  background-color: transparent;
+  box-shadow: 0px 3px 6px #111;
 }
 
 .info_table.events > tbody > tr > td {
@@ -1303,8 +1297,9 @@ a.pandora_pagination:hover {
   filter: brightness(0) contrast(50%) !important;
 }
 
-input[type="image"] {
+input:not(div.login_pass > input):not(div.login_nick > input[type="image"]) {
   background-color: transparent !important;
+  color: inherit !important;
 }
 
 .databox_color {
@@ -1480,13 +1475,6 @@ span.select2-dropdown.select2-dropdown--below {
   z-index: 1200;
 }
 
-div.fixed_filter_bar,
-div.white_table_graph_header {
-  border-radius: 0;
-  border-left: 0px;
-  border-right: 0px;
-}
-
 div.white_table_graph {
   border-radius: 0;
 }
@@ -1500,10 +1488,50 @@ div.white_box.white_box_opened.no_border {
   border-radius: 0px;
 }
 
-table.filter-table-adv td > div label {
+table.filter-table-adv td > div label:not(.inputFile) {
   color: white !important;
 }
 
 #principal_action_buttons {
   background: #111111;
 }
+div.fixed-bottom-box,
+div.fixed-bottom-box
+  > div.fixed-bottom-box-head
+  > div.fixed-bottom-box-head-body {
+  background-color: #111111 !important;
+}
+
+.filter_table,
+.white_table_graph_fixed table {
+  background-color: transparent;
+}
+
+span.select2 {
+  border-radius: 6px;
+}
+
+.ui-dialog .tips_header.ui-dialog-titlebar {
+  color: white !important;
+  background-color: #222222 !important;
+}
+
+#tips_window_modal > div.window > div.description > #title_tip,
+#tips_window_modal > div.window > div.description > #text_tip {
+  color: white !important;
+}
+
+.agent_details_header span.subsection_header_title {
+  color: #fff;
+}
+
+pre code.hljs {
+  background-color: #222222;
+  color: #fff;
+}
+
+a.autorefresh_txt,
+#refrcounter {
+  color: #ffffff;
+  font-size: 8.5pt;
+}
diff --git a/pandora_console/include/styles/progress.css b/pandora_console/include/styles/progress.css
index 66921d7da6..9561797f77 100644
--- a/pandora_console/include/styles/progress.css
+++ b/pandora_console/include/styles/progress.css
@@ -6,8 +6,8 @@
   display: inline-block;
   display: flex;
   border-radius: 4px;
-  line-height: 24px;
-  font-size: 11pt;
+  line-height: 9pt;
+  font-size: 9pt;
 }
 
 .progress_main_noborder {
diff --git a/pandora_console/include/styles/setup.css b/pandora_console/include/styles/setup.css
index f4c1571167..59699aff82 100644
--- a/pandora_console/include/styles/setup.css
+++ b/pandora_console/include/styles/setup.css
@@ -12,8 +12,8 @@ span.subtitle-2 {
   border: 0 !important;
 }
 
-input[type="text"],
-input[type="number"] {
+input[type="text"]:not(.w100p-important),
+input[type="number"]:not(.w100p-important) {
   width: 220px;
 }
 
diff --git a/pandora_console/include/styles/setup.multicolumn.css b/pandora_console/include/styles/setup.multicolumn.css
index 4502ac4a46..89fff6b605 100644
--- a/pandora_console/include/styles/setup.multicolumn.css
+++ b/pandora_console/include/styles/setup.multicolumn.css
@@ -1,9 +1,10 @@
 #form_setup {
-  display: flex;
+  /*display: flex;
   flex-direction: row;
   justify-items: baseline;
   justify-content: space-between;
   flex-wrap: wrap;
+  */
 }
 
 fieldset {
diff --git a/pandora_console/include/styles/tables.css b/pandora_console/include/styles/tables.css
index 1aeaa479e7..2ea3df83f6 100644
--- a/pandora_console/include/styles/tables.css
+++ b/pandora_console/include/styles/tables.css
@@ -236,7 +236,8 @@
 .table_action_buttons > a,
 .table_action_buttons > img,
 .table_action_buttons > button,
-.table_action_buttons > form {
+.table_action_buttons > form,
+.table_action_buttons > div {
   visibility: hidden;
 }
 .info_table > tbody > tr:hover {
@@ -248,7 +249,8 @@
 .info_table > tbody > tr:hover .table_action_buttons > a,
 .info_table > tbody > tr:hover .table_action_buttons > img,
 .info_table > tbody > tr:hover .table_action_buttons > button,
-.info_table > tbody > tr:hover .table_action_buttons > form {
+.info_table > tbody > tr:hover .table_action_buttons > form,
+.info_table > tbody > tr:hover .table_action_buttons > div {
   visibility: visible;
 }
 
@@ -460,9 +462,6 @@ a.pandora_pagination.current:hover {
 .table_action_buttons input[type="image"],
 .action_button_img {
   border-radius: 4px;
-  /*border: 1px solid #dcdcdc !important;*/
-  padding: 1px !important;
-  /*box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.1);*/
 }
 
 /* This class is for only one icon to be a button type. */
@@ -559,6 +558,16 @@ table.filter-table-adv td > div label {
   margin-bottom: 10px;
 }
 
+div.filter-table-adv-manual > div.inline,
+table.filter-table-adv td > div.inline {
+  display: block;
+}
+
+div.filter-table-adv-manual > div.inline input,
+table.filter-table-adv td > div.inline input {
+  margin-top: 10px;
+}
+
 table.filter-table-adv td > div.add-input-reverse {
   flex-direction: row-reverse;
   justify-content: flex-end;
@@ -575,6 +584,10 @@ table.filter-table-adv td input[type="radio"] {
   height: 20px;
 }
 
+table.filter-table-adv div.select-with-sibling {
+  display: flex;
+  align-items: center;
+}
 table.databox.filter-table-adv {
   padding: 10px;
 }
@@ -798,3 +811,15 @@ div[id^="auto-os-"] > img {
   width: 20px;
   height: 20px;
 }
+
+.dataTables_paginate {
+  margin-right: 10px;
+}
+
+.dataTables_paginate.paging_simple_numbers {
+  margin-right: 0;
+}
+
+.w22px {
+  width: 22px;
+}
diff --git a/pandora_console/include/styles/tactical_groups.css b/pandora_console/include/styles/tactical_groups.css
index 383e9ef37f..1c399d1b3b 100644
--- a/pandora_console/include/styles/tactical_groups.css
+++ b/pandora_console/include/styles/tactical_groups.css
@@ -29,3 +29,6 @@ rect {
 .graph-distribution-so {
   margin-top: 55px;
 }
+#list_agents_tactical_wrapper .dataTables_length {
+  margin-bottom: 10px;
+}
diff --git a/pandora_console/include/styles/task_list.css b/pandora_console/include/styles/task_list.css
index 0169775201..74db6d1e5b 100644
--- a/pandora_console/include/styles/task_list.css
+++ b/pandora_console/include/styles/task_list.css
@@ -43,7 +43,7 @@ div.subtitle {
 }
 
 div.subtitle span {
-  font-size: 1.9em;
+  font-size: 1.3em;
 }
 
 div.subtitle div.manage {
diff --git a/pandora_console/include/styles/tips_window.css b/pandora_console/include/styles/tips_window.css
index 0540e2ba47..505799949b 100644
--- a/pandora_console/include/styles/tips_window.css
+++ b/pandora_console/include/styles/tips_window.css
@@ -12,13 +12,13 @@
   padding: 0px;
 }
 .window {
-  background-image: linear-gradient(180deg, #fffce8 0%, #ffffff 100%);
+  background-image: white;
   width: 640px;
   width: 100%;
   border-radius: 5px;
 }
 .ui-dialog .tips_header.ui-dialog-titlebar {
-  display: flex;
+  display: flex !important;
   padding: 0px 20px;
   justify-content: space-between;
   height: fit-content;
@@ -145,9 +145,6 @@
   color: #14524f;
   font-weight: 600;
 }
-#url_tip .arrow_tips {
-  font-size: 20px;
-}
 span.count-round-tip {
   width: 6px !important;
   height: 6px !important;
@@ -175,17 +172,17 @@ span.count-round-tip.active {
 }
 span.enable {
   display: block;
-  width: 15px;
-  height: 15px;
-  border-radius: 15px;
+  width: 40px;
+  height: 20px;
+  border-radius: 4px;
   background-color: #82b92e;
   margin: 0 auto;
 }
 span.disable {
   display: block;
-  width: 15px;
-  height: 15px;
-  border-radius: 15px;
+  width: 40px;
+  height: 20px;
+  border-radius: 4px;
   background-color: #e63c52;
   margin: 0 auto;
 }
@@ -211,3 +208,16 @@ span.disable {
 .buttons_actions input {
   width: 32px;
 }
+.hide-button {
+  opacity: 0;
+  pointer-events: none;
+}
+#list_tips_windows .main_menu_icon {
+  padding: 0px;
+}
+#list_tips_windows .table_action_buttons {
+  text-align: center;
+}
+.button-add-image {
+  max-width: fit-content;
+}
diff --git a/pandora_console/include/styles/visual_maps.css b/pandora_console/include/styles/visual_maps.css
index 835c0767b9..5fa297f376 100644
--- a/pandora_console/include/styles/visual_maps.css
+++ b/pandora_console/include/styles/visual_maps.css
@@ -4,10 +4,17 @@
  * ---------------------------------------------------------------------
  */
 
+input[type="text"],
+input[type="number"],
+select {
+  height: 32px;
+}
+
 div.external-visual-console-container {
   width: 100%;
   overflow-x: auto;
   overflow-y: hidden;
+  z-index: 0;
 }
 
 div#vc-controls {
@@ -70,7 +77,6 @@ div#vc-controls img.vc-qr {
   display: flex;
   flex-direction: row;
   align-items: center;
-  margin-bottom: 5px;
 }
 
 .visual-console-edit-controls {
@@ -140,416 +146,6 @@ div#edit-controls input.sub[disabled] {
   border-color: transparent;
 }
 
-input.delete_min,
-button.delete_min {
-  background: url(../../images/delete.svg) no-repeat center;
-}
-input.delete_min[disabled],
-button.delete_min[disabled] {
-  background: url(../../images/cross.disabled.png) no-repeat center;
-}
-input.delete_min_white,
-button.delete_min_white {
-  background: url(../../images/cross.disabled.png) no-repeat center;
-}
-input.delete_min_white[disabled],
-button.delete_min_white[disabled] {
-  background: url(../../images/delete.svg) no-repeat center;
-}
-
-input.graph_min,
-button.graph_min {
-  background: url(../../images/chart_curve.png) no-repeat center;
-}
-input.graph_min[disabled],
-button.graph_min[disabled] {
-  background: url(../../images/chart_curve.disabled.png) no-repeat center;
-}
-input.graph_min_white,
-button.graph_min_white {
-  background: url(../../images/chart_curve.disabled.png) no-repeat center;
-}
-input.graph_min_white[disabled],
-button.graph_min_white[disabled] {
-  background: url(../../images/chart_curve.png) no-repeat center;
-}
-
-input.bars_graph_min,
-button.bars_graph_min {
-  background: url(../../images/icono-barras-arriba.png) no-repeat center;
-}
-input.bars_graph_min[disabled],
-button.bars_graph_min[disabled] {
-  background: url(../../images/icono-barras-arriba.disabled.png) no-repeat
-    center;
-}
-input.bars_graph_min_white,
-button.bars_graph_min_white {
-  background: url(../../images/icono-barras-arriba.disabled.png) no-repeat
-    center;
-}
-input.bars_graph_min_white[disabled],
-button.bars_graph_min_white[disabled] {
-  background: url(../../images/icono-barras-arriba.png) no-repeat center;
-}
-
-input.percentile_min,
-button.percentile_min {
-  background: url(../../images/chart_bar.png) no-repeat center;
-}
-input.percentile_min[disabled],
-button.percentile_min[disabled] {
-  background: url(../../images/chart_bar.disabled.png) no-repeat center;
-}
-input.percentile_min_white,
-button.percentile_min_white {
-  background: url(../../images/chart_bar.disabled.png) no-repeat center;
-}
-input.percentile_min_white[disabled],
-button.percentile_min_white[disabled] {
-  background: url(../../images/chart_bar.png) no-repeat center;
-}
-
-input.percentile_item_min,
-button.percentile_item_min {
-  background: url(../../images/percentile_item.png) no-repeat center;
-}
-input.percentile_item_min[disabled],
-button.percentile_item_min[disabled] {
-  background: url(../../images/percentile_item.disabled.png) no-repeat center;
-}
-input.percentile_item_min_white,
-button.percentile_item_min_white {
-  background: url(../../images/percentile_item.disabled.png) no-repeat center;
-}
-input.percentile_item_min_white[disabled],
-button.percentile_item_min_white[disabled] {
-  background: url(../../images/percentile_item.png) no-repeat center;
-}
-
-input.auto_sla_graph_min,
-button.auto_sla_graph_min {
-  background: url(../../images/auto_sla_graph.png) no-repeat center;
-}
-input.auto_sla_graph_min[disabled],
-button.auto_sla_graph_min[disabled] {
-  background: url(../../images/auto_sla_graph.disabled.png) no-repeat center;
-}
-input.auto_sla_graph_min_white,
-button.auto_sla_graph_min_white {
-  background: url(../../images/auto_sla_graph.disabled.png) no-repeat center;
-}
-input.auto_sla_graph_min_white[disabled],
-button.auto_sla_graph_min_white[disabled] {
-  background: url(../../images/auto_sla_graph.png) no-repeat center;
-}
-
-input.donut_graph_min,
-button.donut_graph_min {
-  background: url(../../images/icono-quesito.png) no-repeat center;
-}
-input.donut_graph_min[disabled],
-button.donut_graph_min[disabled] {
-  background: url(../../images/icono-quesito.disabled.png) no-repeat center;
-}
-input.donut_graph_min_white,
-button.donut_graph_min_white {
-  background: url(../../images/icono-quesito.disabled.png) no-repeat center;
-}
-input.donut_graph_min_white[disabled],
-button.donut_graph_min_white[disabled] {
-  background: url(../../images/icono-quesito.png) no-repeat center;
-}
-
-input.binary_min,
-button.binary_min {
-  background: url(../../images/binary.png) no-repeat center;
-}
-input.binary_min[disabled],
-button.binary_min[disabled] {
-  background: url(../../images/binary.disabled.png) no-repeat center;
-}
-input.binary_min_white,
-button.binary_min_white {
-  background: url(../../images/binary.disabled.png) no-repeat center;
-}
-input.binary_min_white[disabled],
-button.binary_min_white[disabled] {
-  background: url(../../images/binary.png) no-repeat center;
-}
-
-input.camera_min,
-button.camera_min {
-  background: url(../../images/camera.png) no-repeat center;
-}
-input.camera_min[disabled],
-button.camera_min[disabled] {
-  background: url(../../images/camera.disabled.png) no-repeat center;
-}
-input.camera_min_white,
-button.camera_min_white {
-  background: url(../../images/camera.disabled.png) no-repeat center;
-}
-input.camera_min_white[disabled],
-button.camera_min_white[disabled] {
-  background: url(../../images/camera.png) no-repeat center;
-}
-
-input.config_min,
-button.config_min {
-  background: url(../../images/edit.svg) no-repeat center;
-}
-input.config_min[disabled],
-button.config_min[disabled] {
-  background: url(../../images/config.disabled.png) no-repeat center;
-}
-input.config_min_white,
-button.config_min_white {
-  background: url(../../images/config.disabled.png) no-repeat center;
-}
-input.config_min_white[disabled],
-button.config_min_white[disabled] {
-  background: url(../../images/edit.svg) no-repeat center;
-}
-
-input.label_min,
-button.label_min {
-  background: url(../../images/tag_red.png) no-repeat center;
-}
-input.label_min[disabled],
-button.label_min[disabled] {
-  background: url(../../images/tag_red.disabled.png) no-repeat center;
-}
-input.label_min_white,
-button.label_min_white {
-  background: url(../../images/tag_red.disabled.png) no-repeat center;
-}
-input.label_min_white[disabled],
-button.label_min_white[disabled] {
-  background: url(../../images/tag_red.png) no-repeat center;
-}
-
-input.icon_min,
-button.icon_min {
-  background: url(../../images/photo.png) no-repeat center;
-}
-input.icon_min[disabled],
-button.icon_min[disabled] {
-  background: url(../../images/photo.disabled.png) no-repeat center;
-}
-input.icon_min_white,
-button.icon_min_white {
-  background: url(../../images/photo.disabled.png) no-repeat center;
-}
-input.icon_min_white[disabled],
-button.icon_min_white[disabled] {
-  background: url(../../images/photo.png) no-repeat center;
-}
-
-input.clock_min,
-button.clock_min {
-  background: url(../../images/clock-tab.png) no-repeat center;
-}
-input.clock_min[disabled],
-button.clock_min[disabled] {
-  background: url(../../images/clock-tab.disabled.png) no-repeat center;
-}
-input.clock_min_white,
-button.clock_min_white {
-  background: url(../../images/clock-tab.disabled.png) no-repeat center;
-}
-input.clock_min_white[disabled],
-button.clock_min_white[disabled] {
-  background: url(../../images/clock-tab.png) no-repeat center;
-}
-
-input.box_item,
-button.box_item {
-  background: url(../../images/box_item.png) no-repeat center;
-}
-input.box_item[disabled],
-button.box_item[disabled] {
-  background: url(../../images/box_item.disabled.png) no-repeat center;
-}
-input.box_item_white,
-button.box_item_white {
-  background: url(../../images/box_item.disabled.png) no-repeat center;
-}
-input.box_item_white[disabled],
-button.box_item_white[disabled] {
-  background: url(../../images/box_item.png) no-repeat center;
-}
-
-input.line_item,
-button.line_item {
-  background: url(../../images/line_item.png) no-repeat center;
-}
-input.line_item[disabled],
-button.line_item[disabled] {
-  background: url(../../images/line_item.disabled.png) no-repeat center;
-}
-input.line_item_white,
-button.line_item_white {
-  background: url(../../images/line_item.disabled.png) no-repeat center;
-}
-input.line_item_white[disabled],
-button.line_item_white[disabled] {
-  background: url(../../images/line_item.png) no-repeat center;
-}
-
-input.copy_item,
-button.copy_item {
-  background: url(../../images/copy_visualmap.png) no-repeat center;
-}
-input.copy_item[disabled],
-button.copy_item[disabled] {
-  background: url(../../images/copy_visualmap.disabled.png) no-repeat center;
-}
-input.copy_item_white,
-button.copy_item_white {
-  background: url(../../images/copy_visualmap.disabled.png) no-repeat center;
-}
-input.copy_item_white[disabled],
-button.copy_item_white[disabled] {
-  background: url(../../images/copy_visualmap.png) no-repeat center;
-}
-
-input.grid_min,
-button.grid_min {
-  background: url(../../images/grid.png) no-repeat center;
-}
-input.grid_min[disabled],
-button.grid_min[disabled] {
-  background: url(../../images/grid.disabled.png) no-repeat center;
-}
-input.grid_min_white,
-button.grid_min_white {
-  background: url(../../images/grid.disabled.png) no-repeat center;
-}
-input.grid_min_white[disabled],
-button.grid_min_white[disabled] {
-  background: url(../../images/grid.png) no-repeat center;
-}
-
-input.save_min,
-button.save_min {
-  background: url(../../images/file.png) no-repeat center;
-}
-input.save_min[disabled],
-button.save_min[disabled] {
-  background: url(../../images/file.disabled.png) no-repeat center;
-}
-input.save_min_white,
-button.save_min_white {
-  background: url(../../images/file.disabled.png) no-repeat center;
-}
-input.save_min_white[disabled],
-button.save_min_white[disabled] {
-  background: url(../../images/file.png) no-repeat center;
-}
-
-input.service_min,
-button.service_min {
-  background: url(../../images/box.png) no-repeat center;
-}
-input.service_min[disabled],
-button.service_min[disabled] {
-  background: url(../../images/box.disabled.png) no-repeat center;
-}
-input.service_min_white,
-button.service_min_white {
-  background: url(../../images/box.disabled.png) no-repeat center;
-}
-input.service_min_white[disabled],
-button.service_min_white[disabled] {
-  background: url(../../images/box.png) no-repeat center;
-}
-
-input.network_link_min,
-button.network_link_min {
-  background: url(../../images/network_link_item.png) no-repeat center;
-}
-input.network_link_min[disabled],
-button.network_link_min[disabled] {
-  background: url(../../images/network_link_item.disabled.png) no-repeat center;
-}
-input.network_link_min_white,
-button.network_link_min_white {
-  background: url(../../images/network_link_item.disabled.png) no-repeat center;
-}
-input.network_link_min_white[disabled],
-button.network_link_min_white[disabled] {
-  background: url(../../images/network_link_item.png) no-repeat center;
-}
-
-input.group_item_min,
-button.group_item_min {
-  background: url(../../images/group_green.png) no-repeat center;
-}
-input.group_item_min[disabled],
-button.group_item_min[disabled] {
-  background: url(../../images/group_green.disabled.png) no-repeat center;
-}
-input.group_item_min_white,
-button.group_item_min_white {
-  background: url(../../images/group_green.disabled.png) no-repeat center;
-}
-input.group_item_min_white[disabled],
-button.group_item_min_white[disabled] {
-  background: url(../../images/group_green.png) no-repeat center;
-}
-
-input.color_cloud_min,
-button.color_cloud_min {
-  background: url(../../images/color_cloud_item.png) no-repeat center;
-}
-input.color_cloud_min[disabled],
-button.color_cloud_min[disabled] {
-  background: url(../../images/color_cloud_item.disabled.png) no-repeat center;
-}
-input.color_cloud_min_white,
-button.color_cloud_min_white {
-  background: url(../../images/color_cloud_item.disabled.png) no-repeat center;
-}
-input.color_cloud_min_white[disabled],
-button.color_cloud_min_white[disabled] {
-  background: url(../../images/color_cloud_item.png) no-repeat center;
-}
-
-input.odometer_min,
-button.odometer_min {
-  background: url(../../images/odometer.png) no-repeat center;
-}
-input.odometer_min[disabled],
-button.odometer_min[disabled] {
-  background: url(../../images/odometer.disabled.png) no-repeat center;
-}
-input.odometer_min_white,
-button.odometer_min_white {
-  background: url(../../images/odometer.disabled.png) no-repeat center;
-}
-input.odometer_min_white[disabled],
-button.odometer_min_white[disabled] {
-  background: url(../../images/odometer.png) no-repeat center;
-}
-
-input.basic_chart_min,
-button.basic_chart_min {
-  background: url(../../images/basic_chart.png) no-repeat center;
-}
-input.basic_chart_min[disabled],
-button.basic_chart_min[disabled] {
-  background: url(../../images/basic_chart.disabled.png) no-repeat center;
-}
-input.basic_chart_min_white,
-button.basic_chart_min_white {
-  background: url(../../images/basic_chart.disabled.png) no-repeat center;
-}
-input.basic_chart_min_white[disabled],
-button.basic_chart_min_white[disabled] {
-  background: url(../../images/basic_chart.png) no-repeat center;
-}
-
 div#cont {
   position: fixed;
   max-height: 320px;
diff --git a/pandora_console/include/visual-console-client/maintenanceMode.png b/pandora_console/include/visual-console-client/maintenanceMode.png
new file mode 100644
index 0000000000..588fffc579
Binary files /dev/null and b/pandora_console/include/visual-console-client/maintenanceMode.png differ
diff --git a/pandora_console/include/visual-console-client/vc.main.css b/pandora_console/include/visual-console-client/vc.main.css
index d09216b63d..2dab03034c 100644
--- a/pandora_console/include/visual-console-client/vc.main.css
+++ b/pandora_console/include/visual-console-client/vc.main.css
@@ -5,7 +5,6 @@
   background-size: 100% 100%;
   background-position: center;
   margin-top: 5px;
-  z-index: 0;
 }
 
 .is-maintenance {
@@ -402,10 +401,6 @@ p.error-p-validate {
   border-radius: 5px 5px 0px 0px;
 }
 
-label span.p-slider {
-  width: 30px;
-}
-
 li.interval-color-ranges > label,
 li#li-default-ranges > label {
   margin-right: 15px;
@@ -858,4 +853,5 @@ div.module-graph .gauge_d3_class {
   animation: rotate-second 60s infinite linear;
 }
 
-/*# sourceMappingURL=vc.main.css.map*/
+
+/*# sourceMappingURL=vc.main.css.map*/
\ No newline at end of file
diff --git a/pandora_console/include/visual-console-client/vc.main.css.map b/pandora_console/include/visual-console-client/vc.main.css.map
index b910ab7bf2..1cc45d0821 100644
--- a/pandora_console/include/visual-console-client/vc.main.css.map
+++ b/pandora_console/include/visual-console-client/vc.main.css.map
@@ -1 +1 @@
-{"version":3,"file":"vc.main.css","mappings":"AAAA;EACE,gBAAgB;EAChB,kBAAkB;EAClB,4BAA4B;EAC5B,0BAA0B;EAC1B,2BAA2B;EAC3B,eAAe;AACjB;;AAEA;EACE,oEAA2D;AAC7D;;AAEA;EACE,aAAa;AACf;;AAEA;EACE,kBAAkB;EAClB,aAAa;EACb,uBAAuB;EACvB,qBAAqB;EACrB,mBAAmB;EACnB,iBAAiB;EACjB,UAAU;AACZ;;AAEA;EACE,UAAU;AACZ;;AAEA;EACE,iBAAiB;EACjB,oBAAoB;AACtB;;AAEA;EACE,0BAA0B;EAC1B,4CAA4C;EAC5C,iBAAiB;AACnB;;AAEA;EACE,qBAAqB;AACvB;;AAEA;EACE,0BAA0B;EAC1B,YAAY;EACZ,WAAW;AACb;AACA;EACE,YAAY;EACZ,kBAAkB;EAClB,QAAQ;EACR,SAAS;EACT,WAAW;EACX,YAAY;EACZ,mDAAoC;EACpC,iBAAiB;EACjB,WAAW;AACb;;AAEA;EACE,oBAAoB;AACtB;;AAEA;EACE;IACE,uBAAuB;EACzB;EACA;IACE,wBAAwB;EAC1B;AACF;;AAEA;EACE,yBAAyB;AAC3B;;AAEA;EACE,6BAA6B;EAC7B,gBAAgB;EAChB,qCAAqC;EACrC,uCAAuC;EACvC,wCAAwC;EACxC,4CAA4C;;EAE5C,+BAA+B;EAC/B,wBAAwB;EACxB,mCAAmC;EACnC,iCAAiC;AACnC;;AAEA;;EAEE,cAAc;EACd,WAAW;EACX,YAAY;EACZ,kBAAkB;AACpB;;AAEA;;EAEE,WAAW;EACX,YAAY;AACd;;AAEA;EACE,kBAAkB;EAClB,WAAW;EACX,YAAY;EACZ,aAAa;EACb,mBAAmB;EACnB,YAAY;EACZ,8BAA8B;EAC9B,WAAW;AACb;;AAEA;EACE,qBAAqB;AACvB;;AAEA;EACE,aAAa;AACf;;AAEA,QAAQ;AACR;EACE,aAAa;EACb,mBAAmB;EACnB,eAAe;EACf,mBAAmB;EACnB,eAAe;EACf,gBAAgB;EAChB,cAAc;EACd,kBAAkB;AACpB;AACA;EACE,gBAAgB;AAClB;;AAEA;;EAEE,YAAY;EACZ,eAAe;EACf,6BAA6B;EAC7B,YAAY;EACZ,gBAAgB;EAChB,6BAA6B;EAC7B,oBAAoB;EACpB,wBAAwB;EACxB,sBAAsB;EACtB,kBAAkB;EAClB,iBAAiB;AACnB;;AAEA;EACE,kBAAkB;EAClB,WAAW;EACX,YAAY;AACd;;AAEA;EACE,oBAAoB;EACpB,eAAe;AACjB;;AAEA;EACE,aAAa;EACb,sBAAsB;EACtB,eAAe;AACjB;;AAEA;EACE,WAAW;EACX,mBAAmB;EACnB,kBAAkB;AACpB;;AAEA;EACE,aAAa;EACb,sBAAsB;EACtB,eAAe;EACf,uBAAuB;AACzB;;AAEA;EACE,kBAAkB;EAClB,gBAAgB;AAClB;;AAEA;;EAEE,aAAa;EACb,mBAAmB;EACnB,eAAe;EACf,mBAAmB;AACrB;;AAEA;EACE,uBAAuB;EACvB,kBAAkB;EAClB,kBAAkB;EAClB,0BAA0B;EAC1B,cAAc;AAChB;;AAEA;EACE,iBAAiB;AACnB;;AAEA;EACE,aAAa;EACb,sBAAsB;EACtB,eAAe;EACf,uBAAuB;EACvB,8BAA8B;EAC9B,YAAY;AACd;;AAEA;EACE,kBAAkB;AACpB;;AAEA;EACE,YAAY;AACd;;AAEA;EACE,iBAAiB;AACnB;;AAEA;EACE,iBAAiB;AACnB;;AAEA;;;EAGE,sBAAsB;AACxB;;AAEA;EACE,mBAAmB;AACrB;;AAEA;EACE,WAAW;EACX,WAAW;AACb;;AAEA,+BAA+B;;AAE/B;EACE,qBAAqB;EACrB,SAAS;AACX;;AAEA;;;;EAIE,WAAW;EACX,YAAY;AACd;;AAEA;;EAEE,WAAW;EACX,YAAY;AACd;;AAEA;;EAEE,WAAW;EACX,YAAY;AACd;;AAEA;EACE,qCAAqC;AACvC;;AAEA;EACE,uCAAuC;AACzC;;AAEA;EACE;IACE,uBAAuB;EACzB;EACA;IACE,yBAAyB;EAC3B;AACF;;AAEA;EACE,6CAA6C;EAC7C,kBAAkB;EAClB,qBAAqB;AACvB;AACA;EACE,oBAAoB;AACtB;AACA;EACE,yBAAyB;EACzB,mBAAmB;EACnB,gBAAgB;EAChB,yEAAyE;EACzE,kBAAkB;EAClB,UAAU;EACV,cAAc;EACd,iBAAiB;EACjB,gBAAgB;AAClB;AACA;EACE,WAAW;EACX,aAAa;EACb,eAAe;EACf,sBAAsB;EACtB,gCAAgC;EAChC,6BAA6B;AAC/B;AACA;EACE,WAAW;EACX,yBAAyB;AAC3B;AACA;EACE,0DAA0D;EAC1D,uCAAuC;EACvC,cAAc;AAChB;;AAEA,kBAAkB;;AAElB;EACE,oBAAoB;EACpB,oBAAoB;EACpB,aAAa;EACb,sBAAsB;EACtB,uBAAuB;EACvB,qBAAqB;EACrB,qBAAqB;EACrB,mBAAmB;AACrB;;AAEA;EACE,0BAA0B;EAC1B,kCAAkC;EAClC,wCAAwC;AAC1C;;AAEA;EACE,eAAe;AACjB;;AAEA;EACE,eAAe;AACjB;;AAEA;EACE,eAAe;AACjB;;AAEA,iBAAiB;;AAEjB;EACE,kBAAkB;AACpB;;AAEA;EACE,6CAA6C;AAC/C;;AAEA;EACE,8CAA8C;AAChD;;AAEA;EACE,4CAA4C;AAC9C;;AAEA;EACE,yBAAyB;EACzB,WAAW;AACb;;AAEA;EACE,WAAW;EACX,aAAa;EACb,mBAAmB;EACnB,mBAAmB;EACnB,8BAA8B;AAChC;;AAEA;EACE,kBAAkB;AACpB;;AAEA;EACE,8BAA8B;AAChC;;AAEA;EACE,WAAW;AACb;;AAEA;;EAEE,kBAAkB;AACpB;;AAEA;;EAEE,WAAW;AACb;;AAEA;;;;EAIE,cAAc;EACd,iBAAiB;AACnB;;AAEA;EACE,aAAa;EACb,mBAAmB;EACnB,yBAAyB;AAC3B;;AAEA;EACE,aAAa;AACf;;AAEA;EACE,mBAAmB;EACnB,cAAc;AAChB;;AAEA;EACE,YAAY;AACd;;AAEA;;;;;;EAME,6BAA6B;AAC/B;AACA;;EAEE,gBAAgB;EAChB,cAAc;AAChB;;AAEA;;EAEE,aAAa;AACf;;AAEA;EACE,iBAAiB;AACnB;;AAEA;EACE,yBAAyB;AAC3B;;AAEA,kCAAkC;AAClC;EACE,aAAa;EACb,sBAAsB;EACtB,WAAW;EACX,YAAY;AACd;AACA;EACE,WAAW;EACX,WAAW;EACX,yBAAyB;EACzB,YAAY;EACZ,iBAAiB;EACjB,aAAa;EACb,mBAAmB;EACnB,mBAAmB;EACnB,uBAAuB;AACzB;AACA;EACE,WAAW;EACX,WAAW;EACX,aAAa;EACb,mBAAmB;EACnB,eAAe;EACf,WAAW;EACX,mBAAmB;AACrB;;AAEA;EACE,aAAa;EACb,aAAa;EACb,mBAAmB;EACnB,kBAAkB;EAClB,gBAAgB;EAChB,gBAAgB;EAChB,UAAU;AACZ;;AAEA;EACE,OAAO;EACP,WAAW;EACX,eAAe;EACf,WAAW;EACX,WAAW;EACX,aAAa;EACb,mBAAmB;EACnB,mBAAmB;EACnB,uBAAuB;AACzB;;AAEA;EACE,OAAO;EACP,uBAAuB;EACvB,YAAY;EACZ,eAAe;EACf,WAAW;EACX,WAAW;EACX,YAAY;EACZ,aAAa;EACb,mBAAmB;EACnB,mBAAmB;EACnB,uBAAuB;AACzB;;AAEA;;EAEE,sBAAsB;EACtB,uBAAuB;EACvB,aAAa;EACb,sBAAsB;EACtB,uBAAuB;AACzB;;AAEA;EACE,kCAAkC;AACpC;;AAEA;EACE,YAAY;AACd;;AAEA;EACE,WAAW;EACX,YAAY;EACZ,aAAa;EACb,mBAAmB;EACnB,eAAe;EACf,mBAAmB;EACnB,uBAAuB;AACzB;;AAEA;EACE,WAAW;EACX,YAAY;EACZ,aAAa;EACb,mBAAmB;EACnB,eAAe;EACf,qBAAqB;EACrB,uBAAuB;AACzB;;AAEA;EACE,WAAW;EACX,WAAW;EACX,aAAa;AACf;;AAEA;EACE,SAAS;EACT,UAAU;EACV,YAAY;EACZ,UAAU;EACV,aAAa;EACb,mBAAmB;EACnB,kBAAkB;EAClB,eAAe;AACjB;;AAEA;EACE,SAAS;EACT,UAAU;EACV,YAAY;EACZ,UAAU;EACV,aAAa;EACb,mBAAmB;EACnB,uBAAuB;EACvB,kBAAkB;AACpB;;AAEA;EACE,eAAe;EACf,sBAAsB;EACtB,4BAA4B;EAC5B,kBAAkB;AACpB;;AAEA;EACE,qBAAqB;AACvB;;AAEA;EACE,kBAAkB;EAClB,sBAAsB;EACtB,YAAY;EACZ,iBAAiB;EACjB,eAAe;AACjB;;AAEA;EACE,2BAA2B;AAC7B;;AAEA;EACE,WAAW;EACX,YAAY;EACZ,gBAAgB;EAChB,kBAAkB;EAClB,aAAa;EACb,qBAAqB;AACvB;;AAEA;EACE,UAAU;EACV,kBAAkB;EAClB,UAAU;EACV,WAAW;EACX,iBAAiB;EACjB,oCAAoC;EACpC,aAAa;EACb,mBAAmB;EACnB,yBAAyB;EACzB,sBAAsB;EACtB,gBAAgB;AAClB;;AAEA;EACE,UAAU;EACV,kBAAkB;EAClB,UAAU;EACV,WAAW;EACX,oCAAoC;EACpC,4BAA4B;EAC5B,gCAAgC;EAChC,cAAc;EACd,gBAAgB;AAClB;;AAEA;EACE,UAAU;EACV,kBAAkB;EAClB,UAAU;EACV,WAAW;EACX,cAAc;EACd,yBAAyB;EACzB,iBAAiB;EACjB,kBAAkB;EAClB,oCAAoC;EACpC,4BAA4B;EAC5B,gCAAgC;AAClC;;AAEA;EACE,UAAU;EACV,kBAAkB;EAClB,WAAW;EACX,YAAY;EACZ,yBAAyB;EACzB,iBAAiB;EACjB,kBAAkB;EAClB,oCAAoC;EACpC,4BAA4B;EAC5B,gCAAgC;AAClC;;AAEA;EACE,UAAU;EACV,WAAW;EACX,gBAAgB;EAChB,WAAW;EACX,YAAY;EACZ,2BAA2B;EAC3B,kBAAkB;EAClB,aAAa;EACb,uBAAuB;EACvB,qBAAqB;AACvB;;AAEA;EACE,aAAa;AACf;;AAEA;EACE,qBAAqB;AACvB;;AAEA;EACE,WAAW;AACb;;AAEA;EACE,mBAAmB;AACrB;AACA;EACE,mBAAmB;AACrB;AACA;EACE,mBAAmB;AACrB;AACA;EACE,mBAAmB;AACrB;AACA;EACE,mBAAmB;AACrB;AACA;EACE,mBAAmB;AACrB;;ACvtBA,+BAA+B;;AAE/B;EACE,qBAAqB;EACrB,SAAS;AACX;;AAEA;;;;EAIE,WAAW;EACX,YAAY;AACd;;AAEA;;EAEE,WAAW;EACX,YAAY;AACd;;AAEA;;EAEE,WAAW;EACX,YAAY;AACd;;AAEA;EACE,qCAAqC;AACvC;;AAEA;EACE,uCAAuC;AACzC;;AAEA;EACE;IACE,uBAAuB;EACzB;EACA;IACE,yBAAyB;EAC3B;AACF;;AC1CA;EACE,6CAA6C;EAC7C,kBAAkB;EAClB,qBAAqB;AACvB;AACA;EACE,oBAAoB;AACtB;AACA;EACE,yBAAyB;EACzB,mBAAmB;EACnB,gBAAgB;EAChB,yEAAyE;EACzE,kBAAkB;EAClB,UAAU;EACV,cAAc;EACd,iBAAiB;EACjB,gBAAgB;AAClB;AACA;EACE,WAAW;EACX,aAAa;EACb,eAAe;EACf,sBAAsB;EACtB,gCAAgC;EAChC,6BAA6B;AAC/B;AACA;EACE,WAAW;EACX,yBAAyB;AAC3B;AACA;EACE,0DAA0D;EAC1D,uCAAuC;EACvC,cAAc;AAChB;;ACnCA,kBAAkB;;AAElB;EACE,aAAa;EACb,sBAAsB;EACtB,6BAA6B;EAC7B,qBAAqB;EACrB,qBAAqB;EACrB,mBAAmB;AACrB;;AAEA;EACE,0BAA0B;EAC1B,mCAAmC;EACnC,kCAAkC;EAClC,kCAAkC;EAClC,wCAAwC;AAC1C;;AAEA;EACE,eAAe;AACjB;;AAEA;EACE,eAAe;AACjB;;AAEA;EACE,eAAe;AACjB;;AAEA,iBAAiB;;AAEjB;EACE,kBAAkB;AACpB;;AAEA;EACE,6CAA6C;AAC/C;;AAEA;EACE,8CAA8C;AAChD;;AAEA;EACE,4CAA4C;AAC9C","sources":["webpack://pandora-fms-visual-console/./src/main.css","webpack://pandora-fms-visual-console/./src/lib/FontAwesomeIcon.styles.css","webpack://pandora-fms-visual-console/./src/lib/autocomplete.css","webpack://pandora-fms-visual-console/./src/items/Clock/styles.css"],"sourcesContent":["#visual-console-container {\n  margin: 0px auto;\n  position: relative;\n  background-repeat: no-repeat;\n  background-size: 100% 100%;\n  background-position: center;\n  margin-top: 5px;\n}\n\n.is-maintenance {\n  background-image: url(./lib/maintenanceMode.png) !important;\n}\n\n.is-maintenance :nth-child(1) {\n  display: none;\n}\n\n.visual-console-item {\n  position: absolute;\n  display: flex;\n  flex-direction: initial;\n  justify-items: center;\n  align-items: center;\n  user-select: text;\n  z-index: 1;\n}\n\n.visual-console-item.is-on-top {\n  z-index: 2;\n}\n\n.visual-console-item * {\n  overflow: visible;\n  font-family: inherit;\n}\n\n.visual-console-item.is-editing {\n  border: 2px dashed #b2b2b2;\n  transform: translateX(-2px) translateY(-2px);\n  user-select: none;\n}\n\n.visual-console-item.is-editing:hover {\n  border-color: #82b92e;\n}\n\n.visual-console-item.is-editing.is-selected {\n  border: 2px dashed #2b2b2b;\n  cursor: move;\n  z-index: 10;\n}\n.visual-console-item.is-editing > .resize-draggable {\n  float: right;\n  position: absolute;\n  right: 0;\n  bottom: 0;\n  width: 15px;\n  height: 15px;\n  background: url(./resize-handle.svg);\n  cursor: se-resize;\n  z-index: 10;\n}\n\n.visual-console-item.is-editing :first-child {\n  pointer-events: none;\n}\n\n@keyframes spinner-loading {\n  0% {\n    transform: rotate(0deg);\n  }\n  to {\n    transform: rotate(1turn);\n  }\n}\n\n.visual-console-item.is-alert-triggered {\n  border: 3px solid #f36201;\n}\n\n.visual-console-spinner {\n  background-color: transparent;\n  margin: 0px auto;\n  border-top: 5px solid rgb(82, 85, 87);\n  border-right: 5px solid rgb(82, 85, 87);\n  border-bottom: 5px solid rgb(82, 85, 87);\n  border-left: 5px solid rgba(82, 85, 87, 0.2);\n\n  animation-name: spinner-loading;\n  animation-duration: 0.8s;\n  animation-iteration-count: infinite;\n  animation-timing-function: linear;\n}\n\n.visual-console-spinner,\n.visual-console-spinner :after {\n  display: block;\n  width: 32px;\n  height: 32px;\n  border-radius: 50%;\n}\n\n.visual-console-spinner.small,\n.visual-console-spinner.small :after {\n  width: 12px;\n  height: 12px;\n}\n\n.div-visual-console-spinner {\n  position: absolute;\n  width: 100%;\n  height: 100%;\n  display: flex;\n  align-items: center;\n  opacity: 0.7;\n  background: rgb(212, 215, 218);\n  z-index: 10;\n}\n\n.show-elements {\n  display: inline-block;\n}\n\n.hide-elements {\n  display: none;\n}\n\n/*Forms*/\n.div-input-group label {\n  display: flex;\n  flex-direction: row;\n  flex-wrap: wrap;\n  align-items: center;\n  font-size: 12pt;\n  font-weight: 600;\n  color: #343434;\n  margin-right: 10px;\n}\n.div-input-group label img {\n  margin-left: 4px;\n}\n\n.div-input-group input[type=\"text\"],\n.div-input-group input[type=\"number\"] {\n  height: 25px;\n  font-size: 10pt;\n  background-color: transparent;\n  border: none;\n  border-radius: 0;\n  border-bottom: 1px solid #ccc;\n  font-weight: lighter;\n  padding: 0px 0px 2px 0px;\n  box-sizing: border-box;\n  margin-right: 10px;\n  padding-left: 2px;\n}\n\n.div-input-group input[type=\"radio\"] {\n  margin-right: 10px;\n  width: 17px;\n  height: 17px;\n}\n\n.div-input-group select {\n  font-weight: lighter;\n  font-size: 10pt;\n}\n\n.input-groups {\n  display: flex;\n  flex-direction: column;\n  flex-wrap: wrap;\n}\n\n.input-group {\n  width: 100%;\n  margin-bottom: 25px;\n  padding-left: 20px;\n}\n\n.div-ranges-input-group {\n  display: flex;\n  flex-direction: column;\n  flex-wrap: wrap;\n  align-items: flex-start;\n}\n\n.div-ranges-input-group > div {\n  padding-left: 20px;\n  margin-top: 10px;\n}\n\n.div-input-group,\n.div-input-group div div {\n  display: flex;\n  flex-direction: row;\n  flex-wrap: wrap;\n  align-items: center;\n}\n\n.div-input-group h3 {\n  text-transform: initial;\n  text-align: center;\n  font-style: italic;\n  text-decoration: underline;\n  margin: 0 auto;\n}\n\n.div-input-group div div a {\n  margin-left: 10px;\n}\n\n.div-input-group-autocomplete-agent {\n  display: flex;\n  flex-direction: column;\n  flex-wrap: wrap;\n  align-items: flex-start;\n  justify-content: space-between;\n  height: 70px;\n}\n\n.div-input-group-inside {\n  padding-left: 20px;\n}\n\n.input-group-link-console {\n  height: 70px;\n}\n\n.show-elements > div.div-input-group-autocomplete-agent {\n  margin-left: 20px;\n}\n\n.img-vc-elements {\n  margin-left: 10px;\n}\n\ninput.error-input-validate[type=\"number\"],\ninput.error-input-validate[type=\"text\"],\nselect.error-input-validate {\n  border: 1px solid #c00;\n}\n\nselect.error-input-validate:focus {\n  outline-color: #c00;\n}\n\np.error-p-validate {\n  width: 100%;\n  color: #c00;\n}\n\n/* Styles for the solid icons */\n\n.fa {\n  display: inline-block;\n  margin: 0;\n}\n\n.fa,\n.fa > svg,\n.fa.medium,\n.fa.medium > svg {\n  width: 28px;\n  height: 28px;\n}\n\n.fa.fa-small,\n.fa.fa-small > svg {\n  width: 14px;\n  height: 14px;\n}\n\n.fa.fa-large,\n.fa.fa-large > svg {\n  width: 44px;\n  height: 44px;\n}\n\n.fa-spin {\n  animation: fa-spin 2s infinite linear;\n}\n\n.fa-pulse {\n  animation: fa-spin 1s infinite steps(8);\n}\n\n@keyframes fa-spin {\n  0% {\n    transform: rotate(0deg);\n  }\n  100% {\n    transform: rotate(360deg);\n  }\n}\n\n.autocomplete {\n  /*the container must be positioned relative:*/\n  position: relative;\n  display: inline-block;\n}\n.autocomplete input {\n  /*background: pink;*/\n}\n.autocomplete-items {\n  border: 1px solid #d4d4d4;\n  border-bottom: none;\n  border-top: none;\n  /*position the autocomplete items to be the same width as the container:*/\n  position: absolute;\n  z-index: 1;\n  overflow: auto;\n  max-height: 150px;\n  max-width: 250px;\n}\n.autocomplete-items div {\n  width: 100%;\n  padding: 10px;\n  cursor: pointer;\n  background-color: #fff;\n  border-bottom: 1px solid #d4d4d4;\n  border-top: 1px solid #d4d4d4;\n}\n.autocomplete-items div:hover {\n  width: 100%;\n  background-color: #e9e9e9;\n}\n.autocomplete-active {\n  /*when navigating through the items using the arrow keys:*/\n  background-color: DodgerBlue !important;\n  color: #ffffff;\n}\n\n/* Digital clock */\n\n.visual-console-item .digital-clock {\n  display: -webkit-box;\n  display: -ms-flexbox;\n  display: flex;\n  flex-direction: column;\n  justify-content: center;\n  justify-items: center;\n  align-content: center;\n  align-items: center;\n}\n\n.visual-console-item .digital-clock > span {\n  /* To improve legibility */\n  text-rendering: optimizeLegibility;\n  text-shadow: rgba(0, 0, 0, 0.01) 0 0 1px;\n}\n\n.visual-console-item .digital-clock > span.time {\n  font-size: 50px;\n}\n\n.visual-console-item .digital-clock > span.date {\n  font-size: 25px;\n}\n\n.visual-console-item .digital-clock > span.timezone {\n  font-size: 25px;\n}\n\n/* Analog clock */\n\n.visual-console-item .analogic-clock {\n  text-align: center;\n}\n\n.visual-console-item .analogic-clock .hour-hand {\n  animation: rotate-hour 43200s infinite linear;\n}\n\n.visual-console-item .analogic-clock .minute-hand {\n  animation: rotate-minute 3600s infinite linear;\n}\n\n.visual-console-item .analogic-clock .second-hand {\n  animation: rotate-second 60s infinite linear;\n}\n\n#html-tabs .ui-widget-header {\n  background-color: #ffffff;\n  border: 0px;\n}\n\n#html-tabs .ui-tabs-anchor {\n  float: none;\n  display: flex;\n  flex-direction: row;\n  align-items: center;\n  justify-content: space-between;\n}\n\n#html-tabs .ui-tabs-anchor img {\n  margin-right: 10px;\n}\n\n#html-tabs .ui-tabs-nav li {\n  border-radius: 5px 5px 0px 0px;\n}\n\nlabel span.p-slider {\n  width: 30px;\n}\n\nli.interval-color-ranges > label,\nli#li-default-ranges > label {\n  margin-right: 15px;\n}\n\nli.interval-color-ranges > input[type=\"number\"],\nli#li-default-ranges > input[type=\"number\"] {\n  width: 80px;\n}\n\nli.interval-color-ranges > label:not(:first-child),\nli#li-default-ranges > label:not(:first-child),\nli#li-size-item > label:not(:first-child),\nli#li-position-item > label:not(:first-child) {\n  width: initial;\n  margin-left: 15px;\n}\n\nli#li-image-item label {\n  display: flex;\n  flex-direction: row;\n  justify-content: flex-end;\n}\n\nli#li-image-item label img {\n  flex: initial;\n}\n\n.discovery.modal * {\n  font-weight: normal;\n  color: #343434;\n}\n\n.discovery.modal select {\n  width: 100px;\n}\n\n.discovery.modal div#period_manual select,\n.discovery.modal div#period_manual input,\n.discovery.modal div#period_default select,\n.discovery.modal div#cacheExpiration_manual select,\n.discovery.modal div#cacheExpiration_manual input,\n.discovery.modal div#cacheExpiration_default select {\n  font-size: inherit !important;\n}\n.discovery.modal div#period_default select#period_select,\n.discovery.modal div#cacheExpiration_default select#cacheExpiration_select {\n  max-width: 230px;\n  width: inherit;\n}\n\nli#li-timeZone-item > label:not(:first-child),\n.discovery.modal li#div-textarea-label > label {\n  flex: inherit;\n}\n\nli#li-timeZone-item > select:not(:first-child) {\n  margin-left: 10px;\n}\n\n.discovery.modal li#div-textarea-label table tbody td.mceIframeContainer {\n  background-color: #ededed;\n}\n\n/*style item group show statistic*/\n.group-container {\n  display: flex;\n  flex-direction: column;\n  width: 100%;\n  height: 100%;\n}\n.group-container .group-item-title {\n  width: 100%;\n  height: 30%;\n  background-color: #9d9ea0;\n  color: black;\n  font-weight: bold;\n  display: flex;\n  flex-direction: row;\n  align-items: center;\n  justify-content: center;\n}\n.group-container .group-item-info {\n  width: 100%;\n  height: 70%;\n  display: flex;\n  flex-direction: row;\n  flex-wrap: wrap;\n  padding: 2%;\n  align-items: center;\n}\n\n.group-container .group-item-info .group-item-info-container {\n  flex: 1 1 20%;\n  display: flex;\n  flex-direction: row;\n  border-radius: 2px;\n  max-height: 50px;\n  min-height: 35px;\n  margin: 1%;\n}\n\n.group-container .group-item-info .group-item-info-container .value-style {\n  flex: 1;\n  color: #fff;\n  font-size: 100%;\n  padding: 0%;\n  width: 100%;\n  display: flex;\n  flex-direction: row;\n  align-items: center;\n  justify-content: center;\n}\n\n.group-container .group-item-info .group-item-info-container .name-style {\n  flex: 1;\n  background-color: white;\n  color: black;\n  font-size: 100%;\n  padding: 0%;\n  width: 100%;\n  height: 100%;\n  display: flex;\n  flex-direction: row;\n  align-items: center;\n  justify-content: center;\n}\n\ndiv.label,\ndiv.simple-value {\n  min-width: fit-content;\n  min-height: fit-content;\n  display: flex;\n  flex-direction: column;\n  justify-content: center;\n}\n\ndiv.simple-value > div {\n  max-height: -webkit-fill-available;\n}\n\ndiv.module-graph .parent_graph p table tr {\n  height: 25px;\n}\n\ndiv.module-graph {\n  width: 100%;\n  height: 100%;\n  display: flex;\n  flex-direction: row;\n  flex-wrap: wrap;\n  align-items: center;\n  justify-content: center;\n}\n\ndiv.basic-chart {\n  width: 100%;\n  height: 100%;\n  display: flex;\n  flex-direction: row;\n  flex-wrap: wrap;\n  align-items: flex-end;\n  justify-content: center;\n}\n\n.basic-chart-header {\n  height: 40%;\n  width: 100%;\n  display: flex;\n}\n\n.basic-chart-header-name {\n  margin: 0;\n  padding: 0;\n  height: 100%;\n  width: 80%;\n  display: flex;\n  align-items: center;\n  font-size: 2.5vmin;\n  margin-left: 3%;\n}\n\n.basic-chart-header-value {\n  margin: 0;\n  padding: 0;\n  height: 100%;\n  width: 20%;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  font-size: 2.5vmin;\n}\n\ndiv.module-graph .gauge_d3_class {\n  flex: 1 1 100px;\n  float: none !important;\n  overflow: inherit !important;\n  text-align: center;\n}\n\n.textDecorationNone:hover {\n  text-decoration: none;\n}\n\n.vc-item-nl-label {\n  border-radius: 5px;\n  background-color: #fff;\n  padding: 5px;\n  padding-left: 1em;\n  font-size: 14px;\n}\n\n.odometer {\n  overflow: hidden !important;\n}\n\n.odometer-container {\n  width: 100%;\n  height: 100%;\n  overflow: hidden;\n  text-align: center;\n  display: flex;\n  align-items: flex-end;\n}\n\n.odometer-a {\n  z-index: 5;\n  position: absolute;\n  width: 65%;\n  height: 65%;\n  left: calc(17.5%);\n  border-radius: 1000px 1000px 0px 0px;\n  display: flex;\n  align-items: center;\n  justify-content: flex-end;\n  flex-direction: column;\n  line-height: 0px;\n}\n\n.odometer-b {\n  z-index: 4;\n  position: relative;\n  width: 95%;\n  height: 95%;\n  border-radius: 0px 0px 1000px 1000px;\n  transform-origin: center top;\n  transition: all 1.3s ease-in-out;\n  top: calc(95%);\n  left: calc(2.5%);\n}\n\n.odometer-c {\n  z-index: 3;\n  position: absolute;\n  width: 96%;\n  height: 96%;\n  left: calc(2%);\n  background-color: #202226;\n  margin-left: auto;\n  margin-right: auto;\n  border-radius: 1000px 1000px 0px 0px;\n  transform-origin: center top;\n  transition: all 1.3s ease-in-out;\n}\n\n.odometer-d {\n  z-index: 0;\n  position: absolute;\n  width: 100%;\n  height: 100%;\n  background-color: #82b92e;\n  margin-left: auto;\n  margin-right: auto;\n  border-radius: 1000px 1000px 0px 0px;\n  transform-origin: center top;\n  transition: all 1.3s ease-in-out;\n}\n\n.gauge-data {\n  z-index: 4;\n  color: #fff;\n  font-size: 1.5em;\n  width: 100%;\n  height: 100%;\n  transition: all 1s ease-out;\n  position: absolute;\n  display: flex;\n  justify-content: center;\n  align-items: flex-end;\n}\n\n.svg_warning {\n  fill: #f3b200;\n}\n\n.svg_warning_hide {\n  fill: #fff !important;\n}\n\n.gauge-data #percent {\n  color: #000;\n}\n\n.orange_background {\n  background: #ffa631;\n}\n.red_background {\n  background: #e63c52;\n}\n.yellow_background {\n  background: #f3b200;\n}\n.grey_background {\n  background: #b2b2b2;\n}\n.blue_background {\n  background: #4a83f3;\n}\n.green_background {\n  background: #82b92e;\n}\n","/* Styles for the solid icons */\n\n.fa {\n  display: inline-block;\n  margin: 0;\n}\n\n.fa,\n.fa > svg,\n.fa.medium,\n.fa.medium > svg {\n  width: 28px;\n  height: 28px;\n}\n\n.fa.fa-small,\n.fa.fa-small > svg {\n  width: 14px;\n  height: 14px;\n}\n\n.fa.fa-large,\n.fa.fa-large > svg {\n  width: 44px;\n  height: 44px;\n}\n\n.fa-spin {\n  animation: fa-spin 2s infinite linear;\n}\n\n.fa-pulse {\n  animation: fa-spin 1s infinite steps(8);\n}\n\n@keyframes fa-spin {\n  0% {\n    transform: rotate(0deg);\n  }\n  100% {\n    transform: rotate(360deg);\n  }\n}\n",".autocomplete {\n  /*the container must be positioned relative:*/\n  position: relative;\n  display: inline-block;\n}\n.autocomplete input {\n  /*background: pink;*/\n}\n.autocomplete-items {\n  border: 1px solid #d4d4d4;\n  border-bottom: none;\n  border-top: none;\n  /*position the autocomplete items to be the same width as the container:*/\n  position: absolute;\n  z-index: 1;\n  overflow: auto;\n  max-height: 150px;\n  max-width: 250px;\n}\n.autocomplete-items div {\n  width: 100%;\n  padding: 10px;\n  cursor: pointer;\n  background-color: #fff;\n  border-bottom: 1px solid #d4d4d4;\n  border-top: 1px solid #d4d4d4;\n}\n.autocomplete-items div:hover {\n  width: 100%;\n  background-color: #e9e9e9;\n}\n.autocomplete-active {\n  /*when navigating through the items using the arrow keys:*/\n  background-color: DodgerBlue !important;\n  color: #ffffff;\n}\n","/* Digital clock */\n\n.visual-console-item .digital-clock {\n  display: flex;\n  flex-direction: column;\n  justify-content: space-evenly;\n  justify-items: center;\n  align-content: center;\n  align-items: center;\n}\n\n.visual-console-item .digital-clock > span {\n  /* To improve legibility */\n  -webkit-font-smoothing: antialiased;\n  -moz-osx-font-smoothing: grayscale;\n  text-rendering: optimizeLegibility;\n  text-shadow: rgba(0, 0, 0, 0.01) 0 0 1px;\n}\n\n.visual-console-item .digital-clock > span.time {\n  font-size: 50px;\n}\n\n.visual-console-item .digital-clock > span.date {\n  font-size: 25px;\n}\n\n.visual-console-item .digital-clock > span.timezone {\n  font-size: 25px;\n}\n\n/* Analog clock */\n\n.visual-console-item .analogic-clock {\n  text-align: center;\n}\n\n.visual-console-item .analogic-clock .hour-hand {\n  animation: rotate-hour 43200s infinite linear;\n}\n\n.visual-console-item .analogic-clock .minute-hand {\n  animation: rotate-minute 3600s infinite linear;\n}\n\n.visual-console-item .analogic-clock .second-hand {\n  animation: rotate-second 60s infinite linear;\n}\n"],"names":[],"sourceRoot":""}
\ No newline at end of file
+{"version":3,"file":"vc.main.css","mappings":"AAAA;EACE,gBAAgB;EAChB,kBAAkB;EAClB,4BAA4B;EAC5B,0BAA0B;EAC1B,2BAA2B;EAC3B,eAAe;AACjB;;AAEA;EACE,oEAA2D;AAC7D;;AAEA;EACE,aAAa;AACf;;AAEA;EACE,kBAAkB;EAClB,aAAa;EACb,uBAAuB;EACvB,qBAAqB;EACrB,mBAAmB;EACnB,iBAAiB;EACjB,UAAU;AACZ;;AAEA;EACE,UAAU;AACZ;;AAEA;EACE,iBAAiB;EACjB,oBAAoB;AACtB;;AAEA;EACE,0BAA0B;EAC1B,4CAA4C;EAC5C,iBAAiB;AACnB;;AAEA;EACE,qBAAqB;AACvB;;AAEA;EACE,0BAA0B;EAC1B,YAAY;EACZ,WAAW;AACb;AACA;EACE,YAAY;EACZ,kBAAkB;EAClB,QAAQ;EACR,SAAS;EACT,WAAW;EACX,YAAY;EACZ,mDAAoC;EACpC,iBAAiB;EACjB,WAAW;AACb;;AAEA;EACE,oBAAoB;AACtB;;AAEA;EACE;IACE,uBAAuB;EACzB;EACA;IACE,wBAAwB;EAC1B;AACF;;AAEA;EACE,yBAAyB;AAC3B;;AAEA;EACE,6BAA6B;EAC7B,gBAAgB;EAChB,qCAAqC;EACrC,uCAAuC;EACvC,wCAAwC;EACxC,4CAA4C;;EAE5C,+BAA+B;EAC/B,wBAAwB;EACxB,mCAAmC;EACnC,iCAAiC;AACnC;;AAEA;;EAEE,cAAc;EACd,WAAW;EACX,YAAY;EACZ,kBAAkB;AACpB;;AAEA;;EAEE,WAAW;EACX,YAAY;AACd;;AAEA;EACE,kBAAkB;EAClB,WAAW;EACX,YAAY;EACZ,aAAa;EACb,mBAAmB;EACnB,YAAY;EACZ,8BAA8B;EAC9B,WAAW;AACb;;AAEA;EACE,qBAAqB;AACvB;;AAEA;EACE,aAAa;AACf;;AAEA,QAAQ;AACR;EACE,aAAa;EACb,mBAAmB;EACnB,eAAe;EACf,mBAAmB;EACnB,eAAe;EACf,gBAAgB;EAChB,cAAc;EACd,kBAAkB;AACpB;AACA;EACE,gBAAgB;AAClB;;AAEA;;EAEE,YAAY;EACZ,eAAe;EACf,6BAA6B;EAC7B,YAAY;EACZ,gBAAgB;EAChB,6BAA6B;EAC7B,oBAAoB;EACpB,wBAAwB;EACxB,sBAAsB;EACtB,kBAAkB;EAClB,iBAAiB;AACnB;;AAEA;EACE,kBAAkB;EAClB,WAAW;EACX,YAAY;AACd;;AAEA;EACE,oBAAoB;EACpB,eAAe;AACjB;;AAEA;EACE,aAAa;EACb,sBAAsB;EACtB,eAAe;AACjB;;AAEA;EACE,WAAW;EACX,mBAAmB;EACnB,kBAAkB;AACpB;;AAEA;EACE,aAAa;EACb,sBAAsB;EACtB,eAAe;EACf,uBAAuB;AACzB;;AAEA;EACE,kBAAkB;EAClB,gBAAgB;AAClB;;AAEA;;EAEE,aAAa;EACb,mBAAmB;EACnB,eAAe;EACf,mBAAmB;AACrB;;AAEA;EACE,uBAAuB;EACvB,kBAAkB;EAClB,kBAAkB;EAClB,0BAA0B;EAC1B,cAAc;AAChB;;AAEA;EACE,iBAAiB;AACnB;;AAEA;EACE,aAAa;EACb,sBAAsB;EACtB,eAAe;EACf,uBAAuB;EACvB,8BAA8B;EAC9B,YAAY;AACd;;AAEA;EACE,kBAAkB;AACpB;;AAEA;EACE,YAAY;AACd;;AAEA;EACE,iBAAiB;AACnB;;AAEA;EACE,iBAAiB;AACnB;;AAEA;;;EAGE,sBAAsB;AACxB;;AAEA;EACE,mBAAmB;AACrB;;AAEA;EACE,WAAW;EACX,WAAW;AACb;;AAEA,+BAA+B;;AAE/B;EACE,qBAAqB;EACrB,SAAS;AACX;;AAEA;;;;EAIE,WAAW;EACX,YAAY;AACd;;AAEA;;EAEE,WAAW;EACX,YAAY;AACd;;AAEA;;EAEE,WAAW;EACX,YAAY;AACd;;AAEA;EACE,qCAAqC;AACvC;;AAEA;EACE,uCAAuC;AACzC;;AAEA;EACE;IACE,uBAAuB;EACzB;EACA;IACE,yBAAyB;EAC3B;AACF;;AAEA;EACE,6CAA6C;EAC7C,kBAAkB;EAClB,qBAAqB;AACvB;AACA;EACE,oBAAoB;AACtB;AACA;EACE,yBAAyB;EACzB,mBAAmB;EACnB,gBAAgB;EAChB,yEAAyE;EACzE,kBAAkB;EAClB,UAAU;EACV,cAAc;EACd,iBAAiB;EACjB,gBAAgB;AAClB;AACA;EACE,WAAW;EACX,aAAa;EACb,eAAe;EACf,sBAAsB;EACtB,gCAAgC;EAChC,6BAA6B;AAC/B;AACA;EACE,WAAW;EACX,yBAAyB;AAC3B;AACA;EACE,0DAA0D;EAC1D,uCAAuC;EACvC,cAAc;AAChB;;AAEA,kBAAkB;;AAElB;EACE,oBAAoB;EACpB,oBAAoB;EACpB,aAAa;EACb,sBAAsB;EACtB,uBAAuB;EACvB,qBAAqB;EACrB,qBAAqB;EACrB,mBAAmB;AACrB;;AAEA;EACE,0BAA0B;EAC1B,kCAAkC;EAClC,wCAAwC;AAC1C;;AAEA;EACE,eAAe;AACjB;;AAEA;EACE,eAAe;AACjB;;AAEA;EACE,eAAe;AACjB;;AAEA,iBAAiB;;AAEjB;EACE,kBAAkB;AACpB;;AAEA;EACE,6CAA6C;AAC/C;;AAEA;EACE,8CAA8C;AAChD;;AAEA;EACE,4CAA4C;AAC9C;;AAEA;EACE,yBAAyB;EACzB,WAAW;AACb;;AAEA;EACE,WAAW;EACX,aAAa;EACb,mBAAmB;EACnB,mBAAmB;EACnB,8BAA8B;AAChC;;AAEA;EACE,kBAAkB;AACpB;;AAEA;EACE,8BAA8B;AAChC;;AAEA;;EAEE,kBAAkB;AACpB;;AAEA;;EAEE,WAAW;AACb;;AAEA;;;;EAIE,cAAc;EACd,iBAAiB;AACnB;;AAEA;EACE,aAAa;EACb,mBAAmB;EACnB,yBAAyB;AAC3B;;AAEA;EACE,aAAa;AACf;;AAEA;EACE,mBAAmB;EACnB,cAAc;AAChB;;AAEA;EACE,YAAY;AACd;;AAEA;;;;;;EAME,6BAA6B;AAC/B;AACA;;EAEE,gBAAgB;EAChB,cAAc;AAChB;;AAEA;;EAEE,aAAa;AACf;;AAEA;EACE,iBAAiB;AACnB;;AAEA;EACE,yBAAyB;AAC3B;;AAEA,kCAAkC;AAClC;EACE,aAAa;EACb,sBAAsB;EACtB,WAAW;EACX,YAAY;AACd;AACA;EACE,WAAW;EACX,WAAW;EACX,yBAAyB;EACzB,YAAY;EACZ,iBAAiB;EACjB,aAAa;EACb,mBAAmB;EACnB,mBAAmB;EACnB,uBAAuB;AACzB;AACA;EACE,WAAW;EACX,WAAW;EACX,aAAa;EACb,mBAAmB;EACnB,eAAe;EACf,WAAW;EACX,mBAAmB;AACrB;;AAEA;EACE,aAAa;EACb,aAAa;EACb,mBAAmB;EACnB,kBAAkB;EAClB,gBAAgB;EAChB,gBAAgB;EAChB,UAAU;AACZ;;AAEA;EACE,OAAO;EACP,WAAW;EACX,eAAe;EACf,WAAW;EACX,WAAW;EACX,aAAa;EACb,mBAAmB;EACnB,mBAAmB;EACnB,uBAAuB;AACzB;;AAEA;EACE,OAAO;EACP,uBAAuB;EACvB,YAAY;EACZ,eAAe;EACf,WAAW;EACX,WAAW;EACX,YAAY;EACZ,aAAa;EACb,mBAAmB;EACnB,mBAAmB;EACnB,uBAAuB;AACzB;;AAEA;;EAEE,sBAAsB;EACtB,uBAAuB;EACvB,aAAa;EACb,sBAAsB;EACtB,uBAAuB;AACzB;;AAEA;EACE,kCAAkC;AACpC;;AAEA;EACE,YAAY;AACd;;AAEA;EACE,WAAW;EACX,YAAY;EACZ,aAAa;EACb,mBAAmB;EACnB,eAAe;EACf,mBAAmB;EACnB,uBAAuB;AACzB;;AAEA;EACE,WAAW;EACX,YAAY;EACZ,aAAa;EACb,mBAAmB;EACnB,eAAe;EACf,qBAAqB;EACrB,uBAAuB;AACzB;;AAEA;EACE,WAAW;EACX,WAAW;EACX,aAAa;AACf;;AAEA;EACE,SAAS;EACT,UAAU;EACV,YAAY;EACZ,UAAU;EACV,aAAa;EACb,mBAAmB;EACnB,kBAAkB;EAClB,eAAe;AACjB;;AAEA;EACE,SAAS;EACT,UAAU;EACV,YAAY;EACZ,UAAU;EACV,aAAa;EACb,mBAAmB;EACnB,uBAAuB;EACvB,kBAAkB;AACpB;;AAEA;EACE,eAAe;EACf,sBAAsB;EACtB,4BAA4B;EAC5B,kBAAkB;AACpB;;AAEA;EACE,qBAAqB;AACvB;;AAEA;EACE,kBAAkB;EAClB,sBAAsB;EACtB,YAAY;EACZ,iBAAiB;EACjB,eAAe;AACjB;;AAEA;EACE,2BAA2B;AAC7B;;AAEA;EACE,WAAW;EACX,YAAY;EACZ,gBAAgB;EAChB,kBAAkB;EAClB,aAAa;EACb,qBAAqB;AACvB;;AAEA;EACE,UAAU;EACV,kBAAkB;EAClB,UAAU;EACV,WAAW;EACX,iBAAiB;EACjB,oCAAoC;EACpC,aAAa;EACb,mBAAmB;EACnB,yBAAyB;EACzB,sBAAsB;EACtB,gBAAgB;AAClB;;AAEA;EACE,UAAU;EACV,kBAAkB;EAClB,UAAU;EACV,WAAW;EACX,oCAAoC;EACpC,4BAA4B;EAC5B,gCAAgC;EAChC,cAAc;EACd,gBAAgB;AAClB;;AAEA;EACE,UAAU;EACV,kBAAkB;EAClB,UAAU;EACV,WAAW;EACX,cAAc;EACd,yBAAyB;EACzB,iBAAiB;EACjB,kBAAkB;EAClB,oCAAoC;EACpC,4BAA4B;EAC5B,gCAAgC;AAClC;;AAEA;EACE,UAAU;EACV,kBAAkB;EAClB,WAAW;EACX,YAAY;EACZ,yBAAyB;EACzB,iBAAiB;EACjB,kBAAkB;EAClB,oCAAoC;EACpC,4BAA4B;EAC5B,gCAAgC;AAClC;;AAEA;EACE,UAAU;EACV,WAAW;EACX,gBAAgB;EAChB,WAAW;EACX,YAAY;EACZ,2BAA2B;EAC3B,kBAAkB;EAClB,aAAa;EACb,uBAAuB;EACvB,qBAAqB;AACvB;;AAEA;EACE,aAAa;AACf;;AAEA;EACE,qBAAqB;AACvB;;AAEA;EACE,WAAW;AACb;;AAEA;EACE,mBAAmB;AACrB;AACA;EACE,mBAAmB;AACrB;AACA;EACE,mBAAmB;AACrB;AACA;EACE,mBAAmB;AACrB;AACA;EACE,mBAAmB;AACrB;AACA;EACE,mBAAmB;AACrB;;ACntBA,+BAA+B;;AAE/B;EACE,qBAAqB;EACrB,SAAS;AACX;;AAEA;;;;EAIE,WAAW;EACX,YAAY;AACd;;AAEA;;EAEE,WAAW;EACX,YAAY;AACd;;AAEA;;EAEE,WAAW;EACX,YAAY;AACd;;AAEA;EACE,qCAAqC;AACvC;;AAEA;EACE,uCAAuC;AACzC;;AAEA;EACE;IACE,uBAAuB;EACzB;EACA;IACE,yBAAyB;EAC3B;AACF;;AC1CA;EACE,6CAA6C;EAC7C,kBAAkB;EAClB,qBAAqB;AACvB;AACA;EACE,oBAAoB;AACtB;AACA;EACE,yBAAyB;EACzB,mBAAmB;EACnB,gBAAgB;EAChB,yEAAyE;EACzE,kBAAkB;EAClB,UAAU;EACV,cAAc;EACd,iBAAiB;EACjB,gBAAgB;AAClB;AACA;EACE,WAAW;EACX,aAAa;EACb,eAAe;EACf,sBAAsB;EACtB,gCAAgC;EAChC,6BAA6B;AAC/B;AACA;EACE,WAAW;EACX,yBAAyB;AAC3B;AACA;EACE,0DAA0D;EAC1D,uCAAuC;EACvC,cAAc;AAChB;;ACnCA,kBAAkB;;AAElB;EACE,aAAa;EACb,sBAAsB;EACtB,6BAA6B;EAC7B,qBAAqB;EACrB,qBAAqB;EACrB,mBAAmB;AACrB;;AAEA;EACE,0BAA0B;EAC1B,mCAAmC;EACnC,kCAAkC;EAClC,kCAAkC;EAClC,wCAAwC;AAC1C;;AAEA;EACE,eAAe;AACjB;;AAEA;EACE,eAAe;AACjB;;AAEA;EACE,eAAe;AACjB;;AAEA,iBAAiB;;AAEjB;EACE,kBAAkB;AACpB;;AAEA;EACE,6CAA6C;AAC/C;;AAEA;EACE,8CAA8C;AAChD;;AAEA;EACE,4CAA4C;AAC9C","sources":["webpack://pandora-fms-visual-console/./src/main.css","webpack://pandora-fms-visual-console/./src/lib/FontAwesomeIcon.styles.css","webpack://pandora-fms-visual-console/./src/lib/autocomplete.css","webpack://pandora-fms-visual-console/./src/items/Clock/styles.css"],"sourcesContent":["#visual-console-container {\n  margin: 0px auto;\n  position: relative;\n  background-repeat: no-repeat;\n  background-size: 100% 100%;\n  background-position: center;\n  margin-top: 5px;\n}\n\n.is-maintenance {\n  background-image: url(./lib/maintenanceMode.png) !important;\n}\n\n.is-maintenance :nth-child(1) {\n  display: none;\n}\n\n.visual-console-item {\n  position: absolute;\n  display: flex;\n  flex-direction: initial;\n  justify-items: center;\n  align-items: center;\n  user-select: text;\n  z-index: 1;\n}\n\n.visual-console-item.is-on-top {\n  z-index: 2;\n}\n\n.visual-console-item * {\n  overflow: visible;\n  font-family: inherit;\n}\n\n.visual-console-item.is-editing {\n  border: 2px dashed #b2b2b2;\n  transform: translateX(-2px) translateY(-2px);\n  user-select: none;\n}\n\n.visual-console-item.is-editing:hover {\n  border-color: #82b92e;\n}\n\n.visual-console-item.is-editing.is-selected {\n  border: 2px dashed #2b2b2b;\n  cursor: move;\n  z-index: 10;\n}\n.visual-console-item.is-editing > .resize-draggable {\n  float: right;\n  position: absolute;\n  right: 0;\n  bottom: 0;\n  width: 15px;\n  height: 15px;\n  background: url(./resize-handle.svg);\n  cursor: se-resize;\n  z-index: 10;\n}\n\n.visual-console-item.is-editing :first-child {\n  pointer-events: none;\n}\n\n@keyframes spinner-loading {\n  0% {\n    transform: rotate(0deg);\n  }\n  to {\n    transform: rotate(1turn);\n  }\n}\n\n.visual-console-item.is-alert-triggered {\n  border: 3px solid #f36201;\n}\n\n.visual-console-spinner {\n  background-color: transparent;\n  margin: 0px auto;\n  border-top: 5px solid rgb(82, 85, 87);\n  border-right: 5px solid rgb(82, 85, 87);\n  border-bottom: 5px solid rgb(82, 85, 87);\n  border-left: 5px solid rgba(82, 85, 87, 0.2);\n\n  animation-name: spinner-loading;\n  animation-duration: 0.8s;\n  animation-iteration-count: infinite;\n  animation-timing-function: linear;\n}\n\n.visual-console-spinner,\n.visual-console-spinner :after {\n  display: block;\n  width: 32px;\n  height: 32px;\n  border-radius: 50%;\n}\n\n.visual-console-spinner.small,\n.visual-console-spinner.small :after {\n  width: 12px;\n  height: 12px;\n}\n\n.div-visual-console-spinner {\n  position: absolute;\n  width: 100%;\n  height: 100%;\n  display: flex;\n  align-items: center;\n  opacity: 0.7;\n  background: rgb(212, 215, 218);\n  z-index: 10;\n}\n\n.show-elements {\n  display: inline-block;\n}\n\n.hide-elements {\n  display: none;\n}\n\n/*Forms*/\n.div-input-group label {\n  display: flex;\n  flex-direction: row;\n  flex-wrap: wrap;\n  align-items: center;\n  font-size: 12pt;\n  font-weight: 600;\n  color: #343434;\n  margin-right: 10px;\n}\n.div-input-group label img {\n  margin-left: 4px;\n}\n\n.div-input-group input[type=\"text\"],\n.div-input-group input[type=\"number\"] {\n  height: 25px;\n  font-size: 10pt;\n  background-color: transparent;\n  border: none;\n  border-radius: 0;\n  border-bottom: 1px solid #ccc;\n  font-weight: lighter;\n  padding: 0px 0px 2px 0px;\n  box-sizing: border-box;\n  margin-right: 10px;\n  padding-left: 2px;\n}\n\n.div-input-group input[type=\"radio\"] {\n  margin-right: 10px;\n  width: 17px;\n  height: 17px;\n}\n\n.div-input-group select {\n  font-weight: lighter;\n  font-size: 10pt;\n}\n\n.input-groups {\n  display: flex;\n  flex-direction: column;\n  flex-wrap: wrap;\n}\n\n.input-group {\n  width: 100%;\n  margin-bottom: 25px;\n  padding-left: 20px;\n}\n\n.div-ranges-input-group {\n  display: flex;\n  flex-direction: column;\n  flex-wrap: wrap;\n  align-items: flex-start;\n}\n\n.div-ranges-input-group > div {\n  padding-left: 20px;\n  margin-top: 10px;\n}\n\n.div-input-group,\n.div-input-group div div {\n  display: flex;\n  flex-direction: row;\n  flex-wrap: wrap;\n  align-items: center;\n}\n\n.div-input-group h3 {\n  text-transform: initial;\n  text-align: center;\n  font-style: italic;\n  text-decoration: underline;\n  margin: 0 auto;\n}\n\n.div-input-group div div a {\n  margin-left: 10px;\n}\n\n.div-input-group-autocomplete-agent {\n  display: flex;\n  flex-direction: column;\n  flex-wrap: wrap;\n  align-items: flex-start;\n  justify-content: space-between;\n  height: 70px;\n}\n\n.div-input-group-inside {\n  padding-left: 20px;\n}\n\n.input-group-link-console {\n  height: 70px;\n}\n\n.show-elements > div.div-input-group-autocomplete-agent {\n  margin-left: 20px;\n}\n\n.img-vc-elements {\n  margin-left: 10px;\n}\n\ninput.error-input-validate[type=\"number\"],\ninput.error-input-validate[type=\"text\"],\nselect.error-input-validate {\n  border: 1px solid #c00;\n}\n\nselect.error-input-validate:focus {\n  outline-color: #c00;\n}\n\np.error-p-validate {\n  width: 100%;\n  color: #c00;\n}\n\n/* Styles for the solid icons */\n\n.fa {\n  display: inline-block;\n  margin: 0;\n}\n\n.fa,\n.fa > svg,\n.fa.medium,\n.fa.medium > svg {\n  width: 28px;\n  height: 28px;\n}\n\n.fa.fa-small,\n.fa.fa-small > svg {\n  width: 14px;\n  height: 14px;\n}\n\n.fa.fa-large,\n.fa.fa-large > svg {\n  width: 44px;\n  height: 44px;\n}\n\n.fa-spin {\n  animation: fa-spin 2s infinite linear;\n}\n\n.fa-pulse {\n  animation: fa-spin 1s infinite steps(8);\n}\n\n@keyframes fa-spin {\n  0% {\n    transform: rotate(0deg);\n  }\n  100% {\n    transform: rotate(360deg);\n  }\n}\n\n.autocomplete {\n  /*the container must be positioned relative:*/\n  position: relative;\n  display: inline-block;\n}\n.autocomplete input {\n  /*background: pink;*/\n}\n.autocomplete-items {\n  border: 1px solid #d4d4d4;\n  border-bottom: none;\n  border-top: none;\n  /*position the autocomplete items to be the same width as the container:*/\n  position: absolute;\n  z-index: 1;\n  overflow: auto;\n  max-height: 150px;\n  max-width: 250px;\n}\n.autocomplete-items div {\n  width: 100%;\n  padding: 10px;\n  cursor: pointer;\n  background-color: #fff;\n  border-bottom: 1px solid #d4d4d4;\n  border-top: 1px solid #d4d4d4;\n}\n.autocomplete-items div:hover {\n  width: 100%;\n  background-color: #e9e9e9;\n}\n.autocomplete-active {\n  /*when navigating through the items using the arrow keys:*/\n  background-color: DodgerBlue !important;\n  color: #ffffff;\n}\n\n/* Digital clock */\n\n.visual-console-item .digital-clock {\n  display: -webkit-box;\n  display: -ms-flexbox;\n  display: flex;\n  flex-direction: column;\n  justify-content: center;\n  justify-items: center;\n  align-content: center;\n  align-items: center;\n}\n\n.visual-console-item .digital-clock > span {\n  /* To improve legibility */\n  text-rendering: optimizeLegibility;\n  text-shadow: rgba(0, 0, 0, 0.01) 0 0 1px;\n}\n\n.visual-console-item .digital-clock > span.time {\n  font-size: 50px;\n}\n\n.visual-console-item .digital-clock > span.date {\n  font-size: 25px;\n}\n\n.visual-console-item .digital-clock > span.timezone {\n  font-size: 25px;\n}\n\n/* Analog clock */\n\n.visual-console-item .analogic-clock {\n  text-align: center;\n}\n\n.visual-console-item .analogic-clock .hour-hand {\n  animation: rotate-hour 43200s infinite linear;\n}\n\n.visual-console-item .analogic-clock .minute-hand {\n  animation: rotate-minute 3600s infinite linear;\n}\n\n.visual-console-item .analogic-clock .second-hand {\n  animation: rotate-second 60s infinite linear;\n}\n\n#html-tabs .ui-widget-header {\n  background-color: #ffffff;\n  border: 0px;\n}\n\n#html-tabs .ui-tabs-anchor {\n  float: none;\n  display: flex;\n  flex-direction: row;\n  align-items: center;\n  justify-content: space-between;\n}\n\n#html-tabs .ui-tabs-anchor img {\n  margin-right: 10px;\n}\n\n#html-tabs .ui-tabs-nav li {\n  border-radius: 5px 5px 0px 0px;\n}\n\nli.interval-color-ranges > label,\nli#li-default-ranges > label {\n  margin-right: 15px;\n}\n\nli.interval-color-ranges > input[type=\"number\"],\nli#li-default-ranges > input[type=\"number\"] {\n  width: 80px;\n}\n\nli.interval-color-ranges > label:not(:first-child),\nli#li-default-ranges > label:not(:first-child),\nli#li-size-item > label:not(:first-child),\nli#li-position-item > label:not(:first-child) {\n  width: initial;\n  margin-left: 15px;\n}\n\nli#li-image-item label {\n  display: flex;\n  flex-direction: row;\n  justify-content: flex-end;\n}\n\nli#li-image-item label img {\n  flex: initial;\n}\n\n.discovery.modal * {\n  font-weight: normal;\n  color: #343434;\n}\n\n.discovery.modal select {\n  width: 100px;\n}\n\n.discovery.modal div#period_manual select,\n.discovery.modal div#period_manual input,\n.discovery.modal div#period_default select,\n.discovery.modal div#cacheExpiration_manual select,\n.discovery.modal div#cacheExpiration_manual input,\n.discovery.modal div#cacheExpiration_default select {\n  font-size: inherit !important;\n}\n.discovery.modal div#period_default select#period_select,\n.discovery.modal div#cacheExpiration_default select#cacheExpiration_select {\n  max-width: 230px;\n  width: inherit;\n}\n\nli#li-timeZone-item > label:not(:first-child),\n.discovery.modal li#div-textarea-label > label {\n  flex: inherit;\n}\n\nli#li-timeZone-item > select:not(:first-child) {\n  margin-left: 10px;\n}\n\n.discovery.modal li#div-textarea-label table tbody td.mceIframeContainer {\n  background-color: #ededed;\n}\n\n/*style item group show statistic*/\n.group-container {\n  display: flex;\n  flex-direction: column;\n  width: 100%;\n  height: 100%;\n}\n.group-container .group-item-title {\n  width: 100%;\n  height: 30%;\n  background-color: #9d9ea0;\n  color: black;\n  font-weight: bold;\n  display: flex;\n  flex-direction: row;\n  align-items: center;\n  justify-content: center;\n}\n.group-container .group-item-info {\n  width: 100%;\n  height: 70%;\n  display: flex;\n  flex-direction: row;\n  flex-wrap: wrap;\n  padding: 2%;\n  align-items: center;\n}\n\n.group-container .group-item-info .group-item-info-container {\n  flex: 1 1 20%;\n  display: flex;\n  flex-direction: row;\n  border-radius: 2px;\n  max-height: 50px;\n  min-height: 35px;\n  margin: 1%;\n}\n\n.group-container .group-item-info .group-item-info-container .value-style {\n  flex: 1;\n  color: #fff;\n  font-size: 100%;\n  padding: 0%;\n  width: 100%;\n  display: flex;\n  flex-direction: row;\n  align-items: center;\n  justify-content: center;\n}\n\n.group-container .group-item-info .group-item-info-container .name-style {\n  flex: 1;\n  background-color: white;\n  color: black;\n  font-size: 100%;\n  padding: 0%;\n  width: 100%;\n  height: 100%;\n  display: flex;\n  flex-direction: row;\n  align-items: center;\n  justify-content: center;\n}\n\ndiv.label,\ndiv.simple-value {\n  min-width: fit-content;\n  min-height: fit-content;\n  display: flex;\n  flex-direction: column;\n  justify-content: center;\n}\n\ndiv.simple-value > div {\n  max-height: -webkit-fill-available;\n}\n\ndiv.module-graph .parent_graph p table tr {\n  height: 25px;\n}\n\ndiv.module-graph {\n  width: 100%;\n  height: 100%;\n  display: flex;\n  flex-direction: row;\n  flex-wrap: wrap;\n  align-items: center;\n  justify-content: center;\n}\n\ndiv.basic-chart {\n  width: 100%;\n  height: 100%;\n  display: flex;\n  flex-direction: row;\n  flex-wrap: wrap;\n  align-items: flex-end;\n  justify-content: center;\n}\n\n.basic-chart-header {\n  height: 40%;\n  width: 100%;\n  display: flex;\n}\n\n.basic-chart-header-name {\n  margin: 0;\n  padding: 0;\n  height: 100%;\n  width: 80%;\n  display: flex;\n  align-items: center;\n  font-size: 2.5vmin;\n  margin-left: 3%;\n}\n\n.basic-chart-header-value {\n  margin: 0;\n  padding: 0;\n  height: 100%;\n  width: 20%;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  font-size: 2.5vmin;\n}\n\ndiv.module-graph .gauge_d3_class {\n  flex: 1 1 100px;\n  float: none !important;\n  overflow: inherit !important;\n  text-align: center;\n}\n\n.textDecorationNone:hover {\n  text-decoration: none;\n}\n\n.vc-item-nl-label {\n  border-radius: 5px;\n  background-color: #fff;\n  padding: 5px;\n  padding-left: 1em;\n  font-size: 14px;\n}\n\n.odometer {\n  overflow: hidden !important;\n}\n\n.odometer-container {\n  width: 100%;\n  height: 100%;\n  overflow: hidden;\n  text-align: center;\n  display: flex;\n  align-items: flex-end;\n}\n\n.odometer-a {\n  z-index: 5;\n  position: absolute;\n  width: 65%;\n  height: 65%;\n  left: calc(17.5%);\n  border-radius: 1000px 1000px 0px 0px;\n  display: flex;\n  align-items: center;\n  justify-content: flex-end;\n  flex-direction: column;\n  line-height: 0px;\n}\n\n.odometer-b {\n  z-index: 4;\n  position: relative;\n  width: 95%;\n  height: 95%;\n  border-radius: 0px 0px 1000px 1000px;\n  transform-origin: center top;\n  transition: all 1.3s ease-in-out;\n  top: calc(95%);\n  left: calc(2.5%);\n}\n\n.odometer-c {\n  z-index: 3;\n  position: absolute;\n  width: 96%;\n  height: 96%;\n  left: calc(2%);\n  background-color: #202226;\n  margin-left: auto;\n  margin-right: auto;\n  border-radius: 1000px 1000px 0px 0px;\n  transform-origin: center top;\n  transition: all 1.3s ease-in-out;\n}\n\n.odometer-d {\n  z-index: 0;\n  position: absolute;\n  width: 100%;\n  height: 100%;\n  background-color: #82b92e;\n  margin-left: auto;\n  margin-right: auto;\n  border-radius: 1000px 1000px 0px 0px;\n  transform-origin: center top;\n  transition: all 1.3s ease-in-out;\n}\n\n.gauge-data {\n  z-index: 4;\n  color: #fff;\n  font-size: 1.5em;\n  width: 100%;\n  height: 100%;\n  transition: all 1s ease-out;\n  position: absolute;\n  display: flex;\n  justify-content: center;\n  align-items: flex-end;\n}\n\n.svg_warning {\n  fill: #f3b200;\n}\n\n.svg_warning_hide {\n  fill: #fff !important;\n}\n\n.gauge-data #percent {\n  color: #000;\n}\n\n.orange_background {\n  background: #ffa631;\n}\n.red_background {\n  background: #e63c52;\n}\n.yellow_background {\n  background: #f3b200;\n}\n.grey_background {\n  background: #b2b2b2;\n}\n.blue_background {\n  background: #4a83f3;\n}\n.green_background {\n  background: #82b92e;\n}\n","/* Styles for the solid icons */\n\n.fa {\n  display: inline-block;\n  margin: 0;\n}\n\n.fa,\n.fa > svg,\n.fa.medium,\n.fa.medium > svg {\n  width: 28px;\n  height: 28px;\n}\n\n.fa.fa-small,\n.fa.fa-small > svg {\n  width: 14px;\n  height: 14px;\n}\n\n.fa.fa-large,\n.fa.fa-large > svg {\n  width: 44px;\n  height: 44px;\n}\n\n.fa-spin {\n  animation: fa-spin 2s infinite linear;\n}\n\n.fa-pulse {\n  animation: fa-spin 1s infinite steps(8);\n}\n\n@keyframes fa-spin {\n  0% {\n    transform: rotate(0deg);\n  }\n  100% {\n    transform: rotate(360deg);\n  }\n}\n",".autocomplete {\n  /*the container must be positioned relative:*/\n  position: relative;\n  display: inline-block;\n}\n.autocomplete input {\n  /*background: pink;*/\n}\n.autocomplete-items {\n  border: 1px solid #d4d4d4;\n  border-bottom: none;\n  border-top: none;\n  /*position the autocomplete items to be the same width as the container:*/\n  position: absolute;\n  z-index: 1;\n  overflow: auto;\n  max-height: 150px;\n  max-width: 250px;\n}\n.autocomplete-items div {\n  width: 100%;\n  padding: 10px;\n  cursor: pointer;\n  background-color: #fff;\n  border-bottom: 1px solid #d4d4d4;\n  border-top: 1px solid #d4d4d4;\n}\n.autocomplete-items div:hover {\n  width: 100%;\n  background-color: #e9e9e9;\n}\n.autocomplete-active {\n  /*when navigating through the items using the arrow keys:*/\n  background-color: DodgerBlue !important;\n  color: #ffffff;\n}\n","/* Digital clock */\n\n.visual-console-item .digital-clock {\n  display: flex;\n  flex-direction: column;\n  justify-content: space-evenly;\n  justify-items: center;\n  align-content: center;\n  align-items: center;\n}\n\n.visual-console-item .digital-clock > span {\n  /* To improve legibility */\n  -webkit-font-smoothing: antialiased;\n  -moz-osx-font-smoothing: grayscale;\n  text-rendering: optimizeLegibility;\n  text-shadow: rgba(0, 0, 0, 0.01) 0 0 1px;\n}\n\n.visual-console-item .digital-clock > span.time {\n  font-size: 50px;\n}\n\n.visual-console-item .digital-clock > span.date {\n  font-size: 25px;\n}\n\n.visual-console-item .digital-clock > span.timezone {\n  font-size: 25px;\n}\n\n/* Analog clock */\n\n.visual-console-item .analogic-clock {\n  text-align: center;\n}\n\n.visual-console-item .analogic-clock .hour-hand {\n  animation: rotate-hour 43200s infinite linear;\n}\n\n.visual-console-item .analogic-clock .minute-hand {\n  animation: rotate-minute 3600s infinite linear;\n}\n\n.visual-console-item .analogic-clock .second-hand {\n  animation: rotate-second 60s infinite linear;\n}\n"],"names":[],"sourceRoot":""}
\ No newline at end of file
diff --git a/pandora_console/index.php b/pandora_console/index.php
index 2a91d1c22b..441bcc63fa 100755
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -1491,7 +1491,7 @@ ui_require_javascript_file('connection_check');
 set_js_value('absolute_homeurl', ui_get_full_url(false, false, false, false));
 $conn_title = __('Connection with server has been lost');
 $conn_text = __('Connection to the server has been lost. Please check your internet connection or contact with administrator.');
-ui_print_message_dialog($conn_title, $conn_text, 'connection', '/images/error_1.png');
+ui_print_message_dialog($conn_title, $conn_text, 'connection', '/images/fail@svg.svg');
 
 if ($config['pure'] == 0) {
     echo '</div>';
@@ -1522,13 +1522,6 @@ require 'include/php_to_js_values.php';
 <script type="text/javascript" language="javascript">
     // Handle the scroll.
     $(document).ready(scrollFunction());
-    // When there are less than 5 rows, all rows must be white
-    var theme = "<?php echo $config['style']; ?>";
-    if (theme === 'pandora') {
-        if ($('table.info_table tr').length < 5) {
-            $('table.info_table tbody > tr').css('background-color', '#fff');
-        }
-    }
 
     // When the user scrolls down 400px from the top of the document, show the
     // button.
diff --git a/pandora_console/operation/agentes/alerts_status.php b/pandora_console/operation/agentes/alerts_status.php
index 1378351614..3a6f692399 100755
--- a/pandora_console/operation/agentes/alerts_status.php
+++ b/pandora_console/operation/agentes/alerts_status.php
@@ -497,9 +497,9 @@ if ($agent_view_page === true) {
                 !$alerts_defined,
                 false,
                 true,
-                'box-flat agent_details_col',
-                'white-box-content',
-                'width_available'
+                '',
+                '',
+                'box-flat white_table_graph w100p'
             ),
         ],
     );
diff --git a/pandora_console/operation/agentes/custom_fields.php b/pandora_console/operation/agentes/custom_fields.php
index e336826d1f..a47df306ef 100644
--- a/pandora_console/operation/agentes/custom_fields.php
+++ b/pandora_console/operation/agentes/custom_fields.php
@@ -76,9 +76,9 @@ if ($fields === false) {
         $data[0] = '<b>'.$field['name'].'</b>';
 
         if ($field['display_on_front']) {
-            $data[1] = html_print_image('images/tick.png', true, ['class' => 'invert_filter']);
+            $data[1] = html_print_image('images/validate.svg', true, ['class' => 'invert_filter main_menu_icon']);
         } else {
-            $data[1] = html_print_image('images/delete.png', true, ['class' => 'invert_filter']);
+            $data[1] = html_print_image('images/delete.svg', true, ['class' => 'invert_filter main_menu_icon']);
         }
 
         $custom_value = db_get_all_rows_sql(
diff --git a/pandora_console/operation/agentes/estado_agente.php b/pandora_console/operation/agentes/estado_agente.php
index 1841bd7f6e..b4e60f8ddf 100644
--- a/pandora_console/operation/agentes/estado_agente.php
+++ b/pandora_console/operation/agentes/estado_agente.php
@@ -1163,7 +1163,6 @@ foreach ($agents as $agent) {
 
     $data[2] = html_print_div(
         [
-            'class'   => 'invert_filter main_menu_icon',
             'content' => ui_print_os_icon($agent['id_os'], false, true),
         ],
         true
diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php
index 8aaa7ed60a..dd842ee0b1 100755
--- a/pandora_console/operation/agentes/estado_generalagente.php
+++ b/pandora_console/operation/agentes/estado_generalagente.php
@@ -164,8 +164,8 @@ $table_status->width = '100%';
 $table_status->cellspacing = 0;
 $table_status->cellpadding = 0;
 $table_status->class = 'floating_form';
-$table_status->style[0] = 'height: 32px; width: 30%; padding-right: 5px; text-align: end;';
-$table_status->style[1] = 'height: 32px; width: 70%; padding-left: 5px; font-weight: lighter';
+$table_status->style[0] = 'height: 32px; width: 30%; padding-right: 5px; text-align: end; vertical-align: top';
+$table_status->style[1] = 'height: 32px; width: 70%; padding-left: 5px; font-weight: lighter; vertical-align: top';
 
 $agentStatusGraph = html_print_div(
     [
@@ -386,8 +386,8 @@ $table_contact->width = '100%';
 $table_contact->cellspacing = 0;
 $table_contact->cellpadding = 0;
 $table_contact->class = 'floating_form';
-$table_contact->style[0] = 'height: 32px; width: 30%; padding-right: 5px; text-align: end;';
-$table_contact->style[1] = 'height: 32px; width: 70%; padding-left: 5px; font-weight: lighter';
+$table_contact->style[0] = 'height: 32px; width: 30%; padding-right: 5px; text-align: end; vertical-align: top';
+$table_contact->style[1] = 'height: 32px; width: 70%; padding-left: 5px; font-weight: lighter; vertical-align: top';
 
 $agentContactCaption = html_print_div(
     [
@@ -483,8 +483,7 @@ $data[1] = ui_progress(
             'refresh_contact' => 1,
         ],
 
-    ],
-    'line-height: 13px;'
+    ]
 );
 $table_contact->data[] = $data;
 
@@ -710,7 +709,7 @@ if ((bool) $config['agentaccess'] === true && $access_agent > 0) {
 
     $agentAccessRate = html_print_div(
         [
-            'class'   => 'box-flat agent_details_col mrgn_lft_20px',
+            'class'   => 'box-flat agent_details_col mrgn_lft_20px w50p',
             'id'      => 'table_access_rate',
             'content' => $agentAccessRateHeader.$agentAccessRateContent,
         ],
@@ -1038,7 +1037,7 @@ $agentEventsGraph = html_print_div(
 
 $agentEvents = html_print_div(
     [
-        'class'   => 'box-flat agent_details_col',
+        'class'   => 'box-flat agent_details_col w50p',
         'content' => $agentEventsHeader.$agentEventsGraph,
     ],
     true
diff --git a/pandora_console/operation/agentes/estado_monitores.php b/pandora_console/operation/agentes/estado_monitores.php
index 57f06fd940..4edd12ee5f 100755
--- a/pandora_console/operation/agentes/estado_monitores.php
+++ b/pandora_console/operation/agentes/estado_monitores.php
@@ -187,7 +187,7 @@ html_print_div(
         'class'   => 'agent_details_line',
         'content' => ui_toggle(
             $html_toggle,
-            '<span class="subsection_header_title">'.__('List of modules').'</span>'.$help_not_init.ui_print_help_tip(
+            __('List of modules').' '.$help_not_init.ui_print_help_tip(
                 __('To see the list of modules paginated, enable this option in the Styles Configuration.'),
                 true
             ).reporting_tiny_stats(
@@ -201,9 +201,9 @@ html_print_div(
             false,
             false,
             true,
-            'box-flat agent_details_col',
+            '',
             'white-box-content',
-            'width_available'
+            'box-flat white_table_graph w100p'
         ),
     ],
 );
@@ -543,58 +543,83 @@ function print_form_filter_monitors(
     $form_text = '';
     $table = new stdClass();
     $table->class = 'filter-table-adv';
-    $table->id = 'module_filter_agent_view';
-    $table->styleTable = 'border-radius: 0;padding: 0;margin: 0 0 10px;';
+    // $table->id = 'module_filter_agent_view';
+    // $table->styleTable = 'border-radius: 0;padding: 0;margin: 0 0 10px;';
     $table->width = '100%';
-    $table->cellstyle[0][0] = 'width: 0';
-    $table->cellstyle[0][1] = 'width: 0';
-    $table->cellstyle[0][2] = 'width: 0';
+    $table->size[0] = '25%';
+    $table->size[1] = '25%';
+    $table->size[2] = '25%';
+    $table->size[3] = '25%';
     // Captions.
-    $table->data[0][0] = html_print_input_hidden('filter_monitors', 1, true);
-    $table->data[0][0] .= html_print_input_hidden('monitors_change_filter', 1, true);
-    $table->data[0][0] .= __('Status:');
-    $table->data[0][1] = __('Free text for search (*):').ui_print_help_tip(
-        __('Search by module name, list matches.'),
-        true
+    $table->data[0][0] = html_print_label_input_block(
+        html_print_input_hidden('filter_monitors', 1, true).html_print_input_hidden(
+            'monitors_change_filter',
+            1,
+            true
+        ).__('Status:'),
+        html_print_select(
+            $status_list,
+            'status_filter_monitor',
+            $status_filter_monitor,
+            '',
+            '',
+            0,
+            true,
+            false,
+            true,
+            'w100p',
+            false,
+            'width:100%'
+        )
     );
-    $table->data[0][2] = __('Module group');
-    $table->data[0][3] = __('Show in hierachy mode');
-    // Inputs.
-    $table->data[1][0] = html_print_select(
-        $status_list,
-        'status_filter_monitor',
-        $status_filter_monitor,
-        '',
-        '',
-        0,
-        true
+
+    $table->data[0][1] = html_print_label_input_block(
+        __('Free text for search (*):').ui_print_help_tip(
+            __('Search by module name, list matches.'),
+            true
+        ),
+        html_print_input_text(
+            'status_text_monitor',
+            $status_text_monitor,
+            '',
+            '',
+            100,
+            true
+        )
     );
-    $table->data[1][1] = html_print_input_text(
-        'status_text_monitor',
-        $status_text_monitor,
-        '',
-        '',
-        100,
-        true
+
+    $table->data[0][2] = html_print_label_input_block(
+        __('Module group'),
+        html_print_select(
+            $rows_select,
+            'status_module_group',
+            $status_module_group,
+            '',
+            '',
+            0,
+            true,
+            false,
+            true,
+            'w100p',
+            false,
+            'width:100%'
+        )
     );
-    $table->data[1][2] = html_print_select(
-        $rows_select,
-        'status_module_group',
-        $status_module_group,
-        '',
-        '',
-        0,
-        true
-    );
-    $table->data[1][3] = html_print_switch(
-        [
-            'name'     => 'status_hierachy_mode',
-            'value'    => $all_events_24h,
-            'onchange' => 'change_module_filter()',
-            'id'       => 'checkbox-status_hierachy_mode',
-        ]
+
+    $table->data[0][3] = html_print_label_input_block(
+        __('Show in hierachy mode'),
+        html_print_switch(
+            [
+                'name'     => 'status_hierachy_mode',
+                'value'    => $all_events_24h,
+                'onchange' => 'change_module_filter()',
+                'id'       => 'checkbox-status_hierachy_mode',
+            ]
+        )
     );
 
+    $form_text = html_print_table($table, true);
+
     $filtersButtons = [];
 
     $filtersButtons[] = html_print_button(
@@ -603,8 +628,9 @@ function print_form_filter_monitors(
         false,
         'filter_modules();',
         [
-            'icon' => 'search',
-            'mode' => 'secondary mini',
+            'icon'  => 'search',
+            'mode'  => 'secondary mini',
+            'style' => 'margin-left: 15px',
         ],
         true
     );
@@ -621,16 +647,6 @@ function print_form_filter_monitors(
         true
     );
 
-    $table->data[1][4] = html_print_div(
-        [
-            'class'   => 'action-buttons',
-            'content' => implode('', $filtersButtons),
-        ],
-        true
-    );
-
-    $form_text .= html_print_table($table, true);
-
     // TODO. Unused code.
     if ($status_filter_monitor === -1 && empty($status_text_monitor) === true && $status_module_group === -1) {
         $filter_hidden = true;
@@ -639,4 +655,10 @@ function print_form_filter_monitors(
     }
 
     echo $form_text;
+    html_print_div(
+        [
+            'class'   => 'action-buttons-right-forced',
+            'content' => implode('', $filtersButtons),
+        ]
+    );
 }
diff --git a/pandora_console/operation/agentes/graphs.php b/pandora_console/operation/agentes/graphs.php
index e69ff9766b..f0da16847f 100644
--- a/pandora_console/operation/agentes/graphs.php
+++ b/pandora_console/operation/agentes/graphs.php
@@ -314,7 +314,7 @@ if ($start_date != $current) {
 
 if ($combined) {
     // Pass the $modules before the ajax call.
-    echo '<div class="combined-graph-container center w100p"'.'data-period="'.$period.'"'.'data-stacked="'.CUSTOM_GRAPH_LINE.'"'.'data-date="'.$date.'"'.'data-height="'.$height.'"'.'>'.html_print_image('images/spinner.gif', true).'</div>';
+    echo '<div class="combined-graph-container center w100p white_box"'.'data-period="'.$period.'"'.'data-stacked="'.CUSTOM_GRAPH_LINE.'"'.'data-date="'.$date.'"'.'data-height="'.$height.'"'.'>'.html_print_image('images/spinner.gif', true).'</div>';
 } else {
     foreach ($modules as $id_module) {
         $title = modules_get_agentmodule_name($id_module);
diff --git a/pandora_console/operation/agentes/group_view.php b/pandora_console/operation/agentes/group_view.php
index fa4d171e24..5e281e8b23 100644
--- a/pandora_console/operation/agentes/group_view.php
+++ b/pandora_console/operation/agentes/group_view.php
@@ -321,7 +321,11 @@ if (empty($result_groups) === false) {
             $link = "<a href='index.php?sec=monitoring&sec2=operation/tree&tag_id=".$data['_id_']."'>";
         } else {
             $deep = groups_get_group_deep($data['_id_']);
-            $link = "<a href='index.php?sec=view&sec2=operation/agentes/estado_agente&group_id=".$data['_id_']."'>";
+            if ($data['_id_'] === '0') {
+                $link = "<a href='index.php?sec=view&sec2=operation/agentes/estado_agente&group_id=".$data['_id_']."'>";
+            } else {
+                $link = "<a href='index.php?sec=view&sec2=godmode/groups/tactical&id_group=".$data['_id_']."'>";
+            }
         }
 
         $group_name = '<b><span>'.ui_print_truncate_text($data['_name_'], 50).'</span></b>';
diff --git a/pandora_console/operation/agentes/interface_view.functions.php b/pandora_console/operation/agentes/interface_view.functions.php
index 591346c526..27e4e0a3e9 100644
--- a/pandora_console/operation/agentes/interface_view.functions.php
+++ b/pandora_console/operation/agentes/interface_view.functions.php
@@ -146,35 +146,35 @@ function print_filters($sec)
 
         $filters .= '</form>';
     } else {
-        $table->style[0] = 'font-weight: bold;';
-
-        $table->data[0][0] = '<b>'.__('Interfaces').'</b>';
-        $table->data[0][1] = html_print_select(
-            [],
-            'selected_interfaces[]',
-            '',
-            '',
-            '',
-            0,
-            true,
-            true,
-            true,
-            '',
-            false,
-            'min-width: 180px; max-width: 200px;'
+        $table->data[0][0] = html_print_label_input_block(
+            __('Interfaces'),
+            html_print_select(
+                [],
+                'selected_interfaces[]',
+                '',
+                '',
+                '',
+                0,
+                true,
+                true,
+                true,
+                '',
+                false,
+                'min-width: 200px; max-width: 250px; min-height: 70px;'
+            )
         );
 
         $filters = '<form method="post" action="'.ui_get_url_refresh().'">';
 
         $filters .= html_print_table($table, true);
 
-        $filters .= "<div class='height_100p right'>".html_print_submit_button(
+        $filters .= html_print_submit_button(
             __('Show'),
             'uptbutton',
             false,
-            'class="sub search mgn_tp_0"',
+            ['class' => 'float-right mini'],
             true
-        ).'</div>';
+        );
 
         $filters .= '</form>';
     }
diff --git a/pandora_console/operation/agentes/log_sources_status.php b/pandora_console/operation/agentes/log_sources_status.php
index 9e4dd50518..451f0f15d3 100644
--- a/pandora_console/operation/agentes/log_sources_status.php
+++ b/pandora_console/operation/agentes/log_sources_status.php
@@ -94,9 +94,19 @@ if (!empty($table->data)) {
     echo '<div id="log_sources_status" class="w100p">';
     html_print_table($table);
     echo '</div>';
-} else {
-    ui_print_info_message(['no_close' => true, 'message' => __('No log sources found') ]);
-    $log_sources_defined = false;
+    $html_content = ob_get_clean();
+    // Create controlled toggle content.
+    ui_toggle(
+        $html_content,
+        __('Log sources status'),
+        'log_sources_status',
+        !$log_sources_defined,
+        false,
+        '',
+        'white_table_graph_content no-padding-imp',
+        'white-box-content',
+        'box-flat white_thable_graph mrgn_top_30px'
+    );
 }
 
 // Hidden form to perform post request to Log Viewer page when clicking on the Review field icon.
@@ -109,18 +119,6 @@ html_print_input_hidden('redirect_search', 1, false);
 
 echo '</form>';
 
-$html_content = ob_get_clean();
-
-// Create controlled toggle content.
-ui_toggle(
-    $html_content,
-    __('Log sources status'),
-    'log_sources_status',
-    !$log_sources_defined,
-    false,
-    '',
-    'white_table_graph_content no-padding-imp'
-);
 
 ?>
 
diff --git a/pandora_console/operation/agentes/networkmap.dinamic.php b/pandora_console/operation/agentes/networkmap.dinamic.php
index bd2ed02160..0d9b139821 100644
--- a/pandora_console/operation/agentes/networkmap.dinamic.php
+++ b/pandora_console/operation/agentes/networkmap.dinamic.php
@@ -131,24 +131,18 @@ if ($pure == 1) {
     }
 }
 
-ui_print_page_header(
-    io_safe_output($networkmap['name']),
-    'images/bricks.png',
-    false,
-    'network_map_enterprise_list',
-    false,
-    $buttons,
-    false,
-    '',
-    $config['item_title_size_text']
-);
-
-global $width;
-global $height;
-
-if (_id_ != '_id_') {
-    $width = [];
-    $height = [];
+if ($dashboard != 1) {
+    ui_print_page_header(
+        io_safe_output($networkmap['name']),
+        'images/bricks.png',
+        false,
+        'network_map_enterprise_list',
+        false,
+        $buttons,
+        false,
+        '',
+        $config['item_title_size_text']
+    );
 }
 
 if (empty($width)) {
diff --git a/pandora_console/operation/agentes/pandora_networkmap.editor.php b/pandora_console/operation/agentes/pandora_networkmap.editor.php
index 4450e101ea..14d04dcc60 100644
--- a/pandora_console/operation/agentes/pandora_networkmap.editor.php
+++ b/pandora_console/operation/agentes/pandora_networkmap.editor.php
@@ -275,7 +275,7 @@ if ($not_found) {
 } else {
     if ($disabled_source === false) {
         echo '<div id="map_loading" style="width: 98%;height: 1000px; background-color: rgba(245, 245, 245, .3);position: absolute;display: flex;justify-content: center;align-items: center;flex-direction: column-reverse;">';
-        echo html_print_image('images/spinner.gif', true, 'width: 50px;height: 50px;');
+        echo html_print_image('images/spinner.gif', true, ['width' => '50px', 'height' => '50px']);
         echo '<div>'.__('Creating map...').'</div>';
         echo '</div>';
         $info1 = __('To create a network map that visually recreates link-level (L2) relationships, you must first discover these relationships with Discovery Server.  Network maps only reflect relationships that have already been discovered.');
diff --git a/pandora_console/operation/agentes/pandora_networkmap.php b/pandora_console/operation/agentes/pandora_networkmap.php
index 29fb258949..506f778e6d 100644
--- a/pandora_console/operation/agentes/pandora_networkmap.php
+++ b/pandora_console/operation/agentes/pandora_networkmap.php
@@ -548,6 +548,15 @@ else if ($update_networkmap || $copy_networkmap || $delete) {
 
         $result = networkmap_delete_networkmap($id);
 
+        // Delete network map from fav menu.
+        db_process_sql_delete(
+            'tfavmenu_user',
+            [
+                'id_element' => $id,
+                'section'    => 'Network_map',
+                'id_user'    => $config['id_user'],
+            ]
+        );
         $result_txt = ui_print_result_message(
             $result,
             __('Succesfully deleted'),
diff --git a/pandora_console/operation/agentes/pandora_networkmap.view.php b/pandora_console/operation/agentes/pandora_networkmap.view.php
index 7ad542f637..ea8bf7629d 100644
--- a/pandora_console/operation/agentes/pandora_networkmap.view.php
+++ b/pandora_console/operation/agentes/pandora_networkmap.view.php
@@ -2412,6 +2412,12 @@ if ($networkmap === false) {
                     'link'  => '',
                     'label' => __('Network maps'),
                 ],
+            ],
+            [
+                'id_element' => $networkmap['id'],
+                'url'        => 'operation/agentes/pandora_networkmap&tab=view&id_networkmap='.$networkmap['id'],
+                'label'      => $networkmap['name'],
+                'section'    => 'Network_map',
             ]
         );
     }
diff --git a/pandora_console/operation/agentes/stat_win.php b/pandora_console/operation/agentes/stat_win.php
index 1dc0030eeb..8c39ad8b8d 100644
--- a/pandora_console/operation/agentes/stat_win.php
+++ b/pandora_console/operation/agentes/stat_win.php
@@ -97,7 +97,7 @@ ui_print_message_dialog(
     $conn_title,
     $conn_text,
     'connection',
-    '/images/error_1.png'
+    '/images/fail@svg.svg'
 );
 
 ?>
diff --git a/pandora_console/operation/agentes/status_events.php b/pandora_console/operation/agentes/status_events.php
index d4c63a8b2c..478b0771c2 100755
--- a/pandora_console/operation/agentes/status_events.php
+++ b/pandora_console/operation/agentes/status_events.php
@@ -32,9 +32,9 @@ html_print_div(
             'latest_events_agent',
             false,
             true,
-            'box-flat agent_details_col',
-            'white-box-content',
-            'width_available'
+            '',
+            'box-flat white-box-content no_border',
+            'box-flat white_table_graph w100p'
         ),
     ],
 );
diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php
index b739ecb97a..473337011e 100644
--- a/pandora_console/operation/agentes/status_monitor.php
+++ b/pandora_console/operation/agentes/status_monitor.php
@@ -93,27 +93,6 @@ if (is_metaconsole() === false) {
     }
 }
 
-// Header.
-ui_print_standard_header(
-    __('Monitor detail').$subpage,
-    'images/agent.png',
-    false,
-    '',
-    true,
-    $buttons,
-    [
-        [
-            'link'  => '',
-            'label' => __('Monitoring'),
-        ],
-        [
-            'link'  => '',
-            'label' => __('Views'),
-        ],
-    ]
-);
-
-
 if (is_metaconsole() === false) {
     if ($section == 'fields') {
         include_once $config['homedir'].'/godmode/agentes/status_monitor_custom_fields.php';
@@ -173,6 +152,13 @@ if ($ag_freestring !== '' || $moduletype !== '' || $datatype !== ''
     $autosearch = true;
 }
 
+// The execution has not been done manually.
+$userRequest = (bool) get_parameter('uptbutton');
+if ($userRequest === false) {
+    $autosearch = true;
+    $status = AGENT_MODULE_STATUS_NOT_NORMAL;
+}
+
 if (is_metaconsole() === false) {
     $ag_group = (int) get_parameter('ag_group', 0);
 } else {
@@ -285,8 +271,79 @@ if ($loaded_filter['id_filter'] > 0) {
             $ag_custom_fields = json_decode(io_safe_output($ag_custom_fields), true);
         }
     }
+
+    // Fav menu.
+    $fav_menu = [
+        'id_element' => $loaded_filter['id_filter'],
+        'url'        => 'operation/agentes/status_monitor&pure=&load_filter=1&filter_id='.$loaded_filter['id_filter'],
+        'label'      => $loaded_filter['id_name'],
+        'section'    => 'Modules',
+    ];
 }
 
+if (is_metaconsole() === false) {
+    $section = (string) get_parameter('section', 'view');
+
+    $buttons['fields'] = [
+        'active'    => false,
+        'text'      => '<a href="index.php?sec=view&sec2=operation/agentes/status_monitor&section=fields">'.html_print_image(
+            'images/edit_columns@svg.svg',
+            true,
+            [
+                'title' => __('Custom fields'),
+                'class' => 'invert_filter main_menu_icon',
+            ]
+        ).'</a>',
+        'operation' => true,
+    ];
+
+    $buttons['view'] = [
+        'active'    => false,
+        'text'      => '<a href="index.php?sec=view&sec2=operation/agentes/status_monitor">'.html_print_image(
+            'images/logs@svg.svg',
+            true,
+            [
+                'title' => __('View'),
+                'class' => 'invert_filter main_menu_icon',
+            ]
+        ).'</a>',
+        'operation' => true,
+    ];
+
+    switch ($section) {
+        case 'fields':
+            $buttons['fields']['active'] = true;
+            $subpage = ' &raquo; '.__('Custom fields');
+        break;
+
+        default:
+            $buttons['view']['active'] = true;
+        break;
+    }
+}
+
+// Header.
+ui_print_standard_header(
+    __('Monitor detail').$subpage,
+    'images/agent.png',
+    false,
+    '',
+    true,
+    $buttons,
+    [
+        [
+            'link'  => '',
+            'label' => __('Monitoring'),
+        ],
+        [
+            'link'  => '',
+            'label' => __('Views'),
+        ],
+    ],
+    (empty($fav_menu) === true) ? [] : $fav_menu
+);
+
+
 $all_groups = [];
 
 // Agent group selector.
@@ -1702,7 +1759,7 @@ if (empty($result) === false) {
                     true,
                     [
                         'title' => $row['tags'],
-                        'class' => 'inverse_filter main_menu_icon',
+                        'class' => 'invert_filter main_menu_icon',
                     ]
                 );
             }
@@ -2220,11 +2277,7 @@ if (empty($result) === false) {
         $tablePagination = ui_pagination($count_modules, false, $offset, 0, true, 'offset', false);
     }
 } else {
-    if ($first_interaction) {
-        ui_print_info_message(['no_close' => true, 'message' => __('This group doesn\'t have any monitor')]);
-    } else {
-        ui_print_info_message(['no_close' => true, 'message' => __('Sorry no search parameters')]);
-    }
+    ui_print_info_message(['no_close' => true, 'message' => __('Sorry no search parameters')]);
 }
 
 if (is_metaconsole() !== true) {
@@ -2464,4 +2517,4 @@ if( value_swtich != "") {
 }else {
     chkbox.checked = false;
 }
-</script>
+</script>
\ No newline at end of file
diff --git a/pandora_console/operation/agentes/ver_agente.php b/pandora_console/operation/agentes/ver_agente.php
index d75cb39568..0b2710111a 100644
--- a/pandora_console/operation/agentes/ver_agente.php
+++ b/pandora_console/operation/agentes/ver_agente.php
@@ -30,7 +30,7 @@ use PandoraFMS\Enterprise\Metaconsole\Node;
 
 global $config;
 
-require_once 'include/functions_gis.php';
+require_once $config['homedir'].'/include/functions_gis.php';
 require_once $config['homedir'].'/include/functions_agents.php';
 require_once $config['homedir'].'/include/functions_groups.php';
 require_once $config['homedir'].'/include/functions_modules.php';
@@ -1921,7 +1921,7 @@ switch ($tab) {
 
 if ((bool) $config['pure'] === false) {
     ui_print_standard_header(
-        __('Agent main view'),
+        __('Agent main view').' ( '.strtolower(agents_get_alias($id_agente)).' )',
         $icon,
         false,
         ($help_header ?? ''),
@@ -1940,6 +1940,12 @@ if ((bool) $config['pure'] === false) {
                 'link'  => '',
                 'label' => $tab_name,
             ],
+        ],
+        [
+            'id_element' => $id_agente,
+            'url'        => 'operation/agentes/ver_agente&id_agente='.$id_agente,
+            'label'      => agents_get_alias($id_agente),
+            'section'    => 'Agents',
         ]
     );
 }
diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php
index 3f1ca54d2a..3ec49048d2 100644
--- a/pandora_console/operation/events/events.php
+++ b/pandora_console/operation/events/events.php
@@ -756,7 +756,7 @@ if (is_ajax() === true) {
                                     true,
                                     [
                                         'title' => __('New event'),
-                                        'class' => 'forced-title main_menu_icon',
+                                        'class' => 'forced-title invert_filter main_menu_icon',
                                     ]
                                 );
                                 $state = 0;
@@ -1071,7 +1071,7 @@ if (is_ajax() === true) {
  */
 
 $load_filter_id = (int) get_parameter('filter_id', 0);
-
+$fav_menu = [];
 if ($load_filter_id === 0) {
     // Load user filter.
     $loaded_filter = db_get_row_sql(
@@ -1093,6 +1093,14 @@ if ($load_filter_id === 0) {
         'id_filter',
         $load_filter_id
     );
+
+    // Fav menu
+    $fav_menu = [
+        'id_element' => $load_filter_id,
+        'url'        => 'operation/events/events&pure=&load_filter=1&filter_id='.$load_filter_id,
+        'label'      => $loaded_filter['id_name'],
+        'section'    => 'Events',
+    ];
 }
 
 // Do not load the user filter if we come from the 24h event graph.
@@ -1583,7 +1591,8 @@ if ($pure) {
                     'link'  => '',
                     'label' => __('Events'),
                 ],
-            ]
+            ],
+            $fav_menu
         );
 }
 
diff --git a/pandora_console/operation/events/sound_events.php b/pandora_console/operation/events/sound_events.php
index 6ce7a31c3a..956282b045 100644
--- a/pandora_console/operation/events/sound_events.php
+++ b/pandora_console/operation/events/sound_events.php
@@ -173,7 +173,7 @@ ui_print_message_dialog(
     $conn_title,
     $conn_text,
     'connection',
-    '/images/error_1.png'
+    '/images/fail@svg.svg'
 );
 
 $inputs = [];
diff --git a/pandora_console/operation/gis_maps/public_console.php b/pandora_console/operation/gis_maps/public_console.php
index 1070443ed1..b301754a1e 100755
--- a/pandora_console/operation/gis_maps/public_console.php
+++ b/pandora_console/operation/gis_maps/public_console.php
@@ -278,7 +278,7 @@ if ($layers != false) {
     $conn_text = __('Connection to the server has been lost. Please check your internet connection or contact with administrator.');
     ui_require_javascript_file('connection_check');
     set_js_value('absolute_homeurl', ui_get_full_url(false, false, false, false));
-    ui_print_message_dialog($conn_title, $conn_text, 'connection', '/images/error_1.png');
+    ui_print_message_dialog($conn_title, $conn_text, 'connection', '/images/fail@svg.svg');
 }
 
 // Resize GIS map on fullscreen
diff --git a/pandora_console/operation/incidents/configure_integriaims_incident.php b/pandora_console/operation/incidents/configure_integriaims_incident.php
index 997391a781..6813f2ad80 100644
--- a/pandora_console/operation/incidents/configure_integriaims_incident.php
+++ b/pandora_console/operation/incidents/configure_integriaims_incident.php
@@ -23,11 +23,30 @@ $update = (isset($_GET['incident_id']) === true);
 // Header tabs.
 $onheader = integriaims_tabs('create_tab', $_GET['incident_id']);
 if ($update) {
-    ui_print_page_header(__('Update Integria IMS Ticket'), '', false, '', false, $onheader);
+    $title_header = __('Update Integria IMS Ticket');
 } else {
-    ui_print_page_header(__('Create Integria IMS Ticket'), '', false, '', false, $onheader);
+    $title_header = __('Create Integria IMS Ticket');
 }
 
+ui_print_standard_header(
+    $title_header,
+    '',
+    false,
+    '',
+    false,
+    $onheader,
+    [
+        [
+            'link'  => '',
+            'label' => __('Issues'),
+        ],
+        [
+            'link'  => '',
+            'label' => $title_header,
+        ],
+    ]
+);
+
 // Check if Integria integration enabled.
 if ($config['integria_enabled'] == 0) {
     ui_print_error_message(__('In order to access ticket management system, integration with Integria IMS must be enabled and properly configured'));
@@ -166,19 +185,14 @@ if ($update) {
 $table = new stdClass();
 $table->width = '100%';
 $table->id = 'add_alert_table';
-$table->class = 'databox filters integria_incidents_options';
+$table->class = 'databox filter-table-adv';
 $table->head = [];
-
 $table->data = [];
 $table->size = [];
 $table->size = [];
-$table->style[0] = 'width: 33%; padding-right: 50px; padding-left: 100px;';
-$table->style[1] = 'width: 33%; padding-right: 50px; padding-left: 50px;';
-$table->style[2] = 'width: 33%; padding-right: 100px; padding-left: 50px;';
 $table->colspan[0][0] = 2;
 $table->colspan[4][0] = 3;
 $table->colspan[6][0] = 3;
-
 $help_macros = isset($_GET['from_event']) ? ui_print_help_icon('response_macros', true) : '';
 
 if ($update) {
@@ -210,177 +224,205 @@ if ($update) {
     $input_value_resolution = 0;
 }
 
-$table->data[0][0] = '<div class="label_select"><p class="input_label">'.__('Title').':&nbsp'.$help_macros.'</p>';
-$table->data[0][0] .= '<div class="label_select_parent">'.html_print_input_text(
-    'incident_title',
-    $input_value_title,
-    __('Name'),
-    50,
-    100,
-    true,
-    false,
-    true,
-    '',
-    'w100p'
-).'</div>';
+$table->data[0][0] = html_print_label_input_block(
+    __('Title').$help_macros,
+    html_print_input_text(
+        'incident_title',
+        $input_value_title,
+        __('Name'),
+        50,
+        100,
+        true,
+        false,
+        true,
+        '',
+        'w100p'
+    )
+);
 
 $integria_logo = 'images/integria_logo_gray.png';
 if ($config['style'] === 'pandora_black' && !is_metaconsole()) {
     $integria_logo = 'images/integria_logo.svg';
 }
 
-$table->data[0][2] = html_print_image($integria_logo, true, ['style' => 'width: 70%; float: right;'], false);
+$table->data[0][2] = html_print_image($integria_logo, true, ['style' => 'width: 30%; float: right;'], false);
 
-$table->data[1][0] = '<div class="label_select"><p class="input_label">'.__('Type').': </p>';
-$table->data[1][0] .= '<div class="label_select_parent">'.html_print_select(
-    $integria_types_values,
-    'type',
-    $input_value_type,
-    '',
-    __('Select'),
-    0,
-    true,
-    false,
-    true,
-    '',
-    false,
-    'width: 100%;'
-).'</div>';
+$table->data[1][0] = html_print_label_input_block(
+    __('Type'),
+    html_print_select(
+        $integria_types_values,
+        'type',
+        $input_value_type,
+        '',
+        __('Select'),
+        0,
+        true,
+        false,
+        true,
+        '',
+        false,
+        'width: 100%;'
+    )
+);
 
-$table->data[2][0] = '<div class="label_select"><p class="input_label">'.__('Status').': </p>';
-$table->data[2][0] .= '<div class="label_select_parent">'.html_print_select(
-    $integria_status_values,
-    'status',
-    $input_value_status,
-    '',
-    __('Select'),
-    1,
-    true,
-    false,
-    true,
-    '',
-    false,
-    'width: 100%;'
-).'</div>';
+$table->data[1][1] = html_print_label_input_block(
+    __('Group'),
+    html_print_select(
+        $integria_group_values,
+        'group',
+        $input_value_group,
+        '',
+        '',
+        0,
+        true,
+        false,
+        true,
+        '',
+        false,
+        'width: 100%;'
+    )
+);
 
-$table->data[1][1] = '<div class="label_select"><p class="input_label">'.__('Group').': </p>';
-$table->data[1][1] .= '<div class="label_select_parent">'.html_print_select(
-    $integria_group_values,
-    'group',
-    $input_value_group,
-    '',
-    '',
-    0,
-    true,
-    false,
-    true,
-    '',
-    false,
-    'width: 100%;'
-).'</div>';
+$table->data[1][2] = html_print_label_input_block(
+    __('Priority'),
+    html_print_select(
+        $integria_criticity_values,
+        'criticity',
+        $input_value_criticity,
+        '',
+        __('Select'),
+        0,
+        true,
+        false,
+        true,
+        '',
+        false,
+        'width: 100%;'
+    )
+);
 
-$table->data[2][1] = '<div class="label_select"><p class="input_label">'.__('Creator').': </p>';
-$table->data[2][1] .= '<div class="label_select_parent">'.html_print_input_text(
-    'creator',
-    $config['integria_user'],
-    '',
-    '30',
-    100,
-    true,
-    true,
-    false,
-    '',
-    'w100p'
-).ui_print_help_tip(__('This field corresponds to the Integria IMS user specified in Integria IMS setup'), true).'</div>';
+$table->data[2][0] = html_print_label_input_block(
+    __('Status'),
+    html_print_select(
+        $integria_status_values,
+        'status',
+        $input_value_status,
+        '',
+        __('Select'),
+        1,
+        true,
+        false,
+        true,
+        '',
+        false,
+        'width: 100%;'
+    )
+);
 
-$table->data[1][2] = '<div class="label_select"><p class="input_label">'.__('Priority').': </p>';
-$table->data[1][2] .= '<div class="label_select_parent">'.html_print_select(
-    $integria_criticity_values,
-    'criticity',
-    $input_value_criticity,
-    '',
-    __('Select'),
-    0,
-    true,
-    false,
-    true,
-    '',
-    false,
-    'width: 100%;'
-).'</div>';
+$table->data[2][1] = html_print_label_input_block(
+    __('Creator').ui_print_help_tip(__('This field corresponds to the Integria IMS user specified in Integria IMS setup'), true),
+    html_print_input_text(
+        'creator',
+        $config['integria_user'],
+        '',
+        '30',
+        100,
+        true,
+        true,
+        false,
+        '',
+        'w100p'
+    )
+);
 
-$table->data[2][2] = '<div class="label_select"><p class="input_label">'.__('Owner').': </p>';
+$table->data[2][2] = html_print_label_input_block(
+    __('Owner'),
+    html_print_autocomplete_users_from_integria(
+        'owner',
+        $input_value_owner,
+        true,
+        '30',
+        false,
+        false,
+        'w100p'
+    ),
+    ['div_class' => 'inline']
+);
 
-$table->data[2][2] .= '<div class="label_select_parent">'.html_print_autocomplete_users_from_integria(
-    'owner',
-    $input_value_owner,
-    true,
-    '30',
-    false,
-    false,
-    'w100p'
-).'</div>';
+$table->data[3][0] = html_print_label_input_block(
+    __('Resolution'),
+    html_print_select(
+        $integria_resolution_values,
+        'resolution',
+        $input_value_resolution,
+        '',
+        '',
+        1,
+        true,
+        false,
+        true,
+        '',
+        false,
+        'width: 100%;'
+    )
+);
 
+$table->data[4][0] = html_print_label_input_block(
+    __('Description').$help_macros,
+    html_print_textarea(
+        'incident_content',
+        3,
+        20,
+        $input_value_content,
+        '',
+        true
+    )
+);
 
-$table->data[3][0] = '<div class="label_select"><p class="input_label">'.__('Resolution').': </p>';
+$table->data[5][0] = html_print_label_input_block(
+    __('File name'),
+    html_print_input_file('userfile', true)
+);
 
-$table->data[3][0] .= '<div class="label_select_parent">'.html_print_select(
-    $integria_resolution_values,
-    'resolution',
-    $input_value_resolution,
-    '',
-    '',
-    1,
-    true,
-    false,
-    true,
-    '',
-    false,
-    'width: 100%;'
-).'</div>';
-
-$table->data[4][0] = '<div class="label_select"><p class="input_label">'.__('Description').':&nbsp'.$help_macros.'</p>';
-$table->data[4][0] .= '<div class="label_select_parent">'.html_print_textarea(
-    'incident_content',
-    3,
-    20,
-    $input_value_content,
-    '',
-    true
-).'</div>';
-
-$table->data[5][0] = '<div class="label_select"><p class="input_label">'.__('File name').':</p>';
-$table->data[5][0] .= html_print_input_file('userfile', true);
-$table->data[6][0] = '<div class="label_select"><p class="input_label">'.__('Attachment description').':</p>';
-$table->data[6][0] .= html_print_textarea(
-    'file_description',
-    3,
-    20,
-    '',
-    '',
-    true
+$table->data[6][0] = html_print_label_input_block(
+    __('Attachment description'),
+    html_print_textarea(
+        'file_description',
+        3,
+        20,
+        '',
+        '',
+        true
+    )
 );
 
 // Print forms and stuff.
-echo '<form id="create_integria_incident_form" name="create_integria_incident_form" method="POST" enctype="multipart/form-data">';
+echo '<form class="max_floating_element_size" id="create_integria_incident_form" name="create_integria_incident_form" method="POST" enctype="multipart/form-data">';
 html_print_table($table);
-
+$buttons = '';
 if (!$update) {
-    html_print_input_hidden('create_incident', 1);
+    $buttons .= html_print_input_hidden('create_incident', 1, true);
+    $buttons .= html_print_submit_button(
+        __('Create'),
+        'accion',
+        false,
+        [ 'icon' => 'next' ],
+        true
+    );
 } else {
-    html_print_input_hidden('update_incident', 1);
+    $buttons .= html_print_input_hidden('update_incident', 1, true);
+    $buttons .= html_print_submit_button(
+        __('Update'),
+        'accion',
+        false,
+        [ 'icon' => 'upd' ],
+        true
+    );
 }
 
+html_print_action_buttons($buttons);
+
 echo '</form>';
-
-echo '<div class="w100p right">';
-if ($update) {
-    html_print_submit_button(__('Update'), 'accion', false, 'form="create_integria_incident_form" class="sub wand"');
-} else {
-    html_print_submit_button(__('Create'), 'accion', false, 'form="create_integria_incident_form" class="sub wand"');
-}
-
-echo '</div>';
 ?>
 
 <script type="text/javascript">
diff --git a/pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php b/pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php
index 88cc174665..be32805181 100644
--- a/pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php
+++ b/pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php
@@ -50,14 +50,30 @@ $result_api_call_list = integria_api_call(
 // Return array of api call 'get_incidents'.
 $array_get_incidents = [];
 get_array_from_csv_data_all($result_api_call_list, $array_get_incidents);
-// Remove index (id)
-$array_get_incidents = $array_get_incidents[$incident_id];
 
+// Remove index (id).
+$array_get_incidents = $array_get_incidents[$incident_id];
 
 // Header tabs.
 $onheader = integriaims_tabs(false, $incident_id);
-ui_print_page_header($array_get_incidents[3].' - '.__('Details'), '', false, '', false, $onheader);
-
+ui_print_standard_header(
+    $array_get_incidents[3],
+    '',
+    false,
+    '',
+    false,
+    $onheader,
+    [
+        [
+            'link'  => '',
+            'label' => __('Issues'),
+        ],
+        [
+            'link'  => '',
+            'label' => __('Details'),
+        ],
+    ]
+);
 
 // Data.
 $status = $array_get_incidents[6];
@@ -215,7 +231,7 @@ $table_files_section->data[1][0] .= html_print_textarea(
     true
 );
 
-$table_files_section->data[2][0] .= '<div class="w100p right">'.html_print_submit_button(__('Upload'), 'accion', false, 'class="sub wand"', true).'</div>';
+$table_files_section->data[2][0] .= '<div class="w100p right">'.html_print_submit_button(__('Upload'), 'accion', false, ['icon' => 'wand', 'mode' => 'mini secondary'], true).'</div>';
 
 $upload_file_form = '<div class="w100p">';
 
@@ -268,7 +284,7 @@ $table_comments_section->data[0][0] .= html_print_textarea(
     true
 );
 
-$table_comments_section->data[1][1] .= '<div class="w100p right">'.html_print_submit_button(__('Add'), 'accion', $comment_disabled, 'class="sub wand"', true).'</div>';
+$table_comments_section->data[1][1] .= '<div class="w100p right">'.html_print_submit_button(__('Add'), 'accion', $comment_disabled, ['icon' => 'wand', 'mode' => 'mini secondary'], true).'</div>';
 
 // Upload comment. If ticket is closed, this action cannot be performed.
 if ($upload_comment && $array_get_incidents[6] != 7) {
@@ -399,8 +415,8 @@ ui_toggle(
     '',
     true,
     false,
-    'white_box white_box_opened',
-    'no-border flex'
+    'white-box-content',
+    'w98p'
 );
 echo '</div>';
 
@@ -412,15 +428,14 @@ ui_toggle(
     '',
     true,
     false,
-    'white_box white_box_opened',
-    'no-border flex'
+    'white-box-content',
+    'w98p'
 );
 echo '</div>';
 
 ?>
 <script type="text/javascript">
 $(document).ready (function () {
-
     $('#details_box .white_table_graph_header').click(function(){
         $('div#details_box').toggleClass('integria_details_shadow');
     });
@@ -432,6 +447,5 @@ $(document).ready (function () {
     $('#dates_box .white_table_graph_header').click(function(){
         $('div#dates_box').toggleClass('integria_details_shadow');
     });
-
 });
 </script>
\ No newline at end of file
diff --git a/pandora_console/operation/incidents/incident_statistics.php b/pandora_console/operation/incidents/incident_statistics.php
index 333c0206db..c2e428f188 100755
--- a/pandora_console/operation/incidents/incident_statistics.php
+++ b/pandora_console/operation/incidents/incident_statistics.php
@@ -18,13 +18,31 @@ require_once $config['homedir'].'/include/functions_graph.php';
 
 check_login();
 
-ui_print_page_header(__('Incidents').' &raquo; '.__('Statistics'), 'images/book_edit.png', false, '', false, '');
+ui_print_standard_header(
+    __('Statistics'),
+    'images/book_edit.png',
+    false,
+    '',
+    false,
+    [],
+    [
+        [
+            'link'  => '',
+            'label' => __('Issues'),
+        ],
+        [
+            'link'  => '',
+            'label' => __('Statistics'),
+        ],
+    ]
+);
 
 if (!$config['integria_enabled']) {
     ui_print_error_message(__('In order to access ticket management system, integration with Integria IMS must be enabled and properly configured'));
     exit;
 }
 
+echo '<div class="info_box">';
 echo '<table width="90%">
 	<tr><td valign="top" style="width:50%;"><h3>'.__('Incidents by status').'</h3>';
 echo graph_incidents_status();
@@ -39,3 +57,4 @@ echo '<td style="width:50%;"><h3>'.__('Incidents by user').'</h3>';
 echo graphic_incident_user();
 
 echo '</table>';
+echo '</div>';
diff --git a/pandora_console/operation/incidents/list_integriaims_incidents.php b/pandora_console/operation/incidents/list_integriaims_incidents.php
index ce68e941fb..f28c7a271d 100644
--- a/pandora_console/operation/incidents/list_integriaims_incidents.php
+++ b/pandora_console/operation/incidents/list_integriaims_incidents.php
@@ -20,13 +20,23 @@ check_login();
 
 // Header tabs.
 $onheader = integriaims_tabs('list_tab');
-ui_print_page_header(
+ui_print_standard_header(
     __('Integria IMS Tickets'),
     '',
     false,
     'integria_tab',
     false,
-    $onheader
+    $onheader,
+    [
+        [
+            'link'  => '',
+            'label' => __('Issues'),
+        ],
+        [
+            'link'  => '',
+            'label' => __('Integria IMS Tickets'),
+        ],
+    ]
 );
 
 // Check if Integria integration enabled.
@@ -308,68 +318,100 @@ $resolution_incident = integriaims_get_details('resolution');
 // TABLE FILTERS.
 $table = new StdClass();
 $table->width = '100%';
-$table->class = 'databox filters';
-$table->styleTable = 'margin-bottom:0px';
-$table->cellpadding = '0';
-$table->cellspacing = '0';
+$table->size = [];
+$table->size[0] = '33%';
+$table->size[1] = '33%';
+$table->size[2] = '33%';
+$table->class = 'filter-table-adv';
+
 $table->data = [];
-
-$table->data[0][0] = __('Text filter');
-$table->data[0][1] = html_print_input_text('incident_text', $incident_text, '', 30, 100, true);
-
-$table->data[0][2] = __('Status');
-$table->data[0][3] = html_print_select(
-    $status_incident,
-    'incident_status',
-    $incident_status,
-    '',
-    __('All'),
-    0,
-    true
+$table->data[0][0] = html_print_label_input_block(
+    __('Text filter'),
+    html_print_input_text('incident_text', $incident_text, '', 30, 100, true)
 );
 
-$table->data[0][4] = __('Group');
-$table->data[0][5] = html_print_select(
-    $group_incident,
-    'incident_group',
-    $incident_group,
-    '',
-    __('All'),
-    1,
-    true
+$table->data[0][1] = html_print_label_input_block(
+    __('Status'),
+    html_print_select(
+        $status_incident,
+        'incident_status',
+        $incident_status,
+        '',
+        __('All'),
+        0,
+        true
+    )
 );
 
-$table->data[1][0] = __('Owner');
-$table->data[1][1] = html_print_autocomplete_users_from_integria('incident_owner', $incident_owner, true);
-
-$table->data[1][2] = __('Creator');
-$table->data[1][3] = html_print_autocomplete_users_from_integria('incident_creator', $incident_creator, true);
-
-$table->data[1][4] = __('Priority');
-$table->data[1][5] = html_print_select(
-    $priority_incident,
-    'incident_priority',
-    $incident_priority,
-    '',
-    __('All'),
-    -1,
-    true
+$table->data[0][2] = html_print_label_input_block(
+    __('Group'),
+    html_print_select(
+        $group_incident,
+        'incident_group',
+        $incident_group,
+        '',
+        __('All'),
+        1,
+        true
+    )
 );
 
-$table->data[2][0] = __('Resolution');
-$table->data[2][1] = html_print_select(
-    $resolution_incident,
-    'incident_resolution',
-    $incident_resolution,
-    '',
-    __('All'),
-    '',
-    true
+$table->data[1][0] = html_print_label_input_block(
+    __('Owner'),
+    html_print_autocomplete_users_from_integria(
+        'incident_owner',
+        $incident_owner,
+        true,
+        '30',
+        false,
+        false,
+        'w100p'
+    ),
+    ['div_class' => 'inline']
 );
 
-// TODO: field type date.
-$table->data[2][2] = __('Date');
-$table->data[2][3] = html_print_input_text_extended(
+$table->data[1][1] = html_print_label_input_block(
+    __('Creator'),
+    html_print_autocomplete_users_from_integria(
+        'incident_creator',
+        $incident_creator,
+        true,
+        '30',
+        false,
+        false,
+        'w100p'
+    ),
+    ['div_class' => 'inline']
+);
+
+$table->data[1][2] = html_print_label_input_block(
+    __('Priority'),
+    html_print_select(
+        $priority_incident,
+        'incident_priority',
+        $incident_priority,
+        '',
+        __('All'),
+        -1,
+        true
+    )
+);
+
+$table->data[2][0] = html_print_label_input_block(
+    __('Resolution'),
+    html_print_select(
+        $resolution_incident,
+        'incident_resolution',
+        $incident_resolution,
+        '',
+        __('All'),
+        '',
+        true
+    )
+);
+
+$input_date = '<div>';
+$input_date .= html_print_input_text_extended(
     'created_from',
     $created_from,
     'created_from',
@@ -381,7 +423,7 @@ $table->data[2][3] = html_print_input_text_extended(
     'placeholder="'.__('Created from').'"',
     true
 );
-$table->data[2][3] .= html_print_input_text_extended(
+$input_date .= html_print_input_text_extended(
     'created_to',
     $created_to,
     'created_to',
@@ -393,11 +435,12 @@ $table->data[2][3] .= html_print_input_text_extended(
     'class="mrgn_lft_5px" placeholder="'.__('Created to').'"',
     true
 );
+$input_date .= '</div>';
 
-// TODO: image of Integria IMS.
-$table->data[2][4] = '';
-$table->data[2][5] = '';
-
+$table->data[2][2] = html_print_label_input_block(
+    __('Date'),
+    $input_date
+);
 
 // Send filters to get_tickets_integriaims().
 $tickets_filters = [
@@ -423,20 +466,48 @@ $url = ui_get_full_url(
 // ---- PRINT TABLE FILTERS ----
 $integria_incidents_form = '<form method="post" action="'.$url.'" class="pdd_0px">';
 $integria_incidents_form .= html_print_table($table, true);
-$integria_incidents_form .= '<div class="w100p right">';
-$integria_incidents_form .= '<div class="float-right mrgn_lft_5px">'.html_print_button(
+$buttons = html_print_submit_button(
+    __('Filter'),
+    'filter_button',
+    false,
+    [
+        'icon' => 'search',
+        'mode' => 'mini secondary',
+    ],
+    true
+);
+$buttons .= html_print_button(
     __('Export to CSV'),
     'csv_export',
     false,
     "blockResubmit($(this)); location.href='operation/incidents/integriaims_export_csv.php?tickets_filters=$decode_csv'",
-    'class="sub next"',
+    [
+        'icon' => 'cog',
+        'mode' => 'mini secondary',
+    ],
     true
-).'</div>';
-$integria_incidents_form .= '<div>'.html_print_submit_button(__('Filter'), 'filter_button', false, 'class="sub filter"', true).'</div>';
-$integria_incidents_form .= '</div>';
+);
+
+$integria_incidents_form .= html_print_div(
+    [
+        'class'   => 'action-buttons',
+        'content' => $buttons,
+    ],
+    true
+);
 $integria_incidents_form .= '</form>';
 
-ui_toggle($integria_incidents_form, __('Filter'), '', '', false);
+ui_toggle(
+    $integria_incidents_form,
+    '<span class="subsection_header_title">'.__('Filters').'</span>',
+    'filter_form',
+    '',
+    true,
+    false,
+    '',
+    'white-box-content',
+    'box-flat white_table_graph fixed_filter_bar'
+);
 
 /*
  * Order api call 'get_incidents'.
@@ -552,33 +623,52 @@ foreach ($incidents_paginated as $key => $value) {
 
     $table->data[$i][8] .= '<a id="link_delete_incident" href="'.ui_get_full_url('index.php?sec=incident&sec2=operation/incidents/list_integriaims_incidents&delete_incident='.$array_get_incidents[$key][0]).'"        
     onClick="javascript:if (!confirm(\''.__('Are you sure?').'\')) return false;">';
-    $table->data[$i][8] .= html_print_image('images/delete.svg', true, ['title' => __('Delete'), 'class' => 'invert_filter']);
+    $table->data[$i][8] .= html_print_image('images/delete.svg', true, ['title' => __('Delete'), 'class' => 'invert_filter main_menu_icon']);
     $table->data[$i][8] .= '</a>';
 
     $i++;
 }
 
+$tablePagination = '';
 // Show table incidents.
-ui_pagination(count($array_get_incidents), $url, $offset);
 if (empty($table->data) === true) {
     ui_print_info_message(['no_close' => true, 'message' => __('No tickets to show').'.' ]);
 } else {
     html_print_table($table);
-    ui_pagination(count($array_get_incidents), $url, $offset, 0, false, 'offset', true, 'pagination-bottom');
+    $tablePagination = ui_pagination(
+        count($array_get_incidents),
+        $url,
+        $offset,
+        0,
+        true,
+        'offset',
+        false,
+        'pagination-bottom'
+    );
 }
 
 // Show button to create incident.
 echo '<form method="POST" action="'.ui_get_full_url('index.php?sec=incident&sec2=operation/incidents/configure_integriaims_incident').'">';
-    echo '<div class="wi100p right">';
-        html_print_submit_button(__('Create'), 'create_new_incident', false, 'class="sub next"');
-    echo '</div>';
+html_print_action_buttons(
+    html_print_submit_button(
+        __('Create'),
+        'create_new_incident',
+        false,
+        [ 'icon' => 'next' ],
+        true
+    ),
+    [
+        'type'          => 'data_table',
+        'class'         => 'fixed_action_buttons',
+        'right_content' => $tablePagination,
+    ]
+);
 echo '</form>';
 
 // Datapicker library for show calendar.
 ui_require_jquery_file('ui.datepicker-'.get_user_language(), 'include/javascript/i18n/');
 ?>
 
-
 <script language="javascript" type="text/javascript">
     $(document).ready( function() {
         $("#created_from, #created_to").datepicker({
diff --git a/pandora_console/operation/menu.php b/pandora_console/operation/menu.php
index 62984b4078..b9e2d2d714 100644
--- a/pandora_console/operation/menu.php
+++ b/pandora_console/operation/menu.php
@@ -606,6 +606,44 @@ if ($access_console_node === true) {
     }
 }
 
+$favorite_menu = db_get_all_rows_sql(
+    sprintf(
+        'SELECT id_element, url, label, section
+        FROM tfavmenu_user
+        WHERE id_user = "%s"
+        ORDER BY section DESC',
+        $config['id_user']
+    )
+);
+// Favorite.
+if ($favorite_menu !== false) {
+    $menu_operation['favorite']['text'] = __('Favorite');
+    $menu_operation['favorite']['id'] = 'fav-menu';
+
+    $section = '';
+    $sub = [];
+    $sub2 = [];
+    foreach ($favorite_menu as $key => $row) {
+        if ($row['section'] !== $section) {
+            $section = $row['section'];
+            $sub2 = [];
+        }
+
+        $sub[$section]['text'] = __(str_replace('_', ' ', $section));
+        $sub[$section]['type'] = 'direct';
+        $sub[$section]['subtype'] = 'nolink';
+        $sub[$section]['id'] = $row['section'];
+
+        $sub2[$row['url']]['text'] = io_safe_output($row['label']);
+        $sub[$section]['sub2'] = $sub2;
+    }
+
+    $menu_operation['favorite']['sub'] = $sub;
+}
+
+
+
+
 // Workspace.
 $menu_operation['workspace']['text'] = __('Workspace');
 $menu_operation['workspace']['sec2'] = 'operation/users/user_edit';
diff --git a/pandora_console/operation/messages/message_list.php b/pandora_console/operation/messages/message_list.php
index f62c686e2f..5e13d5a1e4 100644
--- a/pandora_console/operation/messages/message_list.php
+++ b/pandora_console/operation/messages/message_list.php
@@ -184,7 +184,7 @@ if (empty($messages) === true) {
     $table->size[3] = '80px';
     $table->size[4] = '60px';
 
-    $table->head[5] = html_print_checkbox('all_delete_messages', 0, false, true, false);
+    $table->head[5] = html_print_checkbox('all_delete_messages', 0, false, true, false, 'check_all_checkboxes()');
     $table->head[0] = __('Status');
     if ($show_sent === true) {
         $table->head[1] = __('Destination');
@@ -351,28 +351,14 @@ if (empty($messages) === false) {
 
 <script type="text/javascript">
 
-    $( document ).ready(function() {
+function check_all_checkboxes() {
+    if ($("input[name=all_delete_messages]").prop("checked")) {
+        $("[name^='delete_multiple']").prop("checked", true);
+    }
+    else {
+        $("[name^='delete_multiple']").prop("checked", false);
+    }
+}
 
-        $('[id^=checkbox-delete_multiple_messages]').change(function(){
-            if($(this).parent().parent().hasClass('checkselected')){
-                $(this).parent().parent().removeClass('checkselected');
-            }
-            else{
-                $(this).parent().parent().addClass('checkselected');                            
-            }
-        });
-
-        $('[id^=checkbox-all_delete_messages]').change(function(){    
-            if ($("#checkbox-all_delete_messages").prop("checked")) {
-                $('[id^=checkbox-delete_multiple_messages]').parent().parent().addClass('checkselected');
-                $(".check_delete_messages").prop("checked", true);
-            }
-            else{
-                $('[id^=checkbox-delete_multiple_messages]').parent().parent().removeClass('checkselected');
-                $(".check_delete_messages").prop("checked", false);
-            }    
-        });
-
-    });
 
 </script>
diff --git a/pandora_console/operation/netflow/netflow_explorer.php b/pandora_console/operation/netflow/netflow_explorer.php
index cb09927178..3f7e18ba52 100644
--- a/pandora_console/operation/netflow/netflow_explorer.php
+++ b/pandora_console/operation/netflow/netflow_explorer.php
@@ -1,21 +1,29 @@
 <?php
 /**
- * Network explorer
+ * Netflow Explorer
  *
- * @package    Operations.
- * @subpackage Netflow explorer view.
+ * @category   Netflow
+ * @package    Pandora FMS
+ * @subpackage Community
+ * @version    1.0.0
+ * @license    See below
  *
- * Pandora FMS - http://pandorafms.com
- * ==================================================
- * Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2005-2022 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
+ * as published by the Free Software Foundation for version 2.
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ * ============================================================================
  */
 
 global $config;
diff --git a/pandora_console/operation/netflow/nf_live_view.php b/pandora_console/operation/netflow/nf_live_view.php
index f5ee650fb0..e9c71e0570 100644
--- a/pandora_console/operation/netflow/nf_live_view.php
+++ b/pandora_console/operation/netflow/nf_live_view.php
@@ -14,7 +14,7 @@
  * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
  *
  * ============================================================================
- * Copyright (c) 2005-2022 Artica Soluciones Tecnologicas
+ * Copyright (c) 2005-2023 Artica Soluciones Tecnologicas
  * Please see http://pandorafms.org for full contribution list
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -101,7 +101,7 @@ $max_aggregates = (int) get_parameter('max_aggregates', 10);
 $update_date = (int) get_parameter('update_date', 0);
 $connection_name = get_parameter('connection_name', '');
 $interval_length = get_parameter('interval_length', NETFLOW_RES_MEDD);
-$address_resolution = (int) get_parameter('address_resolution', $config['netflow_get_ip_hostname']);
+$address_resolution = (int) get_parameter('address_resolution', ($config['netflow_get_ip_hostname'] ?? ''));
 $filter_selected = (int) get_parameter('filter_selected', 0);
 
 // Read time values.
@@ -125,38 +125,31 @@ $draw = get_parameter('draw_button', '');
 $save = get_parameter('save_button', '');
 $update = get_parameter('update_button', '');
 
-if (is_metaconsole() === false) {
-    // Header.
-    ui_print_page_header(
-        __('Netflow live view'),
-        'images/op_netflow.png',
-        false,
-        '',
-        false,
-        []
-    );
+// Header.
+ui_print_standard_header(
+    __('Netflow live view'),
+    'images/op_netflow.png',
+    false,
+    '',
+    false,
+    [],
+    [
+        [
+            'link'  => '',
+            'label' => __('Monitoring'),
+        ],
+        [
+            'link'  => '',
+            'label' => __('Network'),
+        ],
+    ]
+);
 
-    $is_windows = strtoupper(substr(PHP_OS, 0, 3)) == 'WIN';
-    if ($is_windows) {
-        ui_print_error_message(__('Not supported in Windows systems'));
-    } else {
-        netflow_print_check_version_error();
-    }
+$is_windows = (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN');
+if ($is_windows === true) {
+    ui_print_error_message(__('Not supported in Windows systems'));
 } else {
-    $nav_bar = [
-        [
-            'link' => 'index.php?sec=main',
-            'text' => __('Main'),
-        ],
-        [
-            'link' => 'index.php?sec=netf&sec2=operation/netflow/nf_live_view',
-            'text' => __('Netflow live view'),
-        ],
-    ];
-
-    ui_meta_print_page_header($nav_bar);
-
-    ui_meta_print_header(__('Netflow live view'));
+    netflow_print_check_version_error();
 }
 
 // Save user defined filter.
@@ -202,22 +195,9 @@ if (isset($config['netflow_disable_custom_lvfilters'])) {
     $netflow_disable_custom_lvfilters = $config['netflow_disable_custom_lvfilters'];
 }
 
-$class = 'databox filters';
-
-echo '<form method="post" action="'.$config['homeurl'].'index.php?sec=netf&sec2=operation/netflow/nf_live_view&pure='.$pure.'">';
-
-    echo "<table class='".$class."' width='100%'>";
-if (is_metaconsole()) {
-    echo '<thead>
-			<tr>
-				<th align=center colspan=6>
-					'.__('Draw live filter').'
-				</th>
-			</tr>
-		</thead>';
-
+// Add nodes list.
+if (is_metaconsole() === true) {
     $list_servers = [];
-
     $servers = db_get_all_rows_sql(
         'SELECT *
 			FROM tmetaconsole_setup'
@@ -244,62 +224,246 @@ if (is_metaconsole()) {
         metaconsole_restore_db();
     }
 
-    echo '<tr>';
-    echo '<td><b>'.__('Connection').'</b></td>';
-    echo '<td>'.html_print_select(
-        $list_servers,
-        'connection_name',
-        $connection_name,
+    $nodeListInput = html_print_label_input_block(
+        __('Connection'),
+        html_print_select(
+            $list_servers,
+            'connection_name',
+            $connection_name,
+            '',
+            '',
+            0,
+            true,
+            false,
+            false
+        )
+    );
+} else {
+    $nodeListInput = '';
+}
+
+$class_not_period = ($is_period === true) ? 'nf_hidden' : 'nf_display';
+$class_period = ($is_period === true) ? 'nf_display' : 'nf_hidden';
+
+$max_values = [
+    '2'             => '2',
+    '5'             => '5',
+    '10'            => '10',
+    '15'            => '15',
+    '20'            => '20',
+    '25'            => '25',
+    '50'            => '50',
+    $max_aggregates => $max_aggregates,
+];
+
+$aggregate_list = [];
+$aggregate_list = [
+    'srcip'   => __('Src Ip Address'),
+    'dstip'   => __('Dst Ip Address'),
+    'srcport' => __('Src Port'),
+    'dstport' => __('Dst Port'),
+];
+
+$advanced_toggle = '<table style="width:100%">';
+$advanced_toggle .= '<tr>';
+if ($netflow_disable_custom_lvfilters) {
+    $advanced_toggle .= '<td></td>';
+    $advanced_toggle .= '<td></td>';
+} else {
+    $advanced_toggle .= '<td><b>'.__('Filter').'</b></td>';
+    $advanced_toggle .= '<td colspan="2">'.__('Normal').' '.html_print_radio_button_extended('filter_type', 0, '', $filter_type, false, 'displayNormalFilter();', 'style="margin-right: 40px;"', true).__('Custom').' '.html_print_radio_button_extended('filter_type', 1, '', $filter_type, false, 'displayAdvancedFilter();', 'style="margin-right: 40px;"', true).'</td>';
+}
+
+$advanced_toggle .= '<td><b>'.__('Load filter').'</b></td>';
+$user_groups = users_get_groups($config['id_user'], 'AR', $own_info['is_admin'], true);
+$user_groups[0] = 0;
+// Add all groups.
+$sql = 'SELECT *
+    FROM tnetflow_filter
+    WHERE id_group IN ('.implode(',', array_keys($user_groups)).')';
+$advanced_toggle .= "<td colspan='3'>".html_print_select_from_sql($sql, 'filter_id', $filter_id, '', __('Select a filter'), 0, true);
+$advanced_toggle .= html_print_input_hidden('filter_selected', $filter_selected, false);
+$advanced_toggle .= '</td>';
+$advanced_toggle .= '</tr>';
+
+$advanced_toggle .= "<tr class='filter_normal'>";
+if ($netflow_disable_custom_lvfilters) {
+    $advanced_toggle .= '<td></td>';
+    $advanced_toggle .= '<td></td>';
+} else {
+    $advanced_toggle .= "<td style='font-weight:bold;'>".__('Dst Ip').ui_print_help_tip(__('Destination IP. A comma separated list of destination ip. If we leave the field blank, will show all ip. Example filter by ip:<br>25.46.157.214,160.253.135.249'), true).'</td>';
+    $advanced_toggle .= '<td colspan="2">'.html_print_input_text('ip_dst', $filter['ip_dst'], false, 40, 80, true).'</td>';
+}
+
+if ($netflow_disable_custom_lvfilters) {
+    $advanced_toggle .= '<td></td>';
+    $advanced_toggle .= '<td></td>';
+} else {
+    $advanced_toggle .= "<td style='font-weight:bold;'>".__('Src Ip').ui_print_help_tip(__('Source IP. A comma separated list of source ip. If we leave the field blank, will show all ip. Example filter by ip:<br>25.46.157.214,160.253.135.249'), true).'</td>';
+    $advanced_toggle .= '<td colspan="2">'.html_print_input_text('ip_src', $filter['ip_src'], false, 40, 80, true).'</td>';
+}
+
+$advanced_toggle .= '</tr>';
+
+$advanced_toggle .= "<tr class='filter_normal'>";
+if ($netflow_disable_custom_lvfilters) {
+    $advanced_toggle .= '<td></td>';
+    $advanced_toggle .= '<td></td>';
+} else {
+    $advanced_toggle .= "<td style='font-weight:bold;'>".__('Dst Port').ui_print_help_tip(__('Destination port. A comma separated list of destination ports. If we leave the field blank, will show all ports. Example filter by ports 80 and 22:<br>80,22'), true).'</td>';
+    $advanced_toggle .= '<td colspan="2">'.html_print_input_text('dst_port', $filter['dst_port'], false, 40, 80, true).'</td>';
+}
+
+if ($netflow_disable_custom_lvfilters) {
+    $advanced_toggle .= '<td></td>';
+    $advanced_toggle .= '<td></td>';
+} else {
+    $advanced_toggle .= "<td style='font-weight:bold;'>".__('Src Port').ui_print_help_tip(__('Source port. A comma separated list of source ports. If we leave the field blank, will show all ports. Example filter by ports 80 and 22:<br>80,22'), true).'</td>';
+    $advanced_toggle .= '<td colspan="2">'.html_print_input_text('src_port', $filter['src_port'], false, 40, 80, true).'</td>';
+}
+
+$advanced_toggle .= '</tr>';
+
+$advanced_toggle .= "<tr class='filter_advance' style='display: none;'>";
+if ($netflow_disable_custom_lvfilters) {
+    $advanced_toggle .= '<td></td>';
+    $advanced_toggle .= '<td></td>';
+} else {
+    $advanced_toggle .= '<td>'.ui_print_help_icon('pcap_filter', true).'</td>';
+    $advanced_toggle .= "<td colspan='5'>".html_print_textarea('advanced_filter', 4, 40, $filter['advanced_filter'], "style='min-height: 0px; width: 90%;'", true).'</td>';
+}
+
+$advanced_toggle .= '</tr>';
+$advanced_toggle .= '<tr>';
+
+$onclick = "if (!confirm('".__('Warning').'. '.__('IP address resolution can take a lot of time')."')) return false;";
+$radio_buttons = __('Yes').'&nbsp;&nbsp;'.html_print_radio_button_extended(
+    'address_resolution',
+    1,
+    '',
+    $address_resolution,
+    false,
+    $onclick,
+    '',
+    true
+).'&nbsp;&nbsp;&nbsp;';
+$radio_buttons .= __('No').'&nbsp;&nbsp;'.html_print_radio_button(
+    'address_resolution',
+    0,
+    '',
+    $address_resolution,
+    true
+);
+$advanced_toggle .= '<td><b>'.__('IP address resolution').'</b>'.ui_print_help_tip(__('Resolve the IP addresses to get their hostnames.'), true).'</td>';
+$advanced_toggle .= '<td colspan="2">'.$radio_buttons.'</td>';
+
+$advanced_toggle .= '<td><b>'.__('Source ip').'</b></td>';
+$advanced_toggle .= '<td colspan="2">'.html_print_input_text('router_ip', $filter['router_ip'], false, 40, 80, true).'</td>';
+
+$advanced_toggle .= '</tr>';
+
+$advanced_toggle .= '</table>';
+
+// Read filter type.
+if (empty($filter['advanced_filter']) === false) {
+    $filter_type = 1;
+} else {
+    $filter_type = 0;
+}
+
+$filterTable = new stdClass();
+$filterTable->id = '';
+$filterTable->width = '100%';
+$filterTable->class = 'filter-table-adv';
+$filterTable->size = [];
+$filterTable->size[0] = '33%';
+$filterTable->size[1] = '33%';
+$filterTable->size[2] = '33%';
+$filterTable->data = [];
+
+if (empty($nodeListInput) === false) {
+    $filterTable->data[-1][] = $nodeListInput;
+}
+
+$filterTable->data[0][0] = html_print_label_input_block(
+    __('Interval'),
+    html_print_extended_select_for_time(
+        'period',
+        $period,
         '',
         '',
         0,
-        true,
         false,
-        false
-    ).'</td>';
-    echo '</tr>';
-}
+        true
+    ),
+    [ 'div_id' => 'period_container' ]
+);
 
-    echo '<tr>';
-
-    $class_not_period = ($is_period) ? 'nf_hidden' : 'nf_display';
-    $class_period = ($is_period) ? 'nf_display' : 'nf_hidden';
-    echo '<td>';
-    echo '<b class="'.$class_period.'">'.__('Interval').'</b>';
-    echo '<b class="'.$class_not_period.'">'.__('Start date').'</b>';
-    echo '</td>';
-    echo '<td>';
-    echo html_print_extended_select_for_time('period', $period, '', '', 0, false, true, false, true, $class_period);
-    echo html_print_input_text('date_lower', $date_lower, false, 13, 10, true, false, false, '', $class_not_period);
-    echo html_print_image(
-        'images/calendar_view_day.png',
-        true,
+$filterTable->data[0][0] .= html_print_label_input_block(
+    __('Start date'),
+    html_print_div(
         [
-            'alt'   => 'calendar',
-            'class' => $class_not_period,
-        ]
-    ).html_print_input_text('time_lower', $time_lower, false, 10, 8, true, false, false, '', $class_not_period);
-    echo html_print_checkbox(
-        'is_period',
-        1,
-        ($is_period === true) ? 1 : 0,
-        true,
-        false,
-        'nf_view_click_period(event)'
-    );
-    echo ui_print_help_tip(__('Select this checkbox to write interval instead a date.'), true);
-    echo '</td>';
+            'class'   => '',
+            'content' => html_print_input_text(
+                'date_lower',
+                $date_lower,
+                false,
+                13,
+                10,
+                true
+            ).html_print_image(
+                'images/calendar_view_day.png',
+                true,
+                [
+                    'alt'   => 'calendar',
+                    'class' => 'main_menu_icon invert_filter',
+                ]
+            ).html_print_input_text(
+                'time_lower',
+                $time_lower,
+                false,
+                10,
+                8,
+                true
+            ),
+        ],
+        true
+    ),
+    [ 'div_id' => 'end_date_container' ]
+);
 
-    echo '<td><b>'.__('End date').'</b></td>';
-    echo '<td>'.html_print_input_text('date', $date, false, 13, 10, true).html_print_image(
-        'images/calendar_view_day.png',
-        true,
-        ['alt' => 'calendar']
-    ).html_print_input_text('time', $time, false, 10, 8, true);
-    echo '</td>';
+$filterTable->data[0][1] = html_print_label_input_block(
+    __('End date'),
+    html_print_div(
+        [
+            'class'   => '',
+            'content' => html_print_input_text(
+                'date',
+                $date,
+                false,
+                13,
+                10,
+                true
+            ).html_print_image(
+                'images/calendar_view_day.png',
+                true,
+                ['alt' => 'calendar']
+            ).html_print_input_text(
+                'time',
+                $time,
+                false,
+                10,
+                8,
+                true
+            ),
+        ],
+        true
+    )
+);
 
-    echo '<td><b>'.__('Resolution').ui_print_help_tip(__('The interval will be divided in chunks the length of the resolution.'), true).'</b></td>';
-    echo '<td>'.html_print_select(
+$filterTable->data[0][2] = html_print_label_input_block(
+    __('Resolution'),
+    html_print_select(
         netflow_resolution_select_params(),
         'interval_length',
         $interval_length,
@@ -309,13 +473,27 @@ if (is_metaconsole()) {
         true,
         false,
         false
-    ).'</td>';
+    ).ui_print_input_placeholder(
+        __('The interval will be divided in chunks the length of the resolution.'),
+        true
+    )
+);
 
-    echo '</tr>';
-    echo '<tr>';
+$filterTable->data[1][] = html_print_label_input_block(
+    __('Defined period'),
+    html_print_checkbox_switch(
+        'is_period',
+        1,
+        ($is_period === true) ? 1 : 0,
+        true,
+        false,
+        'nf_view_click_period(event)'
+    )
+);
 
-    echo '<td><b>'.__('Type').'</b></td>';
-    echo '<td>'.html_print_select(
+$filterTable->data[1][] = html_print_label_input_block(
+    __('Type'),
+    html_print_select(
         netflow_get_chart_types(),
         'chart_type',
         $chart_type,
@@ -323,224 +501,160 @@ if (is_metaconsole()) {
         '',
         0,
         true
-    ).'</td>';
+    )
+);
 
-    echo '<td><b>'.__('Max. values').'</b></td>';
-    $max_values = [
-        '2'             => '2',
-        '5'             => '5',
-        '10'            => '10',
-        '15'            => '15',
-        '20'            => '20',
-        '25'            => '25',
-        '50'            => '50',
-        $max_aggregates => $max_aggregates,
-    ];
-    echo '<td>'.html_print_select($max_values, 'max_aggregates', $max_aggregates, '', '', 0, true).'<a id="max_values" href="#" onclick="javascript: edit_max_value();">'.html_print_image('images/edit.svg', true, ['id' => 'pencil', 'class' => 'main_menu_icon invert_filter']).'</a>';
-    echo '</td>';
-
-    echo '<td><b>'.__('Aggregate by').'</b></td>';
-    $aggregate_list = [];
-    $aggregate_list = [
-        'srcip'   => __('Src Ip Address'),
-        'dstip'   => __('Dst Ip Address'),
-        'srcport' => __('Src Port'),
-        'dstport' => __('Dst Port'),
-    ];
-    echo '<td>'.html_print_select($aggregate_list, 'aggregate', $filter['aggregate'], '', '', 0, true, false, true, '', false).'</td>';
-
-    echo '</tr>';
-
-    // Read filter type.
-    if ($filter['advanced_filter'] != '') {
-        $filter_type = 1;
-    } else {
-        $filter_type = 0;
-    }
-
-    echo "<tr class='filter_save' style='display: none;'>";
-
-    echo "<td colspan='6'>".ui_print_error_message('Define a name for the filter and click on Save as new filter again', '', true).'</td>';
-
-    echo '</tr>';
-    echo "<tr class='filter_save' style='display: none;'>";
-
-    echo '<td><span id="filter_name_color"><b>'.__('Name').'</b></span></td>';
-    echo "<td colspan='2'>".html_print_input_text(
-        'name',
-        $filter['id_name'],
-        false,
-        20,
-        80,
-        true
-    ).'</td>';
-    $own_info = get_user_info($config['id_user']);
-    echo '<td><span id="filter_group_color"><b>'.__('Group').'</b></span></td>';
-    echo "<td colspan='2'>".html_print_select_groups($config['id_user'], 'AR', $own_info['is_admin'], 'assign_group', $filter['id_group'], '', '', -1, true, false, false).'</td>';
-    echo '</tr>';
-
-    $advanced_toggle = '<table style="width:100%">';
-
-    $advanced_toggle .= '<tr>';
-    if ($netflow_disable_custom_lvfilters) {
-        $advanced_toggle .= '<td></td>';
-        $advanced_toggle .= '<td></td>';
-    } else {
-        $advanced_toggle .= '<td><b>'.__('Filter').'</b></td>';
-        $advanced_toggle .= '<td colspan="2">'.__('Normal').' '.html_print_radio_button_extended('filter_type', 0, '', $filter_type, false, 'displayNormalFilter();', 'style="margin-right: 40px;"', true).__('Custom').' '.html_print_radio_button_extended('filter_type', 1, '', $filter_type, false, 'displayAdvancedFilter();', 'style="margin-right: 40px;"', true).'</td>';
-    }
-
-
-
-    $advanced_toggle .= '<td><b>'.__('Load filter').'</b></td>';
-    $user_groups = users_get_groups($config['id_user'], 'AR', $own_info['is_admin'], true);
-    $user_groups[0] = 0;
-    // Add all groups.
-    $sql = 'SELECT *
-		FROM tnetflow_filter
-		WHERE id_group IN ('.implode(',', array_keys($user_groups)).')';
-    $advanced_toggle .= "<td colspan='3'>".html_print_select_from_sql($sql, 'filter_id', $filter_id, '', __('Select a filter'), 0, true);
-    $advanced_toggle .= html_print_input_hidden('filter_selected', $filter_selected, false);
-    $advanced_toggle .= '</td>';
-    $advanced_toggle .= '</tr>';
-
-    $advanced_toggle .= "<tr class='filter_normal'>";
-    if ($netflow_disable_custom_lvfilters) {
-        $advanced_toggle .= '<td></td>';
-        $advanced_toggle .= '<td></td>';
-    } else {
-        $advanced_toggle .= "<td style='font-weight:bold;'>".__('Dst Ip').ui_print_help_tip(__('Destination IP. A comma separated list of destination ip. If we leave the field blank, will show all ip. Example filter by ip:<br>25.46.157.214,160.253.135.249'), true).'</td>';
-        $advanced_toggle .= '<td colspan="2">'.html_print_input_text('ip_dst', $filter['ip_dst'], false, 40, 80, true).'</td>';
-    }
-
-    if ($netflow_disable_custom_lvfilters) {
-        $advanced_toggle .= '<td></td>';
-        $advanced_toggle .= '<td></td>';
-    } else {
-        $advanced_toggle .= "<td style='font-weight:bold;'>".__('Src Ip').ui_print_help_tip(__('Source IP. A comma separated list of source ip. If we leave the field blank, will show all ip. Example filter by ip:<br>25.46.157.214,160.253.135.249'), true).'</td>';
-        $advanced_toggle .= '<td colspan="2">'.html_print_input_text('ip_src', $filter['ip_src'], false, 40, 80, true).'</td>';
-    }
-
-    $advanced_toggle .= '</tr>';
-
-    $advanced_toggle .= "<tr class='filter_normal'>";
-    if ($netflow_disable_custom_lvfilters) {
-        $advanced_toggle .= '<td></td>';
-        $advanced_toggle .= '<td></td>';
-    } else {
-        $advanced_toggle .= "<td style='font-weight:bold;'>".__('Dst Port').ui_print_help_tip(__('Destination port. A comma separated list of destination ports. If we leave the field blank, will show all ports. Example filter by ports 80 and 22:<br>80,22'), true).'</td>';
-        $advanced_toggle .= '<td colspan="2">'.html_print_input_text('dst_port', $filter['dst_port'], false, 40, 80, true).'</td>';
-    }
-
-    if ($netflow_disable_custom_lvfilters) {
-        $advanced_toggle .= '<td></td>';
-        $advanced_toggle .= '<td></td>';
-    } else {
-        $advanced_toggle .= "<td style='font-weight:bold;'>".__('Src Port').ui_print_help_tip(__('Source port. A comma separated list of source ports. If we leave the field blank, will show all ports. Example filter by ports 80 and 22:<br>80,22'), true).'</td>';
-        $advanced_toggle .= '<td colspan="2">'.html_print_input_text('src_port', $filter['src_port'], false, 40, 80, true).'</td>';
-    }
-
-    $advanced_toggle .= '</tr>';
-
-    $advanced_toggle .= "<tr class='filter_advance' style='display: none;'>";
-    if ($netflow_disable_custom_lvfilters) {
-        $advanced_toggle .= '<td></td>';
-        $advanced_toggle .= '<td></td>';
-    } else {
-        $advanced_toggle .= '<td>'.ui_print_help_icon('pcap_filter', true).'</td>';
-        $advanced_toggle .= "<td colspan='5'>".html_print_textarea('advanced_filter', 4, 40, $filter['advanced_filter'], "style='min-height: 0px; width: 90%;'", true).'</td>';
-    }
-
-    $advanced_toggle .= '</tr>';
-    $advanced_toggle .= '<tr>';
-
-    $onclick = "if (!confirm('".__('Warning').'. '.__('IP address resolution can take a lot of time')."')) return false;";
-    $radio_buttons = __('Yes').'&nbsp;&nbsp;'.html_print_radio_button_extended(
-        'address_resolution',
-        1,
+$filterTable->data[1][] = html_print_label_input_block(
+    __('Aggregated by'),
+    html_print_select(
+        $aggregate_list,
+        'aggregate',
+        $filter['aggregate'],
         '',
-        $address_resolution,
-        false,
-        $onclick,
         '',
-        true
-    ).'&nbsp;&nbsp;&nbsp;';
-    $radio_buttons .= __('No').'&nbsp;&nbsp;'.html_print_radio_button(
-        'address_resolution',
         0,
+        true,
+        false,
+        true,
         '',
-        $address_resolution,
+        false
+    )
+);
+
+$filterTable->data[2][] = html_print_label_input_block(
+    __('Max values'),
+    html_print_div(
+        [
+            'class'   => '',
+            'content' => html_print_select(
+                $max_values,
+                'max_aggregates',
+                $max_aggregates,
+                '',
+                '',
+                0,
+                true
+            ).html_print_anchor(
+                [
+                    'id'      => 'max_values',
+                    'href'    => '#',
+                    'onClick' => 'edit_max_value()',
+                    'content' => html_print_image(
+                        'images/edit.svg',
+                        true,
+                        [
+                            'id'    => 'pencil',
+                            'class' => 'main_menu_icon invert_filter',
+                        ]
+                    ),
+                ],
+                true
+            ),
+        ],
         true
-    );
-    $advanced_toggle .= '<td><b>'.__('IP address resolution').'</b>'.ui_print_help_tip(__('Resolve the IP addresses to get their hostnames.'), true).'</td>';
-    $advanced_toggle .= '<td colspan="2">'.$radio_buttons.'</td>';
+    )
+);
 
-    $advanced_toggle .= '<td><b>'.__('Source ip').'</b></td>';
-    $advanced_toggle .= '<td colspan="2">'.html_print_input_text('router_ip', $filter['router_ip'], false, 40, 80, true).'</td>';
-
-    $advanced_toggle .= '</tr>';
-
-    $advanced_toggle .= '</table>';
-
-    echo '<tr><td colspan="6">';
-    echo ui_toggle(
+$filterTable->colspan[3][0] = 3;
+$filterTable->data[3][0] = html_print_label_input_block(
+    '',
+    ui_toggle(
         $advanced_toggle,
         __('Advanced'),
         '',
         '',
         true,
         true,
-        'white_box white_box_opened',
-        'no-border flex-row'
-    );
-    echo '</td></tr>';
-    echo '</table>';
+        '',
+        'white-box-content',
+        'box-flat white_table_graph'
+    )
+);
 
-    echo "<table class='' width='100%' style='border: 0px; text-align:right;'><tr><td>";
+$buttons = html_print_submit_button(
+    __('Draw'),
+    'draw_button',
+    false,
+    [
+        'icon' => 'cog',
+        'mode' => 'mini',
+    ],
+    true
+);
 
-    echo html_print_submit_button(__('Draw'), 'draw_button', false, 'class="sub upd"', true);
-
-    if (!$netflow_disable_custom_lvfilters) {
-        if (check_acl($config['id_user'], 0, 'AW')) {
-            html_print_submit_button(__('Save as new filter'), 'save_button', false, 'style="margin-left: 5px;" class="sub upd" onClick="return defineFilterName();"');
-            html_print_submit_button(__('Update current filter'), 'update_button', false, 'style="margin-left: 5px;" class="sub upd"');
-        }
+if (!$netflow_disable_custom_lvfilters) {
+    if ((bool) check_acl($config['id_user'], 0, 'AW') === true) {
+        $buttons .= html_print_submit_button(__('Save as new filter'), 'save_button', false, ['icon' => 'load', 'onClick' => 'return defineFilterName();', 'mode' => 'mini secondary'], true);
+        $buttons .= html_print_submit_button(__('Update current filter'), 'update_button', false, ['icon' => 'load', 'mode' => 'mini secondary'], true);
     }
+}
 
-    echo '</td></tr></table>';
+$filterInputTable = '<form method="post" action="'.$config['homeurl'].'index.php?sec=netf&sec2=operation/netflow/nf_live_view&pure='.$pure.'">';
+$filterInputTable .= html_print_table($filterTable, true);
+$filterInputTable .= html_print_div(
+    [
+        'class'   => 'action-buttons',
+        'content' => $buttons,
+    ],
+    true
+);
+$filterInputTable .= '</form>';
 
-    echo '</form>';
+ui_toggle(
+    $filterInputTable,
+    '<span class="subsection_header_title">'.__('Filter').'</span>',
+    __('Filter'),
+    'search',
+    true,
+    false,
+    '',
+    'white-box-content no_border',
+    'box-flat white_table_graph fixed_filter_bar'
+);
 
-    if (empty($draw) === false) {
-        // Draw.
-        echo '<br/>';
+if (empty($draw) === false) {
+    // No filter selected.
+    if ($netflow_disable_custom_lvfilters && $filter_selected == 0) {
+        ui_print_error_message(__('No filter selected'));
+    } else {
+        // Hidden input for handle properly the text colors.
+        html_print_input_hidden(
+            'selected_style_theme',
+            $config['style']
+        );
 
-        // No filter selected.
-        if ($netflow_disable_custom_lvfilters && $filter_selected == 0) {
-            ui_print_error_message(__('No filter selected'));
-        } else {
-            // Hidden input for handle properly the text colors.
-            html_print_input_hidden(
-                'selected_style_theme',
-                $config['style']
-            );
-            // Draw the netflow chart.
-            echo netflow_draw_item(
-                $start_date,
-                $end_date,
-                $interval_length,
-                $chart_type,
-                $filter,
-                $max_aggregates,
-                $connection_name,
-                'HTML',
-                $address_resolution
-            );
-        }
+        $netflowContainerClass = ($chart_type === 'netflow_data' || $chart_type === 'netflow_summary' || $chart_type === 'netflow_top_N') ? '' : 'white_box';
+
+        // Draw the netflow chart.
+        html_print_div(
+            [
+                'class'   => $netflowContainerClass,
+                'content' => netflow_draw_item(
+                    $start_date,
+                    $end_date,
+                    $interval_length,
+                    $chart_type,
+                    $filter,
+                    $max_aggregates,
+                    $connection_name,
+                    'HTML',
+                    $address_resolution
+                ),
+            ]
+        );
     }
+} else {
+    ui_print_info_message(__('No data to show'));
+}
 
-    ui_include_time_picker();
-    ?>
+ui_include_time_picker();
+?>
+
+<style>
+    .parent_graph {
+        margin: 0 auto !important;
+    }
+</style>
 
 <script type="text/javascript">
     function edit_max_value () {
@@ -722,6 +836,8 @@ if (is_metaconsole()) {
     });
     
     $(document).ready( function() {
+        // Update visibility of controls.
+        nf_view_click_period();
         // Hide update filter button
         if ($("#filter_id").val() == 0) {
             $("#submit-update_button").hide();
@@ -758,13 +874,10 @@ if (is_metaconsole()) {
     
     $.datepicker.regional["<?php echo get_user_language(); ?>"];
 
-    function nf_view_click_period(event) {
-        $(".nf_display").toggle();
-        $(".nf_hidden").toggle(); 
+    function nf_view_click_period() {
+        var is_period = document.getElementById('checkbox-is_period').checked;
+
+        document.getElementById('period_container').style.display = !is_period ? 'none' : 'flex';
+        document.getElementById('end_date_container').style.display = is_period ? 'none' : 'flex';
     }
 </script>
-<style type="text/css">
-.nf_hidden {
-  display: none;
-}
-</style>
\ No newline at end of file
diff --git a/pandora_console/operation/network/network_report.php b/pandora_console/operation/network/network_report.php
index b4e41987de..5d036df61a 100644
--- a/pandora_console/operation/network/network_report.php
+++ b/pandora_console/operation/network/network_report.php
@@ -1,23 +1,32 @@
 <?php
 /**
- * Network explorer
+ * Netflow Report
  *
- * @package    Operations.
- * @subpackage Network explorer view.
+ * @category   Netflow
+ * @package    Pandora FMS
+ * @subpackage Community
+ * @version    1.0.0
+ * @license    See below
  *
- * Pandora FMS - http://pandorafms.com
- * ==================================================
- * Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2005-2022 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
+ * as published by the Free Software Foundation for version 2.
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ * ============================================================================
  */
 
+// Begin.
 check_login();
 
 // ACL Check.
@@ -257,6 +266,7 @@ unset($table);
 $table = new stdClass();
 $table->id = '';
 $table->width = '100%';
+$table->class = 'info_table';
 // Print the header.
 $table->head = [];
 $table->head['main'] = __('IP');
@@ -385,20 +395,31 @@ if (empty($data)) {
         'height' => 230,
         'legend' => [
             'display'  => true,
-            'position' => 'right',
-            'align'    => 'center',
+            'position' => 'top',
+            'align'    => 'left',
         ],
         'labels' => $labels,
     ];
+    // Results table.
+    $resultsTable = html_print_div(
+        [
+            'class'   => '',
+            'style'   => 'flex: 75;margin-right: 5px;',
+            'content' => html_print_table($table, true),
+        ],
+        true
+    );
     // Pie graph.
-    html_print_div(
+    $pieGraph = html_print_div(
         [
             'class'   => 'databox netflow-pie-graph-container padding-2 white_box',
+            'style'   => 'flex: 25;margin-left: 5px;',
             'content' => pie_graph(
                 $chart_data,
                 $options
             ),
-        ]
+        ],
+        true
     );
     // Print the filter remove link.
     if (empty($main_value) === false) {
@@ -418,7 +439,13 @@ if (empty($data)) {
     }
 
     // Print results.
-    html_print_table($table);
+    html_print_div(
+        [
+            'style'   => 'max-width: -webkit-fill-available; display: flex',
+            'class'   => '',
+            'content' => $resultsTable.$pieGraph,
+        ]
+    );
 }
 
 ?>
diff --git a/pandora_console/operation/network/network_usage_map.php b/pandora_console/operation/network/network_usage_map.php
index 8af9ccd485..7e3964b277 100644
--- a/pandora_console/operation/network/network_usage_map.php
+++ b/pandora_console/operation/network/network_usage_map.php
@@ -1,24 +1,32 @@
 <?php
-
 /**
- * Netflow functions
+ * Netflow usage map.
  *
- * @package    Netflow usage map.
- * @subpackage UI.
+ * @category   Netflow
+ * @package    Pandora FMS
+ * @subpackage Community
+ * @version    1.0.0
+ * @license    See below
  *
- * Pandora FMS - http://pandorafms.com
- * ==================================================
- * Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2005-2023 Artica Soluciones Tecnologicas
  * Please see http://pandorafms.org for full contribution list
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; version 2
+ * as published by the Free Software Foundation for version 2.
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ * ============================================================================
  */
 
+ // Begin.
 require_once $config['homedir'].'/include/functions_network.php';
 require_once $config['homedir'].'/include/class/NetworkMap.class.php';
 
@@ -26,7 +34,25 @@ global $config;
 
 check_login();
 
-ui_print_page_header(__('Network usage map'));
+// Header.
+ui_print_standard_header(
+    __('Network usage map'),
+    'images/op_netflow.png',
+    false,
+    '',
+    false,
+    [],
+    [
+        [
+            'link'  => '',
+            'label' => __('Monitoring'),
+        ],
+        [
+            'link'  => '',
+            'label' => __('Network'),
+        ],
+    ]
+);
 
 // ACL Check.
 if (! check_acl($config['id_user'], 0, 'AR')) {
@@ -58,105 +84,180 @@ if (!$is_period) {
 $top = (int) get_parameter('top', 10);
 
 $order_by = get_parameter('order_by', 'bytes');
-if (!in_array($order_by, ['bytes', 'pkts', 'flows'])) {
+if (in_array($order_by, ['bytes', 'pkts', 'flows']) === false) {
     $order_by = 'bytes';
 }
 
-$style_end = ($is_period) ? 'display: none;' : '';
-$style_period = ($is_period) ? '' : 'display: none;';
-
-// Build the table.
-$table = new stdClass();
-$table->class = 'databox filters';
-$table->styleTable = 'width: 100%';
-
-$table->data['0']['0'] = '<div class="flex">';
-$table->data['0']['0'] .= '<div id="end_date_container" style="'.$style_end.'">';
-$table->data['0']['0'] .= __('Start date').'&nbsp;&nbsp;';
-$table->data['0']['0'] .= html_print_input_text('date_lower', $date_lower, '', 10, 7, true);
-$table->data['0']['0'] .= '&nbsp;&nbsp;';
-$table->data['0']['0'] .= html_print_input_text('time_lower', $time_lower, '', 7, 8, true);
-$table->data['0']['0'] .= '</div>';
-
-$table->data['0']['0'] .= '<div id="period_container" style="'.$style_period.'">';
-$table->data['0']['0'] .= __('Time Period').'&nbsp;&nbsp;';
-$table->data['0']['0'] .= html_print_extended_select_for_time('period', $period, '', '', 0, false, true);
-$table->data['0']['0'] .= '</div>';
-$table->data['0']['0'] .= html_print_checkbox(
-    'is_period',
-    1,
-    ($is_period === true) ? 1 : 0,
-    true,
-    false,
-    'network_report_click_period(event)'
-);
-$table->data['0']['0'] .= ui_print_help_tip(
-    __('Select this checkbox to write interval instead a date.'),
-    true
-);
-$table->data['0']['0'] .= '</div>';
-
-$table->data['0']['1'] = __('End date').'&nbsp;&nbsp;';
-$table->data['0']['1'] .= html_print_input_text('date_greater', $date_greater, '', 10, 7, true);
-$table->data['0']['1'] .= '&nbsp;&nbsp;';
-$table->data['0']['1'] .= html_print_input_text('time_greater', $time_greater, '', 7, 8, true);
-
-$table->data['0']['2'] = __('Number of result to show').'&nbsp;&nbsp;';
-$table->data['0']['2'] .= html_print_select(
-    [
-        '5'   => 5,
-        '10'  => 10,
-        '15'  => 15,
-        '20'  => 20,
-        '25'  => 25,
-        '50'  => 50,
-        '100' => 100,
-        '250' => 250,
-    ],
-    'top',
-    $top,
-    '',
-    '',
-    0,
-    true
-);
-
-$table->data['1']['0'] = __('Data to show').'&nbsp;&nbsp;';
-$table->data['1']['0'] .= html_print_select(
-    network_get_report_actions(),
-    'action',
-    $action,
-    '',
-    '',
-    0,
-    true
-);
-$table->data['1']['1'] = '';
-
-$netflow_button = '';
 if ((bool) $config['activate_netflow'] === true) {
     $netflow_button = html_print_submit_button(
         __('Show netflow map'),
         'update_netflow',
         false,
-        'class="sub upd"',
+        ['icon' => 'update'],
         true
     );
+} else {
+    $netflow_button = '';
 }
 
-$table->data['1']['2'] .= implode(
-    '&nbsp;&nbsp;',
-    [$netflow_button]
+
+$filterTable = new stdClass();
+$filterTable->id = '';
+$filterTable->class = 'filter-table-adv';
+$filterTable->size = [];
+$filterTable->size[0] = '33%';
+$filterTable->size[1] = '33%';
+$filterTable->size[2] = '33%';
+$filterTable->data = [];
+
+$filterTable->data[0][0] = html_print_label_input_block(
+    __('Interval'),
+    html_print_extended_select_for_time(
+        'period',
+        $period,
+        '',
+        '',
+        0,
+        false,
+        true
+    ),
+    [ 'div_id' => 'period_container' ]
 );
 
-echo '<form method="post">';
-html_print_input_hidden('order_by', $order_by);
+$filterTable->data[0][0] .= html_print_label_input_block(
+    __('Start date'),
+    html_print_div(
+        [
+            'class'   => '',
+            'content' => html_print_input_text(
+                'date_lower',
+                $date_lower,
+                false,
+                13,
+                10,
+                true
+            ).html_print_image(
+                'images/calendar_view_day.png',
+                true,
+                [
+                    'alt'   => 'calendar',
+                    'class' => 'main_menu_icon invert_filter',
+                ]
+            ).html_print_input_text(
+                'time_lower',
+                $time_lower,
+                false,
+                10,
+                8,
+                true
+            ),
+        ],
+        true
+    ),
+    [ 'div_id' => 'end_date_container' ]
+);
 
-html_print_table($table);
-echo '</form>';
+$filterTable->data[0][1] = html_print_label_input_block(
+    __('End date'),
+    html_print_div(
+        [
+            'content' => html_print_input_text(
+                'date',
+                $date_greater,
+                false,
+                13,
+                10,
+                true
+            ).html_print_image(
+                'images/calendar_view_day.png',
+                true,
+                ['alt' => 'calendar']
+            ).html_print_input_text(
+                'time',
+                $time_greater,
+                false,
+                10,
+                8,
+                true
+            ),
+        ],
+        true
+    )
+);
+
+$filterTable->data[0][2] = html_print_label_input_block(
+    __('Defined period'),
+    html_print_checkbox_switch(
+        'is_period',
+        1,
+        ($is_period === true) ? 1 : 0,
+        true,
+        false,
+        'nf_view_click_period()'
+    )
+);
+
+$filterTable->data[1][] = html_print_label_input_block(
+    __('Results to show'),
+    html_print_select(
+        [
+            '5'   => 5,
+            '10'  => 10,
+            '15'  => 15,
+            '20'  => 20,
+            '25'  => 25,
+            '50'  => 50,
+            '100' => 100,
+            '250' => 250,
+        ],
+        'top',
+        $top,
+        '',
+        '',
+        0,
+        true
+    )
+);
+
+$filterTable->data[1][] = html_print_label_input_block(
+    __('Data to show'),
+    html_print_select(
+        network_get_report_actions(),
+        'action',
+        $action,
+        '',
+        '',
+        0,
+        true
+    )
+);
+
+$filterInputTable = '<form method="POST">';
+$filterInputTable .= html_print_input_hidden('order_by', $order_by);
+$filterInputTable .= html_print_table($filterTable, true);
+$filterInputTable .= html_print_div(
+    [
+        'class'   => 'action-buttons',
+        'content' => $netflow_button,
+    ],
+    true
+);
+$filterInputTable .= '</form>';
+
+ui_toggle(
+    $filterInputTable,
+    '<span class="subsection_header_title">'.__('Filter').'</span>',
+    __('Filter'),
+    'search',
+    true,
+    false,
+    '',
+    'white-box-content no_border',
+    'box-flat white_table_graph fixed_filter_bar'
+);
 
 $has_data = false;
-$first_load = true;
+
 if ((bool) get_parameter('update_netflow') === true) {
     $map_data = netflow_build_map_data(
         $utimestamp_lower,
@@ -165,18 +266,27 @@ if ((bool) get_parameter('update_netflow') === true) {
         ($action === 'talkers') ? 'srcip' : 'dstip'
     );
     $has_data = !empty($map_data['nodes']);
-    $first_load = false;
 }
 
 if ($has_data === true) {
     $map_manager = new NetworkMap($map_data);
     $map_manager->printMap();
-} else if (!$first_load) {
-    ui_print_info_message(__('No data retrieved'));
+} else {
+    ui_print_info_message(__('No data to show'));
 }
 
 ?>
+<style>
+    .networkconsole {
+        min-height: calc(100vh - 280px) !important;
+    }
+</style>
 <script>
+
+    $(document).ready(function(){
+        nf_view_click_period();
+    }
+    );
 // Configure jQuery timepickers.
 $("#text-time_lower, #text-time_greater").timepicker({
     showSecond: true,
@@ -193,16 +303,13 @@ $("#text-time_lower, #text-time_greater").timepicker({
 $("#text-date_lower, #text-date_greater").datepicker({dateFormat: "<?php echo DATE_FORMAT_JS; ?>"});
 $.datepicker.setDefaults($.datepicker.regional[ "<?php echo get_user_language(); ?>"]);
 
-function network_report_click_period(event) {
-    var is_period = document.getElementById(event.target.id).checked;
+function nf_view_click_period() {
+    var is_period = document.getElementById('checkbox-is_period').checked;
 
-    document.getElementById('period_container').style.display = !is_period
-        ? 'none'
-        : 'block';
-    document.getElementById('end_date_container').style.display = is_period
-        ? 'none'
-        : 'block';
+    document.getElementById('period_container').style.display = !is_period ? 'none' : 'flex';
+    document.getElementById('end_date_container').style.display = is_period ? 'none' : 'flex';
 }
+
 </script>
 <style type="text/css">
     tspan {
diff --git a/pandora_console/operation/reporting/reporting_viewer.php b/pandora_console/operation/reporting/reporting_viewer.php
index de1c8dc0cb..7784450371 100755
--- a/pandora_console/operation/reporting/reporting_viewer.php
+++ b/pandora_console/operation/reporting/reporting_viewer.php
@@ -221,6 +221,12 @@ ui_print_standard_header(
             'link'  => '',
             'label' => __('Custom reports'),
         ],
+    ],
+    [
+        'id_element' => $id_report,
+        'url'        => 'operation/reporting/reporting_viewer&id='.$id_report,
+        'label'      => reporting_get_name($id_report),
+        'section'    => 'Reporting',
     ]
 );
 
diff --git a/pandora_console/operation/snmpconsole/snmp_browser.php b/pandora_console/operation/snmpconsole/snmp_browser.php
index 28cb1ce4e4..12cba23676 100644
--- a/pandora_console/operation/snmpconsole/snmp_browser.php
+++ b/pandora_console/operation/snmpconsole/snmp_browser.php
@@ -203,7 +203,7 @@ function snmp_browser_show_add_module_massive(module_target = 'agent') {
 function modal_preaction() {
 
     // Select all in select box.
-    $("input[name='select_all_right']").click();    
+    $('#id_item2>option').prop('selected', true);
 
     // Load adding modules modal.
     waiting_modal();
diff --git a/pandora_console/operation/snmpconsole/snmp_statistics.php b/pandora_console/operation/snmpconsole/snmp_statistics.php
index 0ebc548496..ec5dfd9837 100755
--- a/pandora_console/operation/snmpconsole/snmp_statistics.php
+++ b/pandora_console/operation/snmpconsole/snmp_statistics.php
@@ -57,16 +57,18 @@ if ($config['pure']) {
     ).'</a>';
 }
 
-// List
-$list = [];
-$list['text'] = '<a href="index.php?sec=estado&sec2=operation/snmpconsole/snmp_view&pure='.$config['pure'].'&refresh='.$refr.'">'.html_print_image(
-    'images/SNMP-network-numeric-data@svg.svg',
-    true,
-    [
-        'title' => __('List'),
-        'class' => 'main_menu_icon invert_filter',
-    ]
-).'</a>';
+if ($config['pure'] === false) {
+    // List.
+    $list = [];
+    $list['text'] = '<a href="index.php?sec=estado&sec2=operation/snmpconsole/snmp_view&pure='.$config['pure'].'&refresh='.$refr.'">'.html_print_image(
+        'images/SNMP-network-numeric-data@svg.svg',
+        true,
+        [
+            'title' => __('List'),
+            'class' => 'main_menu_icon invert_filter',
+        ]
+    ).'</a>';
+}
 
 // Statistics (This file)
 $statistics = [];
@@ -165,10 +167,9 @@ $water_mark = [
 // By SOURCE
 $table_source = new StdClass();
 $table_source->width = '100%';
-$table_source->class = 'databox data';
+$table_source->class = 'info_table';
 $table_source->head[] = __('Traps received by source').' - '.sprintf(__('Top %d'), 25);
 $table_source->head_colspan[] = 2;
-$table_source->headstyle[] = 'background-color: #82b92e';
 $table_source->size = [];
 $table_source->size['table'] = '50%';
 $table_source->size['graph'] = '50%';
@@ -182,6 +183,7 @@ $table_source_data->head = [];
 $table_source_data->head['source'] = __('Source IP');
 $table_source_data->head['num'] = __('Number');
 $table_source_data->data = [];
+$table_source_data->class = 'info_table';
 
 $table_source_graph_data = [];
 $labels = [];
@@ -239,9 +241,9 @@ unset($table_source);
 // By OID
 $table_oid = new StdClass();
 $table_oid->width = '100%';
+$table_oid->class = 'info_table';
 $table_oid->head[] = __('Traps received by Enterprise String').' - '.sprintf(__('Top %d'), 25);
 $table_oid->head_colspan[] = 2;
-$table_oid->headstyle[] = 'background-color: #82b92e';
 $table_oid->size = [];
 $table_oid->size['table'] = '50%';
 $table_oid->size['graph'] = '50%';
@@ -255,6 +257,7 @@ $table_oid_data->head = [];
 $table_oid_data->head['oid'] = __('Trap Enterprise String');
 $table_oid_data->head['num'] = __('Number');
 $table_oid_data->data = [];
+$table_oid_data->class = 'info_table';
 
 $table_oid_graph_data = [];
 $labels = [];
diff --git a/pandora_console/operation/users/user_edit.php b/pandora_console/operation/users/user_edit.php
index da3ed994c9..a6144d9de0 100644
--- a/pandora_console/operation/users/user_edit.php
+++ b/pandora_console/operation/users/user_edit.php
@@ -1107,12 +1107,6 @@ $(document).ready (function () {
         });
     });
 
-    $("#submit-uptbutton").click (function () {
-        if($("#autorefresh_list option").length > 0) {
-            $('#autorefresh_list option').prop('selected', true);
-        }
-    });
-
     check_default_block_size()
     $("#checkbox-default_block_size").change(function() {
         check_default_block_size();
diff --git a/pandora_console/operation/visual_console/legacy_public_view.php b/pandora_console/operation/visual_console/legacy_public_view.php
index 40ae10e4bc..e8edbae7db 100644
--- a/pandora_console/operation/visual_console/legacy_public_view.php
+++ b/pandora_console/operation/visual_console/legacy_public_view.php
@@ -56,7 +56,7 @@ ui_require_javascript_file('connection_check', 'include/javascript/', true);
 set_js_value('absolute_homeurl', ui_get_full_url(false, false, false, false));
 $conn_title = __('Connection with server has been lost');
 $conn_text = __('Connection to the server has been lost. Please check your internet connection or contact with administrator.');
-ui_print_message_dialog($conn_title, $conn_text, 'connection', '/images/error_1.png');
+ui_print_message_dialog($conn_title, $conn_text, 'connection', '/images/fail@svg.svg');
 
 require_once 'include/functions_visual_map.php';
 
diff --git a/pandora_console/operation/visual_console/public_view.php b/pandora_console/operation/visual_console/public_view.php
index 265b3183c6..496a34f3a6 100644
--- a/pandora_console/operation/visual_console/public_view.php
+++ b/pandora_console/operation/visual_console/public_view.php
@@ -37,7 +37,7 @@ ui_require_javascript_file('connection_check', 'include/javascript/', true);
 set_js_value('absolute_homeurl', ui_get_full_url(false, false, false, false));
 $conn_title = __('Connection with server has been lost');
 $conn_text = __('Connection to the server has been lost. Please check your internet connection or contact with administrator.');
-ui_print_message_dialog($conn_title, $conn_text, 'connection', '/images/error_1.png');
+ui_print_message_dialog($conn_title, $conn_text, 'connection', '/images/fail@svg.svg');
 
 echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'."\n";
 echo '<html xmlns="http://www.w3.org/1999/xhtml">'."\n";
diff --git a/pandora_console/operation/visual_console/view.php b/pandora_console/operation/visual_console/view.php
index 0c295c9914..fde52505d1 100644
--- a/pandora_console/operation/visual_console/view.php
+++ b/pandora_console/operation/visual_console/view.php
@@ -240,6 +240,12 @@ if (!$config['pure']) {
                 'link'  => '',
                 'label' => __('Visual console'),
             ],
+        ],
+        [
+            'id_element' => $visualConsoleId,
+            'url'        => 'operation/visual_console/render_view&id='.$visualConsoleId,
+            'label'      => $visualConsoleName,
+            'section'    => 'Visual_Console',
         ]
     );
 }
@@ -274,25 +280,25 @@ if ($pure === false) {
         $class_delete = 'delete_item delete_min';
         $class_copy = 'copy_item';
         if ($config['style'] === 'pandora_black' && is_metaconsole() === false) {
-            $class_camera = 'camera_min_white link-create-item';
-            $class_percentile = 'percentile_item_min_white link-create-item';
-            $class_module_graph = 'graph_min_white link-create-item';
-            $class_donut = 'donut_graph_min_white link-create-item';
-            $class_bars = 'bars_graph_min_white link-create-item';
-            $class_value = 'binary_min_white link-create-item';
-            $class_sla = 'auto_sla_graph_min_white link-create-item';
-            $class_label = 'label_min_white link-create-item';
-            $class_icon = 'icon_min_white link-create-item';
-            $class_clock = 'clock_min_white link-create-item';
-            $class_group = 'group_item_min_white link-create-item';
-            $class_box = 'box_item_white link-create-item';
-            $class_line = 'line_item_white link-create-item';
-            $class_cloud = 'color_cloud_min_white link-create-item';
-            $class_nlink = 'network_link_min_white link-create-item';
-            $class_odometer = 'odometer_min_white link-create-item';
-            $class_basic_chart = 'basic_chart_min_white link-create-item';
-            $class_delete = 'delete_item_white delete_min_white';
-            $class_copy = 'copy_item_white';
+            $class_camera .= ' invert_filter';
+            $class_percentile .= ' invert_filter';
+            $class_module_graph .= ' invert_filter';
+            $class_donut .= ' invert_filter';
+            $class_bars .= ' invert_filter';
+            $class_value .= ' invert_filter';
+            $class_sla .= ' invert_filter';
+            $class_label .= ' invert_filter';
+            $class_icon .= ' invert_filter';
+            $class_clock .= ' invert_filter';
+            $class_group .= ' invert_filter';
+            $class_box .= ' invert_filter';
+            $class_line .= ' invert_filter';
+            $class_cloud .= ' invert_filter';
+            $class_nlink .= ' invert_filter';
+            $class_odometer .= ' invert_filter';
+            $class_basic_chart .= ' invert_filter';
+            $class_delete .= ' invert_filter';
+            $class_copy .= ' invert_filter';
         }
 
         visual_map_print_button_editor_refactor(
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 2371461f48..32b32adbbb 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.769
-%define release     230313
+%define release     230323
 
 # 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 1c4fbb9602..f084a36da8 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.769
-%define release     230313
+%define release     230323
 
 # 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 c73bbff767..d7dcf52db7 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.769
-%define release     230313
+%define release     230323
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql
index 6e2a05114d..9ff30ae74f 100644
--- a/pandora_console/pandoradb.sql
+++ b/pandora_console/pandoradb.sql
@@ -2634,9 +2634,17 @@ CREATE TABLE IF NOT EXISTS `tdatabase` (
   `action` TINYINT UNSIGNED DEFAULT 0,
   `ssh_key` TEXT,
   `ssh_pubkey` TEXT,
+  `ssh_status` TINYINT UNSIGNED DEFAULT 0,
   `last_error` TEXT,
+  `db_status` TINYINT UNSIGNED DEFAULT 0,
+  `replication_status` TINYINT UNSIGNED DEFAULT 0,
+  `replication_delay` BIGINT DEFAULT 0,
+  `master` TINYINT UNSIGNED DEFAULT 0,
+  `utimestamp` BIGINT DEFAULT 0,
+  `mysql_version` VARCHAR(10) DEFAULT '',
+  `pandora_version` VARCHAR(10) DEFAULT '',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4 ;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 
 -- -----------------------------------------------------
 -- Table `twidget`
@@ -4246,3 +4254,15 @@ CREATE TABLE IF NOT EXISTS `twelcome_tip_file` (
     REFERENCES `twelcome_tip` (`id`)
     ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
+
+-- ---------------------------------------------------------------------
+-- Table `tfavmenu_user`
+-- ---------------------------------------------------------------------
+CREATE TABLE IF NOT EXISTS `tfavmenu_user` (
+  `id` INT NOT NULL AUTO_INCREMENT,
+  `id_user` VARCHAR(255) NOT NULL,
+  `id_element` TEXT,
+  `url` TEXT NOT NULL,
+  `label` VARCHAR(255) NOT NULL,
+  `section` VARCHAR(255) NOT NULL,
+  PRIMARY KEY (`id`));
\ No newline at end of file
diff --git a/pandora_console/update_manager_client/views/register.php b/pandora_console/update_manager_client/views/register.php
index b893479c23..4fffc0f88f 100644
--- a/pandora_console/update_manager_client/views/register.php
+++ b/pandora_console/update_manager_client/views/register.php
@@ -85,7 +85,7 @@ $product_name = get_product_name(); ?>
                 __('Cancel'),
                 'cancel_registration',
                 false,
-                'class="lato ui-widget
+                'id="submit-cancel_registration" class="lato ui-widget
             ui-state-default ui-corner-all ui-button-text-only sub upd submit-cancel"',
                 true
             );
@@ -97,7 +97,7 @@ $product_name = get_product_name(); ?>
                 __('OK!'),
                 'register',
                 false,
-                'class="lato ui-widget
+                'id="submit-register" class="lato ui-widget
             ui-state-default ui-corner-all ui-button-text-only sub ok submit-next w100px"',
                 true
             );
diff --git a/pandora_console/vendor/mpdf/mpdf/src/Config/FontVariables.php b/pandora_console/vendor/mpdf/mpdf/src/Config/FontVariables.php
index 777ebf8a74..b450044beb 100644
--- a/pandora_console/vendor/mpdf/mpdf/src/Config/FontVariables.php
+++ b/pandora_console/vendor/mpdf/mpdf/src/Config/FontVariables.php
@@ -286,6 +286,9 @@ class FontVariables
 				"unbatang" => [/* Korean */
 					'R' => "UnBatang_0613.ttf",
 				],
+				"lato" => [/* lato */
+					'R' => 'Lato-Regular.ttf',
+				],
 			],
 
 			// Add fonts to this array if they contain characters in the SIP or SMP Unicode planes
@@ -296,6 +299,7 @@ class FontVariables
 				"dejavuserifcondensed",
 				"dejavuserif",
 				"dejavusansmono",
+				"lato",
 			],
 
 			// These next 3 arrays do two things:
@@ -321,6 +325,8 @@ class FontVariables
 			'mono_fonts' => ['dejavusansmono', 'mono', 'monospace', 'freemono', 'liberationmono', 'courier', 'ocrb', 'ocr-b', 'lucidaconsole',
 				'couriernew', 'monotypecorsiva'
 			],
+
+			'lato' => ['lato'],
 		];
 	}
 
diff --git a/pandora_console/vendor/mpdf/mpdf/src/Mpdf.php b/pandora_console/vendor/mpdf/mpdf/src/Mpdf.php
index ffe70a1f64..74166a63dc 100644
--- a/pandora_console/vendor/mpdf/mpdf/src/Mpdf.php
+++ b/pandora_console/vendor/mpdf/mpdf/src/Mpdf.php
@@ -468,6 +468,7 @@ class Mpdf implements \Psr\Log\LoggerAwareInterface
 	var $serif_fonts;
 	var $mono_fonts;
 	var $defaultSubsFont;
+	var $lato;
 
 	// List of ALL available CJK fonts (incl. styles) (Adobe add-ons)  hw removed
 	var $available_CJK_fonts;
@@ -1478,15 +1479,31 @@ class Mpdf implements \Psr\Log\LoggerAwareInterface
 				$default_font = $this->defaultCSS['BODY']['FONT-FAMILY'];
 			}
 		}
+
+		if ($default_font) {
+			$this->SetDefaultFont($default_font);
+		}
+
 		if (!$default_font_size) {
 			$mmsize = $this->sizeConverter->convert($this->defaultCSS['BODY']['FONT-SIZE']);
 			$default_font_size = $mmsize * (Mpdf::SCALE);
 		}
 
-		if ($default_font) {
-			$this->SetDefaultFont($default_font);
-		}
-		if ($default_font_size) {
+		if ($_SESSION['font_size_report']) {
+			// DefaultCss.
+			$this->defaultCSS['BODY']['FONT-SIZE'] = $_SESSION['font_size_report'].'px';
+			$this->defaultCSS['TABLE']['FONT-SIZE'] = $_SESSION['font_size_report'].'pt';
+			$this->defaultCSS['THEAD']['FONT-SIZE'] = $_SESSION['font_size_report'].'pt';
+			$this->defaultCSS['TH']['FONT-SIZE'] = $_SESSION['font_size_report'].'pt';
+			$this->defaultCSS['TD']['FONT-SIZE'] = $_SESSION['font_size_report'].'pt';
+			// CssManager.
+			$this->cssManager->CSS['BODY']['FONT-SIZE'] = $_SESSION['font_size_report'].'px';
+			$this->cssManager->CSS['TABLE']['FONT-SIZE'] = $_SESSION['font_size_report'].'pt';
+			$this->cssManager->CSS['THEAD']['FONT-SIZE'] = $_SESSION['font_size_report'].'pt';
+			$this->cssManager->CSS['TH']['FONT-SIZE'] = $_SESSION['font_size_report'].'pt';
+			$this->cssManager->CSS['TD']['FONT-SIZE'] = $_SESSION['font_size_report'].'pt';
+
+		} elseif ($default_font_size) {
 			$this->SetDefaultFontSize($default_font_size);
 		}
 
diff --git a/pandora_console/views/calendar/edit.php b/pandora_console/views/calendar/edit.php
index 06d8b93d01..b7ec8a46ed 100644
--- a/pandora_console/views/calendar/edit.php
+++ b/pandora_console/views/calendar/edit.php
@@ -34,7 +34,7 @@ if (\is_metaconsole() === true) {
     \alerts_meta_print_header($tabs);
 } else {
     // Header.
-    \ui_print_standard_header(
+    ui_print_standard_header(
         __('Alerts'),
         'images/gm_alerts.png',
         false,
@@ -44,7 +44,11 @@ if (\is_metaconsole() === true) {
         [
             [
                 'link'  => '',
-                'label' => __('Calendars Edit'),
+                'label' => __('Alerts'),
+            ],
+            [
+                'link'  => '',
+                'label' => __('Special days'),
             ],
         ]
     );
diff --git a/pandora_console/views/calendar/list.php b/pandora_console/views/calendar/list.php
index 3e8e924a7d..d37a49955f 100644
--- a/pandora_console/views/calendar/list.php
+++ b/pandora_console/views/calendar/list.php
@@ -33,19 +33,23 @@ if (\is_metaconsole() === true) {
     \alerts_meta_print_header($tabs);
 } else {
     // Header.
-    \ui_print_page_header(
-        // Title.
-        __('Calendars'),
-        // Icon.
+    ui_print_standard_header(
+        __('Alerts'),
         'images/gm_alerts.png',
-        // Return.
         false,
-        // Help.
         'alert_special_days',
-        // Godmode.
         true,
-        // Options.
-        $tabs
+        $tabs,
+        [
+            [
+                'link'  => '',
+                'label' => __('Alerts'),
+            ],
+            [
+                'link'  => '',
+                'label' => __('Special days'),
+            ],
+        ]
     );
 }
 
diff --git a/pandora_console/views/calendar/special_days.php b/pandora_console/views/calendar/special_days.php
index fdf98d28b1..22ea5e3f4f 100644
--- a/pandora_console/views/calendar/special_days.php
+++ b/pandora_console/views/calendar/special_days.php
@@ -43,6 +43,10 @@ if (\is_metaconsole() === true) {
         true,
         $tabs,
         [
+            [
+                'link'  => '',
+                'label' => __('Alerts'),
+            ],
             [
                 'link'  => '',
                 'label' => __('Special days'),
diff --git a/pandora_console/views/cluster/edit.php b/pandora_console/views/cluster/edit.php
index 525d159bab..eb144c5e72 100644
--- a/pandora_console/views/cluster/edit.php
+++ b/pandora_console/views/cluster/edit.php
@@ -127,3 +127,33 @@ if (empty($form) === false) {
 
 // Print always go back button.
 HTML::printForm($wizard->getGoBackForm(), false);
+
+html_print_action_buttons(
+    '',
+    []
+);
+
+?>
+
+<script type="text/javascript">
+    $(document).ready(function() {
+        var buttonnext = $('#button-next').parent().html();
+        $('#button-next').hide();
+        var buttonnext = buttonnext.replace('button-next','button-next_copy');
+        var buttonback = $('#button-submit').parent().html();
+        $('#button-submit').hide();
+        var buttonback = buttonback.replace('button-submit','button-submit_copy');
+        $('.action_buttons_right_content').parent().html(buttonnext+buttonback);
+        var style = $('#principal_action_buttons').attr('style');
+        $('#principal_action_buttons').attr('style',style+' justify-content: unset;');
+
+        // Button next/finish on action buttons.
+        $('#button-next_copy').click(function(){
+            $('#button-next').trigger('click');
+        });
+        // Button back on action buttons.
+        $('#button-submit_copy').click(function(){
+            $('#button-submit').trigger('click');
+        });
+    });
+</script>
\ No newline at end of file
diff --git a/pandora_console/views/cluster/list.php b/pandora_console/views/cluster/list.php
index c72f1752a1..44af135532 100644
--- a/pandora_console/views/cluster/list.php
+++ b/pandora_console/views/cluster/list.php
@@ -50,7 +50,7 @@ try {
         'known_status',
         [
             'text'  => 'options',
-            'class' => 'action_buttons',
+            'class' => 'table_action_buttons',
         ],
     ];
 
@@ -71,7 +71,7 @@ try {
         [
             'id'                  => $tableId,
             'class'               => 'info_table',
-            'style'               => 'width: 100%',
+            'style'               => 'width: 99%',
             'columns'             => $columns,
             'column_names'        => $column_names,
             'ajax_url'            => $model->ajaxController,
@@ -102,6 +102,7 @@ try {
                     ],
                 ],
             ],
+            'filter_main_class'   => 'box-flat white_table_graph fixed_filter_bar',
         ]
     );
 } catch (Exception $e) {
@@ -109,24 +110,20 @@ try {
 }
 
 if (check_acl($config['id_user'], 0, 'AW')) {
-    HTML::printForm(
+    $buttons[] = html_print_submit_button(
+        __('New cluster'),
+        'submit',
+        false,
         [
-            'form'   => [
-                'method' => 'POST',
-                'action' => ui_get_full_url($model->url.'&op=new'),
-            ],
-            'inputs' => [
-                [
-                    'class'     => 'w100p',
-                    'arguments' => [
-                        'name'       => 'submit',
-                        'label'      => __('New cluster'),
-                        'type'       => 'submit',
-                        'attributes' => 'class="sub next"',
-                        'return'     => true,
-                    ],
-                ],
-            ],
-        ]
+            'class' => 'sub ok',
+            'icon'  => 'next',
+        ],
+        true
     );
+    echo '<form action="'.ui_get_full_url($model->url.'&op=new').'" method="POST">';
+    html_print_action_buttons(
+        implode('', $buttons),
+        ['type' => 'form_action']
+    );
+    echo '</form>';
 }
diff --git a/pandora_console/views/cluster/view.php b/pandora_console/views/cluster/view.php
index 775ca3e30a..a6b10313b1 100644
--- a/pandora_console/views/cluster/view.php
+++ b/pandora_console/views/cluster/view.php
@@ -192,7 +192,7 @@ if ($in_planned_downtime && !$cluster->agent()->disabled() && !$cluster->agent()
 $table_agent_header = '<div class="agent_details_agent_alias">';
 $table_agent_header .= $agent_name;
 $table_agent_header .= '</div>';
-$table_agent_header .= '<div class="agent_details_agent_name">';
+$table_agent_header .= '<div class="agent_details_agent_name mrgn_lft_10px">';
 if (!$config['show_group_name']) {
     $table_agent_header .= ui_print_group_icon(
         $cluster->agent()->id_grupo(),
@@ -358,17 +358,13 @@ $map_manager = new NetworkMap(
  *
  */
 
-$table_events = '<div class="white_table_graph" id="table_events">';
-$table_events .= '<div class="white_table_graph_header">';
-$table_events .= html_print_image(
-    'images/arrow_down_green.png',
-    true
-);
-$table_events .= '<span>';
+$table_events = '<div class="white_table_graph" id="table_events" style="width:100%">';
+$table_events .= '<div class="agent_details_header">';
+$table_events .= '<b><span style="font-size: medium;font-weight:bold">';
 $table_events .= __('Events (Last 24h)');
-$table_events .= '</span>';
+$table_events .= '</span></b>';
 $table_events .= '</div>';
-$table_events .= '<div class="white_table_graph_content white-table-graph-content">';
+$table_events .= '<div class="white-table-graph-content">';
 $table_events .= graph_graphic_agentevents(
     $cluster->agent()->id_agente(),
     95,
@@ -384,29 +380,34 @@ $table_events .= '</div>';
 
 ?>
 <div id="agent_details_first_row" class="w100p cluster-agent-data">
-    <div class="box-flat agent_details_col agent_details_col_left">
-        <div class="agent_details_header">
-            <?php echo $table_agent_header; ?>
-        </div>
-        <div class="agent_details_content">
-            <div class="agent_details_graph">
-                <?php echo $table_agent_graph; ?>
-                <div class="agent_details_bullets">
-                    <?php echo $table_agent_count_modules; ?>
+    <div class="flex">
+        <div class="box-flat agent_details_col agent_details_col_left" style="width:50%">
+            <div class="agent_details_header">
+                <?php echo $table_agent_header; ?>
+            </div>
+            <div class="agent_details_content pdd_l_50px">
+                <div class="agent_details_graph">
+                    <?php echo $table_agent_graph; ?>
+                    <div class="agent_details_bullets">
+                        <?php echo $table_agent_count_modules; ?>
+                    </div>
+                </div>
+                <div class="agent_details_info">
+                    <?php
+                    echo $alive_animation;
+                    echo $table_agent_os;
+                    echo $table_agent_ip;
+                    echo $table_agent_version;
+                    echo $table_agent_description;
+                    ?>
                 </div>
             </div>
-            <div class="agent_details_info">
-                <?php
-                echo $alive_animation;
-                echo $table_agent_os;
-                echo $table_agent_ip;
-                echo $table_agent_version;
-                echo $table_agent_description;
-                ?>
-            </div>
+        </div>
+
+        <div class="box-flat agent_details_col" style="width:50%">
+            <?php echo $table_events; ?>
         </div>
     </div>
-
     <div class="box-flat agent_details_col agent_details_col_right">
         <div class="cluster-map">
             <?php $map_manager->printMap(); ?>
@@ -414,10 +415,6 @@ $table_events .= '</div>';
     </div>
 </div>
 
-<div class="w100p cluster-events-graph">
-    <?php echo $table_events; ?>
-</div>
-
 <div id='cluster-modules' class="w100p modules">
 <?php
 $id_agente = $cluster->agent()->id_agente();
@@ -427,28 +424,22 @@ require_once $config['homedir'].'/operation/agentes/estado_monitores.php';
 
 
 <?php
-HTML::printForm(
+$buttons[] = html_print_submit_button(
+    __('Reload'),
+    'submit',
+    false,
     [
-        'form'   => [
-            'action' => $model->url.'&op=view&id='.$cluster->id(),
-            'method' => 'POST',
-        ],
-        'inputs' => [
-            [
-                'arguments' => [
-                    'name'       => 'submit',
-                    'label'      => __('Reload'),
-                    'type'       => 'submit',
-                    'attributes' => 'class="sub cancel"',
-                    'return'     => true,
-                ],
-            ],
-        ],
+        'class' => 'sub ok',
+        'icon'  => 'next',
     ],
-    false
+    true
 );
-
-echo '<br/>';
+echo '<form action="'.$model->url.'&op=view&id='.$cluster->id().'" method="POST">';
+html_print_action_buttons(
+    implode('', $buttons),
+    ['type' => 'form_action']
+);
+echo '</form>';
 
 // Print always go back button.
 HTML::printForm($model->getGoBackForm(), false);
diff --git a/pandora_console/views/dashboard/header.php b/pandora_console/views/dashboard/header.php
index bfe6b3b242..26f588b5ea 100644
--- a/pandora_console/views/dashboard/header.php
+++ b/pandora_console/views/dashboard/header.php
@@ -296,6 +296,12 @@ if ($publicLink === false) {
                 'link'  => '',
                 'label' => __('Dashboard'),
             ],
+        ],
+        [
+            'id_element' => $dashboardId,
+            'url'        => 'operation/dashboard/dashboard&dashboardId='.$dashboardId,
+            'label'      => $dashboardName,
+            'section'    => 'Dashboard_',
         ]
     );
 } else {
diff --git a/pandora_console/views/dashboard/list.php b/pandora_console/views/dashboard/list.php
index 0eaafd98b5..da902709b8 100644
--- a/pandora_console/views/dashboard/list.php
+++ b/pandora_console/views/dashboard/list.php
@@ -92,7 +92,7 @@ if (empty($dashboards) === true) {
     $table->style['full_screen'] = 'text-align: center;';
 
     $table->size = [];
-    $table->size['name'] = '75%';
+    $table->size['name'] = '40%';
     $table->size['full_screen'] = '30px';
 
     $table->head = [];
diff --git a/pandora_console/views/dashboard/tipsWindow.php b/pandora_console/views/dashboard/tipsWindow.php
index b95cf058c6..45b6680ff2 100644
--- a/pandora_console/views/dashboard/tipsWindow.php
+++ b/pandora_console/views/dashboard/tipsWindow.php
@@ -49,11 +49,11 @@ $output .= '<div class="images">';
 if ($files !== false) {
     if ($preview === true) {
         foreach ($files as $key => $file) {
-            $output .= html_print_image($file, true);
+            $output .= html_print_image($file, true, ['class' => 'main_menu_icon']);
         }
     } else {
         foreach ($files as $key => $file) {
-            $output .= html_print_image($file['path'].$file['filename'], true);
+            $output .= html_print_image($file['path'].$file['filename'], true, ['class' => 'main_menu_icon']);
         }
     }
 }
@@ -73,14 +73,17 @@ $output .= '<p id="text_tip">';
 $output .= $text;
 $output .= '</p>';
 
+$link_class = 'invisible';
 if (empty($url) === false && $url !== '') {
-    $output .= '<a href="'.$url.'" target="_blank" id="url_tip">'.__('See more info').'<span class="arrow_tips">→</span></a>';
+    $link_class = '';
 }
 
+$output .= '<a href="'.$url.'" class="'.$link_class.'" target="_blank" id="url_tip">'.__('See more info').'</a>';
+
 $output .= '</div>';
 
 $output .= '<div class="ui-dialog-buttonset">';
-// TODO Delete this buttons and use html_print_button when merge new design
+
 $output .= html_print_button(
     __('Maybe later'),
     '',
@@ -116,7 +119,7 @@ if ($preview === true) {
         '',
         [
             'onclick' => 'next_tip()',
-            'class'   => 'mini',
+            'class'   => ($totalTips === '1') ? 'mini hide-button' : 'mini',
         ],
         true
     );
diff --git a/pandora_plugins/Advanced Log Parser/pandora_logparser.pl b/pandora_plugins/Advanced Log Parser/pandora_logparser.pl
index b83ad3477f..3f4dc7ac2f 100644
--- a/pandora_plugins/Advanced Log Parser/pandora_logparser.pl	
+++ b/pandora_plugins/Advanced Log Parser/pandora_logparser.pl	
@@ -743,8 +743,12 @@ while (my ($key, $value) = each (@{$plugin_setup{"log"}})) {
     if (defined($value->{"log_location_multiple"})){
         $log_filename_multiple = $value->{"log_location_multiple"};
         $log_create_module_for_each_log = $value->{"module_for_each_log"};
-        #my @buffer = `dir "$log_filename_multiple" /b /a-d`;
-        my @buffer = `ls -d "$log_filename_multiple"`;
+        my @buffer;
+        if($^O =~ /win/i){        
+            @buffer = `dir "$log_filename_multiple" /b /a-d`;
+        }else{
+            @buffer = `ls -d "$log_filename_multiple"`;
+        }
         foreach (@buffer) {
             # This should solve problems with carriage return in Unix, Linux and Windooze    
             chomp($_);
@@ -757,6 +761,7 @@ while (my ($key, $value) = each (@{$plugin_setup{"log"}})) {
                 $module_name_multiple =~ s/\//_/g;
                 $module_name_multiple = $module_name . "_" . $module_name_multiple;
             }
+            $log_filename = $log_filename_multiple . $_;
             manage_logfile ($log_filename, $module_name_multiple, $readall, $type, $regexp, $description);
         }
     } 
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index 45a089c547..d02b0d0e41 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.769-230313
+Version: 7.0NG.769-230323
 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 2d7dc46c06..e41856d5d1 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.769-230313"
+pandora_version="7.0NG.769-230323"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/conf/pandora_server.conf.new b/pandora_server/conf/pandora_server.conf.new
index 21449c7df4..8050a4650b 100644
--- a/pandora_server/conf/pandora_server.conf.new
+++ b/pandora_server/conf/pandora_server.conf.new
@@ -331,17 +331,18 @@ recon_timing_template 3
 
 snmpget /usr/bin/snmpget
 
-# Location of the braa binary needed by the Enterprise SNMP Server
-# /usr/bin/braa by default (PANDORA FMS ENTERPRISE ONLY).
+# Location of the pandorafsnmp/braa binary needed by the Enterprise SNMP Server v1 and v2c
+# /usr/bin/pandorafsnmp by default for v1 and v2c (PANDORA FMS ENTERPRISE ONLY).
+# /usr/bin/braa could be set as optional legacy binary for snmp v1 and v2c (PANDORA FMS ENTERPRISE ONLY).
 
-braa /usr/bin/braa
+braa /usr/bin/pandorafsnmp
 
 # Number of retries before braa hands a module over to the Network Server (PANDORA FMS ENTERPRISE ONLY).
 
 braa_retries 3
 
-# Location of the pandorafsnmp binary needed by the Enterprise SNMP Server.
-# /usr/bin/pandorafsnmp by default (PANDORA FMS ENTERPRISE ONLY).
+# Location of the pandorafsnmp binary needed by the Enterprise SNMP Server v3.
+# /usr/bin/pandorafsnmp by default for snmp version 3 (PANDORA FMS ENTERPRISE ONLY).
 
 fsnmp /usr/bin/pandorafsnmp
 
@@ -701,8 +702,35 @@ ncm_ssh_utility /usr/share/pandora_server/util/ncm_ssh_extension
 # Pandora FMS Daemon Watchdog execution interval in seconds (PANDORA FMS ENTERPRISE ONLY).
 ha_interval 30
 
-# Pandora FMS Daemon Watchdog monitoring interval in seconds. Must be a multiple of ha_interval (PANDORA FMS ENTERPRISE ONLY).
-ha_monitoring_interval 60
+# HA operation mode. For backward compatibility with pacemaker. Do not change this value (PANDORA FMS ENTERPRISE ONLY).
+ha_mode pandora
+
+# Comma separated list of HA host IPs or FQDNs (PANDORA FMS ENTERPRISE ONLY).
+#ha_hosts 172.16.0.8,172.168.0.16
+
+# Database username for pandora_ha (PANDORA FMS ENTERPRISE ONLY).
+#ha_dbuser pandora
+
+# Database password for pandora_ha (PANDORA FMS ENTERPRISE ONLY).
+#ha_dbpass pandora
+
+# SSH username for pandora_ha (PANDORA FMS ENTERPRISE ONLY).
+#ha_sshuser pandora
+
+# SSH port for pandora_ha (PANDORA FMS ENTERPRISE ONLY).
+#ha_sshport 22
+
+# Absolute path to the HA slave resync script (PANDORA FMS ENTERPRISE ONLY).
+#ha_resync /usr/share/pandora_server/util/pandora_ha_resync_slave.sh
+
+# Database username for HA replication (PANDORA FMS ENTERPRISE ONLY).
+#repl_dbuser pandora
+
+# Database password for HA replication (PANDORA FMS ENTERPRISE ONLY).
+#repl_dbpass pandora
+
+# Number of retries for connection attempts to HA databases.
+#ha_connect_retries 2
 
 # Enable (1) or disable (0) Pandora FMS Alert Server.
 alertserver 0
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 554f5c3383..d0b212aa9e 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -46,7 +46,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.769";
-my $pandora_build = "230313";
+my $pandora_build = "230323";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
@@ -553,6 +553,25 @@ sub pandora_load_config {
 
 	$pa_config->{"unknown_block_size"} = 1000; # 7.0.769
 
+	$pa_config->{"ha_mode"} = "pacemaker"; # 7.0.770
+	$pa_config->{"ha_file"} = undef; # 7.0.770
+	$pa_config->{"ha_hosts_file"} = '/var/spool/pandora/data_in/conf/pandora_ha_hosts.conf'; # 7.0.770
+	$pa_config->{"ha_connect_retries"} = 2; # 7.0.770
+	$pa_config->{"ha_connect_delay"} = 1; # 7.0.770
+	$pa_config->{"ha_dbuser"} = undef; # 7.0.770
+	$pa_config->{"ha_dbpass"} = undef; # 7.0.770
+	$pa_config->{"ha_hosts"} = undef; # 7.0.770
+	$pa_config->{"ha_resync"} = '/usr/share/pandora_server/util/pandora_ha_resync_slave.sh'; # 7.0.770
+	$pa_config->{"ha_resync_log"} = '/var/log/pandora/pandora_ha_resync.log'; # 7.0.770
+	$pa_config->{"ha_sshuser"} = 'pandora'; # 7.0.770
+	$pa_config->{"ha_sshport"} = 22; # 7.0.770
+
+	$pa_config->{"ha_max_splitbrain_retries"} = 2;
+	$pa_config->{"ha_resync_sleep"} = 10;
+
+	$pa_config->{"repl_dbuser"} = undef; # 7.0.770
+	$pa_config->{"repl_dbpass"} = undef; # 7.0.770
+
 	# Check for UID0
 	if ($pa_config->{"quiet"} != 0){
 		if ($> == 0){
@@ -1283,9 +1302,36 @@ sub pandora_load_config {
 		}
 
 		# Pandora HA extra
+		elsif ($parametro =~ m/^ha_mode\s(.*)/i) {
+			$pa_config->{'ha_mode'} = clean_blank($1);
+		}
 		elsif ($parametro =~ m/^ha_file\s(.*)/i) {
 			$pa_config->{'ha_file'} = clean_blank($1);
 		}
+		elsif ($parametro =~ m/^ha_hosts_file\s(.*)/i) {
+			$pa_config->{'ha_hosts_file'} = clean_blank($1);
+		}
+		elsif ($parametro =~ m/^ha_dbuser\s(.*)/i) {
+			$pa_config->{'ha_dbuser'} = clean_blank($1);
+		}
+		elsif ($parametro =~ m/^ha_dbpass\s(.*)/i) {
+			$pa_config->{'ha_dbpass'} = clean_blank($1);
+		}
+		elsif ($parametro =~ m/^ha_sshuser\s(.*)/i) {
+			$pa_config->{'ha_sshuser'} = clean_blank($1);
+		}
+		elsif ($parametro =~ m/^ha_sshport\s(.*)/i) {
+			$pa_config->{'ha_sshport'} = clean_blank($1);
+		}
+		elsif ($parametro =~ m/^ha_hosts\s(.*)/i) {
+			$pa_config->{'ha_hosts'} = clean_blank($1);
+		}
+		elsif ($parametro =~ m/^ha_resync\s(.*)/i) {
+			$pa_config->{'ha_resync'} = clean_blank($1);
+		}
+		elsif ($parametro =~ m/^ha_resync_log\s(.*)/i) {
+			$pa_config->{'ha_resync_log'} = clean_blank($1);
+		}
 		elsif ($parametro =~ m/^ha_pid_file\s(.*)/i) {
 			$pa_config->{'ha_pid_file'} = clean_blank($1);
 		}
@@ -1313,9 +1359,42 @@ sub pandora_load_config {
 		elsif ($parametro =~ m/^dataserver_smart_queue\s([0-1])/i) {
 			$pa_config->{'dataserver_smart_queue'} = clean_blank($1);
 		}
-		
+		elsif ($parametro =~ m/^ha_connect_retries\s+([0-9]*)/i) {
+			$pa_config->{'ha_connect_retries'} = clean_blank($1);
+		}
+		elsif ($parametro =~ m/^ha_connect_delay\s+([0-9]*)/i) {
+			$pa_config->{'ha_connect_delay'} = clean_blank($1);
+		}
+		elsif ($parametro =~ m/^repl_dbuser\s(.*)/i) {
+			$pa_config->{'repl_dbuser'} = clean_blank($1);
+		}
+		elsif ($parametro =~ m/^repl_dbpass\s(.*)/i) {
+			$pa_config->{'repl_dbpass'} = clean_blank($1);
+		}
 	} # end of loop for parameter #
 
+	# The DB host was overridden by pandora_ha.
+	if (-f $pa_config->{'ha_hosts_file'}) {
+		eval {
+			open(my $fh, '<', $pa_config->{'ha_hosts_file'}) or return;
+			my $dbhost = <$fh>;
+			chomp($dbhost);
+			if (defined($dbhost) && $dbhost ne '') {
+				$pa_config->{'dbhost'} = $dbhost;
+			}
+			close($fh);
+		};
+	}
+	print " [*] DB Host is " . $pa_config->{'dbhost'} . "\n";
+
+	# ha_dbuser and ha_dbpass default to dbuser and dbpass respectively.
+	$pa_config->{'ha_dbuser'} = $pa_config->{'dbuser'} unless defined($pa_config->{'ha_dbuser'});
+	$pa_config->{'ha_dbpass'} = $pa_config->{'dbpass'} unless defined($pa_config->{'ha_dbpass'});
+
+	# repl_dbuser and repl_dbpass default to dbuser and dbpass respectively.
+	$pa_config->{'repl_dbuser'} = $pa_config->{'dbuser'} unless defined($pa_config->{'repl_dbuser'});
+	$pa_config->{'repl_dbpass'} = $pa_config->{'dbpass'} unless defined($pa_config->{'repl_dbpass'});
+
 	# Generate the encryption key after reading the passphrase.
 	$pa_config->{"encryption_key"} = enterprise_hook('pandora_get_encryption_key', [$pa_config, $pa_config->{"encryption_passphrase"}]);
 
diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index b911f05b50..4726df4710 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -54,6 +54,8 @@ Exported Functions:
 
 =item * C<pandora_event>
 
+=item * C<pandora_timed_event>
+
 =item * C<pandora_execute_alert>
 
 =item * C<pandora_execute_action>
@@ -194,6 +196,7 @@ our @EXPORT = qw(
 	pandora_evaluate_alert
 	pandora_evaluate_snmp_alerts
 	pandora_event
+	pandora_timed_event
 	pandora_extended_event
 	pandora_execute_alert
 	pandora_execute_action
@@ -3996,7 +3999,8 @@ Generate an event.
 
 =cut
 ##########################################################################
-sub pandora_event ($$$$$$$$$$;$$$$$$$$$$$$) {
+#sub pandora_event ($$$$$$$$$$;$$$$$$$$$$$$) {
+sub pandora_event {
 	my ($pa_config, $evento, $id_grupo, $id_agente, $severity,
 		$id_alert_am, $id_agentmodule, $event_type, $event_status, $dbh,
 		$source, $user_name, $comment, $id_extra, $tags,
@@ -4113,6 +4117,28 @@ sub pandora_event ($$$$$$$$$$;$$$$$$$$$$$$) {
 	return $event_id;
 }
 
+##########################################################################
+=head2 C<< pandora_timed_event (I<$time_limit>, I<@event>) >> 
+
+Generate an event, but no more than one every $time_limit seconds.
+
+=cut
+##########################################################################
+my %TIMED_EVENTS :shared;
+sub pandora_timed_event ($@) {
+	my ($time_limit, @event) = @_;
+
+	# Match events by message.
+	my $event_msg = $event[1];
+
+	# Do not generate more than one event every $time_limit seconds.
+	my $now = time();
+	if (!defined($TIMED_EVENTS{$event_msg}) || $TIMED_EVENTS{$event_msg} + $time_limit < $now) {
+		$TIMED_EVENTS{$event_msg} = $now;
+		pandora_event(@event);
+	}
+}
+
 ##########################################################################
 =head2 C<< pandora_extended_event (I<$pa_config>, I<$dbh>, I<$event_id>, I<$description>) >> 
 
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index cd0cb9fc64..4c5b37ebb8 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.769";
-my $pandora_build = "230313";
+my $pandora_build = "230323";
 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 f12dce0155..05e0de628b 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_server
 %define version     7.0NG.769
-%define release     230313
+%define release     230323
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 6b03f847d1..0303266d05 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_server
 %define version     7.0NG.769
-%define release     230313
+%define release     230323
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index b14901c613..8800e2e408 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.769"
-PI_BUILD="230313"
+PI_BUILD="230323"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 1d7dd60493..410f87c997 100755
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -35,7 +35,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.769 Build 230313";
+my $version = "7.0NG.769 Build 230323";
 
 # Pandora server configuration
 my %conf;
@@ -629,6 +629,21 @@ sub pandora_load_config_pdb ($) {
 	$conf->{'errorlogfile'} = $conf->{'errorlog_file'};
 	$conf->{'errorlogfile'} = "/var/log/pandora_server.error" unless defined ($conf->{'errorlogfile'});
 
+	# The DB host was overridden by pandora_ha.
+	$conf->{'ha_hosts_file'} = '/var/spool/pandora/data_in/conf/pandora_ha_hosts.conf' unless defined($conf->{'ha_hosts_file'});
+	if (-f $conf->{'ha_hosts_file'}) {
+		eval {
+			open(my $fh, '<', $conf->{'ha_hosts_file'}) or return;
+			my $dbhost = <$fh>;
+			chomp($dbhost);
+			if (defined($dbhost) && $dbhost ne '') {
+				$conf->{'dbhost'} = $dbhost;
+			}
+			close($fh);
+		};
+	}
+	print " [*] DB Host is " . $conf->{'dbhost'} . "\n";
+
 	# Read additional tokens from the DB
 	my $dbh = db_connect ($conf->{'dbengine'}, $conf->{'dbname'}, $conf->{'dbhost'}, $conf->{'dbport'}, $conf->{'dbuser'}, $conf->{'dbpass'});
 
diff --git a/pandora_server/util/pandora_ha.pl b/pandora_server/util/pandora_ha.pl
index 9e44812908..cac883da54 100755
--- a/pandora_server/util/pandora_ha.pl
+++ b/pandora_server/util/pandora_ha.pl
@@ -34,15 +34,27 @@ my %Opts;
 # Run as a daemon.
 my $DAEMON = 0;
 
+# Timeout for the HA DB lock.
+my $LOCK_TIMEOUT = 300;
+
 # Avoid retry old processing orders.
 my $First_Cleanup = 1;
 
+# List of known HA DB hosts.
+my @HA_DB_Hosts;
+
+# Current master node.
+my $DB_Host = '';
+
 # PID file.
 my $PID_FILE = '/var/run/pandora_ha.pid';
 
 # Server service handler.
 my $Pandora_Service;
 
+# Restart the Pandora FMS Server.
+my $Restart = 0;
+
 # Controlled exit
 my $Running = 0;
 
@@ -55,6 +67,10 @@ sub log_message($$$;$) {
   my $level = $verbosity_level;
   $level = 5 unless defined($level);
 
+  if ($source eq 'DEBUG' && !defined($ENV{'PANDORA_DEBUG'})) {
+  	return;
+  }
+
   if (ref($conf) eq "HASH") {
     logger($conf, 'HA (' . $source . ') ' . "$message", $level);
   }
@@ -169,6 +185,17 @@ sub ha_keep_pandora_running($$) {
   my ($conf, $dbh) = @_;
   my $OSNAME = $^O;
   my $control_command;
+  $Pandora_Service = $conf->{'pandora_service_cmd'};
+
+  # A restart was requested.
+  if ($Restart == 1) {
+    $Restart = 0;
+    
+    log_message($conf, 'LOG', 'Restarting Pandora service');
+    $control_command = $^O eq "freebsd" ? "restart_server" : 'restart-server';
+    `$Pandora_Service $control_command $ENV{'PANDORA_DBHOST'} 2>/dev/null`;
+    return;
+  }
 
   # Check if all servers are running
   # Restart if crashed or keep interval is over.
@@ -185,8 +212,6 @@ sub ha_keep_pandora_running($$) {
 
   my $nservers = get_db_value ($dbh, 'SELECT count(*) FROM tserver where name = ?', $conf->{'servername'});
 
-  $Pandora_Service = $conf->{'pandora_service_cmd'};
-
   # Check if service is running
   $control_command = "status-server";
   if ($OSNAME eq "freebsd") {
@@ -308,6 +333,37 @@ sub ha_update_server($$) {
 
 }
 
+################################################################################
+# Dump the list of known databases to disk.
+################################################################################
+sub ha_dump_databases($) {
+    my ($conf) = @_;
+
+	# HA is not configured.
+    return unless defined($conf->{'ha_hosts'});
+
+    eval {
+        open(my $fh, '>', $conf->{'ha_hosts_file'});
+        print $fh $DB_Host; # The console only needs the master DB.
+        close($fh);
+        log_message($conf, 'DEBUG', "Dumped master database $DB_Host to disk");
+    };
+    log_message($conf, 'WARNING', $@) if ($@);
+}
+
+################################################################################
+# Read the list of known databases from disk.
+################################################################################
+sub ha_load_databases($) {
+    my ($conf) = @_;
+
+	# HA is not configured.
+    return unless defined($conf->{'ha_hosts'});
+
+    @HA_DB_Hosts = grep { !/^#/ } map { s/^\s+|\s+$//g; $_; } split(/,/, $conf->{'ha_hosts'});
+    log_message($conf, 'DEBUG', "Loaded databases from disk (@HA_DB_Hosts)");
+}
+
 ###############################################################################
 # Connect to ha database, falling back to direct connection to db.
 ###############################################################################
@@ -324,9 +380,111 @@ sub ha_database_connect($) {
 }
 
 ###############################################################################
-# Main
+# Connect to ha database, falling back to direct connection to db.
 ###############################################################################
-sub ha_main($) {
+sub ha_database_connect_pandora($) {
+	my $conf = shift;
+	my $dbhost = $conf->{'dbhost'};
+
+	# Load the list of HA databases.
+	ha_load_databases($conf);
+
+	# Select a new master database.
+	my ($dbh, $utimestamp, $max_utimestamp) = (undef, undef, -1);
+	foreach my $ha_dbhost (@HA_DB_Hosts) {
+
+		# Retry each database ha_connect_retries times.
+		for (my $i = 0; $i < $conf->{'ha_connect_retries'}; $i++) {
+			eval {
+				log_message($conf, 'DEBUG', "Trying database $ha_dbhost...");
+				$dbh= db_connect('mysql',
+								 $conf->{'dbname'},
+								 $ha_dbhost,
+								 $conf->{'dbport'},
+								 $conf->{'ha_dbuser'},
+								 $conf->{'ha_dbpass'});
+				log_message($conf, 'DEBUG', "Connected to database $ha_dbhost");
+			};
+			log_message($conf, 'WARNING', $@) if ($@);
+
+			# Connection successful.
+			last if defined($dbh);
+
+			# Wait for the next retry.
+			sleep($conf->{'ha_connect_delay'});
+		}
+
+		# No luck. Try the next database.
+		next unless defined($dbh);
+
+		eval {
+		   # Get the most recent utimestamp from the database.
+		   $utimestamp = get_db_value($dbh, 'SELECT UNIX_TIMESTAMP(MAX(keepalive)) FROM tserver');
+		   db_disconnect($dbh);
+
+		   # Did we find a more recent database?
+		   $utimestamp = 0 unless defined($utimestamp);
+		   if ($utimestamp > $max_utimestamp) {
+			   $dbhost = $ha_dbhost;
+			   $max_utimestamp = $utimestamp;
+		   }
+		};
+		log_message($conf, 'WARNING', $@) if ($@);
+	}
+
+	# Return a connection to the selected master.
+	eval {
+		log_message($conf, 'DEBUG', "Connecting to selected master $dbhost...");
+		$dbh = db_connect('mysql',
+						  $conf->{'dbname'},
+						  $dbhost,
+						  $conf->{'dbport'},
+						  $conf->{'ha_dbuser'},
+						  $conf->{'ha_dbpass'});
+
+		# Restart if a new master was selected.
+		if ($dbhost ne $DB_Host) {
+			log_message($conf, 'DEBUG', "Setting master database to $dbhost");
+			$DB_Host = $dbhost;
+			$Restart = 1;
+		}
+	};
+	log_message($conf, 'WARNING', $@) if ($@);
+
+	# Save the list of HA databases.
+	ha_dump_databases($conf);
+
+	return $dbh;
+}
+
+###############################################################################
+# Return 1 if the given DB is read-only, 0 otherwise.
+###############################################################################
+sub ha_read_only($$) {
+    my ($conf, $dbh) = @_;
+
+    my $read_only = get_db_value($dbh, 'SELECT @@global.read_only');
+    return 1 if (defined($read_only) && $read_only == 1);
+
+    return 0;
+}
+
+###############################################################################
+# Restart the Pandora FMS Server.
+###############################################################################
+sub ha_restart_pandora($) {
+    my ($config) = @_;
+
+    my $control_command = $^O eq 'freebsd' ?
+                          'restart_server' :
+                          'restart-server';
+    `$config->{'pandora_service_cmd'} $control_command 2>/dev/null`;
+}
+
+###############################################################################
+# Main (Pacemaker)
+###############################################################################
+sub ha_main_pacemaker($) {
   my ($conf) = @_;
 
   # Set the PID file.
@@ -404,6 +562,100 @@ sub ha_main($) {
   }
 }
 
+###############################################################################
+# Main (Pandora)
+###############################################################################
+sub ha_main_pandora($) {
+  my ($conf) = @_;
+
+  # Set the PID file.
+  $conf->{'PID'} = $PID_FILE;
+
+  # Log to a separate file if needed.
+  $conf->{'log_file'} = $conf->{'ha_log_file'} if defined ($conf->{'ha_log_file'});
+
+  # Run in the background.
+  ha_daemonize($conf) if ($DAEMON == 1);
+
+  # Main loop.
+  $Running = 1;
+  while ($Running) {
+    my $dbh = undef;
+    eval {
+
+      # Connect to a DB.
+      log_message($conf, 'LOG', "Looking for databases");
+      $dbh = ha_database_connect_pandora($conf);
+      if (!defined($dbh)) {
+        log_message($conf, 'LOG', 'No databases available');
+        return;
+      }
+
+      # Make the DB host available to the Pandora FMS Server.
+      $ENV{'PANDORA_DBHOST'} = $DB_Host;
+
+      # Needed for the Enterprise module.
+      $conf->{'dbhost'} = $DB_Host;
+
+      # Enterprise capabilities need access to the DB.
+      eval { 
+        local $SIG{__DIE__};
+        # Load enterprise components.
+        enterprise_load($conf, 1);
+
+        # Register Enterprise logger
+        enterprise_hook('pandoraha_logger', [\&log_message]);
+        log_message($conf, 'LOG', 'Enterprise capabilities loaded');
+
+      };
+      log_message($conf, 'LOG', "No enterprise capabilities: $@") if ($@);
+
+      log_message($conf, 'LOG', "Connected to database $DB_Host");
+      enterprise_hook('pandoraha_stop_slave', [$conf, $dbh]);
+
+      if (ha_read_only($conf, $dbh) == 1) {
+        log_message($conf, 'LOG', "The database is read-only.");
+        return;
+      }
+
+      # Check if there are updates pending.
+      ha_update_server($conf, $dbh);
+
+      # Keep pandora running
+      ha_keep_pandora_running($conf, $dbh);
+
+      # Keep Tentacle running
+      ha_keep_tentacle_running($conf, $dbh);
+    
+      # Are we the master?
+      pandora_set_master($conf, $dbh);
+      if (!pandora_is_master($conf)) {
+        log_message($conf, 'LOG', $conf->{'servername'} . ' is not the current master. Skipping DB-HA actions and monitoring.');
+        return;
+      }
+
+      # Check the status of slave databases.
+      enterprise_hook('pandoraha_check_slaves', [$conf, $dbh, $DB_Host, \@HA_DB_Hosts]);
+
+      # Update the status of HA databases.
+      enterprise_hook('pandoraha_update_dbs', [$conf, $dbh, $DB_Host, \@HA_DB_Hosts]);
+
+      # Execute resync actions.
+      enterprise_hook('pandoraha_resync_dbs', [$conf, $dbh, $DB_Host, \@HA_DB_Hosts]);
+    };
+    log_message($conf, 'WARNING', $@) if ($@);
+
+    # Cleanup.
+    eval {
+      db_disconnect($dbh) if defined($dbh);
+    };
+
+    # Go to sleep.
+    log_message($conf, 'LOG', "Sleep.");
+    sleep($conf->{'ha_interval'});
+  }
+}
+
 ################################################################################
 # Stop pandora server
 ################################################################################
@@ -429,7 +681,6 @@ END {
   stop();
 }
 
-
 $SIG{INT} = \&stop;
 $SIG{TERM} = \&stop;
 
@@ -440,6 +691,10 @@ ha_init_pandora(\%Conf);
 ha_load_pandora_conf (\%Conf);
 
 # Main
-ha_main(\%Conf);
+if (defined($Conf{'ha_mode'}) && lc($Conf{'ha_mode'}) eq 'pandora') {
+	ha_main_pandora(\%Conf);
+} else {
+	ha_main_pacemaker(\%Conf);
+}
 
 exit 0;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 37c365cfcd..da84e3f0d8 100755
--- 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.769 Build 230313";
+my $version = "7.0NG.769 Build 230323";
 
 # save program name for logging
 my $progname = basename($0);