diff --git a/krfb.desktop b/krfb.desktop
index fd0bd865..deba4061 100644
--- a/krfb.desktop
+++ b/krfb.desktop
@@ -1,7 +1,7 @@
 # KDE Config File
 [Desktop Entry]
 Type=Application
-Exec=krfb -caption "%c"
+Exec=krfb -caption "%c" %i
 Icon=krfb
 X-DocPath=krfb/index.html
 Terminal=false
diff --git a/main.cpp b/main.cpp
index cd2d6998..c700f728 100644
--- a/main.cpp
+++ b/main.cpp
@@ -32,6 +32,7 @@
 #include <kapplication.h>
 #include <kmessagebox.h>
 #include <qwindowdefs.h>
+#include <KIcon>
 
 #include <signal.h>
 
@@ -75,7 +76,7 @@ int main(int argc, char *argv[])
 	KCmdLineArgs::init(argc, argv, &aboutData);
 
 	KApplication app;
-
+	QApplication::setWindowIcon(KIcon("krfb"));
     TrayIcon trayicon(new ManageInvitationsDialog);
 
 	KrfbServer *server = KrfbServer::self(); // initialize the server manager