Index: Core/Plugins/src/Core.Plugins.CommonTools.Gui/Properties/Resources.Designer.cs
===================================================================
diff -u -r12c5ceb5471938a64061362a809cab802f00eb30 -r54135385f2c39cad94b80f3ad8197041765c007d
--- Core/Plugins/src/Core.Plugins.CommonTools.Gui/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 12c5ceb5471938a64061362a809cab802f00eb30)
+++ Core/Plugins/src/Core.Plugins.CommonTools.Gui/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 54135385f2c39cad94b80f3ad8197041765c007d)
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18408
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -1377,7 +1377,7 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Exporteer als figuren.
+        ///   Looks up a localized string similar to Exporteer als afbeelding.
         /// </summary>
         public static string Ribbon_ExportAsImage {
             get {
Index: Core/Plugins/src/Core.Plugins.CommonTools.Gui/Properties/Resources.resx
===================================================================
diff -u -r12c5ceb5471938a64061362a809cab802f00eb30 -r54135385f2c39cad94b80f3ad8197041765c007d
--- Core/Plugins/src/Core.Plugins.CommonTools.Gui/Properties/Resources.resx	(.../Resources.resx)	(revision 12c5ceb5471938a64061362a809cab802f00eb30)
+++ Core/Plugins/src/Core.Plugins.CommonTools.Gui/Properties/Resources.resx	(.../Resources.resx)	(revision 54135385f2c39cad94b80f3ad8197041765c007d)
@@ -578,7 +578,7 @@
     <value>Exporteren</value>
   </data>
   <data name="Ribbon_ExportAsImage" xml:space="preserve">
-    <value>Exporteer als figuren</value>
+    <value>Exporteer als afbeelding</value>
   </data>
   <data name="Ribbon_GroupBox_Style" xml:space="preserve">
     <value>Stijl</value>
Index: Core/Plugins/src/Core.Plugins.SharpMapGis/Core.Plugins.SharpMapGis.csproj
===================================================================
diff -u -r3f1a2b8718a744b49b160c89df46dee6b7fb5fdd -r54135385f2c39cad94b80f3ad8197041765c007d
--- Core/Plugins/src/Core.Plugins.SharpMapGis/Core.Plugins.SharpMapGis.csproj	(.../Core.Plugins.SharpMapGis.csproj)	(revision 3f1a2b8718a744b49b160c89df46dee6b7fb5fdd)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis/Core.Plugins.SharpMapGis.csproj	(.../Core.Plugins.SharpMapGis.csproj)	(revision 54135385f2c39cad94b80f3ad8197041765c007d)
@@ -124,6 +124,10 @@
       <Name>Core.Common.Controls.Swf</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Controls\Core.Common.Controls.csproj">
+      <Project>{9A2D67E6-26AC-4D17-B11A-2B4372F2F572}</Project>
+      <Name>Core.Common.Controls</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Core.Common.Utils\Core.Common.Utils.csproj">
       <Project>{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}</Project>
       <Name>Core.Common.Utils</Name>
@@ -199,6 +203,9 @@
   <ItemGroup>
     <None Include="Resources\exportIcon.png" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\exportIcon.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
Index: Core/Plugins/src/Core.Plugins.SharpMapGis/Properties/Resources.Designer.cs
===================================================================
diff -u -r3e5b477ac8dc4113688581e5e08c71fdd6d66ae8 -r54135385f2c39cad94b80f3ad8197041765c007d
--- Core/Plugins/src/Core.Plugins.SharpMapGis/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 3e5b477ac8dc4113688581e5e08c71fdd6d66ae8)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 54135385f2c39cad94b80f3ad8197041765c007d)
@@ -89,6 +89,16 @@
         }
         
         /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
