diff --git a/pandora_console/include/api.php b/pandora_console/include/api.php
index 20028d4b61..0e6083d3e2 100644
--- a/pandora_console/include/api.php
+++ b/pandora_console/include/api.php
@@ -118,7 +118,7 @@ if ($info === 'version') {
 if (empty($apiPassword) === true
     || (empty($apiPassword) === false && $api_password === $apiPassword)
     || $apiTokenValid === true
-) {  
+) {
     if (enterprise_hook('metaconsole_validate_origin', [get_parameter('server_auth')]) === true
         || enterprise_hook('console_validate_origin', [get_parameter('server_auth')])  === true
     ) {
@@ -129,16 +129,15 @@ if (empty($apiPassword) === true
         // Compat.
         $config['id_user'] = 'admin';
         $correctLogin = true;
-    // Bypass credentials if server-auth and api-pass are correct. 
+        // Bypass credentials if server-auth and api-pass are correct.
     } else if (($config['server_unique_identifier'] === get_parameter('server_auth'))
-        && ($api_password === $apiPassword)  
-        && ((bool) isInACL($ipOrigin) === true)) {
-
+        && ($api_password === $apiPassword)
+        && ((bool) isInACL($ipOrigin) === true)
+    ) {
         $config['id_usuario'] = 'admin';
         $config['id_user'] = 'admin';
         $correctLogin = true;
-
-    } else if ((bool) isInACL($ipOrigin) === true) {   
+    } else if ((bool) isInACL($ipOrigin) === true) {
         // External access.
         // Token is valid. Bypass the credentials.
         if ($apiTokenValid === true) {
diff --git a/pandora_console/include/lib/Dashboard/Widgets/module_icon.php b/pandora_console/include/lib/Dashboard/Widgets/module_icon.php
index 24d1c7e207..e5c68eab11 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/module_icon.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/module_icon.php
@@ -540,12 +540,6 @@ class ModuleIconWidget extends Widget
 
         $output = '';
 
-        $id_group = \agents_get_agent_group($this->values['agentId']);
-
-        $modulesAgent = \modules_get_agentmodule_agent(
-            $this->values['moduleId']
-        );
-
         $data_module = \modules_get_last_value(
             $this->values['moduleId']
         );
@@ -574,33 +568,37 @@ class ModuleIconWidget extends Widget
         // General div.
         $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);
+        $status = \modules_get_agentmodule_status($this->values['moduleId']);
 
-        $last = modules_get_last_value($this->values['moduleId']);
+        switch ($status) {
+            case 1:
+            case 4:
+                // Critical or critical alert (BAD).
+                $color_icon .= '_bad.png';
+            break;
 
-        $color_icon = '_ok';
-        if (($last >= $sql_data['min_warning']) && ($last < $sql_data['max_warning'])) {
-            $color_icon = '_warning';
+            case 0:
+                // Normal (OK).
+                $color_icon .= '_ok.png';
+            break;
+
+            case 2:
+            case 10:
+                // Warning or warning alert.
+                $color_icon .= '_warning.png';
+            break;
+
+            case 3:
+                // Unknown.
+            default:
+                $color_icon .= '.png';
+                // Default is Grey (Other).
+            break;
         }
 
-        if ($last >= $sql_data['max_warning']) {
-            $color_icon = '_bad';
-        }
-
-        // Div image.
-        $style_icon = 'flex: 0 1 '.$sizeIcon.'px;';
-
-        $output .= '<div class="pdd_l_15px pdd_r_15px '.$margin_bottom.'" style="flex: 0 1 '.$sizeIcon.'px; height: '.$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.$color_icon.'.png',
+            'images/console/icons/'.$icon.$color_icon,
             true,
             ['width' => $sizeIcon]
         );