diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index bb91ac354..5ceb901cf 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -43,6 +43,8 @@ $Id$
     * Made sure "New" dialog created correct thumbnail subdirectories
       for personal Starters & Templates (e.g., ~/.tuxpaint/starters/thumbs/)
 
+    * Moved the setting of the window icon after window creation.
+
   * Other Improvements
     ------------------
     * Added ability to move color palette options to the end of
diff --git a/src/tuxpaint.c b/src/tuxpaint.c
index d6bda7cdf..760a78151 100644
--- a/src/tuxpaint.c
+++ b/src/tuxpaint.c
@@ -24031,14 +24031,6 @@ static void setup(void)
 #endif
   setup_colors();
 
-  /* Set window icon and caption: */
-
-#ifndef __APPLE__
-  seticon();
-#endif
-  if (hide_cursor)
-    SDL_ShowCursor(SDL_DISABLE);
-
 
   /* Deal with orientation rotation option */
 
@@ -24241,6 +24233,14 @@ static void setup(void)
 
   setup_screen_layout();
 
+  /* Set window icon and caption: */
+
+#ifndef __APPLE__
+  seticon();
+#endif
+  if (hide_cursor)
+    SDL_ShowCursor(SDL_DISABLE);
+
 
   /* quickly: title image, version, progress bar, and watch cursor */