Index: Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.Designer.cs
===================================================================
diff -u -rb517ac90883240f0d0405735d8150c872f69b561 -rbd36f92950113519dcb8b100e12879b9fb1ab4b6
--- Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.Designer.cs	(.../MapControl.Designer.cs)	(revision b517ac90883240f0d0405735d8150c872f69b561)
+++ Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.Designer.cs	(.../MapControl.Designer.cs)	(revision bd36f92950113519dcb8b100e12879b9fb1ab4b6)
@@ -39,9 +39,9 @@
         private void InitializeComponent()
         {
             this.tableLayoutPanel = new System.Windows.Forms.TableLayoutPanel();
-            this.panToggleButton = new System.Windows.Forms.CheckBox();
+            this.panningToggleButton = new System.Windows.Forms.CheckBox();
             this.zoomToRectangleToggleButton = new System.Windows.Forms.CheckBox();
-            this.zoomToExtentsButton = new System.Windows.Forms.CheckBox();
+            this.zoomToAllVisibleLayersButton = new System.Windows.Forms.CheckBox();
             this.showCoordinatesToggleButton = new System.Windows.Forms.CheckBox();
             this.tableLayoutPanel.SuspendLayout();
             this.SuspendLayout();
@@ -55,9 +55,9 @@
             this.tableLayoutPanel.ColumnCount = 2;
             this.tableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 38F));
             this.tableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 38F));
-            this.tableLayoutPanel.Controls.Add(this.panToggleButton, 0, 0);
+            this.tableLayoutPanel.Controls.Add(this.panningToggleButton, 0, 0);
             this.tableLayoutPanel.Controls.Add(this.zoomToRectangleToggleButton, 1, 0);
-            this.tableLayoutPanel.Controls.Add(this.zoomToExtentsButton, 0, 1);
+            this.tableLayoutPanel.Controls.Add(this.zoomToAllVisibleLayersButton, 0, 1);
             this.tableLayoutPanel.Controls.Add(this.showCoordinatesToggleButton, 1, 1);
             this.tableLayoutPanel.Location = new System.Drawing.Point(618, 3);
             this.tableLayoutPanel.Name = "tableLayoutPanel";
@@ -67,17 +67,19 @@
             this.tableLayoutPanel.Size = new System.Drawing.Size(76, 76);
             this.tableLayoutPanel.TabIndex = 1;
             // 
-            // panToggleButton
+            // panningToggleButton
             // 
-            this.panToggleButton.Appearance = System.Windows.Forms.Appearance.Button;
-            this.panToggleButton.AutoSize = true;
-            this.panToggleButton.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.panToggleButton.Image = global::Core.Components.DotSpatial.Forms.Properties.Resources.MapPanZoomImage;
-            this.panToggleButton.Location = new System.Drawing.Point(3, 3);
-            this.panToggleButton.Name = "panToggleButton";
-            this.panToggleButton.Size = new System.Drawing.Size(32, 32);
-            this.panToggleButton.TabIndex = 0;
-            this.panToggleButton.UseVisualStyleBackColor = true;
+            this.panningToggleButton.Appearance = System.Windows.Forms.Appearance.Button;
+            this.panningToggleButton.AutoSize = true;
+            this.panningToggleButton.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panningToggleButton.Image = global::Core.Components.DotSpatial.Forms.Properties.Resources.MapPanZoomImage;
+            this.panningToggleButton.Location = new System.Drawing.Point(3, 3);
+            this.panningToggleButton.Name = "panningToggleButton";
+            this.panningToggleButton.Size = new System.Drawing.Size(32, 32);
+            this.panningToggleButton.TabIndex = 0;
+            this.panningToggleButton.TabStop = false;
+            this.panningToggleButton.UseVisualStyleBackColor = true;
+            this.panningToggleButton.CheckedChanged += new System.EventHandler(this.PanningToggleButtonClicked);
             // 
             // zoomToRectangleToggleButton
             // 
@@ -89,19 +91,23 @@
             this.zoomToRectangleToggleButton.Name = "zoomToRectangleToggleButton";
             this.zoomToRectangleToggleButton.Size = new System.Drawing.Size(32, 32);
             this.zoomToRectangleToggleButton.TabIndex = 1;
+            this.zoomToRectangleToggleButton.TabStop = false;
             this.zoomToRectangleToggleButton.UseVisualStyleBackColor = true;
+            this.zoomToRectangleToggleButton.CheckedChanged += new System.EventHandler(this.ZoomToRectangleToggleButtonClicked);
             // 
-            // zoomToExtentsButton
+            // zoomToAllVisibleLayersButton
             // 
-            this.zoomToExtentsButton.Appearance = System.Windows.Forms.Appearance.Button;
-            this.zoomToExtentsButton.AutoSize = true;
-            this.zoomToExtentsButton.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.zoomToExtentsButton.Image = global::Core.Components.DotSpatial.Forms.Properties.Resources.zoomextents;
-            this.zoomToExtentsButton.Location = new System.Drawing.Point(3, 41);
-            this.zoomToExtentsButton.Name = "zoomToExtentsButton";
-            this.zoomToExtentsButton.Size = new System.Drawing.Size(32, 32);
-            this.zoomToExtentsButton.TabIndex = 2;
-            this.zoomToExtentsButton.UseVisualStyleBackColor = true;
+            this.zoomToAllVisibleLayersButton.Appearance = System.Windows.Forms.Appearance.Button;
+            this.zoomToAllVisibleLayersButton.AutoSize = true;
+            this.zoomToAllVisibleLayersButton.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.zoomToAllVisibleLayersButton.Image = global::Core.Components.DotSpatial.Forms.Properties.Resources.zoomextents;
+            this.zoomToAllVisibleLayersButton.Location = new System.Drawing.Point(3, 41);
+            this.zoomToAllVisibleLayersButton.Name = "zoomToAllVisibleLayersButton";
+            this.zoomToAllVisibleLayersButton.Size = new System.Drawing.Size(32, 32);
+            this.zoomToAllVisibleLayersButton.TabIndex = 2;
+            this.zoomToAllVisibleLayersButton.TabStop = false;
+            this.zoomToAllVisibleLayersButton.UseVisualStyleBackColor = true;
+            this.zoomToAllVisibleLayersButton.CheckedChanged += new System.EventHandler(this.ZoomToAllVisibleLayersButtonClicked);
             // 
             // showCoordinatesToggleButton
             // 
