diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 97afe38827..e2bb1a7868 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,9 @@
+2011-08-25 Javier Lanz <javier.lanz@artica.es>
+
+	* godmode/groups/configure_group.php: Removed the non-desired icons
+
+	Fixes: #3397548
+
 2011-08-25  Sergio Martin <sergio.martin@artica.es>
 
 	* include/db/mysql.php: Fixed a bug in the sql_commit
diff --git a/pandora_console/godmode/groups/configure_group.php b/pandora_console/godmode/groups/configure_group.php
index f99637bcd3..b42a25b9e9 100644
--- a/pandora_console/godmode/groups/configure_group.php
+++ b/pandora_console/godmode/groups/configure_group.php
@@ -79,6 +79,11 @@ $table->data[0][1] = html_print_input_text ('name', $name, '', 35, 100, true);
 
 $table->data[1][0] = __('Icon');
 $files = list_files ('images/groups_small/', "png", 1, 0);
+foreach ($files as $key => $f) {//Remove from the list the non-desired .png files
+	if (strpos ($f, '.bad.png') !== false || strpos ($f, '.default.png') !== false || strpos ($f, '.ok.png') !== false || strpos ($f, '.warning.png') !== false) {
+		unset ($files[$key]);
+	}
+}
 $table->data[1][1] = html_print_select ($files, 'icon', $icon, '', 'None', '', true);
 $table->data[1][1] .= ' <span id="icon_preview">';
 if ($icon) {