Index: Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.Designer.cs
===================================================================
diff -u -r22da5787c0bbdd8f94742b2df2f7c5b6808cfcc7 -r6be1df7c0af906db03cea537cc4446aaef986277
--- Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.Designer.cs	(.../MapControl.Designer.cs)	(revision 22da5787c0bbdd8f94742b2df2f7c5b6808cfcc7)
+++ Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.Designer.cs	(.../MapControl.Designer.cs)	(revision 6be1df7c0af906db03cea537cc4446aaef986277)
@@ -20,7 +20,7 @@
 // All rights reserved.
 
 using System.ComponentModel;
-using Core.Components.DotSpatial.Properties;
+using Core.Components.DotSpatial.Forms.Properties;
 
 namespace Core.Components.DotSpatial.Forms
 {
@@ -100,7 +100,7 @@
             this.zoomToAllVisibleLayersToolStripButton.Name = "zoomToAllVisibleLayersToolStripButton";
             this.zoomToAllVisibleLayersToolStripButton.Size = new System.Drawing.Size(39, 29);
             this.zoomToAllVisibleLayersToolStripButton.Text = "";
-            this.zoomToAllVisibleLayersToolStripButton.ToolTipText = Resources.MapControl_ZoomToVisibleLayers;
+            this.zoomToAllVisibleLayersToolStripButton.ToolTipText = Resources.MapControl_ZoomToExtents;
             this.zoomToAllVisibleLayersToolStripButton.Click += new System.EventHandler(this.ZoomToAllVisibleLayersToolStripButtonClick);
             // 
             // toolStripSeparator2
Index: Core/Components/src/Core.Components.DotSpatial.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r6049b52f0552bb346a429c06d7395d19a36ef26a -r6be1df7c0af906db03cea537cc4446aaef986277
--- Core/Components/src/Core.Components.DotSpatial.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 6049b52f0552bb346a429c06d7395d19a36ef26a)
+++ Core/Components/src/Core.Components.DotSpatial.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 6be1df7c0af906db03cea537cc4446aaef986277)
@@ -100,5 +100,41 @@
                         "ackground_layer", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Verschuiven.
+        /// </summary>
+        internal static string MapControl_Pan {
+            get {
+                return ResourceManager.GetString("MapControl_Pan", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Toon coördinaten.
+        /// </summary>
+        internal static string MapControl_ShowCoordinates {
+            get {
+                return ResourceManager.GetString("MapControl_ShowCoordinates", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Zoom naar alles.
+        /// </summary>
+        internal static string MapControl_ZoomToExtents {
+            get {
+                return ResourceManager.GetString("MapControl_ZoomToExtents", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Zoom door rechthoek.
+        /// </summary>
+        internal static string MapControl_ZoomToRectangle {
+            get {
+                return ResourceManager.GetString("MapControl_ZoomToRectangle", resourceCulture);
+            }
+        }
     }
 }
Index: Core/Components/src/Core.Components.DotSpatial.Forms/Properties/Resources.resx
===================================================================
diff -u -r6049b52f0552bb346a429c06d7395d19a36ef26a -r6be1df7c0af906db03cea537cc4446aaef986277
--- Core/Components/src/Core.Components.DotSpatial.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 6049b52f0552bb346a429c06d7395d19a36ef26a)
+++ Core/Components/src/Core.Components.DotSpatial.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 6be1df7c0af906db03cea537cc4446aaef986277)
@@ -124,4 +124,16 @@
   <data name="MapControl_HandleBruTileInitializationException_Message_0_therefore_cannot_show_background_layer" xml:space="preserve">
     <value>{0} De achtergrondkaart kan nu niet getoond worden.</value>
   </data>
+  <data name="MapControl_Pan" xml:space="preserve">
+    <value>Verschuiven</value>
+  </data>
+  <data name="MapControl_ZoomToRectangle" xml:space="preserve">
+    <value>Zoom door rechthoek</value>
+  </data>
+  <data name="MapControl_ZoomToExtents" xml:space="preserve">
+    <value>Zoom naar alles</value>
+  </data>
+  <data name="MapControl_ShowCoordinates" xml:space="preserve">
+    <value>Toon coördinaten</value>
+  </data>
 </root>
\ No newline at end of file
Index: Core/Components/src/Core.Components.DotSpatial/Properties/Resources.Designer.cs
===================================================================
diff -u -r48e634ab3ef98a7eaeec8626d3ce618cf1fcbac1 -r6be1df7c0af906db03cea537cc4446aaef986277
--- Core/Components/src/Core.Components.DotSpatial/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 48e634ab3ef98a7eaeec8626d3ce618cf1fcbac1)
+++ Core/Components/src/Core.Components.DotSpatial/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 6be1df7c0af906db03cea537cc4446aaef986277)
@@ -91,42 +91,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Verschuiven.
-        /// </summary>
-        public static string MapControl_Pan {
-            get {
-                return ResourceManager.GetString("MapControl_Pan", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Toon coördinaten.
-        /// </summary>
-        public static string MapControl_ShowCoordinates {
-            get {
-                return ResourceManager.GetString("MapControl_ShowCoordinates", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Zoom door rechthoek.
-        /// </summary>
-        public static string MapControl_ZoomToRectangle {
-            get {
-                return ResourceManager.GetString("MapControl_ZoomToRectangle", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Zoom naar alles.
-        /// </summary>
-        public static string MapControl_ZoomToVisibleLayers {
-            get {
-                return ResourceManager.GetString("MapControl_ZoomToVisibleLayers", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Ongeldige transformatie parameters: transformatie moet omkeerbaar zijn..
         /// </summary>
         public static string WorldFile_Not_invertable_transformation_arguments_error {
Index: Core/Components/src/Core.Components.DotSpatial/Properties/Resources.resx
===================================================================
diff -u -r48e634ab3ef98a7eaeec8626d3ce618cf1fcbac1 -r6be1df7c0af906db03cea537cc4446aaef986277
--- Core/Components/src/Core.Components.DotSpatial/Properties/Resources.resx	(.../Resources.resx)	(revision 48e634ab3ef98a7eaeec8626d3ce618cf1fcbac1)
+++ Core/Components/src/Core.Components.DotSpatial/Properties/Resources.resx	(.../Resources.resx)	(revision 6be1df7c0af906db03cea537cc4446aaef986277)
@@ -123,16 +123,4 @@
   <data name="BruTileLayer_Transparency_Value_out_of_Range_0_" xml:space="preserve">
     <value>Transparantie moet in het bereik {0} liggen.</value>
   </data>
-  <data name="MapControl_Pan" xml:space="preserve">
-    <value>Verschuiven</value>
-  </data>
-  <data name="MapControl_ZoomToRectangle" xml:space="preserve">
-    <value>Zoom door rechthoek</value>
-  </data>
-  <data name="MapControl_ZoomToVisibleLayers" xml:space="preserve">
-    <value>Zoom naar alles</value>
-  </data>
-  <data name="MapControl_ShowCoordinates" xml:space="preserve">
-    <value>Toon coördinaten</value>
-  </data>
 </root>
\ No newline at end of file