diff --git a/data/default/resources/images/foundingFathers/peterMinuit.jpg b/data/default/resources/images/foundingFathers/peterMinuit.jpg
index b9bc498be..20698f08c 100644
Binary files a/data/default/resources/images/foundingFathers/peterMinuit.jpg and b/data/default/resources/images/foundingFathers/peterMinuit.jpg differ
diff --git a/data/default/resources/images/foundingFathers/peterMinuit.size6.jpg b/data/default/resources/images/foundingFathers/peterMinuit.size6.jpg
index 18df4453e..5e33bfd4f 100644
Binary files a/data/default/resources/images/foundingFathers/peterMinuit.size6.jpg and b/data/default/resources/images/foundingFathers/peterMinuit.size6.jpg differ
diff --git a/src/net/sf/freecol/client/gui/Canvas.java b/src/net/sf/freecol/client/gui/Canvas.java
index a3f53ce33..11d54ed90 100644
--- a/src/net/sf/freecol/client/gui/Canvas.java
+++ b/src/net/sf/freecol/client/gui/Canvas.java
@@ -798,6 +798,17 @@ public final class Canvas extends JDesktopPane {
      */
     public void removeInGameComponents() {
         // remove listeners, they will be added when launching the new game...
+        removeKeyAndMouseListeners();
+
+        for (Component c : getComponents()) {
+            if (c instanceof CanvasMapViewer) {
+                continue;
+            }
+            removeFromCanvas(c);
+        }
+    }
+
+    private void removeKeyAndMouseListeners() {
         KeyListener[] keyListeners = getKeyListeners();
         for (KeyListener keyListener : keyListeners) {
             removeKeyListener(keyListener);
@@ -812,19 +823,14 @@ public final class Canvas extends JDesktopPane {
         for (MouseMotionListener mouseMotionListener : mouseMotionListeners) {
             removeMouseMotionListener(mouseMotionListener);
         }
-
-        for (Component c : getComponents()) {
-            if (c instanceof CanvasMapViewer) {
-                continue;
-            }
-            removeFromCanvas(c);
-        }
     }
 
     /**
      * Map editor initialization.
      */
     public void startMapEditorGUI() {
+        removeKeyAndMouseListeners();
+        
         freeColClient.updateActions();
         this.parentFrame.setMenuBar(new MapEditorMenuBar(this.freeColClient,
                 new MenuMouseMotionListener(scrolling)));
@@ -838,6 +844,8 @@ public final class Canvas extends JDesktopPane {
      * In game initializations.
      */
     public void initializeInGame() {
+        removeKeyAndMouseListeners();
+        
         this.parentFrame.setMenuBar(new InGameMenuBar(this.freeColClient,
                 new MenuMouseMotionListener(scrolling)));
         addMouseListener(new CanvasMouseListener(this.freeColClient));
diff --git a/srcdata/graphics/Founding_fathers/source/peter_minuit.psd b/srcdata/graphics/Founding_fathers/source/peter_minuit.psd
index c1a43c954..a28d736d6 100644
Binary files a/srcdata/graphics/Founding_fathers/source/peter_minuit.psd and b/srcdata/graphics/Founding_fathers/source/peter_minuit.psd differ
diff --git a/srcdata/graphics/Founding_fathers/source/peter_minuit.xcf b/srcdata/graphics/Founding_fathers/source/peter_minuit.xcf
index daa5ff0d2..f94f93969 100644
Binary files a/srcdata/graphics/Founding_fathers/source/peter_minuit.xcf and b/srcdata/graphics/Founding_fathers/source/peter_minuit.xcf differ