--- a/ui/mainwindow.cpp	Tue Oct 14 18:33:18 2014 +0200
+++ b/ui/mainwindow.cpp	Wed Oct 15 10:03:48 2014 +0200
@@ -674,7 +674,14 @@
     mTrayIcon->setContextMenu(mTrayMenu);
 
     mTrayIcon->setIcon(trayImg);
-    setWindowIcon(trayImg);
+
+    if (mTrayIcon->isAlternative()) {
+        /* On unity (the alternative notification usage)
+         * we want to use the logo as window icon.*/
+        setWindowIcon(QIcon(":/img/logo.png"));
+    } else {
+        setWindowIcon(trayImg);
+    }
     mTrayIcon->setToolTip(tr("TrustBridge"));
 
     connect(mTrayIcon, SIGNAL(messageClicked()), this, SLOT(messageClicked()));