Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapAddLayerCommand.cs
===================================================================
diff -u -re1eca7dab59f9465ca9d0bd6d705490528a5e5a8 -re5cd358fe021d2c9d042e226cc00db06578619e3
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapAddLayerCommand.cs	(.../MapAddLayerCommand.cs)	(revision e1eca7dab59f9465ca9d0bd6d705490528a5e5a8)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapAddLayerCommand.cs	(.../MapAddLayerCommand.cs)	(revision e5cd358fe021d2c9d042e226cc00db06578619e3)
@@ -29,7 +29,7 @@
                 Multiselect = true
             };
 
-            if (openFileDialog.ShowDialog() == DialogResult.OK)
+            if (openFileDialog.ShowDialog(Gui.MainWindow) == DialogResult.OK)
             {
                 return openFileDialog.FileNames;
             }
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapChangeCoordinateSystemCommand.cs
===================================================================
diff -u -r37b92ac1ba7a5d381aedd8e287443450e0c2d7aa -re5cd358fe021d2c9d042e226cc00db06578619e3
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapChangeCoordinateSystemCommand.cs	(.../MapChangeCoordinateSystemCommand.cs)	(revision 37b92ac1ba7a5d381aedd8e287443450e0c2d7aa)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapChangeCoordinateSystemCommand.cs	(.../MapChangeCoordinateSystemCommand.cs)	(revision e5cd358fe021d2c9d042e226cc00db06578619e3)
@@ -23,7 +23,7 @@
 
             var selectCoordinateSystemDialog = new SelectCoordinateSystemDialog(Gui.MainWindow, OgrCoordinateSystemFactory.SupportedCoordinateSystems, GIS.SharpMap.Map.Map.CoordinateSystemFactory.CustomCoordinateSystems);
 
