diff --git a/backend/hint.go b/backend/hint.go
index 66306fdf..7430edb0 100644
--- a/backend/hint.go
+++ b/backend/hint.go
@@ -36,7 +36,7 @@ func treatOpeningHint(pathname string, team fic.Team) {
 			log.Println("[WRN]", err)
 		} else if theme, err := fic.GetTheme(exercice.IdTheme); err != nil {
 			log.Println("[WRN]", err)
-		} else if _, err = fic.NewEvent(fmt.Sprintf("L'équipe %s a dévoilé un indice pour le <strong>%d<sup>e</sup></strong> défi %s&nbsp;!", team.Name, lvl, theme.Name), "info"); err != nil {
+		} else if _, err = fic.NewEvent(fmt.Sprintf("L'équipe %s a dévoilé un indice pour le <strong>%d<sup>e</sup></strong> défi %s&#160;!", team.Name, lvl, theme.Name), "info"); err != nil {
 			log.Println("[WRN] Unable to create event:", err)
 		}
 
diff --git a/backend/registration.go b/backend/registration.go
index 87bc1731..cde5c1e4 100644
--- a/backend/registration.go
+++ b/backend/registration.go
@@ -39,7 +39,7 @@ func treatRegistration(pathname string, team_id string) {
 			if err := os.Remove(pathname); err != nil {
 				log.Println("[WRN]", err)
 			}
-			if _, err := fic.NewEvent(fmt.Sprintf("Souhaitons bonne chance à l'équipe <strong>%s</strong> qui vient de nous rejoindre&nbsp;!", team.Name), "info"); err != nil {
+			if _, err := fic.NewEvent(fmt.Sprintf("Souhaitons bonne chance à l'équipe <strong>%s</strong> qui vient de nous rejoindre&#160;!", team.Name), "info"); err != nil {
 				log.Println("[WRN] Unable to create event:", err)
 			}
 
diff --git a/backend/rename.go b/backend/rename.go
index 2dfecd1c..6c605c49 100644
--- a/backend/rename.go
+++ b/backend/rename.go
@@ -31,7 +31,7 @@ func treatRename(pathname string, team fic.Team) {
 		if err := genTeamMyFile(team); err != nil {
 			log.Println("my-", team.Id, ".json generation error: ", err)
 		}
-		if _, err := fic.NewEvent(fmt.Sprintf("Souhaitons bonne chance à l'équipe <strong>%s</strong> qui vient de nous rejoindre&nbsp;!", team.Name), "info"); err != nil {
+		if _, err := fic.NewEvent(fmt.Sprintf("Souhaitons bonne chance à l'équipe <strong>%s</strong> qui vient de nous rejoindre&#160;!", team.Name), "info"); err != nil {
 			log.Println("[WRN] Unable to create event:", err)
 		}
 		if err := genEventsFile(); err != nil {
diff --git a/backend/submission.go b/backend/submission.go
index 53793f51..14c6cecb 100644
--- a/backend/submission.go
+++ b/backend/submission.go
@@ -121,7 +121,7 @@ func treatSubmission(pathname string, team fic.Team, exercice_id string) {
 		// Write event
 		if lvl, err := exercice.GetLevel(); err != nil {
 			log.Println(id, "[ERR] Unable to get exercice level:", err)
-		} else if _, err := fic.NewEvent(fmt.Sprintf("L'équipe %s a résolu le <strong>%d<sup>e</sup></strong> défi %s&nbsp;!", team.Name, lvl, theme.Name), "success"); err != nil {
+		} else if _, err := fic.NewEvent(fmt.Sprintf("L'équipe %s a résolu le <strong>%d<sup>e</sup></strong> défi %s&#160;!", team.Name, lvl, theme.Name), "success"); err != nil {
 			log.Println(id, "[WRN] Unable to create event:", err)
 		}
 		genTeamAll(team)
@@ -132,7 +132,7 @@ func treatSubmission(pathname string, team fic.Team, exercice_id string) {
 		if tm.Unix() == 0 {
 			if lvl, err := exercice.GetLevel(); err != nil {
 				log.Println(id, "[ERR] Unable to get exercice level:", err)
-			} else if _, err := fic.NewEvent(fmt.Sprintf("L'équipe %s tente le <strong>%d<sup>e</sup></strong> défi %s&nbsp;!", team.Name, lvl, theme.Name), "warning"); err != nil {
+			} else if _, err := fic.NewEvent(fmt.Sprintf("L'équipe %s tente le <strong>%d<sup>e</sup></strong> défi %s&#160;!", team.Name, lvl, theme.Name), "warning"); err != nil {
 				log.Println(id, "[WRN] Unable to create event:", err)
 			}
 		}
diff --git a/frontend/static/js/challenge.js b/frontend/static/js/challenge.js
index 10562f8a..68bc373f 100644
--- a/frontend/static/js/challenge.js
+++ b/frontend/static/js/challenge.js
@@ -187,7 +187,7 @@ angular.module("FICApp", ["ngRoute", "ngSanitize"])
 			maxTimeSeen = event.time;
 
 		    if ($rootScope.notify_field != 0) {
-			var notification = new Notification("Challenge forensic", {body: event.txt.replace(/(<([^>]+)>)/ig,""), icon: "/favicon.ico"});
+			var notification = new Notification("Challenge forensic", {body: event.txt.replace(/&#(\d+);/g, function(match, dec) {return String.fromCharCode(dec);}).replace(/(<([^>]+)>)/ig,""), badge: "/img/icon-" + event.kind + ".ico", icon: "/img/icon-" + event.kind + ".ico"});
 			notification.onclick = function(ev) {
 			    $location.url("/edit");
 			};