diff --git a/pandora_console/general/firts_task/cluster_builder.php b/pandora_console/general/firts_task/cluster_builder.php
index a9c4cf2083..e0ca22576a 100644
--- a/pandora_console/general/firts_task/cluster_builder.php
+++ b/pandora_console/general/firts_task/cluster_builder.php
@@ -25,7 +25,7 @@ ui_print_info_message ( array('no_close'=>true, 'message'=>  __('There are no cl
 
 <div class="new_task">
 	<div class="image_task">
-		<?php echo html_print_image('images/firts_task/icono_grande_custom_reporting.png', true, array("title" => __('Clusters')));?>
+		<?php echo html_print_image('images/firts_task/icono-cluster-activo.png', true, array("title" => __('Clusters')));?>
 	</div>
 	<div class="text_task">
 		<h3> <?php echo __('Create Cluster'); ?></h3>
diff --git a/pandora_console/godmode/reporting/cluster_builder.main.php b/pandora_console/godmode/reporting/cluster_builder.main.php
index e5002e2df1..38f8bbb486 100644
--- a/pandora_console/godmode/reporting/cluster_builder.main.php
+++ b/pandora_console/godmode/reporting/cluster_builder.main.php
@@ -250,13 +250,9 @@ elseif($step == 2){
     $cluster_agents_all[$value['id_agente']] = $value['alias'];
   }
   
-  $cluster_agents_out = array();
-  $cluster_agents_out = array_diff_key($template_agents_all, $template_agents_in);
+  $cluster_agents_out = array_diff_key($cluster_agents_all,$cluster_agents_in);
   
-  $cluster_agents_in_keys = array_keys($template_agents_in);
-  $cluster_agents_out_keys = array_keys($template_agents_out);
-  
-  html_print_select ($cluster_agents_all, 'id_agents[]', 0, false, '', '', false, true, true, '', false, 'width: 100%;', $option_style);
+  html_print_select ($cluster_agents_out, 'id_agents[]', 0, false, '', '', false, true, true, '', false, 'width: 100%;', $option_style);
   
   echo "</td>";
   
diff --git a/pandora_console/godmode/reporting/cluster_list.php b/pandora_console/godmode/reporting/cluster_list.php
index e7c3857f1e..e70aa21e06 100644
--- a/pandora_console/godmode/reporting/cluster_list.php
+++ b/pandora_console/godmode/reporting/cluster_list.php
@@ -77,8 +77,7 @@ ui_pagination (count($clusters));
   foreach ($clusters as $cluster) {
     $data = array ();
     
-    $data[0] = '<a href="index.php?sec=reporting&sec2=godmode/reporting/cluster_view&id='.$cluster["id"].'">'.$cluster["name"].' - Enlace Map Dani (Mapa de red)</a><br><br>'.
-		'<a href="index.php?sec=reporting&sec2=godmode/reporting/cluster_view_2&id='.$cluster["id"].'">'.$cluster["name"].' - Enlace Enrique (pantalla informativa)</a>';
+    $data[0] = '<a href="index.php?sec=reporting&sec2=godmode/reporting/cluster_view&id='.$cluster["id"].'">'.$cluster["name"].'</a>';
     $data[1] = ui_print_truncate_text($cluster["description"], 70);
 		
 		$data[2] = ui_print_group_icon($cluster['group'],true);
@@ -143,7 +142,7 @@ ui_pagination (count($clusters));
 				break;
 		}
 		
-		$data[6] = "<a href='index.php?sec=reporting&sec2=godmode/reporting/cluster_builder&delete_cluster=".$cluster["id"]."'><img src='images/cross.png'></a>
+		$data[6] = "<a href='index.php?sec=reporting&sec2=godmode/reporting/cluster_builder&delete_cluster=".$cluster["id"]."' onclick='javascript: if (!confirm(\"Are you sure to delete?\")) return false;'><img src='images/cross.png'></a>
                 <a href='index.php?sec=reporting&sec2=godmode/reporting/cluster_builder.cluster_editor&id=".$cluster["id"]."'><img src='images/builder.png'></a>";
     
     array_push ($table->data, $data);
diff --git a/pandora_console/images/firts_task/icono-cluster-activo.png b/pandora_console/images/firts_task/icono-cluster-activo.png
new file mode 100644
index 0000000000..49720af75d
Binary files /dev/null and b/pandora_console/images/firts_task/icono-cluster-activo.png differ
diff --git a/pandora_console/images/os_icons/so_cluster.png b/pandora_console/images/os_icons/so_cluster.png
new file mode 100644
index 0000000000..5f76cd1615
Binary files /dev/null and b/pandora_console/images/os_icons/so_cluster.png differ
diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql
index 27dbfea739..3f850e0bd0 100644
--- a/pandora_console/pandoradb_data.sql
+++ b/pandora_console/pandoradb_data.sql
@@ -142,7 +142,7 @@ INSERT INTO `tconfig_os` (`id_os`, `name`, `description`, `icon_name`) VALUES
 (18, 'Switch', 'Generic switch', 'so_switch.png'),
 (19, 'Satellite', 'Satellite agent', 'satellite.png'),
 (20, 'Mainframe', 'Mainframe agent', 'so_mainframe.png'),
-(21, 'Cluster', 'Cluster agent', 'so_mainframe.png');
+(21, 'Cluster', 'Cluster agent', 'so_cluster.png');
 UNLOCK TABLES;