-            if (selectCoordinateSystemDialog.ShowDialog(Gui.MainWindow) == DialogResult.OK)
+            if (selectCoordinateSystemDialog.ShowDialog() == DialogResult.OK)
             {
                 try
                 {
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Core.Plugins.SharpMapGis.Gui.csproj
===================================================================
diff -u -ra772c49f0c4e64a606d832165c4f55f617a6e663 -re5cd358fe021d2c9d042e226cc00db06578619e3
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Core.Plugins.SharpMapGis.Gui.csproj	(.../Core.Plugins.SharpMapGis.Gui.csproj)	(revision a772c49f0c4e64a606d832165c4f55f617a6e663)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Core.Plugins.SharpMapGis.Gui.csproj	(.../Core.Plugins.SharpMapGis.Gui.csproj)	(revision e5cd358fe021d2c9d042e226cc00db06578619e3)
@@ -482,6 +482,9 @@
   <ItemGroup>
     <None Include="Resources\layer_select_point.png" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\buttonAddLayer.Image.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\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.Gui/Forms/MapLegendView/MapLegendView.cs
===================================================================
diff -u -ref35125104cc8b0201f9c961049cc6c8a30fb74d -re5cd358fe021d2c9d042e226cc00db06578619e3
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapLegendView/MapLegendView.cs	(.../MapLegendView.cs)	(revision ef35125104cc8b0201f9c961049cc6c8a30fb74d)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapLegendView/MapLegendView.cs	(.../MapLegendView.cs)	(revision e5cd358fe021d2c9d042e226cc00db06578619e3)
@@ -259,7 +259,7 @@
 
         private void ButtonAddWmsLayerClick(object sender, EventArgs e)
         {
-            var openUrlDialog = new OpenUrlDialog
+            var openUrlDialog = new OpenUrlDialog(gui.MainWindow)
             {
                 Urls = new[]
                 {
@@ -280,7 +280,7 @@
                 Url = "http://openstreetmap.org"
             };
 
-            if (openUrlDialog.ShowDialog(this) == DialogResult.OK)
+            if (openUrlDialog.ShowDialog() == DialogResult.OK)
             {
                 AddLayerFromExternalSource(openUrlDialog.Url);
             }
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapLegendView/OpenUrlDialog.Designer.cs
===================================================================
diff -u -r6771fe13d21dd9bffd06ca54ea0d65b571e62c7b -re5cd358fe021d2c9d042e226cc00db06578619e3
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapLegendView/OpenUrlDialog.Designer.cs	(.../OpenUrlDialog.Designer.cs)	(revision 6771fe13d21dd9bffd06ca54ea0d65b571e62c7b)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapLegendView/OpenUrlDialog.Designer.cs	(.../OpenUrlDialog.Designer.cs)	(revision e5cd358fe021d2c9d042e226cc00db06578619e3)
@@ -64,8 +64,6 @@
             // 
             this.AcceptButton = this.buttonOk;
             resources.ApplyResources(this, "$this");
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.CancelButton = this.buttonCancel;
             this.Controls.Add(this.urlComboBox);
             this.Controls.Add(this.buttonCancel);
             this.Controls.Add(this.buttonOk);
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapLegendView/OpenUrlDialog.cs
===================================================================
diff -u -r6771fe13d21dd9bffd06ca54ea0d65b571e62c7b -re5cd358fe021d2c9d042e226cc00db06578619e3
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapLegendView/OpenUrlDialog.cs	(.../OpenUrlDialog.cs)	(revision 6771fe13d21dd9bffd06ca54ea0d65b571e62c7b)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapLegendView/OpenUrlDialog.cs	(.../OpenUrlDialog.cs)	(revision e5cd358fe021d2c9d042e226cc00db06578619e3)
@@ -1,11 +1,13 @@
 using System.Linq;
 using System.Windows.Forms;
+using Core.Common.Controls.Dialogs;
+using Core.Plugins.SharpMapGis.Gui.Properties;
 
 namespace Core.Plugins.SharpMapGis.Gui.Forms.MapLegendView
 {
-    public partial class OpenUrlDialog : Form
+    public partial class OpenUrlDialog : DialogBase
     {
-        public OpenUrlDialog()
+        public OpenUrlDialog(IWin32Window owner) : base(owner, Resources.buttonAddLayer_Image)
         {
             InitializeComponent();
         }
@@ -34,5 +36,10 @@
                 urlComboBox.Items.AddRange(value);
             }
         }
+
+        protected override Button GetCancelButton()
+        {
+            return buttonCancel;
+        }
     }
 }
\ No newline at end of file
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapLegendView/OpenUrlDialog.resx
===================================================================
diff -u -r6771fe13d21dd9bffd06ca54ea0d65b571e62c7b -re5cd358fe021d2c9d042e226cc00db06578619e3
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapLegendView/OpenUrlDialog.resx	(.../OpenUrlDialog.resx)	(revision 6771fe13d21dd9bffd06ca54ea0d65b571e62c7b)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapLegendView/OpenUrlDialog.resx	(.../OpenUrlDialog.resx)	(revision e5cd358fe021d2c9d042e226cc00db06578619e3)
@@ -119,7 +119,7 @@
   </resheader>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="buttonCancel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>317, 61</value>
+    <value>340, 41</value>
   </data>
   <data name="buttonCancel.Size" type="System.Drawing.Size, System.Drawing">
     <value>75, 23</value>
@@ -144,7 +144,7 @@
     <value>1</value>
   </data>
   <data name="buttonOk.Location" type="System.Drawing.Point, System.Drawing">
-    <value>235, 61</value>
+    <value>258, 41</value>
   </data>
   <data name="buttonOk.Size" type="System.Drawing.Size, System.Drawing">
     <value>75, 23</value>
@@ -171,10 +171,10 @@
     <value>True</value>
   </data>
   <data name="label1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>15, 29</value>
+    <value>15, 14</value>
   </data>
   <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>56, 13</value>
+    <value>49, 13</value>
   </data>
   <data name="label1.TabIndex" type="System.Int32, mscorlib">
     <value>4</value>
@@ -195,10 +195,10 @@
     <value>3</value>
   </data>
   <data name="urlComboBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>77, 26</value>
+    <value>77, 11</value>
   </data>
   <data name="urlComboBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>332, 21</value>
+    <value>338, 21</value>
   </data>
   <data name="urlComboBox.TabIndex" type="System.Int32, mscorlib">
     <value>5</value>
@@ -215,14 +215,14 @@
   <data name="&gt;&gt;urlComboBox.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
-  <data name="$this.Localizable" type="System.Boolean, mscorlib">
+  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
-  </data>
+  </metadata>
   <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
     <value>6, 13</value>
   </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>421, 101</value>
+    <value>421, 72</value>
   </data>
   <data name="$this.Text" xml:space="preserve">
     <value>Openen weblink...</value>
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Properties/Resources.Designer.cs
===================================================================
diff -u -r31b9794f47ec6d8f8debb5d1b558782853cb7c26 -re5cd358fe021d2c9d042e226cc00db06578619e3
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 31b9794f47ec6d8f8debb5d1b558782853cb7c26)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision e5cd358fe021d2c9d042e226cc00db06578619e3)
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.34209
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -81,6 +81,16 @@
         }
         
         /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
+        /// </summary>
+        public static System.Drawing.Icon buttonAddLayer_Image {
+            get {
+                object obj = ResourceManager.GetObject("buttonAddLayer_Image", resourceCulture);
+                return ((System.Drawing.Icon)(obj));
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Coördinaten.
         /// </summary>
         public static string Categories_Coordinates {
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Properties/Resources.resx
===================================================================
diff -u -r31b9794f47ec6d8f8debb5d1b558782853cb7c26 -re5cd358fe021d2c9d042e226cc00db06578619e3
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Properties/Resources.resx	(.../Resources.resx)	(revision 31b9794f47ec6d8f8debb5d1b558782853cb7c26)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Properties/Resources.resx	(.../Resources.resx)	(revision e5cd358fe021d2c9d042e226cc00db06578619e3)
@@ -755,4 +755,7 @@
   <data name="InputTextDialog_InputTextDialog_Please_verify_the_input_is_valid" xml:space="preserve">
     <value>Controleer of de invoer geldig is.</value>
   </data>
+  <data name="buttonAddLayer_Image" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\buttonAddLayer.Image.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.Gui/Resources/buttonAddLayer.Image.ico
===================================================================
diff -u
Binary files differ