diff --git a/wxPython/MANIFEST.in b/wxPython/MANIFEST.in
index 3bf11b684b..29df364d2a 100644
--- a/wxPython/MANIFEST.in
+++ b/wxPython/MANIFEST.in
@@ -22,6 +22,7 @@ include demo/bmp_source/*.png
 include demo/bmp_source/*.jpg
 include demo/*.txt
 include demo/*.xml
+include demo/*.ico
 include demo/data/*.png
 include demo/data/*.htm
 include demo/data/*.html
@@ -96,6 +97,7 @@ include tools/XRCed/TODO
 include tools/XRCed/README
 include tools/XRCed/*.py
 include tools/XRCed/*.xrc
+include tools/XRCed/*.ico
 
 include contrib/glcanvas/*.i
 include contrib/glcanvas/*.py
diff --git a/wxPython/demo/wxpdemo.ico b/wxPython/demo/wxpdemo.ico
new file mode 100644
index 0000000000..3ed4f08c9f
Binary files /dev/null and b/wxPython/demo/wxpdemo.ico differ
diff --git a/wxPython/distrib/make_installer.py b/wxPython/distrib/make_installer.py
index 9a0ad4a750..ed7c301c00 100644
--- a/wxPython/distrib/make_installer.py
+++ b/wxPython/distrib/make_installer.py
@@ -69,6 +69,7 @@ Source: "%(SYSDIR)s\MSVCIRT.dll";           DestDir: "{sys}"; CopyMode: alwayssk
 
 Source: "%(WXDIR)s\lib\%(WXDLL)s";          DestDir: "{app}\wxPython"; Components: core
 Source: "wxPython\wxc.pyd";                 DestDir: "{app}\wxPython"; Components: core
+Source: "wxPython\wxc.pyd.manifest";        DestDir: "{app}\wxPython"; Components: core
 Source: "wxPython\gridc.pyd";               DestDir: "{app}\wxPython"; Components: core
 Source: "wxPython\helpc.pyd";               DestDir: "{app}\wxPython"; Components: core
 Source: "wxPython\htmlc.pyd";               DestDir: "{app}\wxPython"; Components: core
@@ -93,6 +94,7 @@ Source: "wxPython\lib\PyCrust\*.ico";       DestDir: "{app}\wxPython\lib\PyCrust
 Source: "demo\*.py";                        DestDir: "{app}\wxPython\demo"; Components: demo
 Source: "demo\*.xml";                       DestDir: "{app}\wxPython\demo"; Components: demo
 Source: "demo\*.txt";                       DestDir: "{app}\wxPython\demo"; Components: demo
+Source: "demo\*.ico";                       DestDir: "{app}\wxPython\demo"; Components: demo
 
 Source: "demo\bitmaps\*.gif";               DestDir: "{app}\wxPython\demo\bitmaps"; Components: demo
 Source: "demo\bitmaps\*.bmp";               DestDir: "{app}\wxPython\demo\bitmaps"; Components: demo
@@ -135,6 +137,7 @@ Source: "tools\XRCed\TODO";                 DestDir: "{app}\wxPython\tools\XRCed
 Source: "tools\XRCed\README";               DestDir: "{app}\wxPython\tools\XRCed"; Components: tools
 Source: "tools\XRCed\*.py";                 DestDir: "{app}\wxPython\tools\XRCed"; Components: tools
 Source: "tools\XRCed\*.xrc";                DestDir: "{app}\wxPython\tools\XRCed"; Components: tools
+Source: "tools\XRCed\*.ico";                DestDir: "{app}\wxPython\tools\XRCed"; Components: tools
 
 Source: "samples\doodle\*.py";              DestDir: "{app}\wxPython\samples\doodle"; Components: samples
 Source: "samples\doodle\*.txt";             DestDir: "{app}\wxPython\samples\doodle"; Components: samples
@@ -162,7 +165,7 @@ Source: "samples\frogedit\*.py";           DestDir: "{app}\wxPython\samples\frog
 ;;------------------------------------------------------------
 
 [Icons]
-Name: "{group}\Run the DEMO";          Filename: "{code:GetPythonDir}\pythonw.exe";   WorkingDir: "{app}\wxPython\demo";   Parameters: "demo.py"; Components: core
+Name: "{group}\Run the DEMO";          Filename: "{code:GetPythonDir}\pythonw.exe";   WorkingDir: "{app}\wxPython\demo";   Parameters: "demo.py"; IconFilename: "{app}\wxPython\demo\wxpdemo.ico"; Components: core
 Name: "{group}\PyCrust";               Filename: "{code:GetPythonDir}\pythonw.exe";   WorkingDir: "c:\";                   Parameters: "{app}\wxPython\lib\PyCrust\PyCrustApp.py";  IconFilename: "{app}\wxPython\lib\PyCrust\PyCrust.ico"; Components: core
 Name: "{group}\wxWindows Reference";   Filename: "{app}\wxPython\docs\wx.chm";                Components: docs
 Name: "{group}\wxOGL Reference";       Filename: "{app}\wxPython\docs\ogl.chm";               Components: docs
@@ -170,6 +173,7 @@ Name: "{group}\licence.txt";           Filename: "{app}\wxPython\docs\licence\li
 Name: "{group}\README.txt";            Filename: "{app}\wxPython\docs\README.txt";            Components: core
 Name: "{group}\CHANGES.txt";           Filename: "{app}\wxPython\docs\CHANGES.txt";           Components: core
 Name: "{group}\Sample Apps";           Filename: "{app}\wxPython\samples"; Components: samples
+Name: "{group}\Resource Editor";       Filename: "{code:GetPythonDir}\pythonw.exe";   WorkingDir: "c:\";   Parameters: "{app}\wxPython\Tools\XRCed\xrced.py"; IconFilename: "{app}\wxPython\Tools\XRCed\xrced.ico"; Components: tools
 
 
 ;;------------------------------------------------------------
diff --git a/wxPython/tools/XRCed/xrced.ico b/wxPython/tools/XRCed/xrced.ico
new file mode 100644
index 0000000000..c1652ba91f
Binary files /dev/null and b/wxPython/tools/XRCed/xrced.ico differ