diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 1a7012c1e2..36303e11f9 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,4 +1,23 @@
-2009-04-017  Jorge Gonzalez  <jorgegonz@artica.es>
+2009-04-18  Sancho Lerena <slerena@artica.es>
+
+	* include/functions_reporting.php: Altered order of agent icon
+	status (unknown shown after waerning and critical, not before)
+
+	* operation/agentes/estado_generalagente.php: Agent group is
+	not shown twice.
+
+	* operation/agentes/estado_agente.php: module status count shown
+	only when > 0.
+
+	* operation/agentes/estado_monitores.php: Dont show module type.
+
+	* godmode/agentes/module_manager.php: Show icon of non-init module
+	in godmode view, to easily identify non-init modules.
+
+	* godmode/servers/manage_recontask_form.php: Fixed server assigment
+	on recon task.
+
+2009-04-17  Jorge Gonzalez  <jorgegonz@artica.es>
 
 	* include/languages/es.po, include/languages/es.mo: Updated Spanish
 	  translation.
diff --git a/pandora_console/godmode/agentes/module_manager.php b/pandora_console/godmode/agentes/module_manager.php
index e931033f15..fceb00a2d2 100644
--- a/pandora_console/godmode/agentes/module_manager.php
+++ b/pandora_console/godmode/agentes/module_manager.php
@@ -127,7 +127,7 @@ foreach ($modules as $module) {
 		
 		$data = array ();
 	}
-	
+
 	$data[0] = '<a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente='.$id_agente.'&tab=module&edit_module=1&id_agent_module='.$module['id_agente_modulo'].'">';
 	if ($module["disabled"])
 		$data[0] .= '<em>'.$module['nombre'].'</em>';
@@ -140,6 +140,11 @@ foreach ($modules as $module) {
 	if ($module['id_modulo'] > 0) {
 		$data[1] = show_server_type ($module['id_modulo']);
 	}
+
+	// This module is initialized ? (has real data)
+        $module_init = get_db_value ('utimestamp', 'tagente_estado', 'id_agente_modulo', $module['id_agente_modulo']);
+        if ($module_init == 0)
+                $data[1] .= print_image ('images/error.png', true, array ('title' => __('Non initialized module')));
 	
 	// Module type (by data type)
 	$data[2] = '';
@@ -175,7 +180,7 @@ foreach ($modules as $module) {
 			array ('title' => __('Normalize')));
 		$data[6] .= '</a>';
 	}
-	
+
 	array_push ($table->data, $data);
 }
 
diff --git a/pandora_console/godmode/servers/manage_recontask_form.php b/pandora_console/godmode/servers/manage_recontask_form.php
index 78a46c9e4e..65973cddc1 100644
--- a/pandora_console/godmode/servers/manage_recontask_form.php
+++ b/pandora_console/godmode/servers/manage_recontask_form.php
@@ -69,7 +69,7 @@ echo '<form name="modulo" method="POST" action="index.php?sec=gservers&sec2=godm
 $table->data[] = array (__('Task name'),print_input_text ('name',$name,'',25,0,true));
 
 // Recon server
