diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 65b3e04463..d06eb89323 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,35 @@
+2009-05-18  Esteban Sanchez  <estebans@artica.es>
+
+	* images/award_star_bronze_1.png, images/award_star_bronze_2.png,
+	images/award_star_bronze_3.png, images/award_star_gold_2.png,
+	images/award_star_silver_1.png, images/bullet_add.png,
+	images/bullet_black.png, images/bullet_blue.png,
+	images/bullet_delete.png, images/bullet_disk.png,
+	images/bullet_error.png, images/bullet_go.png,
+	images/bullet_green.png, images/bullet_key.png,
+	images/bullet_white.png, images/bullet_wrench.png,
+	images/bullet_yellow.png, images/dot_down.png, images/exclamation.png,
+	images/flag_blue.png, images/flag_green.png, images/flag_yellow.png,
+	images/help_small.jpg, images/lock_open.png, images/mod_udp_proc.png,
+	images/newspaper.png, images/phone_sound.png, images/pixel_blue.png,
+	images/plugin_disabled.png, images/plugin_enabled.png,
+	images/pulpo_lupa.png, images/shield.png, images/so_beos.png,
+	images/status_busy.png, images/status_online.png, images/user_female.png,
+	images/user_gray.png, images/user_orange.png, images/user_red.png,
+	images/webcam.png: Deleted from repository. Unused icons.
+
+	* images/agents_group.png: Added to repository. New icon.
+
+	* godmode/agentes/configurar_agente.php,
+	operation/agentes/ver_agente.php: Replaced icon for agent group.
+
+	* include/functions_db.php: Replaced icons for data server. Style
+	correction.
+
+	* include/functions_ui.php: Cast block_size value for sanity.
+	
+	* ChangeLog: Added some lines of a previous commit.
+
 2009-05-14  Esteban Sanchez  <estebans@artica.es>
 
 	* images/go_first.png, images/go_last.png, images/go_next.png
@@ -58,6 +90,14 @@
 	* general/header.php: Some changes for style. Now displays OpenSource version
 	or Enterprise version depending of version.
 
+2009-05-13  Esteban Sánchez  <estebans@artica.es>
+
+	* images/attachment.png: Added to repository.
+	
+	* images/chart_curve.png, images/chart_bar.png: Replaced with tango icons.
+
+	* operation/incidents/incident.php: Use attachment icon.
+
 2009-05-13  Esteban Sánchez  <estebans@artica.es>
 
 	* images/clean.png, images/fullscreen.png, images/local_component.png,
diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index 3c8c14e77b..1f8768ba31 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -218,7 +218,7 @@ if ($id_agente) {
 
 	echo '<li class="nomn">';
 	echo '<a href="index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&ag_group='.$group.'">';
-	print_image ("images/god4.png", false, $img_style);
+	print_image ("images/agents_group.png", false, $img_style);
         echo '&nbsp; '.__('Group').'</a></li>';
 
 	echo "</ul></div></div>";
diff --git a/pandora_console/images/agents_group.png b/pandora_console/images/agents_group.png
new file mode 100644
index 0000000000..5c140d838d
Binary files /dev/null and b/pandora_console/images/agents_group.png differ
diff --git a/pandora_console/images/award_star_bronze_1.png b/pandora_console/images/award_star_bronze_1.png
deleted file mode 100644
index 658c7117bb..0000000000
Binary files a/pandora_console/images/award_star_bronze_1.png and /dev/null differ
diff --git a/pandora_console/images/award_star_bronze_2.png b/pandora_console/images/award_star_bronze_2.png
deleted file mode 100644
index e47babd7ba..0000000000
Binary files a/pandora_console/images/award_star_bronze_2.png and /dev/null differ
diff --git a/pandora_console/images/award_star_bronze_3.png b/pandora_console/images/award_star_bronze_3.png
deleted file mode 100644
index 396e4b3a25..0000000000
Binary files a/pandora_console/images/award_star_bronze_3.png and /dev/null differ
diff --git a/pandora_console/images/award_star_gold_2.png b/pandora_console/images/award_star_gold_2.png
deleted file mode 100644
index 0eaa571757..0000000000
Binary files a/pandora_console/images/award_star_gold_2.png and /dev/null differ
diff --git a/pandora_console/images/award_star_silver_1.png b/pandora_console/images/award_star_silver_1.png
deleted file mode 100644
index 028a54626a..0000000000
Binary files a/pandora_console/images/award_star_silver_1.png and /dev/null differ
diff --git a/pandora_console/images/bullet_add.png b/pandora_console/images/bullet_add.png
deleted file mode 100644
index 41ff8335b0..0000000000
Binary files a/pandora_console/images/bullet_add.png and /dev/null differ
diff --git a/pandora_console/images/bullet_black.png b/pandora_console/images/bullet_black.png
deleted file mode 100644
index 57619706d1..0000000000
Binary files a/pandora_console/images/bullet_black.png and /dev/null differ
diff --git a/pandora_console/images/bullet_blue.png b/pandora_console/images/bullet_blue.png
deleted file mode 100644
index a7651ec8a0..0000000000
Binary files a/pandora_console/images/bullet_blue.png and /dev/null differ
diff --git a/pandora_console/images/bullet_delete.png b/pandora_console/images/bullet_delete.png
deleted file mode 100644
index bd6271b246..0000000000
Binary files a/pandora_console/images/bullet_delete.png and /dev/null differ
diff --git a/pandora_console/images/bullet_disk.png b/pandora_console/images/bullet_disk.png
deleted file mode 100644
index 209c6a7862..0000000000
Binary files a/pandora_console/images/bullet_disk.png and /dev/null differ
diff --git a/pandora_console/images/bullet_error.png b/pandora_console/images/bullet_error.png
deleted file mode 100644
index bca2b491fd..0000000000
Binary files a/pandora_console/images/bullet_error.png and /dev/null differ
diff --git a/pandora_console/images/bullet_go.png b/pandora_console/images/bullet_go.png
deleted file mode 100644
index bc4faa709e..0000000000
Binary files a/pandora_console/images/bullet_go.png and /dev/null differ
diff --git a/pandora_console/images/bullet_green.png b/pandora_console/images/bullet_green.png
deleted file mode 100644
index 058ad261f5..0000000000
Binary files a/pandora_console/images/bullet_green.png and /dev/null differ
diff --git a/pandora_console/images/bullet_key.png b/pandora_console/images/bullet_key.png
deleted file mode 100644
index 3d37f2ea49..0000000000
Binary files a/pandora_console/images/bullet_key.png and /dev/null differ
diff --git a/pandora_console/images/bullet_white.png b/pandora_console/images/bullet_white.png
deleted file mode 100644
index a9af8d44bf..0000000000
Binary files a/pandora_console/images/bullet_white.png and /dev/null differ
diff --git a/pandora_console/images/bullet_wrench.png b/pandora_console/images/bullet_wrench.png
deleted file mode 100644
index 67817e6e5a..0000000000
Binary files a/pandora_console/images/bullet_wrench.png and /dev/null differ
diff --git a/pandora_console/images/bullet_yellow.png b/pandora_console/images/bullet_yellow.png
deleted file mode 100644
index 6469cea7e9..0000000000
Binary files a/pandora_console/images/bullet_yellow.png and /dev/null differ
diff --git a/pandora_console/images/dot_down.png b/pandora_console/images/dot_down.png
deleted file mode 100644
index c3e87f6953..0000000000
Binary files a/pandora_console/images/dot_down.png and /dev/null differ
diff --git a/pandora_console/images/exclamation.png b/pandora_console/images/exclamation.png
deleted file mode 100644
index c37bd062e6..0000000000
Binary files a/pandora_console/images/exclamation.png and /dev/null differ
diff --git a/pandora_console/images/flag_blue.png b/pandora_console/images/flag_blue.png
deleted file mode 100644
index 003924f5ea..0000000000
Binary files a/pandora_console/images/flag_blue.png and /dev/null differ
diff --git a/pandora_console/images/flag_green.png b/pandora_console/images/flag_green.png
deleted file mode 100644
index e4bc611f87..0000000000
Binary files a/pandora_console/images/flag_green.png and /dev/null differ
diff --git a/pandora_console/images/flag_yellow.png b/pandora_console/images/flag_yellow.png
deleted file mode 100644
index 14c89a5430..0000000000
Binary files a/pandora_console/images/flag_yellow.png and /dev/null differ
diff --git a/pandora_console/images/help_small.jpg b/pandora_console/images/help_small.jpg
deleted file mode 100644
index eaecfa2724..0000000000
Binary files a/pandora_console/images/help_small.jpg and /dev/null differ
diff --git a/pandora_console/images/lock_open.png b/pandora_console/images/lock_open.png
deleted file mode 100644
index a471765ff1..0000000000
Binary files a/pandora_console/images/lock_open.png and /dev/null differ
diff --git a/pandora_console/images/mod_udp_proc.png b/pandora_console/images/mod_udp_proc.png
deleted file mode 100644
index 15091a4886..0000000000
Binary files a/pandora_console/images/mod_udp_proc.png and /dev/null differ
diff --git a/pandora_console/images/newspaper.png b/pandora_console/images/newspaper.png
deleted file mode 100644
index 6a2ecce1b8..0000000000
Binary files a/pandora_console/images/newspaper.png and /dev/null differ
diff --git a/pandora_console/images/phone_sound.png b/pandora_console/images/phone_sound.png
deleted file mode 100644
index 7fdf1c58c0..0000000000
Binary files a/pandora_console/images/phone_sound.png and /dev/null differ
diff --git a/pandora_console/images/pixel_blue.png b/pandora_console/images/pixel_blue.png
deleted file mode 100644
index c390628aa6..0000000000
Binary files a/pandora_console/images/pixel_blue.png and /dev/null differ
diff --git a/pandora_console/images/plugin_disabled.png b/pandora_console/images/plugin_disabled.png
deleted file mode 100644
index f4f6be59cb..0000000000
Binary files a/pandora_console/images/plugin_disabled.png and /dev/null differ
diff --git a/pandora_console/images/plugin_enabled.png b/pandora_console/images/plugin_enabled.png
deleted file mode 100644
index 6187b15aec..0000000000
Binary files a/pandora_console/images/plugin_enabled.png and /dev/null differ
diff --git a/pandora_console/images/pulpo_lupa.png b/pandora_console/images/pulpo_lupa.png
deleted file mode 100644
index 8fdf7cb98e..0000000000
Binary files a/pandora_console/images/pulpo_lupa.png and /dev/null differ
diff --git a/pandora_console/images/shield.png b/pandora_console/images/shield.png
deleted file mode 100644
index 3cb4e25789..0000000000
Binary files a/pandora_console/images/shield.png and /dev/null differ
diff --git a/pandora_console/images/so_beos.png b/pandora_console/images/so_beos.png
deleted file mode 100644
index 347233780f..0000000000
Binary files a/pandora_console/images/so_beos.png and /dev/null differ
diff --git a/pandora_console/images/status_busy.png b/pandora_console/images/status_busy.png
deleted file mode 100644
index 987c806fff..0000000000
Binary files a/pandora_console/images/status_busy.png and /dev/null differ
diff --git a/pandora_console/images/status_online.png b/pandora_console/images/status_online.png
deleted file mode 100644
index 947bd4b62c..0000000000
Binary files a/pandora_console/images/status_online.png and /dev/null differ
diff --git a/pandora_console/images/user_female.png b/pandora_console/images/user_female.png
deleted file mode 100644
index 7c71de03b2..0000000000
Binary files a/pandora_console/images/user_female.png and /dev/null differ
diff --git a/pandora_console/images/user_gray.png b/pandora_console/images/user_gray.png
deleted file mode 100644
index 8fd539e9cb..0000000000
Binary files a/pandora_console/images/user_gray.png and /dev/null differ
diff --git a/pandora_console/images/user_orange.png b/pandora_console/images/user_orange.png
deleted file mode 100644
index b818127df6..0000000000
Binary files a/pandora_console/images/user_orange.png and /dev/null differ
diff --git a/pandora_console/images/user_red.png b/pandora_console/images/user_red.png
deleted file mode 100644
index c6f66e8b30..0000000000
Binary files a/pandora_console/images/user_red.png and /dev/null differ
diff --git a/pandora_console/images/webcam.png b/pandora_console/images/webcam.png
deleted file mode 100644
index af71c30610..0000000000
Binary files a/pandora_console/images/webcam.png and /dev/null differ
diff --git a/pandora_console/include/functions_db.php b/pandora_console/include/functions_db.php
index 2719bc30fb..ade8369fcc 100644
--- a/pandora_console/include/functions_db.php
+++ b/pandora_console/include/functions_db.php
@@ -1278,7 +1278,7 @@ function show_server_type ($id) {
 	global $config;
 	switch ($id) {
 	case 1:
-		return '<img src="images/data.png" title="Pandora FMS Data server">';
+		return '<img src="images/database.png" title="Pandora FMS Data server">';
 		break;
 	case 2:
 		return '<img src="images/network.png" title="Pandora FMS Network server">';
@@ -1294,8 +1294,9 @@ function show_server_type ($id) {
 		break;
 	case 7: 
 		return '<img src="images/server_web.png" title="Pandora FMS WEB server">';
-                break;
-	default: return "--";
+		break;
+	default:
+		return "--";
 	}
 }
 
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 2ec3745aa5..53bbccddff 100644
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -751,7 +751,7 @@ function pagination ($count, $url = false, $offset = 0, $pagination = 0, $return
 	global $config;
 	
 	if (empty ($pagination)) {
-		$pagination = $config["block_size"];
+		$pagination = (int) $config["block_size"];
 	}
 	
 	$offset_name = 'offset';
diff --git a/pandora_console/operation/agentes/ver_agente.php b/pandora_console/operation/agentes/ver_agente.php
index 88584efdb4..05872cf77d 100644
--- a/pandora_console/operation/agentes/ver_agente.php
+++ b/pandora_console/operation/agentes/ver_agente.php
@@ -231,7 +231,7 @@ echo "</li>";
 // Group tab
 echo "<li class='nomn'>";
 echo "<a href='index.php?sec=estado&sec2=operation/agentes/estado_agente&group_id=$id_grupo'>";
-echo "<img src='images/god4.png' class='top' border=0>&nbsp;";
+echo "<img src='images/agents_group.png' class='top' border=0>&nbsp;";
 echo __("Group");
 echo "</a></li>";