diff --git a/imports/Spectral/Page/Room.qml b/imports/Spectral/Page/Room.qml
index bd55905..4e05fa0 100644
--- a/imports/Spectral/Page/Room.qml
+++ b/imports/Spectral/Page/Room.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.9
 
 RoomForm {
-    roomListModel.onNewMessage: if (!window.active) spectralController.showMessage(roomName, content, icon)
+    roomListModel.onNewMessage: if (!window.visible) spectralController.showMessage(roomName, content, icon)
 }
diff --git a/src/main.cpp b/src/main.cpp
index 16c1f6f..d393139 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -31,6 +31,7 @@ int main(int argc, char *argv[]) {
   app.setOrganizationName("ENCOM");
   app.setOrganizationDomain("encom.eu.org");
   app.setApplicationName("Spectral");
+  app.setWindowIcon(QIcon(":/assets/img/icon.png"));
 
   app.setQuitOnLastWindowClosed(false);