@@ -113,7 +119,9 @@
             this.showCoordinatesToggleButton.Name = "showCoordinatesToggleButton";
             this.showCoordinatesToggleButton.Size = new System.Drawing.Size(32, 32);
             this.showCoordinatesToggleButton.TabIndex = 3;
+            this.showCoordinatesToggleButton.TabStop = false;
             this.showCoordinatesToggleButton.UseVisualStyleBackColor = true;
+            this.showCoordinatesToggleButton.CheckedChanged += new System.EventHandler(this.ShowCoordinatesToggleButtonClicked);
             // 
             // MapControl
             // 
@@ -132,9 +140,9 @@
         #endregion
 
         private System.Windows.Forms.TableLayoutPanel tableLayoutPanel;
-        private System.Windows.Forms.CheckBox panToggleButton;
+        private System.Windows.Forms.CheckBox panningToggleButton;
         private System.Windows.Forms.CheckBox zoomToRectangleToggleButton;
-        private System.Windows.Forms.CheckBox zoomToExtentsButton;
+        private System.Windows.Forms.CheckBox zoomToAllVisibleLayersButton;
         private System.Windows.Forms.CheckBox showCoordinatesToggleButton;
     }
 }
\ No newline at end of file
Index: Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.cs
===================================================================
diff -u -r2b894d6833741b18aed72819933caaf48350cb2b -rbd36f92950113519dcb8b100e12879b9fb1ab4b6
--- Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.cs	(.../MapControl.cs)	(revision 2b894d6833741b18aed72819933caaf48350cb2b)
+++ Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.cs	(.../MapControl.cs)	(revision bd36f92950113519dcb8b100e12879b9fb1ab4b6)
@@ -61,6 +61,8 @@
         private MapDataCollection data;
         private ImageBasedMapData backgroundMapData;
         private Timer updateTimer;
+        private bool handlingToggleButtonClicked;
+        private bool handlingZoomToExtentsButtonClicked;
 
         /// <summary>
         /// Creates a new instance of <see cref="MapControl"/>.
@@ -146,7 +148,6 @@
             backGroundMapDataObserver.Dispose();
             backgroundLayerStatus.Dispose();
 
-
             base.Dispose(disposing);
         }
 
@@ -196,8 +197,10 @@
             mapFunctionSelectionZoom.MouseUp += MapFunctionOnMouseUp;
 
             mouseCoordinatesMapExtension = new RdNewMouseCoordinatesMapExtension(map);
-            ToggleMouseCoordinatesVisibility();
 
+            panningToggleButton.CheckState = CheckState.Checked;
+            showCoordinatesToggleButton.CheckState = CheckState.Checked;
+
             Controls.Add(map);
         }
 
@@ -233,6 +236,81 @@
             }
         }
 
+        private void PanningToggleButtonClicked(object sender, EventArgs e)
+        {
+            if (handlingToggleButtonClicked)
+            {
+                return;
+            }
+
+            if (IsPanningEnabled)
+            {
+                panningToggleButton.CheckState = CheckState.Checked;
+
+                return;
+            }
+
+            handlingToggleButtonClicked = true;
+
+            TogglePanning();
+
+            zoomToRectangleToggleButton.CheckState = CheckState.Unchecked;
+
+            map.Focus();
+
+            handlingToggleButtonClicked = false;
+        }
+
+        private void ZoomToRectangleToggleButtonClicked(object sender, EventArgs e)
+        {
+            if (handlingToggleButtonClicked)
+            {
+                return;
+            }
+
+            if (IsRectangleZoomingEnabled)
+            {
+                zoomToRectangleToggleButton.CheckState = CheckState.Checked;
+
+                return;
+            }
+
+            handlingToggleButtonClicked = true;
+
+            ToggleRectangleZooming();
+
+            panningToggleButton.CheckState = CheckState.Unchecked;
+
+            map.Focus();
+
+            handlingToggleButtonClicked = false;
+        }
+
+        private void ZoomToAllVisibleLayersButtonClicked(object sender, EventArgs e)
+        {
+            if (handlingZoomToExtentsButtonClicked)
+            {
+                return;
+            }
+
+            handlingZoomToExtentsButtonClicked = true;
+
+            zoomToAllVisibleLayersButton.CheckState = CheckState.Unchecked;
+
+            map.Focus();
+
+            ZoomToAllVisibleLayers();
+
+            handlingZoomToExtentsButtonClicked = false;
+        }
+
+        private void ShowCoordinatesToggleButtonClicked(object sender, EventArgs e)
+        {
+            ToggleMouseCoordinatesVisibility();
+
+            map.Focus();
+        }
+
         #region Background layer
 
         /// <summary>