diff --git a/gajim.ico b/gajim.ico
new file mode 100644
index 000000000..028b590bd
Binary files /dev/null and b/gajim.ico differ
diff --git a/setup_win32.py b/setup_win32.py
index a6256fe24..2e1bbd7cb 100644
--- a/setup_win32.py
+++ b/setup_win32.py
@@ -41,10 +41,13 @@ setup(
     name = "Gajim",
     description = "A jabber client",
 #    console=["gajim.py"],
-    windows = [{"script": "gajim.py"}],
+    windows = [{"script": "gajim.py",
+                "icon_resources": [(1, "gajim.ico")]}],
     options=opts,
     data_files=[("plugins/gtkgui", glob.glob("plugins/gtkgui/gtkgui.glade")),
                 ("plugins/gtkgui/icons/sun", glob.glob("plugins/gtkgui/icons/sun/*.*")),
+                ("plugins/gtkgui/emoticons", glob.glob("plugins/gtkgui/emoticons/*.*")),
+                ("plugins/gtkgui/pixmaps", glob.glob("plugins/gtkgui/pixmaps/*.*")),
                 ("Messages/fr/LC_MESSAGES", glob.glob("Messages/fr/LC_MESSAGES/*.mo"))
     ],
 )