Index: Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.Designer.cs
===================================================================
diff -u -r599b4b5721f66d2c6db97a23926428788f33644f -r2d9c462dd373edd8cf907713df95ada4876d29d5
--- Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.Designer.cs	(.../MapControl.Designer.cs)	(revision 599b4b5721f66d2c6db97a23926428788f33644f)
+++ Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.Designer.cs	(.../MapControl.Designer.cs)	(revision 2d9c462dd373edd8cf907713df95ada4876d29d5)
@@ -53,7 +53,7 @@
             this.toolStrip.CanOverflow = false;
             this.toolStrip.Dock = System.Windows.Forms.DockStyle.Right;
             this.toolStrip.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;
-            this.toolStrip.ImageScalingSize = new System.Drawing.Size(32, 32);
+            this.toolStrip.ImageScalingSize = new System.Drawing.Size(24, 24);
             this.toolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.panToolStripButton,
             this.zoomToRectangleToolStripButton,
@@ -69,23 +69,23 @@
             // 
             // panToolStripButton
             // 
-            this.panToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.panToolStripButton.Image = global::Core.Components.DotSpatial.Forms.Properties.Resources.Pan;
-            this.panToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.panToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+            this.panToolStripButton.Font = new System.Drawing.Font("Deltares-Riskeer-Symbols", 12F);
             this.panToolStripButton.Margin = new System.Windows.Forms.Padding(2, 2, 2, 3);
             this.panToolStripButton.Name = "panToolStripButton";
-            this.panToolStripButton.Size = new System.Drawing.Size(39, 36);
+            this.panToolStripButton.Size = new System.Drawing.Size(39, 29);
+            this.panToolStripButton.Text = "";
             this.panToolStripButton.ToolTipText = "Verschuiven";
             this.panToolStripButton.Click += new System.EventHandler(this.PanToolStripButtonClick);
             // 
             // zoomToRectangleToolStripButton
             // 
-            this.zoomToRectangleToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.zoomToRectangleToolStripButton.Image = global::Core.Components.DotSpatial.Forms.Properties.Resources.ZoomToRectangle;
-            this.zoomToRectangleToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.zoomToRectangleToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+            this.zoomToRectangleToolStripButton.Font = new System.Drawing.Font("Deltares-Riskeer-Symbols", 12F);
             this.zoomToRectangleToolStripButton.Margin = new System.Windows.Forms.Padding(2, 2, 2, 3);
             this.zoomToRectangleToolStripButton.Name = "zoomToRectangleToolStripButton";
-            this.zoomToRectangleToolStripButton.Size = new System.Drawing.Size(39, 36);
+            this.zoomToRectangleToolStripButton.Size = new System.Drawing.Size(39, 29);
+            this.zoomToRectangleToolStripButton.Text = "";
             this.zoomToRectangleToolStripButton.ToolTipText = "Zoom door rechthoek";
             this.zoomToRectangleToolStripButton.Click += new System.EventHandler(this.ZoomToRectangleToolStripButtonClick);
             // 
@@ -96,12 +96,12 @@
             // 
             // zoomToAllVisibleLayersToolStripButton
             // 
-            this.zoomToAllVisibleLayersToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.zoomToAllVisibleLayersToolStripButton.Image = global::Core.Components.DotSpatial.Forms.Properties.Resources.ZoomToExtents;
-            this.zoomToAllVisibleLayersToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.zoomToAllVisibleLayersToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+            this.zoomToAllVisibleLayersToolStripButton.Font = new System.Drawing.Font("Deltares-Riskeer-Symbols", 12F);
             this.zoomToAllVisibleLayersToolStripButton.Margin = new System.Windows.Forms.Padding(2, 2, 2, 3);
             this.zoomToAllVisibleLayersToolStripButton.Name = "zoomToAllVisibleLayersToolStripButton";
-            this.zoomToAllVisibleLayersToolStripButton.Size = new System.Drawing.Size(39, 36);
+            this.zoomToAllVisibleLayersToolStripButton.Size = new System.Drawing.Size(39, 29);
+            this.zoomToAllVisibleLayersToolStripButton.Text = "";
             this.zoomToAllVisibleLayersToolStripButton.ToolTipText = "Zoom naar alles";
             this.zoomToAllVisibleLayersToolStripButton.Click += new System.EventHandler(this.ZoomToAllVisibleLayersToolStripButtonClick);
             // 
