diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 711674780d..316aa9e2db 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,10 @@
+2013-04-24  Sergio Martin <sergio.martin@artica.es>
+
+	* godmode/servers/servers.build_table.php
+	godmode/servers/modificar_server.php: Rewrite missed
+	servers buttons in last huge merge. Add success/error
+	messages on this actions
+
 2013-04-23  Sergio Martin <sergio.martin@artica.es>
 
 	* include/styles/dialog.css
diff --git a/pandora_console/godmode/servers/modificar_server.php b/pandora_console/godmode/servers/modificar_server.php
index 2f69b00a52..549e8d36c0 100644
--- a/pandora_console/godmode/servers/modificar_server.php
+++ b/pandora_console/godmode/servers/modificar_server.php
@@ -58,12 +58,26 @@ else {
 
 	// Move SNMP modules back to the enterprise server
 	if (isset($_GET["server_reset_snmp_enterprise"])) {
-		db_process_sql ("UPDATE tagente_estado SET last_error=0");
+		$result = db_process_sql ("UPDATE tagente_estado SET last_error=0");
+	
+		if($result === false) {
+			ui_print_error_message(__('Unsuccessfull action'));
+		}
+		else {
+			ui_print_success_message(__('Successfully action'));
+		}
 	}
 	
 	// Move SNMP modules back to the enterprise server
 	if (isset($_GET["server_reset_counts"])) {
-		db_process_sql ("UPDATE tagente SET update_module_count=1, update_alert_count=1");
+		$reslt = db_process_sql ("UPDATE tagente SET update_module_count=1, update_alert_count=1");
+		
+		if($result === false) {
+			ui_print_error_message(__('Unsuccessfull action'));
+		}
+		else {
+			ui_print_success_message(__('Successfully action'));
+		}
 	}
 
 	if (isset ($_GET["delete"])) {
diff --git a/pandora_console/godmode/servers/servers.build_table.php b/pandora_console/godmode/servers/servers.build_table.php
index d9663e8c46..3962ba38e7 100644
--- a/pandora_console/godmode/servers/servers.build_table.php
+++ b/pandora_console/godmode/servers/servers.build_table.php
@@ -108,18 +108,31 @@ foreach ($servers as $server) {
 	$data[6] = $server['threads'].' : '.$server['queued_modules'];
 	$data[7] = ui_print_timestamp ($server['keepalive'], true);
 	
-	//Only Pandora Administrator can delete servers
-	if (check_acl ($config["id_user"], 0, "PM")) {
-		$data[8] = '<a href="index.php?sec=gservers&sec2=godmode/servers/modificar_server&server='.$server["id_server"].'">';
-		$data[8] .= html_print_image ('images/config.png', true,
-			array('title' => __('Edit')));
-		$data[8] .= '</a>';
-		
-		$data[8] .= '&nbsp;&nbsp;<a href="index.php?sec=gservers&sec2=godmode/servers/modificar_server&server_del='.$server["id_server"].'&amp;delete=1">';
-		$data[8] .= html_print_image ('images/cross.png', true,
-			array('title' => __('Delete'),
-				'onclick' => "if (! confirm ('" . __('Modules run by this server will stop working. Do you want to continue?') ."')) return false"));
-		$data[8] .= '</a>';
+	//Only Pandora Administrator can delete servers	 
+	if (check_acl ($config["id_user"], 0, "PM")) {	 
+		 $data[8] = '';	 
+		 if ($server['type'] == 'data') {	 
+				 $data[8] .= '<a href="index.php?sec=gservers&sec2=godmode/servers/modificar_server&refr=0&server_reset_counts='.$server["id_server"].'">';	 
+				 $data[8] .= html_print_image ('images/target.png', true,	 
+						 array('title' => __('Reset module status and fired alert counts')));	 
+				 $data[8] .= '</a>&nbsp;&nbsp;';	 
+		 } else if ($server['type'] == 'enterprise snmp') {	 
+				 $data[8] .= '<a href="index.php?sec=gservers&sec2=godmode/servers/modificar_server&refr=0&server_reset_snmp_enterprise='.$server["id_server"].'">';	 
+				 $data[8] .= html_print_image ('images/target.png', true,	 
+						 array('title' => __('Claim back SNMP modules')));	 
+				 $data[8] .= '</a>&nbsp;&nbsp;';	 
+		 }	 
+
+		 $data[8] .= '<a href="index.php?sec=gservers&sec2=godmode/servers/modificar_server&server='.$server["id_server"].'">';	 
+		 $data[8] .= html_print_image ('images/config.png', true,	 
+				 array('title' => __('Edit')));	 
+		 $data[8] .= '</a>';	 
+
+		 $data[8] .= '&nbsp;&nbsp;<a href="index.php?sec=gservers&sec2=godmode/servers/modificar_server&server_del='.$server["id_server"].'&amp;delete=1">';	 
+		 $data[8] .= html_print_image ('images/cross.png', true,	 
+				 array('title' => __('Delete'),	 
+						 'onclick' => "if (! confirm ('" . __('Modules run by this server will stop working. Do you want to continue?') ."')) return false"));	 
+		 $data[8] .= '</a>';	 
 	}
 	
 	if($tiny) {