diff --git a/src/main/java/net/flectone/chat/manager/FileManager.java b/src/main/java/net/flectone/chat/manager/FileManager.java
index 6dc918d..d5b4078 100644
--- a/src/main/java/net/flectone/chat/manager/FileManager.java
+++ b/src/main/java/net/flectone/chat/manager/FileManager.java
@@ -144,7 +144,8 @@ public BufferedImage getIcon(String icon) {
             File fileIcon = new File(DATA_FOLDER + ICONS_FOLDER + icon + ".png");
             iconsMap.put(icon, ImageIO.read(fileIcon));
         } catch (IOException ignored) {}
-        return null;
+
+        return iconsMap.get(icon);
     }
 
     private void loadIcons() {