--- a/lisp/msw-init.el	Mon Aug 13 10:29:43 2007 +0200
+++ b/lisp/msw-init.el	Mon Aug 13 10:30:37 2007 +0200
@@ -43,6 +43,11 @@
 (defun init-post-mswindows-win (console)
   "Initialize mswindows GUI at startup (post).  Don't call this."
   (unless mswindows-post-win-initted
+    ;; We can't load this until after the initial device is created
+    ;; because the icon initialization needs to access the display to get
+    ;; any toolbar-related color resources.
+    (if (and (featurep 'xpm) (featurep 'toolbar))
+        (init-x-toolbar))
     ;; Old-style mswindows bindings. The new-style mswindows bindings
     ;; (namely Ctrl-X, Ctrl-C and Ctrl-V) are already spoken for by XEmacs.
     (define-key global-map '(control insert) 'mswindows-copy-clipboard)