-$sql = "SELECT id_server, name FROM tserver WHERE recon_server = 1 ORDER BY name";
+$sql = "SELECT id_server, name FROM tserver WHERE server_type = 3 ORDER BY name";
 $result = get_db_all_rows_sql ($sql);
 foreach ($result as $row) {
 	$selectbox[$row["id_server"]] = $row["name"];
diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index de867920be..00899ac717 100644
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -810,12 +810,12 @@ function get_agent_module_info ($id_agent) {
 	
 	//No modules is by default
 	if ($return["modules"] > 0) {
-		if ($return["monitor_down"] > 0) {
-			$return["status_img"] = print_status_image (STATUS_AGENT_DOWN, __('At least one module DOWN'), true);
-		} elseif ($return["monitor_critical"] > 0) {
+		if ($return["monitor_critical"] > 0) {
 			$return["status_img"] = print_status_image (STATUS_AGENT_CRITICAL, __('At least one module in CRITICAL status'), true);
 		} elseif ($return["monitor_warning"] > 0) {
 			$return["status_img"] = print_status_image (STATUS_AGENT_WARNING, __('At least one module in WARNING status'), true);
+		} elseif ($return["monitor_down"] > 0) {
+                        $return["status_img"] = print_status_image (STATUS_AGENT_DOWN, __('At least one module is UKNOWN'), true);
 		} else {
 			$return["status_img"] = print_status_image (STATUS_AGENT_OK, __('All Monitors OK'), true);
 		} 
diff --git a/pandora_console/operation/agentes/estado_agente.php b/pandora_console/operation/agentes/estado_agente.php
index 60c29699dc..07957a40fe 100644
--- a/pandora_console/operation/agentes/estado_agente.php
+++ b/pandora_console/operation/agentes/estado_agente.php
@@ -160,10 +160,14 @@ foreach ($agents as $agent) {
 	
 	$data[4] = '<b>';
 	$data[4] .= $agent_info["modules"];
-	$data[4] .= '</b> : <span class="green">'.$agent_info["monitor_normal"].'</span>';
-	$data[4] .= ' : <span class="yellow">'.$agent_info["monitor_warning"].'</span>';
-	$data[4] .= ' : <span class="red">'.$agent_info["monitor_critical"].'</span>';
-	$data[4] .= ' : <span class="grey">'.$agent_info["monitor_down"].'</span>';
+	if ($agent_info["monitor_normal"] > 0)
+		$data[4] .= '</b> : <span class="green">'.$agent_info["monitor_normal"].'</span>';
+	if ($agent_info["monitor_warning"] > 0)
+		$data[4] .= ' : <span class="yellow">'.$agent_info["monitor_warning"].'</span>';
+	if ($agent_info["monitor_critical"] > 0)
+		$data[4] .= ' : <span class="red">'.$agent_info["monitor_critical"].'</span>';
+	if ($agent_info["monitor_down"] > 0)
+		$data[4] .= ' : <span class="grey">'.$agent_info["monitor_down"].'</span>';
 	
 	$data[5] = $agent_info["status_img"];
 	
diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php
index 090e1d77ec..58f6d0db97 100644
--- a/pandora_console/operation/agentes/estado_generalagente.php
+++ b/pandora_console/operation/agentes/estado_generalagente.php
@@ -83,7 +83,7 @@ echo '<td class="datos2" colspan="2">'.$agent["comentarios"].'</td></tr>';
 // Group
 echo '<tr><td class="datos"><b>'.__('Group').'</b></td>';
 echo '<td class="datos" colspan="2">';
-echo print_group_icon ($agent["id_grupo"]);
+echo print_group_icon ($agent["id_grupo"], true);
 echo '&nbsp;(<b>';
 echo get_group_name ($agent["id_grupo"]);
 echo '</b>)</td></tr>';
diff --git a/pandora_console/operation/agentes/estado_monitores.php b/pandora_console/operation/agentes/estado_monitores.php
index e5c8f328be..ae618e47a3 100644
--- a/pandora_console/operation/agentes/estado_monitores.php
+++ b/pandora_console/operation/agentes/estado_monitores.php
@@ -68,9 +68,9 @@ foreach ($modules as $module) {
 		$data[0] = '';
 	}
 	$data[1] = show_server_type ($module['id_modulo']);
-	$data[1] .= ' <img src="images/'.show_icon_type ($module["id_tipo_modulo"]).'" border="0">';
+	//$data[1] .= ' <img src="images/'.show_icon_type ($module["id_tipo_modulo"]).'" border="0">';
 	if (give_acl ($config['id_user'], $id_grupo, "AW")) 
-	  $data[1] .= '<a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente='.$id_agente.'&tab=module&id_agent_module='.$module["id_agente_modulo"].'&edit_module='.$module["id_modulo"].'"><img src="images/config.png"></a>';
+	  $data[1] .= ' <a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente='.$id_agente.'&tab=module&id_agent_module='.$module["id_agente_modulo"].'&edit_module='.$module["id_modulo"].'"><img src="images/config.png"></a>';
 	  
 	$data[2] = substr ($module["nombre"], 0, 25);
 	$data[3] = substr ($module["descripcion"], 0, 35);