2 files changed, 5 insertions, 4 deletions
diff --git a/views/default/icon/default.php b/views/default/icon/default.php
index 533b92c43..6aeef204b 100644
--- a/views/default/icon/default.php
+++ b/views/default/icon/default.php
@@ -5,9 +5,9 @@
  * @package Elgg
  * @subpackage Core
  *
- * @uses $vars['entity'] The entity the icon represents - uses getIconURL() method
- * @uses $vars['size']   topbar, tiny, small, medium (default), large, master
- * @uses $vars['href']   Optional override for link
+ * @uses $vars['entity']     The entity the icon represents - uses getIconURL() method
+ * @uses $vars['size']       topbar, tiny, small, medium (default), large, master
+ * @uses $vars['href']       Optional override for link
  * @uses $vars['img_class']  Optional CSS class added to img
  */
 
@@ -26,6 +26,7 @@ if (isset($entity->name)) {
 } else {
 	$title = $entity->title;
 }
+$title = htmlspecialchars($title, ENT_QUOTES, 'UTF-8', false);
 
 $url = $entity->getURL();
 if (isset($vars['href'])) {
diff --git a/views/default/icon/user/default.php b/views/default/icon/user/default.php
index 0eb3691bd..906371cf8 100644
--- a/views/default/icon/user/default.php
+++ b/views/default/icon/user/default.php
@@ -26,7 +26,7 @@ if (!($user instanceof ElggUser)) {
 	return true;
 }
 
-$name = htmlspecialchars($user->name, ENT_QUOTES, 'UTF-8');
+$name = htmlspecialchars($user->name, ENT_QUOTES, 'UTF-8', false);
 $username = $user->username;
 
 $icontime = $user->icontime;