diff --git a/src/main/java/ch/hepia/config/AppConfig.java b/src/main/java/ch/hepia/config/AppConfig.java
index d90450125d87f20b42ea61fb8852b6c7c7574377..47571bf87bcfea20a2024830c7e15c5a5b00c81d 100644
--- a/src/main/java/ch/hepia/config/AppConfig.java
+++ b/src/main/java/ch/hepia/config/AppConfig.java
@@ -34,6 +34,7 @@ public final class AppConfig {
 	 * Resources
 	 */
 	public static final String CHAT_MESSAGE_ICON = "/img/bubble.png";
+	public static final String CHAT_MESSAGE_ICON_SELF = "/img/bubble_self.png";
 	public static final String HELP_MESSAGE_ICON = "/img/help.png";
 	/**
 	 * Style
diff --git a/src/main/java/ch/hepia/ui/MainWindowController.java b/src/main/java/ch/hepia/ui/MainWindowController.java
index a315c699fbb8256c5bf5f26f5d1b73c35b8ca1ea..3ac3b3f6363aa264932b169144ffdf429a17d833 100644
--- a/src/main/java/ch/hepia/ui/MainWindowController.java
+++ b/src/main/java/ch/hepia/ui/MainWindowController.java
@@ -311,8 +311,13 @@ public class MainWindowController implements Initializable {
         app.getMessageManager().conditionalSubscribeChatMessage(
             chatMessage -> {
                 Platform.runLater(() -> {
-                    String message = chatMessage.getUser().toString() + ": " + chatMessage.getMessage();
-                    drawMessage(chatMessage.getUser(), message, AppConfig.CHAT_MESSAGE_ICON, AppConfig.COLOR_BLUE_10_OPACITY);
+                    User sender = chatMessage.getUser();
+                    String message = sender.getName() + ": " + chatMessage.getMessage();
+                    if (sender.equals(app.getUser().get())) {
+                        drawMessage(sender, message, AppConfig.CHAT_MESSAGE_ICON_SELF, AppConfig.COLOR_BLUE_10_OPACITY);
+                    } else {
+                        drawMessage(sender, message, AppConfig.CHAT_MESSAGE_ICON, AppConfig.COLOR_BLUE_10_OPACITY);
+                    }
                 });
             },
             chatMessage -> !(app.getUser().get().getIgnoredUserList().contains(chatMessage.getUser()))
diff --git a/src/main/resources/img/bubble_self.png b/src/main/resources/img/bubble_self.png
new file mode 100644
index 0000000000000000000000000000000000000000..3f82566859fd2d56154b276532a5745d7c19ceb5
Binary files /dev/null and b/src/main/resources/img/bubble_self.png differ