diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index c7133c05cb..6204ab541e 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,27 @@
+2010-02-22  Miguel de Dios  <miguel.dedios@artica.es>
+
+	* images/groups_small/*.ok.png, images/groups_small/*.default.png,
+	images/groups_small/*.bad.png, images/groups_small/*.warning.png: add the
+	group images for diferent status, it's used in the GIS map.
+	
+	* godmode/agentes/agent_manager.php: change for new form to name the icons
+	with status.
+	
+	* include/functions_gis.php: clean source code in function "addPoint",
+	rewrite the function "get_agent_icon_map" for used icons with state for
+	group, change some parts of source code in the function "getArrayListIcons"
+	for new form to name the icons.
+	
+	* images/gis_map/icons/*.png: change some icons.
+	
+	* operation/agentes/estado_generalagente.php: show message when there isn't
+	the GIS data.
+	
+	* operation/gis_maps/ajax.php: change the source code and db query to
+	return the GIS data for return default position for agent without GIS data.
+	
+	* operation/gis_maps/render_view.php: show agents without GIS data.
+
 2010-02-22  Miguel de Dios  <miguel.dedios@artica.es>
 
 	* operation/agentes/estado_generalagente.php: fix, use the new tables.
diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php
index 8ec38745b0..f61f5212a8 100644
--- a/pandora_console/godmode/agentes/agent_manager.php
+++ b/pandora_console/godmode/agentes/agent_manager.php
@@ -220,10 +220,10 @@ $path = 'images/gis_map/icons/'; //TODO set better method the path
 
 $table->data[12][0] = __('Icon agent');
 $table->data[12][1] = print_select($arraySelectIcon, "icon_path", $icon_path, "changeIcons();", __('None'), '', true) .
-	'&nbsp;' . __('Default') . ': <img id="icon_default" src="' . $path . $icon_path . '.png" />' .
-	'&nbsp;' . __('Ok') . ': <img id="icon_ok" src="' . $path . $icon_path . '_ok.png" />' .
-	'&nbsp;' . __('Bad') . ': <img id="icon_bad" src="' . $path . $icon_path . '_bad.png" />' .
-	'&nbsp;' . __('Warning') . ': <img id="icon_warning" src="' . $path . $icon_path . '_warning.png" />';
+	'&nbsp;' . __('Default') . ': <img id="icon_default" src="' . $path . $icon_path . '.default.png" />' .
+	'&nbsp;' . __('Ok') . ': <img id="icon_ok" src="' . $path . $icon_path . '.ok.png" />' .
+	'&nbsp;' . __('Bad') . ': <img id="icon_bad" src="' . $path . $icon_path . '.bad.png" />' .
+	'&nbsp;' . __('Warning') . ': <img id="icon_warning" src="' . $path . $icon_path . '.warning.png" />';
 
 if ($config['activate_gis']) {
 	$table->data[13][0] = __('Ignore new GIS data:');
diff --git a/pandora_console/images/gis_map/icons/dot_bad.png b/pandora_console/images/gis_map/icons/dot.bad.png
similarity index 100%
rename from pandora_console/images/gis_map/icons/dot_bad.png
rename to pandora_console/images/gis_map/icons/dot.bad.png
diff --git a/pandora_console/images/gis_map/icons/dot.default.png b/pandora_console/images/gis_map/icons/dot.default.png
new file mode 100755
index 0000000000..d36c05f1e3
Binary files /dev/null and b/pandora_console/images/gis_map/icons/dot.default.png differ
diff --git a/pandora_console/images/gis_map/icons/dot_ok.png b/pandora_console/images/gis_map/icons/dot.ok.png
similarity index 100%
rename from pandora_console/images/gis_map/icons/dot_ok.png
rename to pandora_console/images/gis_map/icons/dot.ok.png
diff --git a/pandora_console/images/gis_map/icons/dot_warning.png b/pandora_console/images/gis_map/icons/dot.warning.png
similarity index 100%
rename from pandora_console/images/gis_map/icons/dot_warning.png
rename to pandora_console/images/gis_map/icons/dot.warning.png
diff --git a/pandora_console/images/gis_map/icons/icon_bad.png b/pandora_console/images/gis_map/icons/icon.bad.png
similarity index 100%
rename from pandora_console/images/gis_map/icons/icon_bad.png
rename to pandora_console/images/gis_map/icons/icon.bad.png
diff --git a/pandora_console/images/gis_map/icons/icon.default.png b/pandora_console/images/gis_map/icons/icon.default.png
new file mode 100755
index 0000000000..04e90c063b
Binary files /dev/null and b/pandora_console/images/gis_map/icons/icon.default.png differ
diff --git a/pandora_console/images/gis_map/icons/icon_ok.png b/pandora_console/images/gis_map/icons/icon.ok.png
similarity index 100%
rename from pandora_console/images/gis_map/icons/icon_ok.png
rename to pandora_console/images/gis_map/icons/icon.ok.png
diff --git a/pandora_console/images/gis_map/icons/icon_warning.png b/pandora_console/images/gis_map/icons/icon.warning.png
similarity index 100%
rename from pandora_console/images/gis_map/icons/icon_warning.png
rename to pandora_console/images/gis_map/icons/icon.warning.png
diff --git a/pandora_console/images/groups_small/application_osx_terminal.bad.png b/pandora_console/images/groups_small/application_osx_terminal.bad.png
new file mode 100644
index 0000000000..ccc8f3f04d
Binary files /dev/null and b/pandora_console/images/groups_small/application_osx_terminal.bad.png differ
diff --git a/pandora_console/images/groups_small/application_osx_terminal.default.png b/pandora_console/images/groups_small/application_osx_terminal.default.png
new file mode 100644
index 0000000000..85f0016ce2
Binary files /dev/null and b/pandora_console/images/groups_small/application_osx_terminal.default.png differ
diff --git a/pandora_console/images/groups_small/application_osx_terminal.ok.png b/pandora_console/images/groups_small/application_osx_terminal.ok.png
new file mode 100644
index 0000000000..0678cb09a1
Binary files /dev/null and b/pandora_console/images/groups_small/application_osx_terminal.ok.png differ
diff --git a/pandora_console/images/groups_small/application_osx_terminal.warning.png b/pandora_console/images/groups_small/application_osx_terminal.warning.png
new file mode 100644
index 0000000000..e95f210a5f
Binary files /dev/null and b/pandora_console/images/groups_small/application_osx_terminal.warning.png differ
diff --git a/pandora_console/images/groups_small/applications.bad.png b/pandora_console/images/groups_small/applications.bad.png
new file mode 100644
index 0000000000..1222421693
Binary files /dev/null and b/pandora_console/images/groups_small/applications.bad.png differ
diff --git a/pandora_console/images/groups_small/applications.default.png b/pandora_console/images/groups_small/applications.default.png
new file mode 100644
index 0000000000..c15fff887f
Binary files /dev/null and b/pandora_console/images/groups_small/applications.default.png differ
diff --git a/pandora_console/images/groups_small/applications.ok.png b/pandora_console/images/groups_small/applications.ok.png
new file mode 100644
index 0000000000..440fe791d3
Binary files /dev/null and b/pandora_console/images/groups_small/applications.ok.png differ
diff --git a/pandora_console/images/groups_small/applications.warning.png b/pandora_console/images/groups_small/applications.warning.png
new file mode 100644
index 0000000000..b708774394
Binary files /dev/null and b/pandora_console/images/groups_small/applications.warning.png differ
diff --git a/pandora_console/images/groups_small/bricks.bad.png b/pandora_console/images/groups_small/bricks.bad.png
new file mode 100644
index 0000000000..0a0cd5459f
Binary files /dev/null and b/pandora_console/images/groups_small/bricks.bad.png differ
diff --git a/pandora_console/images/groups_small/bricks.default.png b/pandora_console/images/groups_small/bricks.default.png
new file mode 100644
index 0000000000..14d8bab5ca
Binary files /dev/null and b/pandora_console/images/groups_small/bricks.default.png differ
diff --git a/pandora_console/images/groups_small/bricks.ok.png b/pandora_console/images/groups_small/bricks.ok.png
new file mode 100644
index 0000000000..931d1a389c
Binary files /dev/null and b/pandora_console/images/groups_small/bricks.ok.png differ
diff --git a/pandora_console/images/groups_small/bricks.warning.png b/pandora_console/images/groups_small/bricks.warning.png
new file mode 100644
index 0000000000..bbfeb0ce3f
Binary files /dev/null and b/pandora_console/images/groups_small/bricks.warning.png differ
diff --git a/pandora_console/images/groups_small/chart_organisation.bad.png b/pandora_console/images/groups_small/chart_organisation.bad.png
new file mode 100644
index 0000000000..410cd5116c
Binary files /dev/null and b/pandora_console/images/groups_small/chart_organisation.bad.png differ
diff --git a/pandora_console/images/groups_small/chart_organisation.default.png b/pandora_console/images/groups_small/chart_organisation.default.png
new file mode 100644
index 0000000000..53619a608b
Binary files /dev/null and b/pandora_console/images/groups_small/chart_organisation.default.png differ
diff --git a/pandora_console/images/groups_small/chart_organisation.ok.png b/pandora_console/images/groups_small/chart_organisation.ok.png
new file mode 100644
index 0000000000..ca7f04061b
Binary files /dev/null and b/pandora_console/images/groups_small/chart_organisation.ok.png differ
diff --git a/pandora_console/images/groups_small/chart_organisation.warning.png b/pandora_console/images/groups_small/chart_organisation.warning.png
new file mode 100644
index 0000000000..c9ba529187
Binary files /dev/null and b/pandora_console/images/groups_small/chart_organisation.warning.png differ
diff --git a/pandora_console/images/groups_small/clock.bad.png b/pandora_console/images/groups_small/clock.bad.png
new file mode 100644
index 0000000000..f281439c87
Binary files /dev/null and b/pandora_console/images/groups_small/clock.bad.png differ
diff --git a/pandora_console/images/groups_small/clock.default.png b/pandora_console/images/groups_small/clock.default.png
new file mode 100644
index 0000000000..2b7a58aa20
Binary files /dev/null and b/pandora_console/images/groups_small/clock.default.png differ
diff --git a/pandora_console/images/groups_small/clock.ok.png b/pandora_console/images/groups_small/clock.ok.png
new file mode 100644
index 0000000000..a3cb173d9e
Binary files /dev/null and b/pandora_console/images/groups_small/clock.ok.png differ
diff --git a/pandora_console/images/groups_small/clock.warning.png b/pandora_console/images/groups_small/clock.warning.png
new file mode 100644
index 0000000000..20880b31df
Binary files /dev/null and b/pandora_console/images/groups_small/clock.warning.png differ
diff --git a/pandora_console/images/groups_small/computer.bad.png b/pandora_console/images/groups_small/computer.bad.png
new file mode 100644
index 0000000000..1807bd726f
Binary files /dev/null and b/pandora_console/images/groups_small/computer.bad.png differ
diff --git a/pandora_console/images/groups_small/computer.default.png b/pandora_console/images/groups_small/computer.default.png
new file mode 100644
index 0000000000..e921e34059
Binary files /dev/null and b/pandora_console/images/groups_small/computer.default.png differ
diff --git a/pandora_console/images/groups_small/computer.ok.png b/pandora_console/images/groups_small/computer.ok.png
new file mode 100644
index 0000000000..c00aa7d51c
Binary files /dev/null and b/pandora_console/images/groups_small/computer.ok.png differ
diff --git a/pandora_console/images/groups_small/computer.warning.png b/pandora_console/images/groups_small/computer.warning.png
new file mode 100644
index 0000000000..51a9acb473
Binary files /dev/null and b/pandora_console/images/groups_small/computer.warning.png differ
diff --git a/pandora_console/images/groups_small/database_gear.bad.png b/pandora_console/images/groups_small/database_gear.bad.png
new file mode 100644
index 0000000000..dba81d5102
Binary files /dev/null and b/pandora_console/images/groups_small/database_gear.bad.png differ
diff --git a/pandora_console/images/groups_small/database_gear.default.png b/pandora_console/images/groups_small/database_gear.default.png
new file mode 100644
index 0000000000..8c26e6f6b3
Binary files /dev/null and b/pandora_console/images/groups_small/database_gear.default.png differ
diff --git a/pandora_console/images/groups_small/database_gear.ok.png b/pandora_console/images/groups_small/database_gear.ok.png
new file mode 100644
index 0000000000..50641bb9b8
Binary files /dev/null and b/pandora_console/images/groups_small/database_gear.ok.png differ
diff --git a/pandora_console/images/groups_small/database_gear.warning.png b/pandora_console/images/groups_small/database_gear.warning.png
new file mode 100644
index 0000000000..cf74596aa3
Binary files /dev/null and b/pandora_console/images/groups_small/database_gear.warning.png differ
diff --git a/pandora_console/images/groups_small/drive_network.bad.png b/pandora_console/images/groups_small/drive_network.bad.png
new file mode 100644
index 0000000000..5f0fb8217d
Binary files /dev/null and b/pandora_console/images/groups_small/drive_network.bad.png differ
diff --git a/pandora_console/images/groups_small/drive_network.default.png b/pandora_console/images/groups_small/drive_network.default.png
new file mode 100644
index 0000000000..428b2eb2a4
Binary files /dev/null and b/pandora_console/images/groups_small/drive_network.default.png differ
diff --git a/pandora_console/images/groups_small/drive_network.ok.png b/pandora_console/images/groups_small/drive_network.ok.png
new file mode 100644
index 0000000000..dbe58f007c
Binary files /dev/null and b/pandora_console/images/groups_small/drive_network.ok.png differ
diff --git a/pandora_console/images/groups_small/drive_network.warning.png b/pandora_console/images/groups_small/drive_network.warning.png
new file mode 100644
index 0000000000..0dbdd4b2a5
Binary files /dev/null and b/pandora_console/images/groups_small/drive_network.warning.png differ
diff --git a/pandora_console/images/groups_small/email.bad.png b/pandora_console/images/groups_small/email.bad.png
new file mode 100644
index 0000000000..064222d63e
Binary files /dev/null and b/pandora_console/images/groups_small/email.bad.png differ
diff --git a/pandora_console/images/groups_small/email.default.png b/pandora_console/images/groups_small/email.default.png
new file mode 100644
index 0000000000..1486cd82a0
Binary files /dev/null and b/pandora_console/images/groups_small/email.default.png differ
diff --git a/pandora_console/images/groups_small/email.ok.png b/pandora_console/images/groups_small/email.ok.png
new file mode 100644
index 0000000000..681fc2ddfa
Binary files /dev/null and b/pandora_console/images/groups_small/email.ok.png differ
diff --git a/pandora_console/images/groups_small/email.warning.png b/pandora_console/images/groups_small/email.warning.png
new file mode 100644
index 0000000000..b08c99d7c1
Binary files /dev/null and b/pandora_console/images/groups_small/email.warning.png differ
diff --git a/pandora_console/images/groups_small/eye.bad.png b/pandora_console/images/groups_small/eye.bad.png
new file mode 100644
index 0000000000..f8191a1b17
Binary files /dev/null and b/pandora_console/images/groups_small/eye.bad.png differ
diff --git a/pandora_console/images/groups_small/eye.default.png b/pandora_console/images/groups_small/eye.default.png
new file mode 100644
index 0000000000..cd852b7502
Binary files /dev/null and b/pandora_console/images/groups_small/eye.default.png differ
diff --git a/pandora_console/images/groups_small/eye.ok.png b/pandora_console/images/groups_small/eye.ok.png
new file mode 100644
index 0000000000..0da4304f71
Binary files /dev/null and b/pandora_console/images/groups_small/eye.ok.png differ
diff --git a/pandora_console/images/groups_small/eye.warning.png b/pandora_console/images/groups_small/eye.warning.png
new file mode 100644
index 0000000000..65a5722201
Binary files /dev/null and b/pandora_console/images/groups_small/eye.warning.png differ
diff --git a/pandora_console/images/groups_small/firewall.bad.png b/pandora_console/images/groups_small/firewall.bad.png
new file mode 100644
index 0000000000..d138d12932
Binary files /dev/null and b/pandora_console/images/groups_small/firewall.bad.png differ
diff --git a/pandora_console/images/groups_small/firewall.default.png b/pandora_console/images/groups_small/firewall.default.png
new file mode 100644
index 0000000000..2c35c40139
Binary files /dev/null and b/pandora_console/images/groups_small/firewall.default.png differ
diff --git a/pandora_console/images/groups_small/firewall.ok.png b/pandora_console/images/groups_small/firewall.ok.png
new file mode 100644
index 0000000000..5c46d05d24
Binary files /dev/null and b/pandora_console/images/groups_small/firewall.ok.png differ
diff --git a/pandora_console/images/groups_small/firewall.warning.png b/pandora_console/images/groups_small/firewall.warning.png
new file mode 100644
index 0000000000..644ea4d594
Binary files /dev/null and b/pandora_console/images/groups_small/firewall.warning.png differ
diff --git a/pandora_console/images/groups_small/g_apps.bad.png b/pandora_console/images/groups_small/g_apps.bad.png
new file mode 100644
index 0000000000..91ff715828
Binary files /dev/null and b/pandora_console/images/groups_small/g_apps.bad.png differ
diff --git a/pandora_console/images/groups_small/g_apps.default.png b/pandora_console/images/groups_small/g_apps.default.png
new file mode 100644
index 0000000000..c5a71a0c9c
Binary files /dev/null and b/pandora_console/images/groups_small/g_apps.default.png differ
diff --git a/pandora_console/images/groups_small/g_apps.ok.png b/pandora_console/images/groups_small/g_apps.ok.png
new file mode 100644
index 0000000000..3c052229f7
Binary files /dev/null and b/pandora_console/images/groups_small/g_apps.ok.png differ
diff --git a/pandora_console/images/groups_small/g_apps.warning.png b/pandora_console/images/groups_small/g_apps.warning.png
new file mode 100644
index 0000000000..d65c54b74d
Binary files /dev/null and b/pandora_console/images/groups_small/g_apps.warning.png differ
diff --git a/pandora_console/images/groups_small/g_comms.bad.png b/pandora_console/images/groups_small/g_comms.bad.png
new file mode 100644
index 0000000000..4c93200156
Binary files /dev/null and b/pandora_console/images/groups_small/g_comms.bad.png differ
diff --git a/pandora_console/images/groups_small/g_comms.default.png b/pandora_console/images/groups_small/g_comms.default.png
new file mode 100644
index 0000000000..9ebefe0a2e
Binary files /dev/null and b/pandora_console/images/groups_small/g_comms.default.png differ
diff --git a/pandora_console/images/groups_small/g_comms.ok.png b/pandora_console/images/groups_small/g_comms.ok.png
new file mode 100644
index 0000000000..f3fc5c0bb6
Binary files /dev/null and b/pandora_console/images/groups_small/g_comms.ok.png differ
diff --git a/pandora_console/images/groups_small/g_comms.warning.png b/pandora_console/images/groups_small/g_comms.warning.png
new file mode 100644
index 0000000000..60ee2dca7d
Binary files /dev/null and b/pandora_console/images/groups_small/g_comms.warning.png differ
diff --git a/pandora_console/images/groups_small/g_db.bad.png b/pandora_console/images/groups_small/g_db.bad.png
new file mode 100644
index 0000000000..ae19d79a6b
Binary files /dev/null and b/pandora_console/images/groups_small/g_db.bad.png differ
diff --git a/pandora_console/images/groups_small/g_db.default.png b/pandora_console/images/groups_small/g_db.default.png
new file mode 100644
index 0000000000..8f75d11858
Binary files /dev/null and b/pandora_console/images/groups_small/g_db.default.png differ
diff --git a/pandora_console/images/groups_small/g_db.ok.png b/pandora_console/images/groups_small/g_db.ok.png
new file mode 100644
index 0000000000..781ffd5dde
Binary files /dev/null and b/pandora_console/images/groups_small/g_db.ok.png differ
diff --git a/pandora_console/images/groups_small/g_db.warning.png b/pandora_console/images/groups_small/g_db.warning.png
new file mode 100644
index 0000000000..c1e1efa047
Binary files /dev/null and b/pandora_console/images/groups_small/g_db.warning.png differ
diff --git a/pandora_console/images/groups_small/g_firewall.bad.png b/pandora_console/images/groups_small/g_firewall.bad.png
new file mode 100644
index 0000000000..4845a86002
Binary files /dev/null and b/pandora_console/images/groups_small/g_firewall.bad.png differ
diff --git a/pandora_console/images/groups_small/g_firewall.default.png b/pandora_console/images/groups_small/g_firewall.default.png
new file mode 100644
index 0000000000..f2fdcb0afd
Binary files /dev/null and b/pandora_console/images/groups_small/g_firewall.default.png differ
diff --git a/pandora_console/images/groups_small/g_firewall.ok.png b/pandora_console/images/groups_small/g_firewall.ok.png
new file mode 100644
index 0000000000..120c057397
Binary files /dev/null and b/pandora_console/images/groups_small/g_firewall.ok.png differ
diff --git a/pandora_console/images/groups_small/g_firewall.warning.png b/pandora_console/images/groups_small/g_firewall.warning.png
new file mode 100644
index 0000000000..9e229109bf
Binary files /dev/null and b/pandora_console/images/groups_small/g_firewall.warning.png differ
diff --git a/pandora_console/images/groups_small/g_ids.bad.png b/pandora_console/images/groups_small/g_ids.bad.png
new file mode 100644
index 0000000000..e0193b50c3
Binary files /dev/null and b/pandora_console/images/groups_small/g_ids.bad.png differ
diff --git a/pandora_console/images/groups_small/g_ids.default.png b/pandora_console/images/groups_small/g_ids.default.png
new file mode 100644
index 0000000000..cd434e0606
Binary files /dev/null and b/pandora_console/images/groups_small/g_ids.default.png differ
diff --git a/pandora_console/images/groups_small/g_ids.ok.png b/pandora_console/images/groups_small/g_ids.ok.png
new file mode 100644
index 0000000000..1b25fc8c99
Binary files /dev/null and b/pandora_console/images/groups_small/g_ids.ok.png differ
diff --git a/pandora_console/images/groups_small/g_ids.warning.png b/pandora_console/images/groups_small/g_ids.warning.png
new file mode 100644
index 0000000000..0979e21a74
Binary files /dev/null and b/pandora_console/images/groups_small/g_ids.warning.png differ
diff --git a/pandora_console/images/groups_small/g_others.bad.png b/pandora_console/images/groups_small/g_others.bad.png
new file mode 100644
index 0000000000..edda4a298b
Binary files /dev/null and b/pandora_console/images/groups_small/g_others.bad.png differ
diff --git a/pandora_console/images/groups_small/g_others.default.png b/pandora_console/images/groups_small/g_others.default.png
new file mode 100644
index 0000000000..ce1aa5f47d
Binary files /dev/null and b/pandora_console/images/groups_small/g_others.default.png differ
diff --git a/pandora_console/images/groups_small/g_others.ok.png b/pandora_console/images/groups_small/g_others.ok.png
new file mode 100644
index 0000000000..f110240957
Binary files /dev/null and b/pandora_console/images/groups_small/g_others.ok.png differ
diff --git a/pandora_console/images/groups_small/g_others.warning.png b/pandora_console/images/groups_small/g_others.warning.png
new file mode 100644
index 0000000000..e7d4b9dbb9
Binary files /dev/null and b/pandora_console/images/groups_small/g_others.warning.png differ
diff --git a/pandora_console/images/groups_small/g_servers.bad.png b/pandora_console/images/groups_small/g_servers.bad.png
new file mode 100644
index 0000000000..c1798decf1
Binary files /dev/null and b/pandora_console/images/groups_small/g_servers.bad.png differ
diff --git a/pandora_console/images/groups_small/g_servers.default.png b/pandora_console/images/groups_small/g_servers.default.png
new file mode 100644
index 0000000000..a6939c804e
Binary files /dev/null and b/pandora_console/images/groups_small/g_servers.default.png differ
diff --git a/pandora_console/images/groups_small/g_servers.ok.png b/pandora_console/images/groups_small/g_servers.ok.png
new file mode 100644
index 0000000000..dc0f6e7090
Binary files /dev/null and b/pandora_console/images/groups_small/g_servers.ok.png differ
diff --git a/pandora_console/images/groups_small/g_servers.warning.png b/pandora_console/images/groups_small/g_servers.warning.png
new file mode 100644
index 0000000000..015bfb9358
Binary files /dev/null and b/pandora_console/images/groups_small/g_servers.warning.png differ
diff --git a/pandora_console/images/groups_small/g_workstation.bad.png b/pandora_console/images/groups_small/g_workstation.bad.png
new file mode 100644
index 0000000000..c91d5b65ab
Binary files /dev/null and b/pandora_console/images/groups_small/g_workstation.bad.png differ
diff --git a/pandora_console/images/groups_small/g_workstation.default.png b/pandora_console/images/groups_small/g_workstation.default.png
new file mode 100644
index 0000000000..b8717f09a8
Binary files /dev/null and b/pandora_console/images/groups_small/g_workstation.default.png differ
diff --git a/pandora_console/images/groups_small/g_workstation.ok.png b/pandora_console/images/groups_small/g_workstation.ok.png
new file mode 100644
index 0000000000..524612b00f
Binary files /dev/null and b/pandora_console/images/groups_small/g_workstation.ok.png differ
diff --git a/pandora_console/images/groups_small/g_workstation.warning.png b/pandora_console/images/groups_small/g_workstation.warning.png
new file mode 100644
index 0000000000..f1c00a5d2e
Binary files /dev/null and b/pandora_console/images/groups_small/g_workstation.warning.png differ
diff --git a/pandora_console/images/groups_small/heart.bad.png b/pandora_console/images/groups_small/heart.bad.png
new file mode 100644
index 0000000000..ff3008fcc4
Binary files /dev/null and b/pandora_console/images/groups_small/heart.bad.png differ
diff --git a/pandora_console/images/groups_small/heart.default.png b/pandora_console/images/groups_small/heart.default.png
new file mode 100644
index 0000000000..a7cfff0cc3
Binary files /dev/null and b/pandora_console/images/groups_small/heart.default.png differ
diff --git a/pandora_console/images/groups_small/heart.ok.png b/pandora_console/images/groups_small/heart.ok.png
new file mode 100644
index 0000000000..0f0798523d
Binary files /dev/null and b/pandora_console/images/groups_small/heart.ok.png differ
diff --git a/pandora_console/images/groups_small/heart.warning.png b/pandora_console/images/groups_small/heart.warning.png
new file mode 100644
index 0000000000..66b8583393
Binary files /dev/null and b/pandora_console/images/groups_small/heart.warning.png differ
diff --git a/pandora_console/images/groups_small/house.bad.png b/pandora_console/images/groups_small/house.bad.png
new file mode 100644
index 0000000000..815f719f7c
Binary files /dev/null and b/pandora_console/images/groups_small/house.bad.png differ
diff --git a/pandora_console/images/groups_small/house.default.png b/pandora_console/images/groups_small/house.default.png
new file mode 100644
index 0000000000..fac912b267
Binary files /dev/null and b/pandora_console/images/groups_small/house.default.png differ
diff --git a/pandora_console/images/groups_small/house.ok.png b/pandora_console/images/groups_small/house.ok.png
new file mode 100644
index 0000000000..c3a2e9053e
Binary files /dev/null and b/pandora_console/images/groups_small/house.ok.png differ
diff --git a/pandora_console/images/groups_small/house.warning.png b/pandora_console/images/groups_small/house.warning.png
new file mode 100644
index 0000000000..cf76552f5f
Binary files /dev/null and b/pandora_console/images/groups_small/house.warning.png differ
diff --git a/pandora_console/images/groups_small/images.bad.png b/pandora_console/images/groups_small/images.bad.png
new file mode 100644
index 0000000000..454b36e1d5
Binary files /dev/null and b/pandora_console/images/groups_small/images.bad.png differ
diff --git a/pandora_console/images/groups_small/images.default.png b/pandora_console/images/groups_small/images.default.png
new file mode 100644
index 0000000000..501a97fe27
Binary files /dev/null and b/pandora_console/images/groups_small/images.default.png differ
diff --git a/pandora_console/images/groups_small/images.ok.png b/pandora_console/images/groups_small/images.ok.png
new file mode 100644
index 0000000000..530af4f4c4
Binary files /dev/null and b/pandora_console/images/groups_small/images.ok.png differ
diff --git a/pandora_console/images/groups_small/images.warning.png b/pandora_console/images/groups_small/images.warning.png
new file mode 100644
index 0000000000..46cd29d989
Binary files /dev/null and b/pandora_console/images/groups_small/images.warning.png differ
diff --git a/pandora_console/images/groups_small/lightning.bad.png b/pandora_console/images/groups_small/lightning.bad.png
new file mode 100644
index 0000000000..a6ec10a2bc
Binary files /dev/null and b/pandora_console/images/groups_small/lightning.bad.png differ
diff --git a/pandora_console/images/groups_small/lightning.default.png b/pandora_console/images/groups_small/lightning.default.png
new file mode 100644
index 0000000000..47447d48be
Binary files /dev/null and b/pandora_console/images/groups_small/lightning.default.png differ
diff --git a/pandora_console/images/groups_small/lightning.ok.png b/pandora_console/images/groups_small/lightning.ok.png
new file mode 100644
index 0000000000..7dee1c4a81
Binary files /dev/null and b/pandora_console/images/groups_small/lightning.ok.png differ
diff --git a/pandora_console/images/groups_small/lightning.warning.png b/pandora_console/images/groups_small/lightning.warning.png
new file mode 100644
index 0000000000..020cfe9ac7
Binary files /dev/null and b/pandora_console/images/groups_small/lightning.warning.png differ
diff --git a/pandora_console/images/groups_small/lock.bad.png b/pandora_console/images/groups_small/lock.bad.png
new file mode 100644
index 0000000000..29fecde26d
Binary files /dev/null and b/pandora_console/images/groups_small/lock.bad.png differ
diff --git a/pandora_console/images/groups_small/lock.default.png b/pandora_console/images/groups_small/lock.default.png
new file mode 100644
index 0000000000..d462751473
Binary files /dev/null and b/pandora_console/images/groups_small/lock.default.png differ
diff --git a/pandora_console/images/groups_small/lock.ok.png b/pandora_console/images/groups_small/lock.ok.png
new file mode 100644
index 0000000000..fb9a8749bd
Binary files /dev/null and b/pandora_console/images/groups_small/lock.ok.png differ
diff --git a/pandora_console/images/groups_small/lock.warning.png b/pandora_console/images/groups_small/lock.warning.png
new file mode 100644
index 0000000000..bfb2826d31
Binary files /dev/null and b/pandora_console/images/groups_small/lock.warning.png differ
diff --git a/pandora_console/images/groups_small/network.bad.png b/pandora_console/images/groups_small/network.bad.png
new file mode 100644
index 0000000000..f3293d77ac
Binary files /dev/null and b/pandora_console/images/groups_small/network.bad.png differ
diff --git a/pandora_console/images/groups_small/network.default.png b/pandora_console/images/groups_small/network.default.png
new file mode 100644
index 0000000000..c330e90893
Binary files /dev/null and b/pandora_console/images/groups_small/network.default.png differ
diff --git a/pandora_console/images/groups_small/network.ok.png b/pandora_console/images/groups_small/network.ok.png
new file mode 100644
index 0000000000..edd8831666
Binary files /dev/null and b/pandora_console/images/groups_small/network.ok.png differ
diff --git a/pandora_console/images/groups_small/network.warning.png b/pandora_console/images/groups_small/network.warning.png
new file mode 100644
index 0000000000..6ddd996e56
Binary files /dev/null and b/pandora_console/images/groups_small/network.warning.png differ
diff --git a/pandora_console/images/groups_small/plugin.bad.png b/pandora_console/images/groups_small/plugin.bad.png
new file mode 100644
index 0000000000..6d156e363f
Binary files /dev/null and b/pandora_console/images/groups_small/plugin.bad.png differ
diff --git a/pandora_console/images/groups_small/plugin.default.png b/pandora_console/images/groups_small/plugin.default.png
new file mode 100644
index 0000000000..d97051dec6
Binary files /dev/null and b/pandora_console/images/groups_small/plugin.default.png differ
diff --git a/pandora_console/images/groups_small/plugin.ok.png b/pandora_console/images/groups_small/plugin.ok.png
new file mode 100644
index 0000000000..ff830a1475
Binary files /dev/null and b/pandora_console/images/groups_small/plugin.ok.png differ
diff --git a/pandora_console/images/groups_small/plugin.warning.png b/pandora_console/images/groups_small/plugin.warning.png
new file mode 100644
index 0000000000..58104424a0
Binary files /dev/null and b/pandora_console/images/groups_small/plugin.warning.png differ
diff --git a/pandora_console/images/groups_small/printer.bad.png b/pandora_console/images/groups_small/printer.bad.png
new file mode 100644
index 0000000000..9b2d285e85
Binary files /dev/null and b/pandora_console/images/groups_small/printer.bad.png differ
diff --git a/pandora_console/images/groups_small/printer.default.png b/pandora_console/images/groups_small/printer.default.png
new file mode 100644
index 0000000000..859c2474af
Binary files /dev/null and b/pandora_console/images/groups_small/printer.default.png differ
diff --git a/pandora_console/images/groups_small/printer.ok.png b/pandora_console/images/groups_small/printer.ok.png
new file mode 100644
index 0000000000..e85430df61
Binary files /dev/null and b/pandora_console/images/groups_small/printer.ok.png differ
diff --git a/pandora_console/images/groups_small/printer.warning.png b/pandora_console/images/groups_small/printer.warning.png
new file mode 100644
index 0000000000..7eb19cf180
Binary files /dev/null and b/pandora_console/images/groups_small/printer.warning.png differ
diff --git a/pandora_console/images/groups_small/server_database.bad.png b/pandora_console/images/groups_small/server_database.bad.png
new file mode 100644
index 0000000000..ade364eb92
Binary files /dev/null and b/pandora_console/images/groups_small/server_database.bad.png differ
diff --git a/pandora_console/images/groups_small/server_database.default.png b/pandora_console/images/groups_small/server_database.default.png
new file mode 100644
index 0000000000..7043931277
Binary files /dev/null and b/pandora_console/images/groups_small/server_database.default.png differ
diff --git a/pandora_console/images/groups_small/server_database.ok.png b/pandora_console/images/groups_small/server_database.ok.png
new file mode 100644
index 0000000000..1d6799ae08
Binary files /dev/null and b/pandora_console/images/groups_small/server_database.ok.png differ
diff --git a/pandora_console/images/groups_small/server_database.warning.png b/pandora_console/images/groups_small/server_database.warning.png
new file mode 100644
index 0000000000..77c0822a5e
Binary files /dev/null and b/pandora_console/images/groups_small/server_database.warning.png differ
diff --git a/pandora_console/images/groups_small/transmit.bad.png b/pandora_console/images/groups_small/transmit.bad.png
new file mode 100644
index 0000000000..90e71b4e73
Binary files /dev/null and b/pandora_console/images/groups_small/transmit.bad.png differ
diff --git a/pandora_console/images/groups_small/transmit.default.png b/pandora_console/images/groups_small/transmit.default.png
new file mode 100644
index 0000000000..04e0be58ea
Binary files /dev/null and b/pandora_console/images/groups_small/transmit.default.png differ
diff --git a/pandora_console/images/groups_small/transmit.ok.png b/pandora_console/images/groups_small/transmit.ok.png
new file mode 100644
index 0000000000..f247cd946f
Binary files /dev/null and b/pandora_console/images/groups_small/transmit.ok.png differ
diff --git a/pandora_console/images/groups_small/transmit.warning.png b/pandora_console/images/groups_small/transmit.warning.png
new file mode 100644
index 0000000000..14e209e758
Binary files /dev/null and b/pandora_console/images/groups_small/transmit.warning.png differ
diff --git a/pandora_console/images/groups_small/world.bad.png b/pandora_console/images/groups_small/world.bad.png
new file mode 100644
index 0000000000..cc5a584997
Binary files /dev/null and b/pandora_console/images/groups_small/world.bad.png differ
diff --git a/pandora_console/images/groups_small/world.default.png b/pandora_console/images/groups_small/world.default.png
new file mode 100644
index 0000000000..8917d22cc6
Binary files /dev/null and b/pandora_console/images/groups_small/world.default.png differ
diff --git a/pandora_console/images/groups_small/world.ok.png b/pandora_console/images/groups_small/world.ok.png
new file mode 100644
index 0000000000..bf79037c77
Binary files /dev/null and b/pandora_console/images/groups_small/world.ok.png differ
diff --git a/pandora_console/images/groups_small/world.warning.png b/pandora_console/images/groups_small/world.warning.png
new file mode 100644
index 0000000000..66cf9efd03
Binary files /dev/null and b/pandora_console/images/groups_small/world.warning.png differ
diff --git a/pandora_console/include/functions_gis.php b/pandora_console/include/functions_gis.php
index f73c4d83ee..c5bd1d82e1 100644
--- a/pandora_console/include/functions_gis.php
+++ b/pandora_console/include/functions_gis.php
@@ -292,26 +292,18 @@ function activateAjaxRefresh($layers = null, $lastTimeOfData = null) {
 	<?php
 }
 
-function addPoint($layerName, $pointName, $lat, $lon, $icon = null, $width = 20, $height = 20, $point_id  = '', $status = -1, $type_string = '') {
+function addPoint($layerName, $pointName, $lat, $lon, $icon = null, $width = 20,
+	$height = 20, $point_id  = '', $status = -1, $type_string = '') {
 	?>
 	<script type="text/javascript">
 	$(document).ready (
 		function () {
 			<?php
-			if ($icon != null) { 
-			?>
-				js_addPointExtent('<?php echo $layerName; ?>',
-					'<?php echo $pointName; ?>', <?php echo $lon; ?>,
-					<?php echo $lat; ?>, '<?php echo $icon; ?>', <?php echo $width; ?>,
-					<?php echo $height?>, <?php echo $point_id; ?>, '<?php echo $type_string; ?>');
-			<?php
+			if ($icon != null) {
+				echo "js_addPointExtent('$layerName', '$pointName', $lon, $lat, '$icon', $width, $height, $point_id, '$type_string');";
 			}
-			else { 
-			?>
-				js_addPoint('<?php echo $layerName; ?>',
-					'<?php echo $pointName; ?>', <?php echo $lon; ?>, <?php echo $lat; ?>, <?php echo $point_id; ?>,
-					'<?php echo $type_string; ?>');
-			<?php
+			else {
+				echo "js_addPoint('$layerName', '$pointName', $lon, $lat, $point_id, '$type_string');";
 			} 
 			?>
 		}
@@ -367,36 +359,37 @@ function get_agent_last_coords($idAgent) {
 function get_agent_icon_map($idAgent, $state = false) {
 	$row = get_db_row_sql('SELECT id_grupo, icon_path FROM tagente WHERE id_agente = ' . $idAgent);
 	
-	if ($row['icon_path'] === null) {
-		$iconGroup = "images/groups_small/" . get_group_icon($row['id_grupo']) . ".png";
-		return $iconGroup;
+	if (($row['icon_path'] === null) || (strlen($row['icon_path']) == 0)) {
+		$icon = "images/groups_small/" . get_group_icon($row['id_grupo']);
 	}
 	else {
 		$icon = "images/gis_map/icons/" . $row['icon_path'];
-		if (!$state)
-			return $icon . ".png";
-		else {
-			switch (get_agent_status($idAgent)) {
-				case 1:
-				case 4:
-					//Critical (BAD or ALERT)
-					$state = "_bad";
-					break;
-				case 0:
-					//Normal (OK)
-					$state = "_ok";
-					break;
-				case 2:
-					//Warning
-					$state = "_warning";
-					break;
-				default:
-					// Default is Grey (Other)
-					$state = '';
-			}
-			
-			return $icon . $state . ".png";
+	}
+	
+	if (!$state) {
+		return $icon . ".png";
+	}
+	else {
+		switch (get_agent_status($idAgent)) {
+			case 1:
+			case 4:
+				//Critical (BAD or ALERT)
+				$state = ".bad";
+				break;
+			case 0:
+				//Normal (OK)
+				$state = ".ok";
+				break;
+			case 2:
+				//Warning
+				$state = ".warning";
+				break;
+			default:
+				// Default is Grey (Other)
+				$state = '.default';
+				break;
 		}
+		return $icon . $state . ".png";
 	}
 }
 
@@ -777,36 +770,17 @@ function getArrayListIcons($fullpath = true) {
 			unset($dir[$index]);
 	}
 	
-	$baseImages = array();
-	$stateImages = array();
 	foreach ($dir as $item) {
-		if (strstr($item, "_") !== false)
-			$stateImages[] = $item;
-		else
-			$baseImages[] = $item;
-	}
-	
-	foreach ($baseImages as $item) {
 		$chunks = explode('.', $item);
 		$extension = end($chunks);
 		
 		$nameWithoutExtension = str_replace("." . $extension, "", $item);
+		$nameClean = str_replace(array('.bad', '.ok', '.warning', '.default'), "", $nameWithoutExtension);
 		
-		$return[$nameWithoutExtension]['ok'] = null;
-		$return[$nameWithoutExtension]['bad'] = null;
-		$return[$nameWithoutExtension]['warning'] = null;
-		$return[$nameWithoutExtension]['default'] = $path . $item;
-		
-		if (in_array($nameWithoutExtension.'_bad.' . $extension, $stateImages))
-			$return[$nameWithoutExtension]['bad'] = $path . $nameWithoutExtension.'_bad.' . $extension;
-		
-		if (in_array($nameWithoutExtension.'_ok.' . $extension, $stateImages))
-			$return[$nameWithoutExtension]['ok'] = $path . $nameWithoutExtension.'_ok.' . $extension;
-			$return[$nameWithoutExtension]['bad'] = $path . $nameWithoutExtension.'_bad.' . $extension;
-		
-		if (in_array($nameWithoutExtension.'_warning.' . $extension, $stateImages))
-			$return[$nameWithoutExtension]['warning'] = $path . $nameWithoutExtension.'_warning.' . $extension;
-		
+		$return[$nameClean]['ok'] = $path . $nameClean . '.ok.png';
+		$return[$nameClean]['bad'] = $path . $nameClean . '.bad.png';
+		$return[$nameClean]['warning'] = $path . $nameClean . '.warning.png';
+		$return[$nameClean]['default'] = $path . $nameClean . '.default.png';
 	}
 	
 	return $return;
diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php
index fff35c7e90..a3e2a509ea 100644
--- a/pandora_console/operation/agentes/estado_generalagente.php
+++ b/pandora_console/operation/agentes/estado_generalagente.php
@@ -117,8 +117,14 @@ if ($config['activate_gis']) {
 	$dataPositionAgent = getDataLastPositionAgent($agent['id_agente']);
 	
 	echo '<tr><td class="datos2"><b>'.__('Position (Long, Lat)'). '</b></td>';
-    echo '<td class="datos2" colspan="2">
-    	<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&tab=gis&id_agente='.$id_agente.'">'.$dataPositionAgent['stored_longitude'].', '.$dataPositionAgent['stored_latitude'].'</a></td></tr>';
+    echo '<td class="datos2" colspan="2">';
+    if ($dataPositionAgent === false) {
+    	echo __('There is no GIS data.');
+    }
+    else {
+    	echo '<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&tab=gis&id_agente='.$id_agente.'">'.$dataPositionAgent['stored_longitude'].', '.$dataPositionAgent['stored_latitude'].'</a>';
+    }
+    echo '</td></tr>';
 }
 // Last contact
 echo '<tr><td class="datos2"><b>'.__('Last contact')." / ".__('Remote').'</b></td><td class="datos2 f9" colspan="2">';
diff --git a/pandora_console/operation/gis_maps/ajax.php b/pandora_console/operation/gis_maps/ajax.php
index 441f104f1c..1461de3860 100644
--- a/pandora_console/operation/gis_maps/ajax.php
+++ b/pandora_console/operation/gis_maps/ajax.php
@@ -44,7 +44,17 @@ switch ($opt) {
 		
 		$flagGroupAll = get_db_all_rows_sql('SELECT tgrupo_id_grupo FROM tgis_map_layer WHERE id_tmap_layer = ' . $layerId . ' AND tgrupo_id_grupo = 1;'); //group 1 = all groups
 		
+		$defaultCoords = get_db_row_sql('SELECT default_longitude, default_latitude
+			FROM tgis_map
+			WHERE id_tgis_map IN (SELECT tgis_map_id_tgis_map FROM tgis_map_layer WHERE id_tmap_layer = ' . $layerId . ')');
+		
 		if ($flagGroupAll === false) {
+			$idAgentsWithGISTemp = get_db_all_rows_sql('SELECT id_agente FROM tagente WHERE id_grupo IN
+					(SELECT tgrupo_id_grupo FROM tgis_map_layer WHERE id_tmap_layer = ' . $layerId . ')
+					OR id_agente IN
+					(SELECT tagente_id_agente FROM tgis_map_layer_has_tagente WHERE tgis_map_layer_id_tmap_layer = ' . $layerId . ');');
+			
+			
 			$agentsGISStatus = get_db_all_rows_sql('SELECT tagente_id_agente, stored_longitude, stored_latitude
 				FROM tgis_data_status
 				WHERE tagente_id_agente IN
@@ -56,11 +66,29 @@ switch ($opt) {
 		}
 		else {
 			//All groups, all agents
+			$idAgentsWithGISTemp = get_db_all_rows_sql('SELECT tagente_id_agente AS id_agente
+				FROM tgis_data_status
+				WHERE tagente_id_agente');
+			
+			
 			$agentsGISStatus = get_db_all_rows_sql('SELECT tagente_id_agente, stored_longitude, stored_latitude
 				FROM tgis_data_status
 				WHERE tagente_id_agente');
 		}
 		
+		foreach ($idAgentsWithGISTemp as $idAgent) {
+			$idAgentsWithGIS[] = $idAgent['id_agente'];
+		}
+		
+		$agentsGISStatus = get_db_all_rows_sql('SELECT tagente_id_agente, stored_longitude, stored_latitude
+				FROM tgis_data_status
+				WHERE tagente_id_agente IN (' . implode(',', $idAgentsWithGIS) . ')
+				UNION
+				SELECT id_agente AS tagente_id_agente,
+					' . $defaultCoords['default_longitude'] . ' AS stored_longitude, ' . $defaultCoords['default_latitude'] . ' AS stored_latitude
+				FROM tagente
+				WHERE id_agente NOT IN (' . implode(',', $idAgentsWithGIS) . ')');
+		
 		if ($agentsGISStatus === false) {
 			$agentsGISStatus = array();
 		}
diff --git a/pandora_console/operation/gis_maps/render_view.php b/pandora_console/operation/gis_maps/render_view.php
index 079a28fc28..e8efc7844c 100644
--- a/pandora_console/operation/gis_maps/render_view.php
+++ b/pandora_console/operation/gis_maps/render_view.php
@@ -80,16 +80,20 @@ if ($layers != false) {
 			$idAgent = get_agent_id($agentName);
 			$coords = getDataLastPositionAgent($idAgent);
 			
-			if ($coords === false)
-				continue;
-			
+			if ($coords === false) {
+				$coords['stored_latitude'] = $map['default_latitude'];
+				$coords['stored_longitude'] = $map['default_longitude'];
+			}
+			else {
+				if ($show_history == 'y') { 	
+					addPath($layer['layer_name'], $idAgent);
+				}
+			}
 			$icon = get_agent_icon_map($idAgent, true);
 			$status = get_agent_status($idAgent);
 			
-			if ($show_history == 'y') { 	
-				addPath($layer['layer_name'], $idAgent);
-			}
-			addPoint($layer['layer_name'], $agentName, $coords['stored_latitude'], $coords['stored_longitude'], $icon, 20, 20, $idAgent, $status, 'point_agent_info');
+			addPoint($layer['layer_name'], $agentName, $coords['stored_latitude'],
+				$coords['stored_longitude'], $icon, 20, 20, $idAgent, $status, 'point_agent_info');
 		}
 	}