diff --git a/gajim.iss b/gajim.iss
index 28b52ca57..b1d1eabba 100644
--- a/gajim.iss
+++ b/gajim.iss
@@ -26,10 +26,12 @@ Source: "dist\*.exe"; DestDir: "{app}"; components: main
 Source: "*.ico"; DestDir: "{app}"
 Source: "dist\plugins\gtkgui\*.glade"; DestDir: "{app}\plugins\gtkgui"
 Source: "dist\plugins\gtkgui\icons\sun\*"; DestDir: "{app}\plugins\gtkgui\icons\sun"
+Source: "dist\plugins\gtkgui\emoticons\*"; DestDir: "{app}\plugins\gtkgui\emoticons"
+Source: "dist\plugins\gtkgui\pixmaps\*"; DestDir: "{app}\plugins\gtkgui\pixmaps"
 
 [Icons]
 Name: "{group}\Gajim"; Filename: "{app}\runCore.exe"; WorkingDir: "{app}"; IconFilename: "{app}\gajim.ico"
-Name: "{userdesktop}\Gajim"; Filename: "{app}\runCore.exe"; WorkingDir: "{app}"; IconFilename: "{app}\gajim.ico"; Components: main; Tasks: desktopicon
+Name: "{userdesktop}\Gajim"; Filename: "{app}\gajim.exe"; WorkingDir: "{app}"; IconFilename: "{app}\gajim.ico"; Components: main; Tasks: desktopicon
 
 [Run]
-Filename: "{app}\runCore.exe"; Description: "Launch application"; Flags: postinstall nowait skipifsilent
+Filename: "{app}\gajim.exe"; Description: "Launch application"; Flags: postinstall nowait skipifsilent