diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 366b97c0d8..beee0fc65e 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,14 @@
+2013-07-09  Sergio Martin <sergio.martin@artica.es>
+
+	* include/styles/pandora.css
+	images/wand_agent.png
+	images/wand_snmp.png
+	images/wand_wmi.png
+	images/wand_interfaces.png
+	godmode/agentes/agent_wizard.php
+	godmode/agentes/configurar_agente.php: Add new subtab to
+	agent wizard
+
 2013-07-08  Sergio Martin <sergio.martin@artica.es>
 
 	* include/javascript/pandora_modules.js
diff --git a/pandora_console/godmode/agentes/agent_wizard.php b/pandora_console/godmode/agentes/agent_wizard.php
index d06deca9e1..f1225254a0 100644
--- a/pandora_console/godmode/agentes/agent_wizard.php
+++ b/pandora_console/godmode/agentes/agent_wizard.php
@@ -33,11 +33,13 @@ switch($wizard_section) {
 		break;
 }
 
+/*
 echo "<div style='text-align: right; width: 98%; padding-top: 10px; padding-bottom: 10px;'>";
 echo "<a href='index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=agent_wizard&wizard_section=snmp_interfaces_explorer&id_agente=$idAgent' style='" . $snmp_interfaces_explorer_style . "'>" . __('SNMP Interfaces explorer') . "</a>";
 echo " | ";
 echo "<a href='index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=agent_wizard&wizard_section=wmi_explorer&id_agente=$idAgent' style='" . $wmi_explorer_style . "'>" . __('WMI explorer') . "</a>";
 echo "</div>";
+*/
 
 require("agent_wizard." . $wizard_section . ".php");
 
diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index c82b216b8c..45a858dd8a 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -340,8 +340,8 @@ if ($id_agente) {
 	}
 	
 	/* Agent wizard tab */
-	$agent_wizard['text'] = '<a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=agent_wizard&id_agente='.$id_agente.'">'
-		. html_print_image ("images/wand.png", true, array ( "title" => __('Agent wizard')))
+	$agent_wizard['text'] = '<a href="javascript:" class="agent_wizard_tab">'
+		. html_print_image ("images/wand_agent.png", true, array ( "title" => __('Agent wizard')))
 		. '</a>';
 	
 	if ($tab == "agent_wizard")
@@ -1416,4 +1416,61 @@ switch ($tab) {
 		}
 		break;
 }
+
+// Hidden subtab layer
+echo '<div id="agent_wizard_subtabs">';
+echo '<ul class="mn subsubmenu" style="background: #555555;">';
+echo '<li class="nomn tab_godmode" style="text-align: center;">';
+echo '<a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=agent_wizard&wizard_section=snmp_interfaces_explorer&id_agente='.$id_agente.'">'
+		. html_print_image ("images/wand_interfaces.png", true, array ( "title" => __('SNMP Interfaces explorer')))
+		. '</a>';
+echo '<li>';
+echo '<li class="nomn tab_godmode" style="text-align: center;">';
+echo '<a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=agent_wizard&wizard_section=wmi_explorer&id_agente='.$id_agente.'">'
+		. html_print_image ("images/wand_wmi.png", true, array ( "title" => __('WMI Explorer')))
+		. '</a>';
+echo '<li>';
+echo '</ul>';
+echo '</div>';
 ?>
+<script type="text/javascript">
+var wizard_tab_showed = 0;
+
+/* <![CDATA[ */
+$(document).ready (function () {
+	// Control the tab and subtab hover. When mouse leave one, 
+	// check if is hover the other before hide the subtab
+	$('.agent_wizard_tab').hover(agent_wizard_tab_show, agent_wizard_tab_hide);
+	
+	$('#agent_wizard_subtabs').hover(agent_wizard_tab_show, agent_wizard_tab_hide);
+});
+
+// Set the position and width of the subtab
+function agent_wizard_tab_setup() {		
+	$('#agent_wizard_subtabs').css('left', $('.agent_wizard_tab').offset().left)
+	$('#agent_wizard_subtabs').css('top', $('.agent_wizard_tab').offset().top + $('.agent_wizard_tab').height() + 4)
+	$('#agent_wizard_subtabs').css('width', $('.agent_wizard_tab').width() + 6)
+}
+agent_wizard_tab_setup();
+
+
+function agent_wizard_tab_show() {
+	wizard_tab_showed = wizard_tab_showed + 1;
+	
+	if(wizard_tab_showed == 1) {
+		$('#agent_wizard_subtabs').show("fast");
+	}
+}
+
+function agent_wizard_tab_hide() {
+	wizard_tab_showed = wizard_tab_showed - 1;
+
+	setTimeout(function() {
+		if(wizard_tab_showed <= 0) {
+			$('#agent_wizard_subtabs').hide("fast");
+		}
+	},500);
+}
+
+/* ]]> */
+</script>
diff --git a/pandora_console/images/wand_agent.png b/pandora_console/images/wand_agent.png
new file mode 100644
index 0000000000..7858b38013
Binary files /dev/null and b/pandora_console/images/wand_agent.png differ
diff --git a/pandora_console/images/wand_interfaces.png b/pandora_console/images/wand_interfaces.png
new file mode 100644
index 0000000000..04d22867bf
Binary files /dev/null and b/pandora_console/images/wand_interfaces.png differ
diff --git a/pandora_console/images/wand_snmp.png b/pandora_console/images/wand_snmp.png
new file mode 100644
index 0000000000..94feac62bd
Binary files /dev/null and b/pandora_console/images/wand_snmp.png differ
diff --git a/pandora_console/images/wand_wmi.png b/pandora_console/images/wand_wmi.png
new file mode 100644
index 0000000000..5920531392
Binary files /dev/null and b/pandora_console/images/wand_wmi.png differ
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 5d12686737..8c850ca168 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -2658,4 +2658,27 @@ DIV.nodata_container {
 	#padding: 10px;
 }
 
+/* Subtab styles */
 
+ul.subsubmenu {
+	border-bottom-right-radius: 5px;
+	border-bottom-left-radius: 5px;
+	-moz-border-bottom-right-radius: 5px;
+	-moz-border-bottom-left-radius: 5px;
+	-webkit-border-bottom-right-radius: 5px;
+	-webkit-border-bottom-left-radius: 5px;
+	
+	background: #555555;
+}
+
+div#agent_wizard_subtabs {
+	position: absolute;
+	margin-left: 0px;
+	display: none;
+	padding-bottom: 3px;
+	z-index: 1000;
+}
+
+.agent_wizard_tab:hover {
+	cursor: default;
+}