@@ -112,12 +112,12 @@
             // 
             // showCoordinatesToolStripButton
             // 
-            this.showCoordinatesToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.showCoordinatesToolStripButton.Image = global::Core.Components.DotSpatial.Forms.Properties.Resources.ShowCoordinates;
-            this.showCoordinatesToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.showCoordinatesToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+            this.showCoordinatesToolStripButton.Font = new System.Drawing.Font("Deltares-Riskeer-Symbols", 12F);
             this.showCoordinatesToolStripButton.Margin = new System.Windows.Forms.Padding(2, 2, 2, 3);
             this.showCoordinatesToolStripButton.Name = "showCoordinatesToolStripButton";
-            this.showCoordinatesToolStripButton.Size = new System.Drawing.Size(39, 36);
+            this.showCoordinatesToolStripButton.Size = new System.Drawing.Size(39, 29);
+            this.showCoordinatesToolStripButton.Text = "";
             this.showCoordinatesToolStripButton.ToolTipText = "Toon coördinaten";
             this.showCoordinatesToolStripButton.Click += new System.EventHandler(this.ShowCoordinatesToolStripButtonClick);
             // 
Index: Core/Components/src/Core.Components.DotSpatial.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r7f4c410f8cd860ca3c5511c819f1e1b48a6f824b -r2d9c462dd373edd8cf907713df95ada4876d29d5
--- Core/Components/src/Core.Components.DotSpatial.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 7f4c410f8cd860ca3c5511c819f1e1b48a6f824b)
+++ Core/Components/src/Core.Components.DotSpatial.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 2d9c462dd373edd8cf907713df95ada4876d29d5)
@@ -40,7 +40,7 @@
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -90,45 +90,5 @@
                         "ackground_layer", resourceCulture);
             }
         }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap Pan {
-            get {
-                object obj = ResourceManager.GetObject("Pan", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap ShowCoordinates {
-            get {
-                object obj = ResourceManager.GetObject("ShowCoordinates", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap ZoomToExtents {
-            get {
-                object obj = ResourceManager.GetObject("ZoomToExtents", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap ZoomToRectangle {
-            get {
-                object obj = ResourceManager.GetObject("ZoomToRectangle", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
     }
 }
Index: Core/Components/src/Core.Components.DotSpatial.Forms/Properties/Resources.resx
===================================================================
diff -u -r7f4c410f8cd860ca3c5511c819f1e1b48a6f824b -r2d9c462dd373edd8cf907713df95ada4876d29d5
--- Core/Components/src/Core.Components.DotSpatial.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 7f4c410f8cd860ca3c5511c819f1e1b48a6f824b)
+++ Core/Components/src/Core.Components.DotSpatial.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 2d9c462dd373edd8cf907713df95ada4876d29d5)
@@ -120,17 +120,4 @@
   <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>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="Pan" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Pan.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="ShowCoordinates" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\ShowCoordinates.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="ZoomToExtents" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\ZoomToExtents.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="ZoomToRectangle" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\ZoomToRectangle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
 </root>
\ No newline at end of file
Index: Core/Components/src/Core.Components.DotSpatial.Forms/Resources/Pan.png
===================================================================
diff -u -rf3d39e01874c99004027cc77af2c05843924d539 -r2d9c462dd373edd8cf907713df95ada4876d29d5
Binary files differ
Index: Core/Components/src/Core.Components.DotSpatial.Forms/Resources/ShowCoordinates.png
===================================================================
diff -u -rf3d39e01874c99004027cc77af2c05843924d539 -r2d9c462dd373edd8cf907713df95ada4876d29d5
Binary files differ
Index: Core/Components/src/Core.Components.DotSpatial.Forms/Resources/ZoomToExtents.png
===================================================================
diff -u -rf3d39e01874c99004027cc77af2c05843924d539 -r2d9c462dd373edd8cf907713df95ada4876d29d5
Binary files differ
Index: Core/Components/src/Core.Components.DotSpatial.Forms/Resources/ZoomToRectangle.png
===================================================================
diff -u -rf3d39e01874c99004027cc77af2c05843924d539 -r2d9c462dd373edd8cf907713df95ada4876d29d5
Binary files differ