diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 0b3a98bd05..8a5fc3539e 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,20 @@
+2007-05-28  Raul Mateos  <raulofpandora@gmail.com>
+
+	* include/styles/pandora.css, pandora_red.css: New style with icon
+	for search.
+	
+	* include/languages/*.php: New string for alert updating.
+	
+	* godmode/agentes/*.php: Updated h2 headers.
+	
+	* operation/agentes/estado_alertas.php, estado_monitores.php,
+	estado_ultimopaquete.php: Updated h2 headers. Added code for not showing
+	table headers if no alert defined. Add some icon to input buttons.
+	
+	* operation/incidents/incident_detail.php, incident_search.php,
+	operation/messages/message.php, operation/snmpconsole/snmp_alert.php:
+	Add some icon to input buttons.
+
 2007-05-27  Raul Mateos  <raulofpandora@gmail.com>
 
 	* include/styles/help.css: New file only used in help pages.
diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php
index b65358c098..77afa76d8f 100644
--- a/pandora_console/godmode/agentes/agent_manager.php
+++ b/pandora_console/godmode/agentes/agent_manager.php
@@ -93,14 +93,14 @@ echo '<tr><td class="datos"><b>'.$lang_label["group"].'</b>';
 echo '<td class="datos"><select name="grupo" class="w130">';
 
 if (isset($grupo)){
-echo "<option value='".$grupo."'>".dame_grupo($grupo);
+echo "<option value='".$grupo."'>".dame_grupo($grupo)."</option>";
 }
 $sql1='SELECT id_grupo, nombre FROM tgrupo ORDER BY nombre';
 $result=mysql_query($sql1);
 while ($row=mysql_fetch_array($result)){
 	// Group ALL cannot be selected
 	if ($row["id_grupo"] != 1){
-		echo "<option value='".$row["id_grupo"]."'>".$row["nombre"];
+		echo "<option value='".$row["id_grupo"]."'>".$row["nombre"]."</option>";
 	}
 }
 ?>
@@ -114,12 +114,12 @@ while ($row=mysql_fetch_array($result)){
 <select name="id_os" class="w130">
 <?php
 if (isset($id_os)){
-	echo "<option value='".$id_os."'>".dame_so_name($id_os);
+	echo "<option value='".$id_os."'>".dame_so_name($id_os)."</option>";
 }
 $sql1='SELECT id_os, name FROM tconfig_os ORDER BY name';
 $result=mysql_query($sql1);
 while ($row=mysql_fetch_array($result)){
-	echo "<option value='".$row["id_os"]."'>".$row["name"];
+	echo "<option value='".$row["id_os"]."'>".$row["name"]."</option>";
 }
 ?>
 </select>
@@ -129,10 +129,11 @@ while ($row=mysql_fetch_array($result)){
 <select name="id_server" class="w130">
 <?php
 echo "<option value='".$id_server."'>".give_server_name($id_server);
-$sql1='SELECT id_server, name FROM tserver where network_server = 1 ORDER BY name';
+$sql1='SELECT id_server, name FROM tserver where network_server = 1 
+ORDER BY name';
 $result=mysql_query($sql1);
 while ($row=mysql_fetch_array($result)){
-	echo "<option value='".$row["id_server"]."'>".$row["name"];
+	echo "<option value='".$row["id_server"]."'>".$row["name"]."</option>";
 }
 
 ?>
diff --git a/pandora_console/godmode/agentes/alert_manager.php b/pandora_console/godmode/agentes/alert_manager.php
index c361800f02..f25c78e261 100644
--- a/pandora_console/godmode/agentes/alert_manager.php
+++ b/pandora_console/godmode/agentes/alert_manager.php
@@ -27,6 +27,8 @@
 // VIEW ALERTS
 // ====================================================================================
 
+echo "<h2>".$lang_label["agent_conf"]." &gt; ".$lang_label["alerts"]."</h2>";
+
 $sql1='SELECT * FROM tagente_modulo WHERE id_agente = "'.$id_agente.'"';
 $result=mysql_query($sql1);
 	if ($row=mysql_num_rows($result)){
diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index da100b8e04..84c1a37106 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -139,7 +139,7 @@ echo "<div id='menu_tab'>
 <li class='nomn'>";
 
 echo "<li class='nomn'>";
-echo "<a href='index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=$id_agente'><img src='images/zoom.png' width='16' class='top' border=0>&nbsp; View</A>";
+echo "<a href='index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=$id_agente'><img src='images/zoom.png' width='16' class='top' border=0>&nbsp; View</a>";
 echo "</li>";
 
 echo "<li class='nomn'>";
diff --git a/pandora_console/godmode/agentes/module_manager.php b/pandora_console/godmode/agentes/module_manager.php
index 03c355fa37..780385831b 100644
--- a/pandora_console/godmode/agentes/module_manager.php
+++ b/pandora_console/godmode/agentes/module_manager.php
@@ -162,14 +162,14 @@ if (give_acl($id_user, 0, "AW")!=1) {
 // MODULE VISUALIZATION TABLE
 // ==========================
 
+echo "<h2>".$lang_label["agent_conf"]." &gt; ".$lang_label["modules"]."</h2>"; 
 $sql1='SELECT * FROM tagente_modulo WHERE id_agente = "'.$id_agente.'"
 ORDER BY id_module_group, nombre ';
 $result=mysql_query($sql1);
-echo "<h2>".$lang_label["agent_conf"]." &gt; ".$lang_label["assigned_modules"]."
+echo "<h3>".$lang_label["assigned_modules"]."
 	<a href='help/".$help_code."/chap3.php#321' target='_help' class='help'>
 	<span>".$lang_label["help"]."</span></a>";
-	echo "&nbsp;&nbsp;<a class='info' href='#module_assignment'> <span>".$lang_label["module_asociation_form"]."</span><img src='images/wand.png'></a>";
-	echo "</h2>";
+	echo "&nbsp;&nbsp;<a class='info' href='#module_assignment'> <span>".$lang_label["module_asociation_form"]."</span><img src='images/wand.png'></a></h3>";
 if ($row=mysql_num_rows($result)){
 	echo '<table width="750" cellpadding="4" cellspacing="4" class="databox">';
 	echo '<tr>';
@@ -246,8 +246,8 @@ if ($row=mysql_num_rows($result)){
 // ==========================
 
 echo "<a name='module_assignment'></a>";
-echo "<h2>".$lang_label["agent_conf"]." &gt; ".$lang_label["module_asociation_form"]."<a href='help/".$help_code."/chap3.php#321' target='_help' class='help'>
-&nbsp;<span>".$lang_label["help"]."</span></a></h2>";
+echo "<h3>".$lang_label["module_asociation_form"]."<a href='help/".$help_code."/chap3.php#321' target='_help' class='help'>
+&nbsp;<span>".$lang_label["help"]."</span></a></h3>";
 
 if ($update_module == "1")
 	echo '<form name="modulo" method="post" action="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=module&id_agente='.$id_agente.'#module_assignment">';
diff --git a/pandora_console/include/languages/language_ca.php b/pandora_console/include/languages/language_ca.php
index 487e9cb03f..8313955e19 100644
--- a/pandora_console/include/languages/language_ca.php
+++ b/pandora_console/include/languages/language_ca.php
@@ -160,6 +160,7 @@ $lang_label["profile"]="Perfil";
 $lang_label["update_agent"]="Actualitzar agent";
 $lang_label["create_agent"]="Crear agent";
 $lang_label["create_alert"]="Crear alerta";
+$lang_label["update_alert"]="Actualitzar alerta";
 $lang_label["create_user"]="Crear usuari";
 $lang_label["update_user"]="Actualitzar usuari";
 $lang_label["alert_config"]="Configuraci&oacute; d'alerta";
diff --git a/pandora_console/include/languages/language_de.php b/pandora_console/include/languages/language_de.php
index dcec114fba..44a7f619aa 100644
--- a/pandora_console/include/languages/language_de.php
+++ b/pandora_console/include/languages/language_de.php
@@ -175,6 +175,7 @@ $lang_label["profile"]="Profile";
 $lang_label["update_agent"]="Aktualisiere Agenten";
 $lang_label["create_agent"]="Kreiere Agent";
 $lang_label["create_alert"]="Kreiere Alarm";
+$lang_label["update_alert"]="Aktualisiere Alarm";
 $lang_label["create_user"]="F&uuml;ge neuen Nutzer hinzu";
 $lang_label["update_user"]="Aktualisiere Nutzer";
 $lang_label["alert_config"]="Konfiguration eines Alarms";
diff --git a/pandora_console/include/languages/language_en.php b/pandora_console/include/languages/language_en.php
index 9aba6c7939..7cd0635f83 100644
--- a/pandora_console/include/languages/language_en.php
+++ b/pandora_console/include/languages/language_en.php
@@ -178,6 +178,7 @@ $lang_label["profile"]="Profile";
 $lang_label["update_agent"]="Update agent";
 $lang_label["create_agent"]="Create agent";
 $lang_label["create_alert"]="Create alert";
+$lang_label["update_alert"]="Update_alert";
 $lang_label["create_user"]="Create user";
 $lang_label["update_user"]="Update user";
 $lang_label["alert_config"]="Alert configuration";
@@ -758,7 +759,7 @@ $lang_label["custom_graphs"]="Custom graphs";
 $lang_label["custom_reporting"]="Custom reporting";
 $lang_label["alert_text"]="Alert text";
 $lang_label["text"]="Text";
-$lang_label["delete_data_above"]="Delete data above";
+$lang_label["delete_data_above"]="Deleted data above";
 $lang_label["enabled"]="Enabled";
 
 // 3 may 2007
@@ -782,7 +783,7 @@ $lang_label["visual_console"]="Visual console";
 $lang_label["elements"]="Elements";
 $lang_label["minutes"]="minutes";
 
-$lang_label["avg_only"]="Avg.Only";
+$lang_label["avg_only"]="Avg. Only";
 $lang_label["avg_value"]="Avg. Value";
 $lang_label["auto_refresh_time"]="Autorefresh time";
 $lang_label["refresh"]="Refresh";
diff --git a/pandora_console/include/languages/language_es_es.php b/pandora_console/include/languages/language_es_es.php
index 595a0d8695..e08bc52bdb 100644
--- a/pandora_console/include/languages/language_es_es.php
+++ b/pandora_console/include/languages/language_es_es.php
@@ -183,6 +183,7 @@ $lang_label["user_ID"]="ID de usuario";
 $lang_label["profile"]="Perfil";
 $lang_label["update_agent"]="Actualizar agente";
 $lang_label["create_agent"]="Crear agente";
+$lang_label["update_alert"]="Actualizar alerta";
 $lang_label["create_alert"]="Crear alerta";
 $lang_label["create_user"]="Crear usuario";
 $lang_label["update_user"]="Actualizar usuario";
diff --git a/pandora_console/include/languages/language_es_la.php b/pandora_console/include/languages/language_es_la.php
index 4ebfaceea6..917c24979c 100644
--- a/pandora_console/include/languages/language_es_la.php
+++ b/pandora_console/include/languages/language_es_la.php
@@ -181,6 +181,7 @@ $lang_label["profile"]="Perfil";
 $lang_label["update_agent"]="Actualizar agente";
 $lang_label["create_agent"]="Crear agente";
 $lang_label["create_alert"]="Crear alerta";
+$lang_label["update_alert"]="Actualizar alerta";
 $lang_label["create_user"]="Crear usuario";
 $lang_label["update_user"]="Actualizar usuario";
 $lang_label["alert_config"]="Configuraci&oacute;n de alertas";
diff --git a/pandora_console/include/languages/language_fr.php b/pandora_console/include/languages/language_fr.php
index 03f6670768..209b05bf7f 100644
--- a/pandora_console/include/languages/language_fr.php
+++ b/pandora_console/include/languages/language_fr.php
@@ -180,6 +180,7 @@ $lang_label["profile"]="Profil";
 $lang_label["update_agent"]="Actualiser l'agent";
 $lang_label["create_agent"]="Cr&eacute;er un agent";
 $lang_label["create_alert"]="Cr&eacute;er une alerte";
+$lang_label["update_alert"]="Actualiser l'alerte";
 $lang_label["create_user"]="Cr&eacute;er un usager";
 $lang_label["update_user"]="Actualiser l'usager";
 $lang_label["alert_config"]="Configuration des alertes";
diff --git a/pandora_console/include/languages/language_gl.php b/pandora_console/include/languages/language_gl.php
index 4c5f7f0fc3..30a5d9e681 100644
--- a/pandora_console/include/languages/language_gl.php
+++ b/pandora_console/include/languages/language_gl.php
@@ -181,6 +181,7 @@ $lang_label["profile"]="Perfil";
 $lang_label["update_agent"]="Actualizar axente";
 $lang_label["create_agent"]="Crear axente";
 $lang_label["create_alert"]="Crear alerta";
+$lang_label["update_alert"]="Actualizar alerta";
 $lang_label["create_user"]="Crear usuario";
 $lang_label["update_user"]="Actualizar usuario";
 $lang_label["alert_config"]="Configuraci&oacute;n de alertas";
diff --git a/pandora_console/include/languages/language_it.php b/pandora_console/include/languages/language_it.php
index fbb174eb7a..7a0089905b 100644
--- a/pandora_console/include/languages/language_it.php
+++ b/pandora_console/include/languages/language_it.php
@@ -161,6 +161,7 @@ $lang_label["profile"] = "Profilo";
 $lang_label["update_agent"] = "Aggiorna agente";
 $lang_label["create_agent"] = "Crea agente";
 $lang_label["create_alert"] = "Crea allarme";
+$lang_label["update_alert"] = "Aggiorna allarme";
 $lang_label["create_user"] = "Crea utente";
 $lang_label["update_user"] = "Aggiorna utente";
 $lang_label["alert_config"] = "Configura allarme";
diff --git a/pandora_console/include/languages/language_pt_br.php b/pandora_console/include/languages/language_pt_br.php
index 14a7ef6bd5..46169de6e2 100644
--- a/pandora_console/include/languages/language_pt_br.php
+++ b/pandora_console/include/languages/language_pt_br.php
@@ -160,6 +160,7 @@ $lang_label["profile"] = "Perfil";
 $lang_label["update_agent"] = "Atualizar agente";
 $lang_label["create_agent"] = "Criar agente";
 $lang_label["create_alert"] = "Criar alerta";
+$lang_label["update_alert"] = "Atualizar alerta";
 $lang_label["create_user"] = "Criar usu&aacute;rio";
 $lang_label["update_user"] = "Atualizar usu&aacute;rio";
 $lang_label["alert_config"] = "Configura&ccedil;&atilde;o de alertas";
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index adb8d24ca5..470b361f17 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -262,6 +262,10 @@ input.delete {
 	padding-right: 21px;
 	background: #e5e5e5 url(../../images/cross.png) no-repeat right 3px;
 }
+input.search {
+	padding-right: 21px;
+	background: #e5e5e5 url(../../images/zoom.png) no-repeat right 3px;
+}
 table, img {
 	border: 0px;
 }
diff --git a/pandora_console/include/styles/pandora_red.css b/pandora_console/include/styles/pandora_red.css
index 84b30b0444..d4f1d571af 100644
--- a/pandora_console/include/styles/pandora_red.css
+++ b/pandora_console/include/styles/pandora_red.css
@@ -262,6 +262,10 @@ input.delete {
 	padding-right: 21px;
 	background: #e5e5e5 url(../../images/cross.png) no-repeat right 3px;
 }
+input.search {
+	padding-right: 21px;
+	background: #e5e5e5 url(../../images/zoom.png) no-repeat right 3px;
+}
 table, img {
 	border: 0px;
 }
diff --git a/pandora_console/operation/agentes/estado_alertas.php b/pandora_console/operation/agentes/estado_alertas.php
index 50d2ccdb5e..b919629cea 100644
--- a/pandora_console/operation/agentes/estado_alertas.php
+++ b/pandora_console/operation/agentes/estado_alertas.php
@@ -41,10 +41,19 @@ if (comprueba_login() != 0) {
 // Show alerts for specific agent
 // -------------------------------
 if (isset($_GET["id_agente"])){
-	echo "<h3>".$lang_label["alert_listing"]."<a href='help/".$help_code."/chap3.php#3324' target='_help' class='help'><span>".$lang_label["help"]."</span></a></h3>";
+
+	if (isset($_GET["tab"])){
+		echo "<h2>".$lang_label["ag_title"]." &gt; ".$lang_label["alert_listing"]."<a href='help/".$help_code."/chap3.php#3324' target='_help' class='help'><span>".$lang_label["help"]."</span></a></h2>";
+	}
 	$id_agente = $_GET["id_agente"];
 	$query_gen='SELECT talerta_agente_modulo.alert_text, talerta_agente_modulo.id_alerta, talerta_agente_modulo.descripcion, talerta_agente_modulo.last_fired, talerta_agente_modulo.times_fired, tagente_modulo.nombre, talerta_agente_modulo.dis_max, talerta_agente_modulo.dis_min, talerta_agente_modulo.max_alerts, talerta_agente_modulo.time_threshold, talerta_agente_modulo.min_alerts, talerta_agente_modulo.id_agente_modulo, tagente_modulo.id_agente_modulo FROM tagente_modulo, talerta_agente_modulo WHERE tagente_modulo.id_agente = '.$id_agente.' AND tagente_modulo.id_agente_modulo = talerta_agente_modulo.id_agente_modulo ORDER BY tagente_modulo.nombre';
-	if ($result_gen=mysql_query($query_gen)){
+	$result_gen=mysql_query($query_gen);
+	if (mysql_num_rows ($result_gen)) {
+	
+		if (!isset($_GET["tab"])) {
+			echo "<h3>".$lang_label["alert_listing"]."<a href='help/".$help_code."/chap3.php#3324' target='_help' class='help'><span>".$lang_label["help"]."</span></a></h3>";
+		}
+	
 		echo "<table cellpadding='4' cellspacing='4' width=750 border=0 class='databox'>";
 		echo "<tr>
 		<th>".$lang_label["type"]."<th>".$lang_label["name"]."</th>
@@ -65,9 +74,9 @@ if (isset($_GET["id_agente"])){
 				$color = 1;
 			}
 			echo "<tr>";
-			echo "<td class='".$tdcolor."'>".dame_nombre_alerta($data["id_alerta"]);
-			echo "<td class='".$tdcolor."'>".$data["nombre"];
-			echo "<td class='".$tdcolor."'>".$data["descripcion"];
+			echo "<td class='".$tdcolor."'>".dame_nombre_alerta($data["id_alerta"])."</td>";
+			echo "<td class='".$tdcolor."'>".$data["nombre"]."</td>";
+			echo "<td class='".$tdcolor."'>".$data["descripcion"]."</td>";
 
 			$mytempdata = fmod($data["dis_min"], 1);
 			if ($mytempdata == 0)
@@ -84,25 +93,27 @@ if (isset($_GET["id_agente"])){
 			$mymax =  format_for_graph($mymax );
 			// Text alert ?
 			if ($data["alert_text"] != "")
-				echo "<td class='".$tdcolor."'>".$lang_label["text"];
+				echo "<td class='".$tdcolor."'>".$lang_label["text"]."</td>";
 			else 
-				echo "<td class='".$tdcolor."'>".$mymin." / ".$mymax;
+				echo "<td class='".$tdcolor."'>".$mymin." / ".$mymax."</td>";
 			echo "<td class='".$tdcolor."'>".$data["time_threshold"];
 			if ($data["last_fired"] == "0000-00-00 00:00:00") {
-				echo "<td class='".$tdcolor."f9'>".$lang_label["never"];
+				echo "<td class='".$tdcolor."f9'>".$lang_label["never"]."</td>";
 			}
 			else {
-				echo "<td class='".$tdcolor."f9'>".$data["last_fired"];
+				echo "<td class='".$tdcolor."f9'>".$data["last_fired"]."</td>";
 			}
-			echo "<td class='".$tdcolor."'>".$data["times_fired"];
+			echo "<td class='".$tdcolor."'>".$data["times_fired"]."</td>";
 			if ($data["times_fired"] <> 0)
-				echo "<td class='".$tdcolor."' align='center'><img src='images/dot_red.gif'>";
+				echo "<td class='".$tdcolor."' align='center'><img src='images/dot_red.gif'></td>";
 			else
-				echo "<td class='".$tdcolor."' align='center'><img src='images/dot_green.gif'>";
+				echo "<td class='".$tdcolor."' align='center'><img src='images/dot_green.gif'></td>";
 		}
 		echo '</table>';
+
+	} else {
+	echo "<div class='nf'>".$lang_label["no_alerts"]."</div>";
 	}
-	else echo "<div class='nf'>".$lang_label["no_alerts"]."</div>";
 
 } else {
 	// -------------------------------
diff --git a/pandora_console/operation/agentes/estado_monitores.php b/pandora_console/operation/agentes/estado_monitores.php
index 5a9029be3c..e4458c75ad 100644
--- a/pandora_console/operation/agentes/estado_monitores.php
+++ b/pandora_console/operation/agentes/estado_monitores.php
@@ -106,8 +106,9 @@ if (comprueba_login() == 0) {
 			}
 		}
 		echo '</table>';
-	}
-	else 
+
+	} else {
 		echo "<div class='nf'>".$lang_label["no_monitors"]."</div>";
+	}
 }
 ?>
diff --git a/pandora_console/operation/agentes/estado_ultimopaquete.php b/pandora_console/operation/agentes/estado_ultimopaquete.php
index 59f0c51018..07ee35469e 100644
--- a/pandora_console/operation/agentes/estado_ultimopaquete.php
+++ b/pandora_console/operation/agentes/estado_ultimopaquete.php
@@ -59,7 +59,8 @@ if (comprueba_login() == 0) {
 	$sql3='SELECT * FROM tagente_modulo, tagente_estado WHERE tagente_modulo.id_agente = '.$id_agente.' AND tagente_modulo.id_agente_modulo = tagente_estado.id_agente_modulo ORDER BY id_module_group, nombre';
 	$label_group=0;
 	$last_label = "";
-	echo "<h3>".$lang_label["last_data_chunk"]."<a href='help/".$help_code."/chap3.php#3322' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h3>";
+	echo "<h2>".$lang_label["ag_title"]." &gt; ";
+	echo $lang_label["last_data_chunk"]."<a href='help/".$help_code."/chap3.php#3322' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h2>";
 	$result3=mysql_query($sql3);
 	if (mysql_num_rows ($result3)) {
 	echo "<table width='750' cellpadding='3' cellspacing='3' class='databox'>";
diff --git a/pandora_console/operation/incidents/incident_detail.php b/pandora_console/operation/incidents/incident_detail.php
index 2fe294fc48..bc6266d946 100644
--- a/pandora_console/operation/incidents/incident_detail.php
+++ b/pandora_console/operation/incidents/incident_detail.php
@@ -203,10 +203,11 @@ if (isset($id_inc)) {
 	echo $lang_label["create_incident"]."<a href='help/".$help_code."/chap4.php#41' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h2>";
 }
 echo '<table cellpadding=3 cellspacing=3 border=0 width=600>';
-if ((give_acl($iduser_temp, $id_grupo, "IM")==1) OR ($usuario == $iduser_temp))
+if ((give_acl($iduser_temp, $id_grupo, "IM")==1) OR ($usuario == $iduser_temp)) {
 	echo '<tr><td class="lb" rowspan="6" width="5"><td class="datos"><b>'.$lang_label["incident"].'</b><td colspan=3 class="datos"><input type="text" name="titulo" size=70 value="'.$titulo.'">';
-else
+} else {
 	echo '<tr><td class="datos"><b>'.$lang_label["incident"].'</b><td colspan=3 class="datos"><input type="text" name="titulo" size=70 value="'.$titulo.'" readonly>';
+	}
 echo '<tr><td class="datos2"><b>'.$lang_label["in_openedwhen"].'</b>';
 echo "<td class='datos2' <i>".$inicio."</i>";
 echo '<td class="datos2"><b>'.$lang_label["updated_at"].'</b>';
@@ -218,7 +219,7 @@ if ((give_acl($id_user, $id_grupo, "IM")==1) OR ($usuario == $id_user)) {
 	$sql1='SELECT * FROM tusuario ORDER BY id_usuario';
 	$result=mysql_query($sql1);
 	while ($row2=mysql_fetch_array($result)){
-		echo "<option value='".$row2["id_usuario"]."'>".$row2["id_usuario"]." - ".$row2["nombre_real"];
+		echo "<option value='".$row2["id_usuario"]."'>".$row2["id_usuario"]." - ".$row2["nombre_real"]."</option>";
 	}
 	echo "</select>";
 }
@@ -288,7 +289,7 @@ $sql1='SELECT * FROM tgrupo ORDER BY nombre';
 $result=mysql_query($sql1);
 while ($row=mysql_fetch_array($result)){
 	if (give_acl($iduser_temp, $row["id_grupo"], "IR")==1)
-		echo "<option value='".$row["id_grupo"]."'>".$row["nombre"];
+		echo "<option value='".$row["id_grupo"]."'>".$row["nombre"]."</option>";
 }
 
 echo '</select><tr>';
@@ -341,11 +342,11 @@ $iduser_temp=$_SESSION['id_usuario'];
 
 if ($creacion_incidente == 0){
 	if ((give_acl($iduser_temp, $id_grupo, "IM")==1) OR ($usuario == $iduser_temp)){
-		echo '<input type="submit" class="sub" name="accion" value="'.$lang_label["in_modinc"].'" border="0">';
+		echo '<input type="submit" class="sub upd" name="accion" value="'.$lang_label["in_modinc"].'" border="0">';
 	}
 } else {
 	if (give_acl($iduser_temp, $id_grupo, "IW")) {
-		echo '<input type="submit" class="sub" name="accion" value="'.$lang_label["create"].'" border="0">';
+		echo '<input type="submit" class="sub wand" name="accion" value="'.$lang_label["create"].'" border="0">';
 	}
 }
 echo "</form>";
@@ -355,7 +356,7 @@ if ($creacion_incidente == 0){
 	echo '
 	<form method="post" action="index.php?sec=incidencias&sec2=operation/incidents/incident_note&id_inc='.$id_inc.'">
 	<input type="hidden" name="nota" value="add">
-	<input align=right name="addnote" type="submit" class="sub" value="'.$lang_label["add_note"].'">
+	<input align=right name="addnote" type="submit" class="sub next" value="'.$lang_label["add_note"].'">
 	</form>';
 }
 echo "</tr></table><br>";
@@ -364,8 +365,8 @@ if ($creacion_incidente == 0){
 // Upload control
 	if (give_acl($iduser_temp, $id_grupo, "IW")==1){
 		echo '
+		<h3>'.$lang_label["attachfile"].'</h3>
 		<table cellpadding=3 cellspacing=3 border=0 width="400">
-		<tr><td colspan="3"><b>'.$lang_label["attachfile"].'</b>
 		<tr><td class="lb" rowspan="2" width="5">
 		<td class="datos">'.$lang_label["filename"].'</td>
 		<td class="datos"><form method="post" action="index.php?sec=incidencias&sec2=operation/incidents/incident_detail&id='.$id_inc.'&upload_file=1" enctype="multipart/form-data">
diff --git a/pandora_console/operation/incidents/incident_search.php b/pandora_console/operation/incidents/incident_search.php
index f406681f13..05e0627dc8 100644
--- a/pandora_console/operation/incidents/incident_search.php
+++ b/pandora_console/operation/incidents/incident_search.php
@@ -50,7 +50,7 @@ echo "<div style='float:right;'><img src='images/pulpo_lupa.gif' class='bot' ali
 <tr><td class="datos" colspan="2"><i><?php echo $lang_label["free_text_search_msg"] ?></i></td></tr>
 <tr><td colspan='3'><div class='raya'></div></td></tr>
 <tr><td align="right" colspan="3">
-<?php echo "<input name='uptbutton' type='submit' class='sub' value='".$lang_label["search"]."'>"; ?>
+<?php echo "<input name='uptbutton' type='submit' class='sub search' value='".$lang_label["search"]."'>"; ?>
 
 </form>
 </table>
diff --git a/pandora_console/operation/messages/message.php b/pandora_console/operation/messages/message.php
index fef7563cbe..981a4d49a7 100644
--- a/pandora_console/operation/messages/message.php
+++ b/pandora_console/operation/messages/message.php
@@ -121,7 +121,7 @@ if (isset($_GET["nuevo"]) || isset($_GET["nuevo_g"])){
 		echo '</textarea></td></tr>
 		<tr><td colspan="2"><div class="noraya"></div></td></tr>
 		<tr><td colspan="2" align="right">
-		<input type="submit" class="sub" name="send_mes" value="'.$lang_label["send_mes"].'"></form></td></tr>';
+		<input type="submit" class="sub wand" name="send_mes" value="'.$lang_label["send_mes"].'"></form></td></tr>';
 	}
 	
 	if (isset($_GET["nuevo_g"])){
@@ -144,7 +144,7 @@ if (isset($_GET["nuevo"]) || isset($_GET["nuevo_g"])){
 		<tr><td class="datos2">'.$lang_label["message"].':</td></tr>
 		<tr><td class="datos" colspan="4"><textarea name="mensaje" rows="10" width="540px"></textarea></td></tr>
 		<tr><td colspan="2" align="right">
-		<input type="submit" class="sub" name="send_mes" value="'.$lang_label["send_mes"].'"></form></td></tr>';
+		<input type="submit" class="sub wand" name="send_mes" value="'.$lang_label["send_mes"].'"></form></td></tr>';
 	}
 }
 else {
diff --git a/pandora_console/operation/snmpconsole/snmp_alert.php b/pandora_console/operation/snmpconsole/snmp_alert.php
index 8e18f2191d..f7fc750b4d 100644
--- a/pandora_console/operation/snmpconsole/snmp_alert.php
+++ b/pandora_console/operation/snmpconsole/snmp_alert.php
@@ -122,9 +122,13 @@ if (give_acl($id_user, 0, "LW")==1) {
 	// Add alert form
 	if (($alert_update != 0) || ($alert_add == 1)) {
 	
+		if ($alert_update != 0) {
+			echo $lang_label["update_alert"]."<a href='help/".$help_code."/chap3.php#331' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h2>";
+		} else {
+			echo $lang_label["create_alert"]."<a href='help/".$help_code."/chap3.php#331' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h2>";
+		}
 		echo '<form name="agente" method="post" action="index.php?sec=snmpconsole&sec2=operation/snmpconsole/snmp_alert&submit=1">';
-		echo '<input type="hidden" name="id_as" value="'.$id_as.'">'; // if known, if add will be undetermined (0).
-		echo $lang_label["create_alert"]."<a href='help/".$help_code."/chap3.php#331' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h2>";
+		echo '<input type="hidden" name="id_as" value="'.$id_as.'">'; // if known, if add will be undetermined (0).	
 		echo '<table cellpadding="3" cellspacing="3" width="650" class="fon">';
 		echo '<tr><td class="lb" rowspan="13" width=5>';
 		// Alert
@@ -185,11 +189,11 @@ if (give_acl($id_user, 0, "LW")==1) {
 		echo '<tr><td colspan="3"><div class="raya"></div></td></tr>';
 		// Update or Add button
 		if ($alert_update != 0) {
-			echo '<tr><td colspan="3" align="right"><input name="uptbutton" type="submit" class="sub" value="'.$lang_label["update"].'">';
+			echo '<tr><td colspan="3" align="right"><input name="uptbutton" type="submit" class="sub upd" value="'.$lang_label["update"].'">';
 			echo "<input type='hidden' name='update' value='1'>";
 			echo "<input type='hidden' name='create' value='0'>";
 		} else {
-			echo '<tr><td colspan="3" align="right"><input name="createbutton" type="submit" class="sub" value="'.$lang_label["create"].'">';
+			echo '<tr><td colspan="3" align="right"><input name="createbutton" type="submit" class="sub next" value="'.$lang_label["create"].'">';
 			echo "<input type='hidden' name='update' value='0'>";
 			echo "<input type='hidden' name='create' value='1'>";
 		}