diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index 58add351ab..f7ff804b50 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -367,7 +367,7 @@ $img_style = [
 if ($id_agente) {
     // View tab.
     $viewtab['text'] = '<a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$id_agente.'">'.html_print_image(
-        'images/operation.png',
+        'images/eye.png',
         true,
         [
             'title' => __('View'),
@@ -563,6 +563,27 @@ if ($id_agente) {
         $agent_wizard['active'] = false;
     }
 
+
+    $total_incidents = agents_get_count_incidents($id_agente);
+
+    // Incident tab.
+    if ($total_incidents > 0) {
+        $incidenttab['text'] = '<a href="index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente&amp;tab=incident&amp;id_agente='.$id_agente.'">'.html_print_image(
+            'images/book_edit.png',
+            true,
+            [
+                'title' => __('Incidents'),
+                'class' => 'invert_filter',
+            ]
+        ).'</a>';
+
+        if ($tab == 'incident') {
+            $incidenttab['active'] = true;
+        } else {
+            $incidenttab['active'] = false;
+        }
+    }
+
     if (check_acl_one_of_groups($config['id_user'], $all_groups, 'AW')) {
         if ($has_remote_conf) {
             $agent_name = agents_get_name($id_agente);
@@ -616,6 +637,11 @@ if ($id_agente) {
 
             ];
         }
+
+        // Only if the agent has incidents associated show incidents tab.
+        if ($total_incidents) {
+            $onheader['incident'] = $incidenttab;
+        }
     } else {
         $onheader = [
             'view'      => $viewtab,
diff --git a/pandora_console/include/functions_snmp_browser.php b/pandora_console/include/functions_snmp_browser.php
index cbe6683931..04f3823304 100644
--- a/pandora_console/include/functions_snmp_browser.php
+++ b/pandora_console/include/functions_snmp_browser.php
@@ -144,7 +144,7 @@ function snmp_browser_get_html_tree(
         // Branch or leave with branches!
         if (isset($sub_level['__OID__'])) {
             $output .= "<a onfocus='javascript: this.blur();' href='javascript: snmpGet(\"".addslashes($sub_level['__OID__'])."\");'>";
-            $output .= '<img src="'.$url.'/../../images/eye.png" class="vertical_middle">';
+            $output .= '<img src="'.$url.'/../../images/operation.png" class="vertical_middle">';
             $output .= '</a>';
         }