diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index e1ce45cdde..04dfaeb2a2 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,11 @@
+2012-05-04 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
+
+	* operation/agentes/ver_agente.php: Changed way of truncate agent 
+	name in header due to bad visualization if agent name has entities.
+		
+	* include/styles/pandora.css
+	images/header_f2.png: Modified header image with 3000px width. 
+
 2012-05-03 Miguel de Dios <miguel.dedios@artica.es>
 	
 	* include/styles/pandora.css: fixed ".is_submenu2 li" because there
@@ -24,6 +32,13 @@
 	
 	MERGED FROM 4.0.2
 
+2012-05-03 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
+
+	* operation/agentes/ver_agente.php: Changed way of truncate agent 
+	name in header due to bad visualization if agent name has entities.
+	
+	Merged from branches.
+
 2012-05-03 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
 
 	* include/styles/pandora.css: Removed background color of 
diff --git a/pandora_console/images/header_f2.png b/pandora_console/images/header_f2.png
index 87adca1764..a3bcb23d69 100644
Binary files a/pandora_console/images/header_f2.png and b/pandora_console/images/header_f2.png differ
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 35659df514..752ef69a2c 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -1353,9 +1353,9 @@ div#main {
 }
 div#head {
 	width: auto;
+	height: auto;
 	background-color: #000;
-	background-image: url(../../images/header_f2.png); 
-	background-size: 100% !important;
+	background-image: url(../../images/header_f2.png);
 }
 
 div#foot {
@@ -1611,7 +1611,7 @@ td.datos_greyf9, td.datos_bluef9, td.datos_greenf9, td.datos_redf9, td.datos_yel
 }
 
 .menu li.selected {
-	background-color: #B1B1B1 !important;
+     background-color: #B1B1B1 !important;
 }
 
 .menu li {
@@ -1619,7 +1619,7 @@ td.datos_greyf9, td.datos_bluef9, td.datos_greenf9, td.datos_redf9, td.datos_yel
 }
 
 .submenu li a{
-	background-color: #E4E4E4 !important;
+     background-color: #E4E4E4 !important;
 }
 
 .menu li a:hover, 
@@ -1632,7 +1632,7 @@ td.datos_greyf9, td.datos_bluef9, td.datos_greenf9, td.datos_redf9, td.datos_yel
 }
 
 .is_submenu2 {
-	background-color: #222222 !important;
+   background-color: #222222 !important;
 }
 
 .menu li.submenu_selected a {
diff --git a/pandora_console/operation/agentes/ver_agente.php b/pandora_console/operation/agentes/ver_agente.php
index c221e22cf4..bdcaf1e168 100644
--- a/pandora_console/operation/agentes/ver_agente.php
+++ b/pandora_console/operation/agentes/ver_agente.php
@@ -757,7 +757,7 @@ switch($tab) {
 		break;
 }
 
-ui_print_page_header (__('Agent').'&nbsp;-&nbsp;'.mb_substr(agents_get_name($id_agente),0,25) . $header_description, $icon, false, "", false, $onheader);
+ui_print_page_header (__('Agent').'&nbsp;-&nbsp;'.ui_print_truncate_text(agents_get_name($id_agente),25, false) . $header_description, $icon, false, "", false, $onheader);
 
 
 switch ($tab) {