diff --git a/gajim.iss b/gajim.iss
index 400e6d27e..11d44a1e7 100644
--- a/gajim.iss
+++ b/gajim.iss
@@ -24,14 +24,13 @@ Source: "dist\*.dll"; DestDir: "{app}\src"
 Source: "dist\*.zip"; DestDir: "{app}\src"
 Source: "COPYING"; DestDir: "{app}"
 Source: "dist\gajim.exe"; DestDir: "{app}\src"; components: main
-Source: "*.ico"; DestDir: "{app}"
 Source: "dist\*.glade"; DestDir: "{app}\src"
 Source: "data\*"; DestDir: "{app}\data"; Flags: recursesubdirs
 
 [Icons]
 Name: "{group}\Gajim"; Filename: "{app}\src\Gajim.exe"; WorkingDir: "{app}\src"
 Name: "{group}\Uninstall Gajim"; Filename: "{app}\unins000.exe"; WorkingDir: "{app}"
-Name: "{userdesktop}\Gajim"; Filename: "{app}\src\gajim.exe"; WorkingDir: "{app}\src"; IconFilename: "{app}\gajim.ico"; Components: main; Tasks: desktopicon
+Name: "{userdesktop}\Gajim"; Filename: "{app}\src\gajim.exe"; WorkingDir: "{app}\src"; IconFilename: "{app}\data\pixmaps\gajim.ico"; Components: main; Tasks: desktopicon
 
 [Run]
 Filename: "{app}\src\gajim.exe"; Description: "Launch application"; Flags: postinstall nowait skipifsilent