diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 4a079ebd16..ef5f7b3922 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -27,6 +27,7 @@
       </indentOptions>
     </codeStyleSettings>
     <codeStyleSettings language="JAVA">
+      <option name="KEEP_LINE_BREAKS" value="false" />
       <option name="ALIGN_MULTILINE_CHAINED_METHODS" value="true" />
       <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
       <option name="CALL_PARAMETERS_WRAP" value="1" />
diff --git a/src/main/java/com/faforever/client/audio/AudioService.java b/src/main/java/com/faforever/client/audio/AudioService.java
index e144ba2fab..a07846a341 100644
--- a/src/main/java/com/faforever/client/audio/AudioService.java
+++ b/src/main/java/com/faforever/client/audio/AudioService.java
@@ -27,7 +27,6 @@ public class AudioService implements InitializingBean {
   private static final String FRIEND_OFFLINE_SOUND = "theme/sounds/friendOfflineSound.mp3";
   private static final String FRIEND_JOINS_GAME_SOUND = "theme/sounds/friendJoinsGameSound.mp3";
   private static final String FRIEND_PLAYS_GAME_SOUND = "theme/sounds/friendPlaysGameSound.mp3";
-  private static final long MILLISECONDS_SILENT_AFTER_SOUND = 30000;
 
   private final AudioClipPlayer audioClipPlayer;
   private final ThemeService themeService;
@@ -155,7 +154,7 @@ private void playSound(AudioClip audioClip) {
     }
 
     long currentTimeMillis = System.currentTimeMillis();
-    if (currentTimeMillis - lastPlayedSoundTime < MILLISECONDS_SILENT_AFTER_SOUND) {
+    if (currentTimeMillis - lastPlayedSoundTime < notificationPrefs.getSilenceBetweenSounds()) {
       return;
     }
     lastPlayedSoundTime = currentTimeMillis;
diff --git a/src/main/java/com/faforever/client/chat/AbstractChatTabController.java b/src/main/java/com/faforever/client/chat/AbstractChatTabController.java
index 316b704583..90adc83f47 100644
--- a/src/main/java/com/faforever/client/chat/AbstractChatTabController.java
+++ b/src/main/java/com/faforever/client/chat/AbstractChatTabController.java
@@ -10,16 +10,12 @@
 import com.faforever.client.fx.TabController;
 import com.faforever.client.fx.WebViewConfigurer;
 import com.faforever.client.i18n.I18n;
-import com.faforever.client.navigation.NavigationHandler;
 import com.faforever.client.notification.NotificationService;
 import com.faforever.client.player.CountryFlagService;
-import com.faforever.client.player.PlayerService;
 import com.faforever.client.preferences.ChatPrefs;
-import com.faforever.client.preferences.NotificationPrefs;
 import com.faforever.client.theme.ThemeService;
 import com.faforever.client.theme.UiService;
 import com.faforever.client.ui.StageHolder;
-import com.faforever.client.user.LoginService;
 import com.faforever.client.util.ConcurrentUtil;
 import com.faforever.client.util.PopupUtil;
 import com.faforever.client.util.TimeService;
@@ -28,6 +24,7 @@
 import com.google.common.io.CharStreams;
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.ReadOnlyStringWrapper;
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.value.ObservableValue;
@@ -43,11 +40,9 @@
 import javafx.scene.control.skin.TabPaneSkin;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
-import javafx.scene.paint.Color;
 import javafx.scene.web.WebEngine;
 import javafx.scene.web.WebView;
 import javafx.stage.Popup;
-import javafx.stage.PopupWindow;
 import javafx.stage.PopupWindow.AnchorLocation;
 import javafx.stage.Window;
 import lombok.RequiredArgsConstructor;
@@ -60,7 +55,6 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.Reader;
-import java.lang.ref.WeakReference;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -121,9 +115,7 @@ public abstract class AbstractChatTabController extends TabController {
   private static final String ACTION_CSS_CLASS = "action";
   private static final String MESSAGE_CSS_CLASS = "message";
 
-  protected final LoginService loginService;
   protected final ChatService chatService;
-  protected final PlayerService playerService;
   protected final TimeService timeService;
   protected final I18n i18n;
   protected final NotificationService notificationService;
@@ -133,9 +125,7 @@ public abstract class AbstractChatTabController extends TabController {
   protected final EmoticonService emoticonService;
   protected final CountryFlagService countryFlagService;
   protected final ChatPrefs chatPrefs;
-  protected final NotificationPrefs notificationPrefs;
   protected final FxApplicationThreadExecutor fxApplicationThreadExecutor;
-  protected final NavigationHandler navigationHandler;
 
   /**
    * Messages that arrived before the web view was ready. Those are appended as soon as it is ready.
@@ -145,17 +135,19 @@ public abstract class AbstractChatTabController extends TabController {
   private final IntegerProperty unreadMessagesCount = new SimpleIntegerProperty();
   protected final ObjectProperty<ChatChannel> chatChannel = new SimpleObjectProperty<>();
   protected final ObservableValue<String> channelName = chatChannel.map(ChatChannel::getName);
+  private final ReadOnlyStringWrapper chatMessageTextHtml = new ReadOnlyStringWrapper();
+  private final ReadOnlyStringWrapper chatMessageSectionHtml = new ReadOnlyStringWrapper();
 
   private final Consumer<ChatMessage> messageListener = this::onChatMessage;
   private int lastEntryId;
   private boolean isChatReady;
 
   public Button emoticonsButton;
-  @VisibleForTesting
-  protected WeakReference<Popup> emoticonsPopupWindowWeakReference;
 
   private ChatMessage lastMessage;
   private WebEngine engine;
+  private Popup emoticonsPopup;
+
   private String currentUserMessage = "";
   private int curMessageHistoryIndex = 0;
 
@@ -165,7 +157,41 @@ public abstract class AbstractChatTabController extends TabController {
   @Override
   protected void onInitialize() {
     mentionPattern = Pattern.compile(
-        "(^|[^A-Za-z0-9-])" + Pattern.quote(loginService.getUsername()) + "([^A-Za-z0-9-]|$)", CASE_INSENSITIVE);
+        "(^|[^A-Za-z0-9-])" + Pattern.quote(chatService.getCurrentUsername()) + "([^A-Za-z0-9-]|$)", CASE_INSENSITIVE);
+
+    chatMessageTextHtml.bind(chatPrefs.chatFormatProperty().map(chatFormat -> switch (chatFormat) {
+      case COMPACT -> CHAT_TEXT_COMPACT;
+      case EXTENDED -> CHAT_TEXT_EXTENDED;
+    }).map(themeFile -> {
+      try {
+        return themeService.getThemeFileUrl(themeFile);
+      } catch (IOException e) {
+        return null;
+      }
+    }).map(url -> {
+      try (Reader reader = new InputStreamReader(url.openStream())) {
+        return CharStreams.toString(reader);
+      } catch (IOException e) {
+        return null;
+      }
+    }).orElse(""));
+
+    chatMessageSectionHtml.bind(chatPrefs.chatFormatProperty().map(chatFormat -> switch (chatFormat) {
+      case COMPACT -> CHAT_SECTION_COMPACT;
+      case EXTENDED -> CHAT_SECTION_EXTENDED;
+    }).map(themeFile -> {
+      try {
+        return themeService.getThemeFileUrl(themeFile);
+      } catch (IOException e) {
+        return null;
+      }
+    }).map(url -> {
+      try (Reader reader = new InputStreamReader(url.openStream())) {
+        return CharStreams.toString(reader);
+      } catch (IOException e) {
+        return null;
+      }
+    }).orElse(""));
 
     initChatView();
 
@@ -196,6 +222,11 @@ protected void onInitialize() {
     unreadMessagesCount.subscribe(
         (oldValue, newValue) -> incrementUnreadMessageCount(newValue.intValue() - oldValue.intValue()));
     getRoot().setOnClosed(this::onClosed);
+
+    EmoticonsWindowController controller = uiService.loadFxml("theme/chat/emoticons/emoticons_window.fxml");
+    controller.setTextInputControl(messageTextField());
+    emoticonsPopup = PopupUtil.createPopup(AnchorLocation.WINDOW_BOTTOM_RIGHT, controller.getRoot());
+    emoticonsPopup.setConsumeAutoHidingEvents(false);
   }
 
   @Override
@@ -405,7 +436,7 @@ public void onSendMessage() {
     }
 
     if(userMessageHistory.size() >= 50) {
-      userMessageHistory.remove(0);
+      userMessageHistory.removeFirst();
       userMessageHistory.add(text);
     } else {
       userMessageHistory.add(text);
@@ -427,12 +458,7 @@ public void onSendMessage() {
   }
 
   private void hideEmoticonsWindow() {
-    if (emoticonsPopupWindowWeakReference != null) {
-      PopupWindow window = emoticonsPopupWindowWeakReference.get();
-      if (window != null && window.isShowing()) {
-        window.hide();
-      }
-    }
+    emoticonsPopup.hide();
   }
 
   private void sendMessage() {
@@ -510,6 +536,10 @@ private void removeTopmostMessages() {
    * entry.
    */
   private void addMessage(ChatMessage chatMessage) {
+    if (mentionPattern.matcher(chatMessage.message()).find()) {
+      onMention(chatMessage);
+    }
+
     JavaFxUtil.assertApplicationThread();
     try {
       if (requiresNewChatSection(chatMessage)) {
@@ -527,7 +557,7 @@ private boolean requiresNewChatSection(ChatMessage chatMessage) {
     if (lastMessage == null) {
       return true;
     }
-    if (!lastMessage.username().equals(chatMessage.username())) {
+    if (!lastMessage.sender().getUsername().equals(chatMessage.sender().getUsername())) {
       return true;
     }
     if (lastMessage.time().isBefore(chatMessage.time().minus(1, MINUTES))) {
@@ -537,40 +567,23 @@ private boolean requiresNewChatSection(ChatMessage chatMessage) {
   }
 
   private void appendMessage(ChatMessage chatMessage) throws IOException {
-    URL themeFileUrl;
-    if (chatPrefs.getChatFormat() == ChatFormat.COMPACT) {
-      themeFileUrl = themeService.getThemeFileUrl(CHAT_TEXT_COMPACT);
-    } else {
-      themeFileUrl = themeService.getThemeFileUrl(CHAT_TEXT_EXTENDED);
-    }
-
-    String html = renderHtml(chatMessage, themeFileUrl, null);
+    String html = fillTemplateHtml(chatMessage, chatMessageTextHtml.get(), null);
 
     insertIntoContainer(html, "chat-section-" + lastEntryId);
   }
 
   private void appendChatMessageSection(ChatMessage chatMessage) throws IOException {
-    URL themeFileURL;
-    if (chatPrefs.getChatFormat() == ChatFormat.COMPACT) {
-      themeFileURL = themeService.getThemeFileUrl(CHAT_SECTION_COMPACT);
-    } else {
-      themeFileURL = themeService.getThemeFileUrl(CHAT_SECTION_EXTENDED);
-    }
-
-    String html = renderHtml(chatMessage, themeFileURL, ++lastEntryId);
+    String html = fillTemplateHtml(chatMessage, chatMessageSectionHtml.get(), ++lastEntryId);
     insertIntoContainer(html, MESSAGE_CONTAINER_ID);
     appendMessage(chatMessage);
   }
 
-  private String renderHtml(ChatMessage chatMessage, URL themeFileUrl, @Nullable Integer sectionId) throws IOException {
-    String html;
-    try (Reader reader = new InputStreamReader(themeFileUrl.openStream())) {
-      html = CharStreams.toString(reader);
-    }
-
-    String username = chatMessage.username();
+  private String fillTemplateHtml(ChatMessage chatMessage, String htmlTemplate,
+                                  @Nullable Integer sectionId) throws IOException {
+    ChatChannelUser sender = chatMessage.sender();
+    String username = sender.getUsername();
 
-    Optional<PlayerBean> playerOptional = playerService.getPlayerByNameIfOnline(chatMessage.username());
+    Optional<PlayerBean> playerOptional = sender.getPlayer();
     Optional<String> clanOptional = playerOptional.map(PlayerBean::getClan);
 
     String avatarUrl = playerOptional.map(PlayerBean::getAvatar).map(AvatarBean::getUrl).map(URL::toString).orElse("");
@@ -582,7 +595,7 @@ private String renderHtml(ChatMessage chatMessage, URL themeFileUrl, @Nullable I
     String decoratedClanTag = clanOptional.map(tag -> i18n.get("chat.clanTagFormat", tag)).orElse("");
 
     String timeString = timeService.asShortTime(chatMessage.time());
-    html = html.replace("{time}", timeString)
+    String html = htmlTemplate.replace("{time}", timeString)
                .replace("{avatar}", avatarUrl)
                .replace("{username}", username)
                .replace("{clan-tag}", clanTag)
@@ -591,17 +604,16 @@ private String renderHtml(ChatMessage chatMessage, URL themeFileUrl, @Nullable I
                .replace("{section-id}", String.valueOf(sectionId));
 
     Collection<String> cssClasses = new ArrayList<>();
-    cssClasses.add(String.format("user-%s", chatMessage.username()));
+    cssClasses.add(String.format("user-%s", username));
     if (chatMessage.action()) {
       cssClasses.add(ACTION_CSS_CLASS);
     } else {
       cssClasses.add(MESSAGE_CSS_CLASS);
     }
+    sender.getCategories().stream().sorted().map(ChatUserCategory::getCssClass).findFirst().ifPresent(cssClasses::add);
 
     html = html.replace("{css-classes}", Joiner.on(' ').join(cssClasses));
 
-    Optional.ofNullable(getMessageCssClass(username)).ifPresent(cssClasses::add);
-
     String text = htmlEscaper().escape(chatMessage.message()).replace("\\", "\\\\");
     text = convertUrlsToHyperlinks(text);
     text = replaceChannelNamesWithHyperlinks(text);
@@ -610,11 +622,9 @@ private String renderHtml(ChatMessage chatMessage, URL themeFileUrl, @Nullable I
     Matcher matcher = mentionPattern.matcher(text);
     if (matcher.find()) {
       text = matcher.replaceAll("<span class='self'>" + matcher.group() + "</span>");
-      onMention(chatMessage);
     }
 
-    return html.replace("{css-classes}", Joiner.on(' ').join(cssClasses))
-               .replace("{inline-style}", getInlineStyle(username))
+    return html.replace("{inline-style}", getInlineStyle(sender))
                // Always replace text last in case the message contains one of the placeholders.
                .replace("{text}", text);
   }
@@ -645,25 +655,11 @@ protected void onMention(ChatMessage chatMessage) {
     // Default implementation does nothing
   }
 
-  protected String getMessageCssClass(String login) {
-    Optional<PlayerBean> playerOptional = playerService.getPlayerByNameIfOnline(login);
-    if (playerOptional.isEmpty()) {
-      return CSS_CLASS_CHAT_ONLY;
-    }
-
-    return playerOptional.get().getSocialStatus().getCssClass();
-  }
-
-  protected String getInlineStyle(String username) {
+  protected String getInlineStyle(ChatChannelUser chatChannelUser) {
     // To be overridden by subclasses
     return "";
   }
 
-  @VisibleForTesting
-  String createInlineStyleFromColor(Color messageColor) {
-    return String.format("color: %s;", JavaFxUtil.toRgbCode(messageColor));
-  }
-
   protected String convertUrlsToHyperlinks(String text) {
     JavaFxUtil.assertApplicationThread();
     return (String) engine.executeScript("link('" + text.replace("'", "\\'") + "')");
@@ -686,22 +682,8 @@ public void openEmoticonsPopupWindow() {
     double anchorX = screenBounds.getMaxX() - 5;
     double anchorY = screenBounds.getMinY() - 5;
 
-    if (emoticonsPopupWindowWeakReference != null) {
-      PopupWindow window = emoticonsPopupWindowWeakReference.get();
-      if (window != null) {
-        window.show(emoticonsButton.getScene().getWindow(), anchorX, anchorY);
-        messageTextField().requestFocus();
-        return;
-      }
-    }
-
-    EmoticonsWindowController controller = uiService.loadFxml("theme/chat/emoticons/emoticons_window.fxml");
-    controller.setTextInputControl(messageTextField());
     messageTextField().requestFocus();
-    Popup window = PopupUtil.createPopup(AnchorLocation.WINDOW_BOTTOM_RIGHT, controller.getRoot());
-    window.setConsumeAutoHidingEvents(false);
-    window.show(emoticonsButton.getScene().getWindow(), anchorX, anchorY);
-    emoticonsPopupWindowWeakReference = new WeakReference<>(window);
+    emoticonsPopup.show(emoticonsButton.getScene().getWindow(), anchorX, anchorY);
   }
 
   @VisibleForTesting
diff --git a/src/main/java/com/faforever/client/chat/ChannelTabController.java b/src/main/java/com/faforever/client/chat/ChannelTabController.java
index fe988a1fe7..7b07532471 100644
--- a/src/main/java/com/faforever/client/chat/ChannelTabController.java
+++ b/src/main/java/com/faforever/client/chat/ChannelTabController.java
@@ -1,21 +1,17 @@
 package com.faforever.client.chat;
 
 import com.faforever.client.chat.emoticons.EmoticonService;
-import com.faforever.client.domain.PlayerBean;
 import com.faforever.client.fx.FxApplicationThreadExecutor;
 import com.faforever.client.fx.JavaFxUtil;
 import com.faforever.client.fx.PlatformService;
 import com.faforever.client.fx.WebViewConfigurer;
 import com.faforever.client.i18n.I18n;
-import com.faforever.client.navigation.NavigationHandler;
 import com.faforever.client.notification.NotificationService;
 import com.faforever.client.player.CountryFlagService;
-import com.faforever.client.player.PlayerService;
 import com.faforever.client.preferences.ChatPrefs;
 import com.faforever.client.preferences.NotificationPrefs;
 import com.faforever.client.theme.ThemeService;
 import com.faforever.client.theme.UiService;
-import com.faforever.client.user.LoginService;
 import com.faforever.client.util.TimeService;
 import javafx.beans.binding.BooleanExpression;
 import javafx.beans.value.ObservableValue;
@@ -44,13 +40,11 @@
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 
-import java.time.Instant;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
 import static com.faforever.client.fx.PlatformService.URL_REGEX_PATTERN;
-import static com.faforever.client.player.SocialStatus.FOE;
 import static java.util.Locale.US;
 
 @Slf4j
@@ -64,6 +58,7 @@ public class ChannelTabController extends AbstractChatTabController {
   private static final int TOPIC_CHARACTERS_LIMIT = 350;
 
   private final PlatformService platformService;
+  private final NotificationPrefs notificationPrefs;
 
   public Tab root;
   public SplitPane splitPane;
@@ -89,19 +84,17 @@ public class ChannelTabController extends AbstractChatTabController {
   private final ListChangeListener<ChatChannelUser> channelUserListChangeListener = this::updateChangedUsersStyles;
 
 
-  public ChannelTabController(WebViewConfigurer webViewConfigurer, LoginService loginService, ChatService chatService,
-                              PlayerService playerService,
-                              TimeService timeService, I18n i18n,
+  public ChannelTabController(WebViewConfigurer webViewConfigurer, ChatService chatService, TimeService timeService,
+                              I18n i18n,
                               NotificationService notificationService, UiService uiService, ThemeService themeService,
-                              NavigationHandler navigationHandler,
                               CountryFlagService countryFlagService, EmoticonService emoticonService,
                               PlatformService platformService, ChatPrefs chatPrefs,
                               NotificationPrefs notificationPrefs,
                               FxApplicationThreadExecutor fxApplicationThreadExecutor) {
-    super(loginService, chatService, playerService, timeService, i18n, notificationService, uiService, themeService,
-          webViewConfigurer, emoticonService, countryFlagService, chatPrefs, notificationPrefs,
-          fxApplicationThreadExecutor, navigationHandler);
+    super(chatService, timeService, i18n, notificationService, uiService, themeService, webViewConfigurer,
+          emoticonService, countryFlagService, chatPrefs, fxApplicationThreadExecutor);
     this.platformService = platformService;
+    this.notificationPrefs = notificationPrefs;
   }
 
   @Override
@@ -136,8 +129,8 @@ protected void onInitialize() {
 
     chatUserListController.chatChannelProperty().bind(chatChannel.when(showing));
 
-    ObservableValue<Boolean> isModerator = chatChannel.map(channel -> channel.getUser(loginService.getUsername())
-                                                                             .orElse(null))
+    ObservableValue<Boolean> isModerator = chatChannel.map(
+                                                          channel -> channel.getUser(chatService.getCurrentUsername()).orElse(null))
                                                       .flatMap(ChatChannelUser::moderatorProperty)
                                                       .orElse(false)
                                                       .when(showing);
@@ -242,23 +235,14 @@ private void setChannelTopic(String content) {
   }
 
   private void updateChannelTopic(ChannelTopic oldTopic, ChannelTopic newTopic) {
-    String newTopicContent = newTopic.content();
-
     fxApplicationThreadExecutor.execute(() -> {
-      setChannelTopic(newTopicContent);
+      setChannelTopic(newTopic.content());
 
       if (topicPane.isDisable()) {
         topicTextField.setVisible(false);
         topicPane.setDisable(false);
       }
     });
-
-
-    if (oldTopic != null) {
-      String oldTopicContent = oldTopic.content();
-      onChatMessage(new ChatMessage(Instant.now(), newTopic.author(),
-                                    i18n.get("chat.topicUpdated", oldTopicContent, newTopicContent)));
-    }
   }
 
   public void onChatChannelKeyReleased(KeyEvent keyEvent) {
@@ -320,25 +304,16 @@ private void removeUserMessageStyleClass(ChatChannelUser user, String styleClass
     }
   }
 
-  @Override
-  protected String getMessageCssClass(String login) {
-    return chatService.getOrCreateChatUser(login, channelName.getValue())
-                      .isModerator() ? MODERATOR_STYLE_CLASS : super.getMessageCssClass(login);
-  }
-
   @Override
   protected void onMention(ChatMessage chatMessage) {
-    if (notificationPrefs.getNotifyOnAtMentionOnlyEnabled() && !chatMessage.message()
-                                                                           .contains(
-                                                                               "@" + loginService.getUsername())) {
+    if (notificationPrefs.isNotifyOnAtMentionOnlyEnabled() && !chatMessage.message()
+                                                                          .contains(
+                                                                              "@" + chatService.getCurrentUsername())) {
       return;
     }
 
-    if (playerService.getPlayerByNameIfOnline(chatMessage.username())
-                     .map(PlayerBean::getSocialStatus)
-                     .map(FOE::equals)
-                     .orElse(false)) {
-      log.debug("Ignored ping from {}", chatMessage.username());
+    if (chatMessage.sender().getCategories().contains(ChatUserCategory.FOE)) {
+      log.debug("Ignored ping from {}", chatMessage.sender().getUsername());
     } else if (!hasFocus()) {
       incrementUnreadMessagesCount();
       setUnread(true);
@@ -346,18 +321,15 @@ protected void onMention(ChatMessage chatMessage) {
   }
 
   @Override
-  protected String getInlineStyle(String username) {
-    ChatChannelUser user = chatChannel.map(channel -> channel.getUser(username).orElse(null)).getValue();
-    if (user == null) {
-      return "";
-    }
-
-    if (chatPrefs.isHideFoeMessages() && user.getCategories()
+  protected String getInlineStyle(ChatChannelUser chatChannelUser) {
+    if (chatPrefs.isHideFoeMessages() && chatChannelUser.getCategories()
                                              .stream()
                                              .anyMatch(category -> category == ChatUserCategory.FOE)) {
       return "display: none;";
     } else {
-      return user.getColor().map(color -> String.format("color: %s;", JavaFxUtil.toRgbCode(color))).orElse("");
+      return chatChannelUser.getColor()
+                            .map(color -> String.format("color: %s;", JavaFxUtil.toRgbCode(color)))
+                            .orElse("");
     }
   }
 
diff --git a/src/main/java/com/faforever/client/chat/ChannelTopic.java b/src/main/java/com/faforever/client/chat/ChannelTopic.java
index 157974b9d0..0db1a906e0 100644
--- a/src/main/java/com/faforever/client/chat/ChannelTopic.java
+++ b/src/main/java/com/faforever/client/chat/ChannelTopic.java
@@ -1,3 +1,3 @@
 package com.faforever.client.chat;
 
-public record ChannelTopic(String author, String content) {}
+public record ChannelTopic(ChatChannelUser author, String content) {}
diff --git a/src/main/java/com/faforever/client/chat/ChatChannel.java b/src/main/java/com/faforever/client/chat/ChatChannel.java
index 98c2ca18d4..0d3dccac59 100644
--- a/src/main/java/com/faforever/client/chat/ChatChannel.java
+++ b/src/main/java/com/faforever/client/chat/ChatChannel.java
@@ -32,7 +32,7 @@ public class ChatChannel {
       FXCollections.synchronizedObservableList(FXCollections.observableArrayList(
           item -> new Observable[]{item.categoriesProperty(), item.colorProperty(), item.moderatorProperty()})),
       usernameToChatUser);
-  private final ObjectProperty<ChannelTopic> topic = new SimpleObjectProperty<>(new ChannelTopic("", ""));
+  private final ObjectProperty<ChannelTopic> topic = new SimpleObjectProperty<>(new ChannelTopic(null, ""));
   private final Set<Consumer<ChatMessage>> messageListeners = new HashSet<>();
   private final List<ChatMessage> messages = new ArrayList<>();
   private final BooleanProperty open = new SimpleBooleanProperty();
diff --git a/src/main/java/com/faforever/client/chat/ChatMessage.java b/src/main/java/com/faforever/client/chat/ChatMessage.java
index ab677a043d..738129aff3 100644
--- a/src/main/java/com/faforever/client/chat/ChatMessage.java
+++ b/src/main/java/com/faforever/client/chat/ChatMessage.java
@@ -2,9 +2,9 @@
 
 import java.time.Instant;
 
-public record ChatMessage(Instant time, String username, String message, boolean action) {
+public record ChatMessage(Instant time, ChatChannelUser sender, String message, boolean action) {
 
-  public ChatMessage(Instant time, String username, String message) {
-    this(time, username, message, false);
+  public ChatMessage(Instant time, ChatChannelUser sender, String message) {
+    this(time, sender, message, false);
   }
 }
diff --git a/src/main/java/com/faforever/client/chat/ChatService.java b/src/main/java/com/faforever/client/chat/ChatService.java
index 04abed7e39..0afadaaf5b 100644
--- a/src/main/java/com/faforever/client/chat/ChatService.java
+++ b/src/main/java/com/faforever/client/chat/ChatService.java
@@ -61,4 +61,6 @@ default void leaveChannel(String channelName) {
   void onInitiatePrivateChat(String username);
 
   Set<ChatChannel> getChannels();
+
+  String getCurrentUsername();
 }
diff --git a/src/main/java/com/faforever/client/chat/ChatUserCategory.java b/src/main/java/com/faforever/client/chat/ChatUserCategory.java
index e36a244c2f..d914dc8d75 100644
--- a/src/main/java/com/faforever/client/chat/ChatUserCategory.java
+++ b/src/main/java/com/faforever/client/chat/ChatUserCategory.java
@@ -3,16 +3,16 @@
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
+
 @Getter
 @RequiredArgsConstructor
 public enum ChatUserCategory {
-
-  SELF("chat.category.self"),
-  MODERATOR("chat.category.moderators"),
-  FRIEND("chat.category.friends"),
-  OTHER("chat.category.others"),
-  CHAT_ONLY("chat.category.chatOnly"),
-  FOE("chat.category.foes");
+  // Order is important
+  SELF("chat.category.self", "self"), MODERATOR("chat.category.moderators", "moderator"), FRIEND(
+      "chat.category.friends", "friend"), OTHER("chat.category.others", "other"), CHAT_ONLY("chat.category.chatOnly",
+                                                                                            "chat_only"), FOE(
+      "chat.category.foes", "foe");
 
   private final String i18nKey;
+  private final String cssClass;
 }
diff --git a/src/main/java/com/faforever/client/chat/KittehChatService.java b/src/main/java/com/faforever/client/chat/KittehChatService.java
index a109bc1e48..4a65d473c1 100644
--- a/src/main/java/com/faforever/client/chat/KittehChatService.java
+++ b/src/main/java/com/faforever/client/chat/KittehChatService.java
@@ -82,7 +82,6 @@
 import java.util.stream.Collectors;
 
 import static com.faforever.client.chat.ChatColorMode.RANDOM;
-import static com.faforever.client.player.SocialStatus.FOE;
 import static java.util.Locale.US;
 import static java.util.regex.Pattern.CASE_INSENSITIVE;
 import static javafx.collections.FXCollections.observableHashMap;
@@ -270,7 +269,9 @@ private void onTopicChange(ChannelTopicEvent event) {
                          .map(name -> name.replaceFirst("!.*", ""))
                          .orElse("");
     String content = event.getNewTopic().getValue().orElse("");
-    getOrCreateChannel(event.getChannel().getName()).setTopic(new ChannelTopic(author, content));
+    ChatChannel channel = getOrCreateChannel(event.getChannel().getName());
+    ChatChannelUser chatChannelUser = getOrCreateChatUser(author, channel.getName());
+    channel.setTopic(new ChannelTopic(chatChannelUser, content));
   }
 
   @Handler
@@ -280,24 +281,21 @@ private void onChannelMessage(ChannelMessageEvent event) {
     String channelName = event.getChannel().getName();
 
     String text = event.getMessage();
-    String sender = user.getNick();
     ChatChannel chatChannel = getOrCreateChannel(channelName);
+    ChatChannelUser sender = getOrCreateChatUser(user.getNick(), chatChannel.getName());
     notifyIfMentioned(text, chatChannel, sender);
 
     chatChannel.addMessage(new ChatMessage(Instant.now(), sender, text, false));
   }
 
-  private void notifyIfMentioned(String text, ChatChannel chatChannel, String sender) {
+  private void notifyIfMentioned(String text, ChatChannel chatChannel, ChatChannelUser sender) {
     Matcher matcher = Pattern.compile(
         "(^|[^A-Za-z0-9-])" + Pattern.quote(loginService.getUsername()) + "([^A-Za-z0-9-]|$)",
         CASE_INSENSITIVE).matcher(text);
     boolean mentioned = matcher.find();
     if (mentioned) {
-      boolean fromFoe = playerService.getPlayerByNameIfOnline(sender)
-                                     .map(PlayerBean::getSocialStatus)
-                                     .map(FOE::equals)
-                                     .orElse(false);
-      if (fromFoe || (notificationPrefs.getNotifyOnAtMentionOnlyEnabled() && !text.contains(
+      boolean fromFoe = sender.getCategories().contains(ChatUserCategory.FOE);
+      if (fromFoe || (notificationPrefs.isNotifyOnAtMentionOnlyEnabled() && !text.contains(
           "@" + loginService.getUsername()))) {
         log.debug("Ignored ping {} from {}", text, sender);
         return;
@@ -305,14 +303,15 @@ private void notifyIfMentioned(String text, ChatChannel chatChannel, String send
 
       audioService.playChatMentionSound();
 
-      String identIconSource = playerService.getPlayerByNameIfOnline(sender)
-                                            .map(PlayerBean::getId)
-                                            .map(String::valueOf)
-                                            .orElse(sender);
+      String identIconSource = sender.getPlayer()
+                                     .map(PlayerBean::getId)
+                                     .map(String::valueOf)
+                                     .orElse(sender.getUsername());
 
       if (!chatChannel.isOpen() && notificationPrefs.isPrivateMessageToastEnabled()) {
         notificationService.addNotification(
-            new TransientNotification(sender, text, IdenticonUtil.createIdenticon(identIconSource), evt -> {
+            new TransientNotification(sender.getUsername(), text, IdenticonUtil.createIdenticon(identIconSource),
+                                      evt -> {
               navigationHandler.navigateTo(new NavigateEvent(NavigationItem.CHAT));
             }));
       }
@@ -342,8 +341,11 @@ private void onChannelCTCP(ChannelCtcpEvent event) {
 
     String channelName = event.getChannel().getName();
 
-    String message = event.getMessage().replace("ACTION", user.getNick());
-    getOrCreateChannel(channelName).addMessage(new ChatMessage(Instant.now(), user.getNick(), message, true));
+    String senderNick = user.getNick();
+    String message = event.getMessage().replace("ACTION", senderNick);
+    ChatChannel chatChannel = getOrCreateChannel(channelName);
+    ChatChannelUser sender = getOrCreateChatUser(senderNick, chatChannel.getName());
+    chatChannel.addMessage(new ChatMessage(Instant.now(), sender, message, true));
   }
 
   @Handler
@@ -381,9 +383,10 @@ private void onPrivateMessage(PrivateMessageEvent event) {
 
     String text = event.getMessage();
     ChatChannel chatChannel = getOrCreateChannel(senderNick);
+    ChatChannelUser sender = getOrCreateChatUser(user.getNick(), chatChannel.getName());
     notifyOnPrivateMessage(text, chatChannel, senderNick);
 
-    chatChannel.addMessage(new ChatMessage(Instant.now(), senderNick, text));
+    chatChannel.addMessage(new ChatMessage(Instant.now(), sender, text));
   }
 
   private void joinAutoChannels() {
@@ -478,7 +481,7 @@ public void connect() {
     Irc irc = clientProperties.getIrc();
     this.defaultChannelName = irc.getDefaultChannel();
 
-    username = loginService.getUsername();
+    String username = loginService.getUsername();
 
     client = (DefaultClient) Client.builder()
                                    .realName(username)
@@ -520,9 +523,10 @@ public void disconnect() {
 
   @Override
   public CompletableFuture<Void> sendMessageInBackground(ChatChannel chatChannel, String message) {
+    ChatChannelUser sender = getOrCreateChatUser(getCurrentUsername(), chatChannel.getName());
     return CompletableFuture.runAsync(() -> {
       client.sendMessage(chatChannel.getName(), message);
-      chatChannel.addMessage(new ChatMessage(Instant.now(), client.getNick(), message));
+      chatChannel.addMessage(new ChatMessage(Instant.now(), sender, message));
     });
   }
 
@@ -560,9 +564,10 @@ public void leaveChannel(ChatChannel channel) {
 
   @Override
   public CompletableFuture<Void> sendActionInBackground(ChatChannel chatChannel, String action) {
+    ChatChannelUser sender = getOrCreateChatUser(client.getName(), chatChannel.getName());
     return CompletableFuture.runAsync(() -> {
       client.sendCtcpMessage(chatChannel.getName(), "ACTION " + action);
-      chatChannel.addMessage(new ChatMessage(Instant.now(), client.getNick(), action, true));
+      chatChannel.addMessage(new ChatMessage(Instant.now(), sender, action, true));
     });
   }
 
@@ -637,4 +642,9 @@ public void onInitiatePrivateChat(String username) {
   public Set<ChatChannel> getChannels() {
     return Set.copyOf(channels.values());
   }
+
+  @Override
+  public String getCurrentUsername() {
+    return loginService.getUsername();
+  }
 }
diff --git a/src/main/java/com/faforever/client/chat/MatchmakingChatController.java b/src/main/java/com/faforever/client/chat/MatchmakingChatController.java
index bdcf4020dc..2feefd719e 100644
--- a/src/main/java/com/faforever/client/chat/MatchmakingChatController.java
+++ b/src/main/java/com/faforever/client/chat/MatchmakingChatController.java
@@ -5,15 +5,11 @@
 import com.faforever.client.fx.FxApplicationThreadExecutor;
 import com.faforever.client.fx.WebViewConfigurer;
 import com.faforever.client.i18n.I18n;
-import com.faforever.client.navigation.NavigationHandler;
 import com.faforever.client.notification.NotificationService;
 import com.faforever.client.player.CountryFlagService;
-import com.faforever.client.player.PlayerService;
 import com.faforever.client.preferences.ChatPrefs;
-import com.faforever.client.preferences.NotificationPrefs;
 import com.faforever.client.theme.ThemeService;
 import com.faforever.client.theme.UiService;
-import com.faforever.client.user.LoginService;
 import com.faforever.client.util.TimeService;
 import com.google.common.annotations.VisibleForTesting;
 import javafx.collections.ListChangeListener;
@@ -54,21 +50,15 @@ public class MatchmakingChatController extends AbstractChatTabController {
     }
   };
 
-  // TODO cut dependencies
-  public MatchmakingChatController(LoginService loginService,
-                                   PlayerService playerService, TimeService timeService, I18n i18n,
+  public MatchmakingChatController(TimeService timeService, I18n i18n,
                                    NotificationService notificationService, UiService uiService,
-                                   ThemeService themeService,
-                                   NavigationHandler navigationHandler,
-                                   ChatService chatService,
+                                   ThemeService themeService, ChatService chatService,
                                    WebViewConfigurer webViewConfigurer, CountryFlagService countryFlagService,
                                    EmoticonService emoticonService, ChatPrefs chatPrefs,
-                                   NotificationPrefs notificationPrefs,
                                    FxApplicationThreadExecutor fxApplicationThreadExecutor,
                                    JoinDiscordEventHandler joinDiscordEventHandler) {
-    super(loginService, chatService, playerService, timeService, i18n, notificationService, uiService, themeService,
-          webViewConfigurer, emoticonService, countryFlagService, chatPrefs, notificationPrefs,
-          fxApplicationThreadExecutor, navigationHandler);
+    super(chatService, timeService, i18n, notificationService, uiService, themeService, webViewConfigurer,
+          emoticonService, countryFlagService, chatPrefs, fxApplicationThreadExecutor);
     this.joinDiscordEventHandler = joinDiscordEventHandler;
   }
 
@@ -133,11 +123,15 @@ public void onDiscordButtonClicked() {
 
   @VisibleForTesting
   void onPlayerDisconnected(String userName) {
-    fxApplicationThreadExecutor.execute(() -> onChatMessage(new ChatMessage(Instant.now(), i18n.get("chat.operator") + ":", i18n.get("chat.groupChat.playerDisconnect", userName), true)));
+    fxApplicationThreadExecutor.execute(() -> onChatMessage(
+        new ChatMessage(Instant.now(), new ChatChannelUser(i18n.get("chat.operator") + ":", channelName.getValue()),
+                        i18n.get("chat.groupChat.playerDisconnect", userName), true)));
   }
 
   @VisibleForTesting
   void onPlayerConnected(String userName) {
-    fxApplicationThreadExecutor.execute(() -> onChatMessage(new ChatMessage(Instant.now(), i18n.get("chat.operator") + ":", i18n.get("chat.groupChat.playerConnect", userName), true)));
+    fxApplicationThreadExecutor.execute(() -> onChatMessage(
+        new ChatMessage(Instant.now(), new ChatChannelUser(i18n.get("chat.operator") + ":", channelName.getValue()),
+                        i18n.get("chat.groupChat.playerConnect", userName), true)));
   }
 }
diff --git a/src/main/java/com/faforever/client/chat/PrivateChatTabController.java b/src/main/java/com/faforever/client/chat/PrivateChatTabController.java
index af77524a46..1fd955b70f 100644
--- a/src/main/java/com/faforever/client/chat/PrivateChatTabController.java
+++ b/src/main/java/com/faforever/client/chat/PrivateChatTabController.java
@@ -7,16 +7,12 @@
 import com.faforever.client.fx.JavaFxUtil;
 import com.faforever.client.fx.WebViewConfigurer;
 import com.faforever.client.i18n.I18n;
-import com.faforever.client.navigation.NavigationHandler;
 import com.faforever.client.notification.NotificationService;
 import com.faforever.client.player.CountryFlagService;
-import com.faforever.client.player.PlayerService;
 import com.faforever.client.player.PrivatePlayerInfoController;
 import com.faforever.client.preferences.ChatPrefs;
-import com.faforever.client.preferences.NotificationPrefs;
 import com.faforever.client.theme.ThemeService;
 import com.faforever.client.theme.UiService;
-import com.faforever.client.user.LoginService;
 import com.faforever.client.util.TimeService;
 import com.google.common.annotations.VisibleForTesting;
 import javafx.collections.ListChangeListener;
@@ -37,8 +33,6 @@
 import java.time.Instant;
 import java.util.List;
 
-import static com.faforever.client.player.SocialStatus.FOE;
-
 @Component
 @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 public class PrivateChatTabController extends AbstractChatTabController {
@@ -58,20 +52,14 @@ public class PrivateChatTabController extends AbstractChatTabController {
   private boolean userOffline;
 
   @Autowired
-  // TODO cut dependencies
-  public PrivateChatTabController(LoginService loginService,
-                                  PlayerService playerService, TimeService timeService, I18n i18n,
+  public PrivateChatTabController(TimeService timeService, I18n i18n,
                                   NotificationService notificationService, UiService uiService,
-                                  ThemeService themeService,
-                                  NavigationHandler navigationHandler,
-                                  ChatService chatService,
+                                  ThemeService themeService, ChatService chatService,
                                   WebViewConfigurer webViewConfigurer, CountryFlagService countryFlagService,
                                   EmoticonService emoticonService, AvatarService avatarService, ChatPrefs chatPrefs,
-                                  NotificationPrefs notificationPrefs,
                                   FxApplicationThreadExecutor fxApplicationThreadExecutor) {
-    super(loginService, chatService, playerService, timeService, i18n, notificationService, uiService, themeService,
-          webViewConfigurer, emoticonService, countryFlagService, chatPrefs, notificationPrefs,
-          fxApplicationThreadExecutor, navigationHandler);
+    super(chatService, timeService, i18n, notificationService, uiService, themeService, webViewConfigurer,
+          emoticonService, countryFlagService, chatPrefs, fxApplicationThreadExecutor);
     this.avatarService = avatarService;
   }
 
@@ -90,10 +78,12 @@ protected void onInitialize() {
                          .when(showing));
 
     avatarImageView.imageProperty()
-        .bind(channelName.map(username -> playerService.getPlayerByNameIfOnline(username).orElse(null))
-            .flatMap(PlayerBean::avatarProperty)
-            .map(avatarService::loadAvatar)
-                         .when(showing));
+                   .bind(chatChannel.flatMap(
+                       channel -> channelName.map(chanName -> channel.getUser(chanName).orElse(null))
+                                             .flatMap(ChatChannelUser::playerProperty)
+                                             .flatMap(PlayerBean::avatarProperty)
+                                             .map(avatarService::loadAvatar)
+                                             .when(showing)));
 
     chatChannel.when(attached).addListener(((observable, oldValue, newValue) -> {
       if (oldValue != null) {
@@ -142,10 +132,7 @@ protected WebView getMessagesWebView() {
 
   @Override
   public void onChatMessage(ChatMessage chatMessage) {
-    if (playerService.getPlayerByNameIfOnline(chatMessage.username())
-        .map(PlayerBean::getSocialStatus)
-        .map(FOE::equals)
-        .orElse(false) && chatPrefs.isHideFoeMessages()) {
+    if (chatMessage.sender().getCategories().contains(ChatUserCategory.FOE) && chatPrefs.isHideFoeMessages()) {
       return;
     }
 
@@ -174,7 +161,9 @@ void onPlayerDisconnected(String userName) {
       return;
     }
     userOffline = true;
-    fxApplicationThreadExecutor.execute(() -> onChatMessage(new ChatMessage(Instant.now(), i18n.get("chat.operator") + ":", i18n.get("chat.privateMessage.playerLeft", userName), true)));
+    fxApplicationThreadExecutor.execute(() -> onChatMessage(
+        new ChatMessage(Instant.now(), new ChatChannelUser(i18n.get("chat.operator") + ":", channelName.getValue()),
+                        i18n.get("chat.privateMessage.playerLeft", userName), true)));
   }
 
   @VisibleForTesting
@@ -183,6 +172,8 @@ void onPlayerConnected(String userName) {
       return;
     }
     userOffline = false;
-    fxApplicationThreadExecutor.execute(() -> onChatMessage(new ChatMessage(Instant.now(), i18n.get("chat.operator") + ":", i18n.get("chat.privateMessage.playerReconnect", userName), true)));
+    fxApplicationThreadExecutor.execute(() -> onChatMessage(
+        new ChatMessage(Instant.now(), new ChatChannelUser(i18n.get("chat.operator") + ":", channelName.getValue()),
+                        i18n.get("chat.privateMessage.playerReconnect", userName), true)));
   }
 }
diff --git a/src/main/java/com/faforever/client/domain/PlayerBean.java b/src/main/java/com/faforever/client/domain/PlayerBean.java
index a132ad046c..ae47e7328e 100644
--- a/src/main/java/com/faforever/client/domain/PlayerBean.java
+++ b/src/main/java/com/faforever/client/domain/PlayerBean.java
@@ -47,7 +47,6 @@ public class PlayerBean extends AbstractEntityBean {
   ObservableValue<Integer> numberOfGames = leaderboardRatings.map(
       ratings -> ratings.values().stream().mapToInt(LeaderboardRatingBean::getNumberOfGames).sum()).orElse(0);
 
-
   public SocialStatus getSocialStatus() {
     return socialStatus.get();
   }
diff --git a/src/main/java/com/faforever/client/preferences/NotificationPrefs.java b/src/main/java/com/faforever/client/preferences/NotificationPrefs.java
index c524bc2778..838760bf11 100644
--- a/src/main/java/com/faforever/client/preferences/NotificationPrefs.java
+++ b/src/main/java/com/faforever/client/preferences/NotificationPrefs.java
@@ -30,6 +30,7 @@ public class NotificationPrefs {
   private final BooleanProperty notifyOnAtMentionOnlyEnabled = new SimpleBooleanProperty(false);
   private final IntegerProperty toastScreen = new SimpleIntegerProperty(0);
   private final IntegerProperty toastDisplayTime = new SimpleIntegerProperty(5000);
+  private final IntegerProperty silenceBetweenSounds = new SimpleIntegerProperty(30000);
   private final BooleanProperty afterGameReviewEnabled = new SimpleBooleanProperty(true);
 
   public boolean isSoundsEnabled() {
@@ -260,7 +261,7 @@ public IntegerProperty toastDisplayTimeProperty() {
     return toastDisplayTime;
   }
 
-  public boolean getNotifyOnAtMentionOnlyEnabled() {
+  public boolean isNotifyOnAtMentionOnlyEnabled() {
     return notifyOnAtMentionOnlyEnabled.get();
   }
 
@@ -283,4 +284,16 @@ public void setAfterGameReviewEnabled(boolean afterGameReviewEnabled) {
   public BooleanProperty afterGameReviewEnabledProperty() {
     return afterGameReviewEnabled;
   }
+
+  public int getSilenceBetweenSounds() {
+    return silenceBetweenSounds.get();
+  }
+
+  public IntegerProperty silenceBetweenSoundsProperty() {
+    return silenceBetweenSounds;
+  }
+
+  public void setSilenceBetweenSounds(int silenceBetweenSounds) {
+    this.silenceBetweenSounds.set(silenceBetweenSounds);
+  }
 }
diff --git a/src/main/java/com/faforever/client/uploader/ImageUploadService.java b/src/main/java/com/faforever/client/uploader/ImageUploadService.java
deleted file mode 100644
index a374e57c0d..0000000000
--- a/src/main/java/com/faforever/client/uploader/ImageUploadService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.faforever.client.uploader;
-
-import javafx.scene.image.Image;
-
-import java.util.concurrent.CompletableFuture;
-
-public interface ImageUploadService {
-
-  CompletableFuture<String> uploadImageInBackground(Image image);
-}
diff --git a/src/main/java/com/faforever/client/uploader/imgur/ImgurImageUploadService.java b/src/main/java/com/faforever/client/uploader/imgur/ImgurImageUploadService.java
deleted file mode 100644
index 65389ee27f..0000000000
--- a/src/main/java/com/faforever/client/uploader/imgur/ImgurImageUploadService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.faforever.client.uploader.imgur;
-
-import com.faforever.client.task.TaskService;
-import com.faforever.client.uploader.ImageUploadService;
-import javafx.scene.image.Image;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.ObjectFactory;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-
-import java.util.concurrent.CompletableFuture;
-
-
-@Lazy
-@Service
-@RequiredArgsConstructor
-public class ImgurImageUploadService implements ImageUploadService {
-
-  private final TaskService taskService;
-  private final ObjectFactory<ImgurUploadTask> imgurUploadTaskFactory;
-
-  @Override
-  public CompletableFuture<String> uploadImageInBackground(Image image) {
-    ImgurUploadTask imgurUploadTask = imgurUploadTaskFactory.getObject();
-    imgurUploadTask.setImage(image);
-    return taskService.submitTask(imgurUploadTask).getFuture();
-  }
-}
diff --git a/src/test/java/com/faforever/client/audio/AudioServiceTest.java b/src/test/java/com/faforever/client/audio/AudioServiceTest.java
index 289d48e13e..960652e03b 100644
--- a/src/test/java/com/faforever/client/audio/AudioServiceTest.java
+++ b/src/test/java/com/faforever/client/audio/AudioServiceTest.java
@@ -23,6 +23,7 @@
 
 public class AudioServiceTest extends ServiceTest {
 
+  public static final int SILENCE_BETWEEN_SOUNDS = 100;
   @InjectMocks
   private AudioService instance;
 
@@ -48,6 +49,7 @@ public void setUp() throws Exception {
     notificationPrefs.setFriendOnlineSoundEnabled(true);
     notificationPrefs.setFriendPlaysGameSoundEnabled(true);
     notificationPrefs.setFriendOfflineSoundEnabled(true);
+    notificationPrefs.setSilenceBetweenSounds(SILENCE_BETWEEN_SOUNDS);
 
     instance.afterPropertiesSet();
   }
@@ -105,7 +107,7 @@ public void testNoDoubleSound() {
   public void testSoundTurnedBackOn() {
     instance.playChatMentionSound();
 
-    WaitForAsyncUtils.sleep(35, TimeUnit.SECONDS);
+    WaitForAsyncUtils.sleep(SILENCE_BETWEEN_SOUNDS + 1, TimeUnit.MILLISECONDS);
 
     instance.playChatMentionSound();
 
diff --git a/src/test/java/com/faforever/client/chat/AbstractChatTabControllerTest.java b/src/test/java/com/faforever/client/chat/AbstractChatTabControllerTest.java
index 57e8796c72..860e837d3e 100644
--- a/src/test/java/com/faforever/client/chat/AbstractChatTabControllerTest.java
+++ b/src/test/java/com/faforever/client/chat/AbstractChatTabControllerTest.java
@@ -1,44 +1,31 @@
 package com.faforever.client.chat;
 
-import com.faforever.client.builders.PlayerBeanBuilder;
 import com.faforever.client.chat.emoticons.EmoticonService;
-import com.faforever.client.domain.PlayerBean;
+import com.faforever.client.chat.emoticons.EmoticonsWindowController;
 import com.faforever.client.fx.WebViewConfigurer;
 import com.faforever.client.i18n.I18n;
-import com.faforever.client.navigation.NavigationHandler;
 import com.faforever.client.notification.NotificationService;
 import com.faforever.client.player.CountryFlagService;
-import com.faforever.client.player.PlayerService;
-import com.faforever.client.player.SocialStatus;
 import com.faforever.client.preferences.ChatPrefs;
-import com.faforever.client.preferences.NotificationPrefs;
-import com.faforever.client.reporting.ReportingService;
 import com.faforever.client.test.FakeTestException;
 import com.faforever.client.test.PlatformTest;
 import com.faforever.client.theme.ThemeService;
 import com.faforever.client.theme.UiService;
-import com.faforever.client.uploader.ImageUploadService;
-import com.faforever.client.user.LoginService;
 import com.faforever.client.util.TimeService;
 import javafx.scene.control.Button;
 import javafx.scene.control.Tab;
 import javafx.scene.control.TextField;
 import javafx.scene.control.TextInputControl;
+import javafx.scene.layout.VBox;
 import javafx.scene.web.WebView;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 import org.mockito.Spy;
 
-import java.time.Instant;
-import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.regex.Pattern;
 
-import static com.faforever.client.chat.AbstractChatTabController.CSS_CLASS_CHAT_ONLY;
-import static com.faforever.client.player.SocialStatus.FOE;
-import static com.faforever.client.player.SocialStatus.FRIEND;
-import static com.faforever.client.player.SocialStatus.SELF;
 import static java.util.concurrent.CompletableFuture.completedFuture;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.emptyString;
@@ -48,6 +35,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -56,14 +44,8 @@ public class AbstractChatTabControllerTest extends PlatformTest {
   @Mock
   private ChatService chatService;
   @Mock
-  private LoginService loginService;
-  @Mock
-  private PlayerService playerService;
-  @Mock
   private TimeService timeService;
   @Mock
-  private ImageUploadService imageUploadService;
-  @Mock
   private I18n i18n;
   @Mock
   private NotificationService notificationService;
@@ -74,17 +56,14 @@ public class AbstractChatTabControllerTest extends PlatformTest {
   @Mock
   private WebViewConfigurer webViewConfigurer;
   @Mock
-  private ReportingService reportingService;
-  @Mock
-  private NavigationHandler navigationHandler;
-  @Mock
   private CountryFlagService countryFlagService;
   @Mock
   private EmoticonService emoticonService;
   @Spy
   private ChatPrefs chatPrefs;
-  @Spy
-  private NotificationPrefs notificationPrefs;
+
+  @Mock
+  private EmoticonsWindowController emoticonsWindowController;
 
   private AbstractChatTabController instance;
 
@@ -92,14 +71,16 @@ public class AbstractChatTabControllerTest extends PlatformTest {
   public void setup() throws Exception {
     when(themeService.getThemeFileUrl(any())).thenReturn(
         getClass().getResource("/" + ThemeService.CHAT_SECTION_EXTENDED));
-    when(loginService.getUsername()).thenReturn("junit");
+    when(chatService.getCurrentUsername()).thenReturn("junit");
+    lenient().when(uiService.loadFxml("theme/chat/emoticons/emoticons_window.fxml"))
+             .thenReturn(emoticonsWindowController);
+    lenient().when(emoticonsWindowController.getRoot()).thenReturn(new VBox());
 
     fxApplicationThreadExecutor.executeAndWait(() -> {
-      instance = new AbstractChatTabController(loginService, chatService, playerService, timeService, i18n,
+      instance = new AbstractChatTabController(chatService, timeService, i18n,
                                                notificationService, uiService, themeService, webViewConfigurer,
-                                               emoticonService,
-                                               countryFlagService, chatPrefs, notificationPrefs,
-                                               fxApplicationThreadExecutor, navigationHandler) {
+                                               emoticonService, countryFlagService, chatPrefs,
+                                               fxApplicationThreadExecutor) {
         private final Tab root = new Tab();
         private final WebView webView = new WebView();
         private final TextInputControl messageTextField = new TextField();
@@ -191,56 +172,6 @@ public void testOnSendMessageSendActionFailed() {
     assertThat(instance.messageTextField().isDisable(), is(false));
   }
 
-
-  @Test
-  public void testOnChatMessage() {
-    // TODO assert something, maybe we can spy on engine
-    runOnFxThreadAndWait(() -> instance.onChatMessage(new ChatMessage(Instant.now(), "junit", "Test message")));
-  }
-
-  @Test
-  public void testOnChatMessageAction() {
-    // TODO assert something, maybe we can spy on engine
-    runOnFxThreadAndWait(() -> instance.onChatMessage(new ChatMessage(Instant.now(), "junit", "Test action", true)));
-  }
-
-  @Test
-  public void getMessageCssClassFriend() {
-    PlayerBean player = PlayerBeanBuilder.create().defaultValues().get();
-    player.setSocialStatus(FRIEND);
-    when(playerService.getPlayerByNameIfOnline(player.getUsername())).thenReturn(Optional.of(player));
-    assertEquals(instance.getMessageCssClass(player.getUsername()), SocialStatus.FRIEND.getCssClass());
-  }
-
-  @Test
-  public void getMessageCssClassFoe() {
-    PlayerBean player = PlayerBeanBuilder.create().defaultValues().get();
-    player.setSocialStatus(FOE);
-    when(playerService.getPlayerByNameIfOnline(player.getUsername())).thenReturn(Optional.of(player));
-    assertEquals(instance.getMessageCssClass(player.getUsername()), SocialStatus.FOE.getCssClass());
-  }
-
-  @Test
-  public void getMessageCssClassChatOnly() {
-    String playerName = "somePlayer";
-    when(playerService.getPlayerByNameIfOnline(playerName)).thenReturn(Optional.empty());
-    assertEquals(instance.getMessageCssClass(playerName), CSS_CLASS_CHAT_ONLY);
-  }
-
-  @Test
-  public void getMessageCssClassSelf() {
-    PlayerBean player = PlayerBeanBuilder.create().defaultValues().get();
-    player.setSocialStatus(SELF);
-    when(playerService.getPlayerByNameIfOnline(player.getUsername())).thenReturn(Optional.of(player));
-    assertEquals(instance.getMessageCssClass(player.getUsername()), SocialStatus.SELF.getCssClass());
-  }
-
-  @Test
-  public void getMessageCssClassChatOnlyNullPlayerInfoBean() {
-    String playerName = "somePlayer";
-    assertEquals(instance.getMessageCssClass(playerName), CSS_CLASS_CHAT_ONLY);
-  }
-
   @Test
   public void testChannelNamesTransformedToHyperlinks() {
     String output = instance.replaceChannelNamesWithHyperlinks("Go to #moderation and report a user");
@@ -280,7 +211,8 @@ public void testTransformEmoticonShortcodesToImages() {
 
   @Test
   public void testMentionPattern() {
-    when(loginService.getUsername()).thenReturn("-Box-");
+    when(chatService.getCurrentUsername()).thenReturn("-Box-");
+
     runOnFxThreadAndWait(() -> reinitialize(instance));
     assertTrue(instance.mentionPattern.matcher("-Box-").find());
     assertTrue(instance.mentionPattern.matcher("-Box-!").find());
diff --git a/src/test/java/com/faforever/client/chat/ChatChannelTabControllerTest.java b/src/test/java/com/faforever/client/chat/ChannelTabControllerTest.java
similarity index 67%
rename from src/test/java/com/faforever/client/chat/ChatChannelTabControllerTest.java
rename to src/test/java/com/faforever/client/chat/ChannelTabControllerTest.java
index 7c474063e4..ce576fb837 100644
--- a/src/test/java/com/faforever/client/chat/ChatChannelTabControllerTest.java
+++ b/src/test/java/com/faforever/client/chat/ChannelTabControllerTest.java
@@ -1,24 +1,21 @@
 package com.faforever.client.chat;
 
-import com.faforever.client.builders.ChatChannelUserBuilder;
 import com.faforever.client.builders.PlayerBeanBuilder;
 import com.faforever.client.chat.emoticons.EmoticonService;
+import com.faforever.client.chat.emoticons.EmoticonsWindowController;
 import com.faforever.client.domain.PlayerBean;
+import com.faforever.client.fx.JavaFxUtil;
 import com.faforever.client.fx.PlatformService;
 import com.faforever.client.fx.WebViewConfigurer;
 import com.faforever.client.i18n.I18n;
 import com.faforever.client.notification.NotificationService;
 import com.faforever.client.player.CountryFlagService;
-import com.faforever.client.player.PlayerService;
 import com.faforever.client.preferences.ChatPrefs;
 import com.faforever.client.preferences.NotificationPrefs;
-import com.faforever.client.reporting.ReportingService;
 import com.faforever.client.test.PlatformTest;
 import com.faforever.client.theme.ThemeService;
 import com.faforever.client.theme.UiService;
 import com.faforever.client.ui.StageHolder;
-import com.faforever.client.uploader.ImageUploadService;
-import com.faforever.client.user.LoginService;
 import com.faforever.client.util.TimeService;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleObjectProperty;
@@ -26,6 +23,7 @@
 import javafx.scene.control.TabPane;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
+import javafx.scene.layout.VBox;
 import javafx.scene.paint.Color;
 import javafx.stage.Stage;
 import org.junit.jupiter.api.BeforeEach;
@@ -33,11 +31,9 @@
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Spy;
-import org.springframework.scheduling.TaskScheduler;
 import org.testfx.util.WaitForAsyncUtils;
 
 import java.time.Instant;
-import java.util.Optional;
 import java.util.regex.Pattern;
 
 import static com.faforever.client.player.SocialStatus.FOE;
@@ -59,9 +55,8 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-public class ChatChannelTabControllerTest extends PlatformTest {
+public class ChannelTabControllerTest extends PlatformTest {
 
-  private static final String USER_NAME = "junit";
   private static final String CHANNEL_NAME = "#testChannel";
 
   @InjectMocks
@@ -70,15 +65,8 @@ public class ChatChannelTabControllerTest extends PlatformTest {
   @Mock
   private ChatService chatService;
   @Mock
-  private LoginService loginService;
-
-  @Mock
-  private PlayerService playerService;
-  @Mock
   private TimeService timeService;
   @Mock
-  private ImageUploadService imageUploadService;
-  @Mock
   private I18n i18n;
   @Mock
   private NotificationService notificationService;
@@ -89,29 +77,36 @@ public class ChatChannelTabControllerTest extends PlatformTest {
   @Mock
   private WebViewConfigurer webViewConfigurer;
   @Mock
-  private ReportingService reportingService;
-  @Mock
   private CountryFlagService countryFlagService;
   @Mock
   private PlatformService platformService;
   @Mock
   private EmoticonService emoticonService;
   @Mock
-  private TaskScheduler taskScheduler;
-  @Mock
   private ChatUserListController chatUserListController;
   @Spy
   private ChatPrefs chatPrefs;
   @Spy
   private NotificationPrefs notificationPrefs;
 
+  @Mock
+  private EmoticonsWindowController emoticonsWindowController;
+
+  private ChatChannelUser user;
+  private ChatChannelUser other;
   private ChatChannel defaultChatChannel;
 
   @BeforeEach
   public void setUp() throws Exception {
+    user = new ChatChannelUser("junit", CHANNEL_NAME);
+    other = new ChatChannelUser("other", CHANNEL_NAME);
     defaultChatChannel = new ChatChannel(CHANNEL_NAME);
-    when(loginService.getUsername()).thenReturn(USER_NAME);
-    when(themeService.getThemeFileUrl(CHAT_CONTAINER)).thenReturn(getClass().getResource("/theme/chat/chat_container.html"));
+    lenient().when(uiService.loadFxml("theme/chat/emoticons/emoticons_window.fxml"))
+             .thenReturn(emoticonsWindowController);
+    lenient().when(emoticonsWindowController.getRoot()).thenReturn(new VBox());
+    lenient().when(chatService.getCurrentUsername()).thenReturn(user.getUsername());
+    lenient().when(themeService.getThemeFileUrl(CHAT_CONTAINER))
+             .thenReturn(getClass().getResource("/theme/chat/chat_container.html"));
     lenient().when(themeService.getThemeFileUrl(CHAT_SECTION_COMPACT))
         .thenReturn(getClass().getResource("/theme/chat/compact/chat_section.html"));
     lenient().when(themeService.getThemeFileUrl(CHAT_TEXT_COMPACT))
@@ -123,7 +118,6 @@ public void setUp() throws Exception {
     lenient().when(chatService.getOrCreateChatUser(any(String.class), eq(CHANNEL_NAME)))
         .thenReturn(new ChatChannelUser("junit", "test"));
     when(chatUserListController.chatChannelProperty()).thenReturn(new SimpleObjectProperty<>());
-    when(loginService.getUsername()).thenReturn(USER_NAME);
 
     Stage stage = mock(Stage.class);
     lenient().when(stage.focusedProperty()).thenReturn(new SimpleBooleanProperty());
@@ -157,7 +151,7 @@ public void testGetMessageTextField() {
 
   @Test
   public void testSetChannelTopic() {
-    defaultChatChannel.setTopic(new ChannelTopic(USER_NAME, "topic https://example.com/1"));
+    defaultChatChannel.setTopic(new ChannelTopic(user, "topic https://example.com/1"));
     initializeDefaultChatChannel();
 
     assertEquals(2, instance.topicText.getChildren().size());
@@ -168,11 +162,9 @@ public void testSetChannelTopic() {
 
   @Test
   public void testNoChannelTopic() {
-    ChatChannelUser user = ChatChannelUserBuilder.create(USER_NAME, CHANNEL_NAME).defaultValues().get();
     defaultChatChannel.addUser(user);
-    when(loginService.getUsername()).thenReturn(USER_NAME);
 
-    defaultChatChannel.setTopic(new ChannelTopic("", ""));
+    defaultChatChannel.setTopic(new ChannelTopic(null, ""));
     initializeDefaultChatChannel();
     assertFalse(instance.topicPane.isVisible());
   }
@@ -185,14 +177,13 @@ public void testSetTabName() {
 
   @Test
   public void testChannelTopicUpdate() {
-    when(i18n.get(eq("chat.topicUpdated"), any(), any())).thenReturn("topic updated");
-
-    defaultChatChannel.setTopic(new ChannelTopic(USER_NAME, "topic1: https://faforever.com"));
+    defaultChatChannel.setTopic(new ChannelTopic(user, "topic1: https://faforever.com"));
     initializeDefaultChatChannel();
 
     assertEquals(2, instance.topicText.getChildren().size());
 
-    runOnFxThreadAndWait(() -> defaultChatChannel.setTopic(new ChannelTopic("junit2", "topic2: https://faforever.com topic3: https://faforever.com/example")));
+    runOnFxThreadAndWait(() -> defaultChatChannel.setTopic(
+        new ChannelTopic(null, "topic2: https://faforever.com topic3: https://faforever.com/example")));
     assertEquals(4, instance.topicText.getChildren().size());
     assertEquals("topic2: ", ((Labeled) instance.topicText.getChildren().getFirst()).getText());
     assertEquals("https://faforever.com", ((Labeled) instance.topicText.getChildren().get(1)).getText());
@@ -202,28 +193,23 @@ public void testChannelTopicUpdate() {
 
   @Test
   public void testChangeTopicButtonForModerators() {
-    ChatChannelUser user = ChatChannelUserBuilder.create(USER_NAME, CHANNEL_NAME).defaultValues().moderator(true).get();
+    user.setModerator(true);
     defaultChatChannel.addUser(user);
-    when(loginService.getUsername()).thenReturn(USER_NAME);
     initializeDefaultChatChannel();
     assertTrue(instance.changeTopicTextButton.isVisible());
   }
 
   @Test
   public void testNoChangeTopicButtonForNonModerators() {
-    ChatChannelUser user = ChatChannelUserBuilder.create(USER_NAME, CHANNEL_NAME)
-        .defaultValues()
-        .moderator(false)
-        .get();
+    user.setModerator(false);
     defaultChatChannel.addUser(user);
-    when(loginService.getUsername()).thenReturn(USER_NAME);
     initializeDefaultChatChannel();
     assertFalse(instance.changeTopicTextButton.isVisible());
   }
 
   @Test
   public void testCheckModeratorListener() {
-    ChatChannelUser user = ChatChannelUserBuilder.create(USER_NAME, CHANNEL_NAME).defaultValues().moderator(true).get();
+    user.setModerator(true);
     defaultChatChannel.addUser(user);
     initializeDefaultChatChannel();
     assertTrue(instance.changeTopicTextButton.isVisible());
@@ -233,7 +219,7 @@ public void testCheckModeratorListener() {
 
   @Test
   public void testOnTopicTextFieldEntered() {
-    defaultChatChannel.setTopic(new ChannelTopic(USER_NAME, "topic1: https://faforever.com"));
+    defaultChatChannel.setTopic(new ChannelTopic(user, "topic1: https://faforever.com"));
     initializeDefaultChatChannel();
 
     runOnFxThreadAndWait(() -> {
@@ -246,7 +232,7 @@ public void testOnTopicTextFieldEntered() {
 
   @Test
   public void testOnChangeTopicTextButtonClicked() {
-    defaultChatChannel.setTopic(new ChannelTopic(USER_NAME, "topic1: https://faforever.com"));
+    defaultChatChannel.setTopic(new ChannelTopic(user, "topic1: https://faforever.com"));
     initializeDefaultChatChannel();
     runOnFxThreadAndWait(() -> instance.onChangeTopicTextButtonClicked());
     assertEquals("topic1: https://faforever.com", instance.topicTextField.getText());
@@ -256,7 +242,7 @@ public void testOnChangeTopicTextButtonClicked() {
 
   @Test
   public void testOnCancelChangesTopicTextButtonClicked() {
-    defaultChatChannel.setTopic(new ChannelTopic(USER_NAME, "topic: https://faforever.com"));
+    defaultChatChannel.setTopic(new ChannelTopic(user, "topic: https://faforever.com"));
     initializeDefaultChatChannel();
 
     runOnFxThreadAndWait(() -> {
@@ -273,7 +259,7 @@ public void testOnCancelChangesTopicTextButtonClicked() {
 
   @Test
   public void textCheckTextTopicLimitListener() {
-    defaultChatChannel.setTopic(new ChannelTopic(USER_NAME, "topic: https://faforever.com"));
+    defaultChatChannel.setTopic(new ChannelTopic(user, "topic: https://faforever.com"));
     initializeDefaultChatChannel();
     runOnFxThreadAndWait(() -> instance.onChangeTopicTextButtonClicked());
     int length = "topic: https://faforever.com".length();
@@ -288,7 +274,7 @@ public void testSearchChatMessage() throws Exception {
     String highlighted = "<span class=\"highlight\">world</span>";
 
     initializeDefaultChatChannel();
-    sendMessage(USER_NAME, "Hello, world!");
+    sendMessage(user, "Hello, world!");
 
     runOnFxThreadAndWait(() -> instance.onChatChannelKeyReleased(new KeyEvent(null, null, KeyEvent.KEY_PRESSED,
         null, null, KeyCode.F, false, true, false, false)));
@@ -310,7 +296,7 @@ public void testSearchChatMessageAndCloseViaEscape() throws Exception {
     String highlighted = "<span class=\"highlight\">world</span>";
 
     initializeDefaultChatChannel();
-    sendMessage(USER_NAME, "Hello, world!");
+    sendMessage(user, "Hello, world!");
 
     runOnFxThreadAndWait(() -> instance.onChatChannelKeyReleased(new KeyEvent(null, null, KeyEvent.KEY_PRESSED,
         null, null, KeyCode.F, false, true, false, false)));
@@ -347,86 +333,65 @@ public void testOnTabClosed() {
     verify(chatService).leaveChannel(defaultChatChannel);
   }
 
-  @Test
-  public void testGetMessageCssClassModerator() {
-    ChatChannelUser chatUser = ChatChannelUserBuilder.create(USER_NAME, CHANNEL_NAME)
-        .defaultValues()
-        .moderator(true)
-        .get();
-
-    when(chatService.getOrCreateChatUser(USER_NAME, defaultChatChannel.getName())).thenReturn(chatUser);
-
-    initializeDefaultChatChannel();
-
-    assertEquals(ChannelTabController.MODERATOR_STYLE_CLASS, instance.getMessageCssClass(USER_NAME));
-  }
-
   @Test
   public void testAtMentionTriggersNotification() {
     notificationPrefs.notifyOnAtMentionOnlyEnabledProperty().setValue(false);
-    instance.onMention(new ChatMessage(Instant.now(), USER_NAME, "hello @" + USER_NAME + "!!"));
+    instance.onMention(new ChatMessage(Instant.now(), user, "hello @" + user + "!!"));
     verify(chatService).incrementUnreadMessagesCount(1);
   }
 
   @Test
   public void testAtMentionTriggersNotificationWhenFlagIsEnabled() {
     notificationPrefs.notifyOnAtMentionOnlyEnabledProperty().setValue(true);
-    instance.onMention(new ChatMessage(Instant.now(), USER_NAME, "hello @" + USER_NAME + "!!"));
+    instance.onMention(new ChatMessage(Instant.now(), user, "hello @" + user.getUsername() + "!!"));
     verify(chatService).incrementUnreadMessagesCount(1);
   }
 
   @Test
   public void testNormalMentionTriggersNotification() {
     notificationPrefs.notifyOnAtMentionOnlyEnabledProperty().setValue(false);
-    instance.onMention(new ChatMessage(Instant.now(), USER_NAME, "hello " + USER_NAME + "!!"));
+    instance.onMention(new ChatMessage(Instant.now(), user, "hello " + user + "!!"));
     verify(chatService).incrementUnreadMessagesCount(1);
   }
 
   @Test
   public void testNormalMentionDoesNotTriggerNotificationWhenFlagIsEnabled() {
     notificationPrefs.notifyOnAtMentionOnlyEnabledProperty().setValue(true);
-    instance.onMention(new ChatMessage(Instant.now(), USER_NAME, "hello " + USER_NAME + "!!"));
+    instance.onMention(new ChatMessage(Instant.now(), user, "hello " + user + "!!"));
     verify(chatService, never()).incrementUnreadMessagesCount(anyInt());
   }
 
   @Test
   public void testNormalMentionDoesNotTriggerNotificationFromFoe() {
     notificationPrefs.notifyOnAtMentionOnlyEnabledProperty().setValue(false);
-    when(playerService.getPlayerByNameIfOnline(USER_NAME)).thenReturn(Optional.ofNullable(PlayerBeanBuilder.create()
-        .defaultValues()
-        .username("junit")
-        .socialStatus(FOE)
-        .get()));
-    instance.onMention(new ChatMessage(Instant.now(), USER_NAME, "hello " + USER_NAME + "!!"));
+    user.setPlayer(PlayerBeanBuilder.create().defaultValues().socialStatus(FOE).get());
+    instance.onMention(new ChatMessage(Instant.now(), user, "hello " + user + "!!"));
     verify(chatService, never()).incrementUnreadMessagesCount(anyInt());
   }
 
   @Test
   public void getInlineStyleChangeToRandom() {
-    ChatChannelUser chatUser = ChatChannelUserBuilder.create(USER_NAME, CHANNEL_NAME).defaultValues().get();
-
     initializeDefaultChatChannel();
     runOnFxThreadAndWait(() -> {
       chatPrefs.setChatColorMode(ChatColorMode.RANDOM);
       chatPrefs.setHideFoeMessages(false);
     });
 
-    defaultChatChannel.addUser(chatUser);
+    defaultChatChannel.addUser(user);
 
     Color color = ColorGeneratorUtil.generateRandomColor();
-    chatUser.setColor(color);
+    user.setColor(color);
     WaitForAsyncUtils.waitForFxEvents();
 
-    String expected = instance.createInlineStyleFromColor(color);
-    String result = instance.getInlineStyle(USER_NAME);
+    String expected = String.format("color: %s;", JavaFxUtil.toRgbCode(color));
+    String result = instance.getInlineStyle(user);
     assertEquals(expected, result);
   }
 
   @Test
   public void getInlineStyleRandom() {
     Color color = ColorGeneratorUtil.generateRandomColor();
-    ChatChannelUser chatUser = ChatChannelUserBuilder.create(USER_NAME, CHANNEL_NAME).defaultValues().get();
-    chatUser.setColor(color);
+    user.setColor(color);
 
     initializeDefaultChatChannel();
     runOnFxThreadAndWait(() -> {
@@ -434,66 +399,57 @@ public void getInlineStyleRandom() {
       chatPrefs.setHideFoeMessages(false);
     });
 
-    defaultChatChannel.addUser(chatUser);
+    defaultChatChannel.addUser(user);
 
-    String expected = instance.createInlineStyleFromColor(color);
-    String result = instance.getInlineStyle(USER_NAME);
+    String expected = String.format("color: %s;", JavaFxUtil.toRgbCode(color));
+    String result = instance.getInlineStyle(user);
     assertEquals(expected, result);
   }
 
   @Test
   public void getInlineStyleRandomFoeHide() {
-    ChatChannelUser chatUser = ChatChannelUserBuilder.create(USER_NAME, CHANNEL_NAME).defaultValues().player(PlayerBeanBuilder.create()
-        .defaultValues()
-        .username(USER_NAME)
-        .socialStatus(FOE)
-        .get()).get();
-
     initializeDefaultChatChannel();
     runOnFxThreadAndWait(() -> {
       chatPrefs.setChatColorMode(ChatColorMode.RANDOM);
       chatPrefs.setHideFoeMessages(true);
     });
 
-    defaultChatChannel.addUser(chatUser);
+    user.setPlayer(PlayerBeanBuilder.create().defaultValues().socialStatus(FOE).get());
 
-    String result = instance.getInlineStyle(USER_NAME);
+    String result = instance.getInlineStyle(user);
     assertEquals("display: none;", result);
   }
 
   @Test
   public void getInlineStyleRandomFoeShow() {
-    ChatChannelUser chatUser = ChatChannelUserBuilder.create(USER_NAME, CHANNEL_NAME).defaultValues().get();
-
     initializeDefaultChatChannel();
     runOnFxThreadAndWait(() -> {
       chatPrefs.setChatColorMode(ChatColorMode.RANDOM);
       chatPrefs.setHideFoeMessages(false);
     });
 
-    defaultChatChannel.addUser(chatUser);
+    user.setPlayer(PlayerBeanBuilder.create().defaultValues().socialStatus(FOE).get());
 
-    String result = instance.getInlineStyle(USER_NAME);
+    String result = instance.getInlineStyle(user);
     assertEquals("", result);
   }
 
   @Test
   public void userColorChangeTest() throws Exception {
-    String before = "<span class=\"text user-junit message\" style=\"\">Hello world!</span>";
-    String otherBefore = "<span class=\"text user-other message\" style=\"\">Hello man!</span>";
-    String after = "<span class=\"text user-junit message\" style=\"color: rgb(0, 255, 255);\">Hello world!</span>";
-    ChatChannelUser chatUser = ChatChannelUserBuilder.create(USER_NAME, CHANNEL_NAME).defaultValues().player(PlayerBeanBuilder.create().defaultValues().get()).get();
-    defaultChatChannel.addUser(chatUser);
+    String before = "<span class=\"text user-junit message chat_only\" style=\"\">Hello world!</span>";
+    String otherBefore = "<span class=\"text user-other message chat_only\" style=\"\">Hello man!</span>";
+    String after = "<span class=\"text user-junit message chat_only\" style=\"color: rgb(0, 255, 255);\">Hello world!</span>";
+    defaultChatChannel.addUser(user);
 
     initializeDefaultChatChannel();
-    sendMessage(USER_NAME, "Hello world!");
-    sendMessage("other", "Hello man!");
+    sendMessage(user, "Hello world!");
+    sendMessage(other, "Hello man!");
 
     String content = instance.getHtmlBodyContent();
     assertTrue(content.contains(before));
     assertTrue(content.contains(otherBefore));
 
-    runOnFxThreadAndWait(() -> chatUser.setColor(Color.AQUA));
+    runOnFxThreadAndWait(() -> user.setColor(Color.AQUA));
     content = instance.getHtmlBodyContent();
     assertTrue(content.contains(after));
     assertTrue(content.contains(otherBefore));
@@ -501,21 +457,17 @@ public void userColorChangeTest() throws Exception {
 
   @Test
   public void testOnUserMessageVisibility() throws Exception {
-    String before = "<span class=\"text user-junit message\" style=\"\">Hello world!</span>";
-    String after = "<span class=\"text user-junit message\" style=\"display: none;\">Hello world!</span>";
-    String otherBefore = "<span class=\"text user-other message\" style=\"\">Hello man!</span>";
+    String before = "<span class=\"text user-junit message other\" style=\"\">Hello world!</span>";
+    String after = "<span class=\"text user-junit message other\" style=\"display: none;\">Hello world!</span>";
+    String otherBefore = "<span class=\"text user-other message chat_only\" style=\"\">Hello man!</span>";
 
     PlayerBean player = PlayerBeanBuilder.create().socialStatus(OTHER).get();
-    ChatChannelUser chatUser = ChatChannelUserBuilder.create(USER_NAME, CHANNEL_NAME)
-        .defaultValues()
-        .player(player)
-        .get();
-
-    defaultChatChannel.addUser(chatUser);
+    user.setPlayer(player);
+    defaultChatChannel.addUser(user);
 
     initializeDefaultChatChannel();
-    sendMessage(USER_NAME, "Hello world!");
-    sendMessage("other", "Hello man!");
+    sendMessage(user, "Hello world!");
+    sendMessage(other, "Hello man!");
 
     String content = instance.getHtmlBodyContent();
     assertTrue(content.contains(before));
@@ -529,24 +481,22 @@ public void testOnUserMessageVisibility() throws Exception {
 
   @Test
   public void testOnChatOnlyUserStyleClassUpdate() throws Exception {
-    String before = "<span class=\"text user-junit message\" style=\"\">Hello world!</span>";
-    String after = "<span class=\"text user-junit message chat_only\" style=\"\">Hello world!</span>";
-    String otherBefore = "<span class=\"text user-other message\" style=\"\">Hello man!</span>";
+    String before = "<span class=\"text user-junit message other\" style=\"\">Hello world!</span>";
+    String after = "<span class=\"text user-junit message other chat_only\" style=\"\">Hello world!</span>";
+    String otherBefore = "<span class=\"text user-other message chat_only\" style=\"\">Hello man!</span>";
 
-    ChatChannelUser chatUser = ChatChannelUserBuilder.create(USER_NAME, CHANNEL_NAME).defaultValues()
-        .player(PlayerBeanBuilder.create().defaultValues().get()).get();
-
-    defaultChatChannel.addUser(chatUser);
+    user.setPlayer(PlayerBeanBuilder.create().defaultValues().get());
+    defaultChatChannel.addUser(user);
 
     initializeDefaultChatChannel();
-    sendMessage(USER_NAME, "Hello world!");
-    sendMessage("other", "Hello man!");
+    sendMessage(user, "Hello world!");
+    sendMessage(other, "Hello man!");
 
     String content = instance.getHtmlBodyContent();
     assertTrue(content.contains(before));
     assertTrue(content.contains(otherBefore));
 
-    runOnFxThreadAndWait(() -> chatUser.setPlayer(null));
+    runOnFxThreadAndWait(() -> user.setPlayer(null));
     content = instance.getHtmlBodyContent();
     assertTrue(content.contains(after));
     assertTrue(content.contains(otherBefore));
@@ -554,33 +504,28 @@ public void testOnChatOnlyUserStyleClassUpdate() throws Exception {
 
   @Test
   public void testOnModeratorUserStyleClassUpdate() throws Exception {
-    String before = "<span class=\"text user-junit message\" style=\"\">Hello world!</span>";
-    String after = "<span class=\"text user-junit message moderator\" style=\"\">Hello world!</span>";
-    String otherBefore = "<span class=\"text user-other message\" style=\"\">Hello man!</span>";
+    String before = "<span class=\"text user-junit message chat_only\" style=\"\">Hello world!</span>";
+    String after = "<span class=\"text user-junit message chat_only moderator\" style=\"\">Hello world!</span>";
+    String otherBefore = "<span class=\"text user-other message chat_only\" style=\"\">Hello man!</span>";
 
-    ChatChannelUser chatUser = ChatChannelUserBuilder.create(USER_NAME, CHANNEL_NAME)
-        .defaultValues()
-        .player(PlayerBeanBuilder.create().socialStatus(OTHER).get())
-        .moderator(false)
-        .get();
-    defaultChatChannel.addUser(chatUser);
+    defaultChatChannel.addUser(user);
 
     initializeDefaultChatChannel();
-    sendMessage(USER_NAME, "Hello world!");
-    sendMessage("other", "Hello man!");
+    sendMessage(user, "Hello world!");
+    sendMessage(other, "Hello man!");
 
     String content = instance.getHtmlBodyContent();
     assertTrue(content.contains(before));
     assertTrue(content.contains(otherBefore));
 
-    runOnFxThreadAndWait(() -> chatUser.setModerator(true));
+    runOnFxThreadAndWait(() -> user.setModerator(true));
     content = instance.getHtmlBodyContent();
     assertTrue(content.contains(after));
     assertTrue(content.contains(otherBefore));
   }
 
-  private void sendMessage(String username, String message) {
-    runOnFxThreadAndWait(() -> instance.onChatMessage(new ChatMessage(Instant.now(), username, message)));
+  private void sendMessage(ChatChannelUser sender, String message) {
+    runOnFxThreadAndWait(() -> instance.onChatMessage(new ChatMessage(Instant.now(), sender, message)));
   }
 
   private void initializeDefaultChatChannel() {
diff --git a/src/test/java/com/faforever/client/chat/KittehChatServiceTest.java b/src/test/java/com/faforever/client/chat/KittehChatServiceTest.java
index 745bbb3c90..0432ff9255 100644
--- a/src/test/java/com/faforever/client/chat/KittehChatServiceTest.java
+++ b/src/test/java/com/faforever/client/chat/KittehChatServiceTest.java
@@ -474,7 +474,6 @@ public void testTopicChange() {
         new DefaultChannelTopic(null, "new topic", new DefaultActor(mock(WithManagement.class), "junit2!IP")),
         false));
 
-    assertEquals("junit2", chatChannel.getTopic().author());
     assertEquals("new topic", chatChannel.getTopic().content());
   }
 
@@ -493,7 +492,7 @@ public void testChatMessageEventTriggeredByChannelMessage() throws Exception {
     ChatMessage chatMessage = chatMessageFuture.get(TIMEOUT, TIMEOUT_UNIT);
 
     assertThat(chatMessage.message(), is(message));
-    assertThat(chatMessage.username(), is(user1.getNick()));
+    assertThat(chatMessage.sender().getUsername(), is(user1.getNick()));
     assertThat(chatMessage.action(), is(false));
   }
 
@@ -512,7 +511,7 @@ public void testChatMessageEventTriggeredByChannelAction() throws Exception {
     ChatMessage chatMessage = chatMessageFuture.get(TIMEOUT, TIMEOUT_UNIT);
 
     assertThat(chatMessage.message(), is(message));
-    assertThat(chatMessage.username(), is(user1.getNick()));
+    assertThat(chatMessage.sender().getUsername(), is(user1.getNick()));
     assertThat(chatMessage.action(), is(true));
   }
 
@@ -531,7 +530,7 @@ public void testChatMessageEventTriggeredByPrivateMessage() throws Exception {
     ChatMessage chatMessage = chatMessageFuture.get(TIMEOUT, TIMEOUT_UNIT);
 
     assertThat(chatMessage.message(), is(message));
-    assertThat(chatMessage.username(), is(user1.getNick()));
+    assertThat(chatMessage.sender().getUsername(), is(user1.getNick()));
     assertThat(chatMessage.action(), is(false));
   }
 
diff --git a/src/test/java/com/faforever/client/chat/MatchmakingChatControllerTest.java b/src/test/java/com/faforever/client/chat/MatchmakingChatControllerTest.java
index b7a7205a92..ca2e75526b 100644
--- a/src/test/java/com/faforever/client/chat/MatchmakingChatControllerTest.java
+++ b/src/test/java/com/faforever/client/chat/MatchmakingChatControllerTest.java
@@ -1,22 +1,21 @@
 package com.faforever.client.chat;
 
 import com.faforever.client.chat.emoticons.EmoticonService;
+import com.faforever.client.chat.emoticons.EmoticonsWindowController;
 import com.faforever.client.discord.JoinDiscordEventHandler;
 import com.faforever.client.fx.WebViewConfigurer;
 import com.faforever.client.i18n.I18n;
 import com.faforever.client.notification.NotificationService;
 import com.faforever.client.player.CountryFlagService;
-import com.faforever.client.player.PlayerService;
 import com.faforever.client.preferences.ChatPrefs;
 import com.faforever.client.reporting.ReportingService;
 import com.faforever.client.test.PlatformTest;
 import com.faforever.client.theme.ThemeService;
 import com.faforever.client.theme.UiService;
 import com.faforever.client.ui.StageHolder;
-import com.faforever.client.uploader.ImageUploadService;
-import com.faforever.client.user.LoginService;
 import com.faforever.client.util.TimeService;
 import javafx.beans.property.SimpleBooleanProperty;
+import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -40,14 +39,8 @@ public class MatchmakingChatControllerTest extends PlatformTest {
   @Mock
   private ChatService chatService;
   @Mock
-  private LoginService loginService;
-  @Mock
-  private PlayerService playerService;
-  @Mock
   private TimeService timeService;
   @Mock
-  private ImageUploadService imageUploadService;
-  @Mock
   private I18n i18n;
   @Mock
   private NotificationService notificationService;
@@ -68,14 +61,20 @@ public class MatchmakingChatControllerTest extends PlatformTest {
   @Spy
   private ChatPrefs chatPrefs;
 
+  @Mock
+  private EmoticonsWindowController emoticonsWindowController;
+
   @InjectMocks
   private MatchmakingChatController instance;
 
   @BeforeEach
   public void setUp() throws Exception {
+    lenient().when(uiService.loadFxml("theme/chat/emoticons/emoticons_window.fxml"))
+             .thenReturn(emoticonsWindowController);
+    lenient().when(emoticonsWindowController.getRoot()).thenReturn(new VBox());
+    lenient().when(chatService.getCurrentUsername()).thenReturn("junit");
     lenient().when(i18n.get(anyString())).thenReturn("");
     lenient().when(chatService.getOrCreateChannel("partyName")).thenReturn(new ChatChannel("partyName"));
-    lenient().when(loginService.getUsername()).thenReturn("junit");
     lenient().when(themeService.getThemeFileUrl(CHAT_CONTAINER)).thenReturn(
         getClass().getResource("/theme/chat/chat_container.html"));
     lenient().when(themeService.getThemeFileUrl(CHAT_SECTION_COMPACT)).thenReturn(
diff --git a/src/test/java/com/faforever/client/chat/PrivateChatTabControllerTest.java b/src/test/java/com/faforever/client/chat/PrivateChatTabControllerTest.java
index 4a23677a7c..85bf01a7f3 100644
--- a/src/test/java/com/faforever/client/chat/PrivateChatTabControllerTest.java
+++ b/src/test/java/com/faforever/client/chat/PrivateChatTabControllerTest.java
@@ -5,6 +5,7 @@
 import com.faforever.client.builders.AvatarBeanBuilder;
 import com.faforever.client.builders.PlayerBeanBuilder;
 import com.faforever.client.chat.emoticons.EmoticonService;
+import com.faforever.client.chat.emoticons.EmoticonsWindowController;
 import com.faforever.client.domain.AvatarBean;
 import com.faforever.client.domain.PlayerBean;
 import com.faforever.client.fx.WebViewConfigurer;
@@ -13,30 +14,27 @@
 import com.faforever.client.navigation.NavigationHandler;
 import com.faforever.client.notification.NotificationService;
 import com.faforever.client.player.CountryFlagService;
-import com.faforever.client.player.PlayerService;
 import com.faforever.client.player.PrivatePlayerInfoController;
 import com.faforever.client.preferences.ChatPrefs;
-import com.faforever.client.preferences.NotificationPrefs;
 import com.faforever.client.replay.WatchButtonController;
 import com.faforever.client.reporting.ReportingService;
 import com.faforever.client.test.PlatformTest;
 import com.faforever.client.theme.ThemeService;
 import com.faforever.client.theme.UiService;
-import com.faforever.client.uploader.ImageUploadService;
-import com.faforever.client.user.LoginService;
 import com.faforever.client.util.TimeService;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.scene.control.TabPane;
 import javafx.scene.control.skin.TabPaneSkin;
 import javafx.scene.image.Image;
+import javafx.scene.layout.VBox;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Spy;
 
 import java.io.InputStream;
 import java.net.URL;
-import java.util.Optional;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -45,22 +43,17 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 public class PrivateChatTabControllerTest extends PlatformTest {
 
-  @Mock
-  private LoginService loginService;
-  @Mock
-  private PlayerService playerService;
   @Mock
   private TimeService timeService;
   @Mock
   private AudioService audioService;
   @Mock
-  private ImageUploadService imageUploadService;
-  @Mock
   private I18n i18n;
   @Mock
   private NotificationService notificationService;
@@ -90,9 +83,11 @@ public class PrivateChatTabControllerTest extends PlatformTest {
   private ChatService chatService;
   @Spy
   private ChatPrefs chatPrefs;
-  @Spy
-  private NotificationPrefs notificationPrefs;
 
+  @Mock
+  private EmoticonsWindowController emoticonsWindowController;
+
+  @InjectMocks
   private PrivateChatTabController instance;
 
   private String playerName;
@@ -100,20 +95,21 @@ public class PrivateChatTabControllerTest extends PlatformTest {
 
   @BeforeEach
   public void setUp() throws Exception {
-    instance = new PrivateChatTabController(loginService, playerService, timeService, i18n, notificationService,
-                                            uiService, themeService, navigationHandler, chatService, webViewConfigurer,
-                                            countryFlagService,
-                                            emoticonService, avatarService, chatPrefs, notificationPrefs,
-                                            fxApplicationThreadExecutor);
-
     player = PlayerBeanBuilder.create().defaultValues().get();
     playerName = player.getUsername();
 
-    when(playerService.getPlayerByNameIfOnline(playerName)).thenReturn(Optional.of(player));
-    when(loginService.getUsername()).thenReturn(playerName);
-    when(themeService.getThemeFileUrl(any())).then(invocation -> getThemeFileUrl(invocation.getArgument(0)));
-    when(privatePlayerInfoController.chatUserProperty()).thenReturn(new SimpleObjectProperty<>());
-    when(avatarService.loadAvatar(player.getAvatar())).thenReturn(new Image(InputStream.nullInputStream()));
+    lenient().when(uiService.loadFxml("theme/chat/emoticons/emoticons_window.fxml"))
+             .thenReturn(emoticonsWindowController);
+    lenient().when(emoticonsWindowController.getRoot()).thenReturn(new VBox());
+    lenient().when(chatService.getCurrentUsername()).thenReturn(playerName);
+    lenient().when(themeService.getThemeFileUrl(any())).then(invocation -> getThemeFileUrl(invocation.getArgument(0)));
+    lenient().when(privatePlayerInfoController.chatUserProperty()).thenReturn(new SimpleObjectProperty<>());
+    lenient().when(avatarService.loadAvatar(player.getAvatar())).thenReturn(new Image(InputStream.nullInputStream()));
+
+    ChatChannel chatChannel = new ChatChannel(playerName);
+    ChatChannelUser chatChannelUser = new ChatChannelUser(playerName, playerName);
+    chatChannelUser.setPlayer(player);
+    chatChannel.addUser(chatChannelUser);
 
     loadFxml("theme/chat/private_chat_tab.fxml", clazz -> {
       if (clazz == PrivatePlayerInfoController.class) {
@@ -132,7 +128,7 @@ public void setUp() throws Exception {
       TabPane tabPane = new TabPane();
       tabPane.setSkin(new TabPaneSkin(tabPane));
       tabPane.getTabs().add(instance.getRoot());
-      instance.setChatChannel(new ChatChannel(playerName));
+      instance.setChatChannel(chatChannel);
     });
     verify(webViewConfigurer).configureWebView(eq(instance.messagesWebView));
   }
@@ -181,8 +177,4 @@ public void checkPlayerAvatarListener() throws Exception {
     runOnFxThreadAndWait(() -> player.setAvatar(avatarBean));
     assertEquals(newAvatar, instance.avatarImageView.getImage());
   }
-
-  @Test
-  public void testOnClosedTab() {
-  }
 }