+        /// </summary>
+        public static System.Drawing.Icon exportIcon1 {
+            get {
+                object obj = ResourceManager.GetObject("exportIcon1", resourceCulture);
+                return ((System.Drawing.Icon)(obj));
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to {0} bestanden (*.{0})|*.{0}.
         /// </summary>
         public static string ExportImageHelper_Format_0_as_filter {
@@ -98,7 +108,7 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Exporteer kaart als figuren.
+        ///   Looks up a localized string similar to Exporteer kaart als afbeelding.
         /// </summary>
         public static string ExportMapToImageMapTool_OnBeforeContextMenu_Export_map_as_image {
             get {
Index: Core/Plugins/src/Core.Plugins.SharpMapGis/Properties/Resources.resx
===================================================================
diff -u -r3e5b477ac8dc4113688581e5e08c71fdd6d66ae8 -r54135385f2c39cad94b80f3ad8197041765c007d
--- Core/Plugins/src/Core.Plugins.SharpMapGis/Properties/Resources.resx	(.../Resources.resx)	(revision 3e5b477ac8dc4113688581e5e08c71fdd6d66ae8)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis/Properties/Resources.resx	(.../Resources.resx)	(revision 54135385f2c39cad94b80f3ad8197041765c007d)
@@ -117,13 +117,13 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="BackGroundMapLayer_UpdateLayers_Background_BackgroundMapName" xml:space="preserve">
     <value>Achtergrond ({0})</value>
   </data>
   <data name="ExportMapToImageMapTool_OnBeforeContextMenu_Export_map_as_image" xml:space="preserve">
-    <value>Exporteer kaart als figuren</value>
+    <value>Exporteer kaart als afbeelding</value>
   </data>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="Map" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\resources\map.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -139,4 +139,7 @@
   <data name="ExportImageHelper_Format_0_as_filter" xml:space="preserve">
     <value>{0} bestanden (*.{0})|*.{0}</value>
   </data>
+  <data name="exportIcon1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\exportIcon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
\ No newline at end of file
Index: Core/Plugins/src/Core.Plugins.SharpMapGis/Resources/exportIcon.ico
===================================================================
diff -u
Binary files differ
Index: Core/Plugins/src/Core.Plugins.SharpMapGis/Tools/ExportImageHelper.cs
===================================================================
diff -u -r0aa7cf8c9a9eba3df2f5e9f90d81540fe314c36a -r54135385f2c39cad94b80f3ad8197041765c007d
--- Core/Plugins/src/Core.Plugins.SharpMapGis/Tools/ExportImageHelper.cs	(.../ExportImageHelper.cs)	(revision 0aa7cf8c9a9eba3df2f5e9f90d81540fe314c36a)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis/Tools/ExportImageHelper.cs	(.../ExportImageHelper.cs)	(revision 54135385f2c39cad94b80f3ad8197041765c007d)
@@ -68,7 +68,7 @@
                 return;
             }
 
-            var imageResolutionDialog = new ImageResolutionDialog
+            var imageResolutionDialog = new ImageResolutionDialog(owner)
             {
                 BaseImage = image
             };
Index: Core/Plugins/src/Core.Plugins.SharpMapGis/Tools/ImageResolutionDialog.Designer.cs
===================================================================
diff -u -r045f766f6da1214f0a810d537952cf1f170a4d99 -r54135385f2c39cad94b80f3ad8197041765c007d
--- Core/Plugins/src/Core.Plugins.SharpMapGis/Tools/ImageResolutionDialog.Designer.cs	(.../ImageResolutionDialog.Designer.cs)	(revision 045f766f6da1214f0a810d537952cf1f170a4d99)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis/Tools/ImageResolutionDialog.Designer.cs	(.../ImageResolutionDialog.Designer.cs)	(revision 54135385f2c39cad94b80f3ad8197041765c007d)
@@ -39,8 +39,8 @@
             this.textBoxHeight = new System.Windows.Forms.TextBox();
             this.textBoxWidth = new System.Windows.Forms.TextBox();
             this.panel1 = new System.Windows.Forms.Panel();
-            this.button2 = new System.Windows.Forms.Button();
-            this.button1 = new System.Windows.Forms.Button();
+            this.buttonCancel = new System.Windows.Forms.Button();
+            this.buttonOk = new System.Windows.Forms.Button();
             ((System.ComponentModel.ISupportInitialize)(this.trackBar1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
@@ -124,35 +124,32 @@
             // 
             // panel1
             // 
-            this.panel1.Controls.Add(this.button2);
-            this.panel1.Controls.Add(this.button1);
+            this.panel1.Controls.Add(this.buttonCancel);
+            this.panel1.Controls.Add(this.buttonOk);
             resources.ApplyResources(this.panel1, "panel1");
             this.panel1.Name = "panel1";
             // 
-            // button2
+            // buttonCancel
             // 
-            resources.ApplyResources(this.button2, "button2");
-            this.button2.Name = "button2";
-            this.button2.UseVisualStyleBackColor = true;
-            this.button2.Click += new System.EventHandler(this.CancelButtonClicked);
+            resources.ApplyResources(this.buttonCancel, "buttonCancel");
+            this.buttonCancel.Name = "buttonCancel";
+            this.buttonCancel.UseVisualStyleBackColor = true;
+            this.buttonCancel.Click += new System.EventHandler(this.CancelButtonClicked);
             // 
-            // button1
+            // buttonOk
             // 
-            resources.ApplyResources(this.button1, "button1");
-            this.button1.Name = "button1";
-            this.button1.UseVisualStyleBackColor = true;
-            this.button1.Click += new System.EventHandler(this.OkButtonClicked);
+            resources.ApplyResources(this.buttonOk, "buttonOk");
+            this.buttonOk.Name = "buttonOk";
+            this.buttonOk.UseVisualStyleBackColor = true;
+            this.buttonOk.Click += new System.EventHandler(this.OkButtonClicked);
             // 
             // ImageResolutionDialog
             // 
             resources.ApplyResources(this, "$this");
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.panel1);
             this.Controls.Add(this.splitContainer1);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
             this.Name = "ImageResolutionDialog";
-            this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
-            this.TopMost = true;
             ((System.ComponentModel.ISupportInitialize)(this.trackBar1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
             this.splitContainer1.Panel1.ResumeLayout(false);
@@ -176,8 +173,8 @@
         private System.Windows.Forms.TextBox textBoxHeight;
         private System.Windows.Forms.TextBox textBoxWidth;
         private System.Windows.Forms.Panel panel1;
-        private System.Windows.Forms.Button button2;
-        private System.Windows.Forms.Button button1;
+        private System.Windows.Forms.Button buttonCancel;
+        private System.Windows.Forms.Button buttonOk;
         public System.Windows.Forms.PictureBox pictureBox1;
     }
 }
\ No newline at end of file
Index: Core/Plugins/src/Core.Plugins.SharpMapGis/Tools/ImageResolutionDialog.cs
===================================================================
diff -u -r045f766f6da1214f0a810d537952cf1f170a4d99 -r54135385f2c39cad94b80f3ad8197041765c007d
--- Core/Plugins/src/Core.Plugins.SharpMapGis/Tools/ImageResolutionDialog.cs	(.../ImageResolutionDialog.cs)	(revision 045f766f6da1214f0a810d537952cf1f170a4d99)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis/Tools/ImageResolutionDialog.cs	(.../ImageResolutionDialog.cs)	(revision 54135385f2c39cad94b80f3ad8197041765c007d)
@@ -1,17 +1,19 @@
 using System;
 using System.Drawing;
 using System.Windows.Forms;
+using Core.Common.Controls.Dialogs;
+using Core.Plugins.SharpMapGis.Properties;
 
 namespace Core.Plugins.SharpMapGis.Tools
 {
-    public partial class ImageResolutionDialog : Form
+    public partial class ImageResolutionDialog : DialogBase
     {
         private DialogResult result;
         private bool updatingControls;
 
         private Image baseImage;
 
-        public ImageResolutionDialog()
+        public ImageResolutionDialog(IWin32Window owner) : base(owner, Resources.exportIcon1)
         {
             InitializeComponent();
             Resolution = 100;
@@ -54,14 +56,7 @@
 
             UpdateControls();
 
-            Show();
-
-            while (Visible)
-            {
-                Application.DoEvents();
-            }
-
-            return result;
+            return ShowDialog();
         }
 
         private void OkButtonClicked(object sender, EventArgs e)
@@ -190,5 +185,10 @@
                    Resolution/100*BaseImage.Width > 1 &&
                    Resolution/100*BaseImage.Height > 1;
         }
+
+        protected override Button GetCancelButton()
+        {
+            return buttonCancel;
+        }
     }
 }
\ No newline at end of file
Index: Core/Plugins/src/Core.Plugins.SharpMapGis/Tools/ImageResolutionDialog.resx
===================================================================
diff -u -r045f766f6da1214f0a810d537952cf1f170a4d99 -r54135385f2c39cad94b80f3ad8197041765c007d
--- Core/Plugins/src/Core.Plugins.SharpMapGis/Tools/ImageResolutionDialog.resx	(.../ImageResolutionDialog.resx)	(revision 045f766f6da1214f0a810d537952cf1f170a4d99)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis/Tools/ImageResolutionDialog.resx	(.../ImageResolutionDialog.resx)	(revision 54135385f2c39cad94b80f3ad8197041765c007d)
@@ -378,52 +378,52 @@
   <data name="&gt;&gt;splitContainer1.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
-  <data name="button2.Location" type="System.Drawing.Point, System.Drawing">
+  <data name="buttonCancel.Location" type="System.Drawing.Point, System.Drawing">
     <value>370, 5</value>
   </data>
-  <data name="button2.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="buttonCancel.Size" type="System.Drawing.Size, System.Drawing">
     <value>75, 23</value>
   </data>
-  <data name="button2.TabIndex" type="System.Int32, mscorlib">
+  <data name="buttonCancel.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
   </data>
-  <data name="button2.Text" xml:space="preserve">
+  <data name="buttonCancel.Text" xml:space="preserve">
     <value>Annuleren</value>
   </data>
-  <data name="&gt;&gt;button2.Name" xml:space="preserve">
-    <value>button2</value>
+  <data name="&gt;&gt;buttonCancel.Name" xml:space="preserve">
+    <value>buttonCancel</value>
   </data>
-  <data name="&gt;&gt;button2.Type" xml:space="preserve">
+  <data name="&gt;&gt;buttonCancel.Type" xml:space="preserve">
     <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;button2.Parent" xml:space="preserve">
+  <data name="&gt;&gt;buttonCancel.Parent" xml:space="preserve">
     <value>panel1</value>
   </data>
-  <data name="&gt;&gt;button2.ZOrder" xml:space="preserve">
+  <data name="&gt;&gt;buttonCancel.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
-  <data name="button1.Location" type="System.Drawing.Point, System.Drawing">
+  <data name="buttonOk.Location" type="System.Drawing.Point, System.Drawing">
     <value>289, 5</value>
   </data>
-  <data name="button1.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="buttonOk.Size" type="System.Drawing.Size, System.Drawing">
     <value>75, 23</value>
   </data>
-  <data name="button1.TabIndex" type="System.Int32, mscorlib">
+  <data name="buttonOk.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
   </data>
-  <data name="button1.Text" xml:space="preserve">
+  <data name="buttonOk.Text" xml:space="preserve">
     <value>OK</value>
   </data>
-  <data name="&gt;&gt;button1.Name" xml:space="preserve">
-    <value>button1</value>
+  <data name="&gt;&gt;buttonOk.Name" xml:space="preserve">
+    <value>buttonOk</value>
   </data>
-  <data name="&gt;&gt;button1.Type" xml:space="preserve">
+  <data name="&gt;&gt;buttonOk.Type" xml:space="preserve">
     <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;button1.Parent" xml:space="preserve">
+  <data name="&gt;&gt;buttonOk.Parent" xml:space="preserve">
     <value>panel1</value>
   </data>
-  <data name="&gt;&gt;button1.ZOrder" xml:space="preserve">
+  <data name="&gt;&gt;buttonOk.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
   <data name="panel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">