Index: Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj
===================================================================
diff -u -r1830c4c91f9fab6c13ad4488d0d54308c8f04706 -ra600b08ffb5dac8164691824fe6dc7f4e96814d0
--- Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj	(.../Core.Common.Gui.csproj)	(revision 1830c4c91f9fab6c13ad4488d0d54308c8f04706)
+++ Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj	(.../Core.Common.Gui.csproj)	(revision a600b08ffb5dac8164691824fe6dc7f4e96814d0)
@@ -513,6 +513,9 @@
   <ItemGroup>
     <None Include="Resources\OptionsHS.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\arrow-000-medium-question-mark.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/Common/src/Core.Common.Gui/Forms/SelectViewDialog.Designer.cs
===================================================================
diff -u -reee6c7815d1e418eac38c1c552fb279c0887ef55 -ra600b08ffb5dac8164691824fe6dc7f4e96814d0
--- Core/Common/src/Core.Common.Gui/Forms/SelectViewDialog.Designer.cs	(.../SelectViewDialog.Designer.cs)	(revision eee6c7815d1e418eac38c1c552fb279c0887ef55)
+++ Core/Common/src/Core.Common.Gui/Forms/SelectViewDialog.Designer.cs	(.../SelectViewDialog.Designer.cs)	(revision a600b08ffb5dac8164691824fe6dc7f4e96814d0)
@@ -77,16 +77,11 @@
             // 
             this.AcceptButton = this.buttonOk;
             resources.ApplyResources(this, "$this");
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.CancelButton = this.buttonCancel;
             this.Controls.Add(this.checkBoxDefault);
             this.Controls.Add(this.label1);
             this.Controls.Add(this.listBox);
             this.Controls.Add(this.buttonCancel);
             this.Controls.Add(this.buttonOk);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-            this.MaximizeBox = false;
-            this.MinimizeBox = false;
             this.Name = "SelectViewDialog";
             this.ResumeLayout(false);
             this.PerformLayout();
Index: Core/Common/src/Core.Common.Gui/Forms/SelectViewDialog.cs
===================================================================
diff -u -r622c20f6fc0b693b67a3e57b2ece939823002c62 -ra600b08ffb5dac8164691824fe6dc7f4e96814d0
--- Core/Common/src/Core.Common.Gui/Forms/SelectViewDialog.cs	(.../SelectViewDialog.cs)	(revision 622c20f6fc0b693b67a3e57b2ece939823002c62)
+++ Core/Common/src/Core.Common.Gui/Forms/SelectViewDialog.cs	(.../SelectViewDialog.cs)	(revision a600b08ffb5dac8164691824fe6dc7f4e96814d0)
@@ -2,15 +2,16 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Windows.Forms;
+using Core.Common.Controls.Dialogs;
 using Core.Common.Gui.Properties;
 
 namespace Core.Common.Gui.Forms
 {
-    public partial class SelectViewDialog : Form
+    public partial class SelectViewDialog : DialogBase
     {
         private IList<string> items;
 
-        public SelectViewDialog()
+        public SelectViewDialog(IWin32Window owner) : base(owner, Resources.arrow_000_medium_question_mark)
         {
             InitializeComponent();
 
@@ -50,6 +51,11 @@
 
         public string DefaultViewName { get; set; }
 
+        protected override Button GetCancelButton()
+        {
+            return buttonCancel;
+        }
+
         private void listBox_DoubleClick(object sender, EventArgs e)
         {
             DialogResult = DialogResult.OK;
Index: Core/Common/src/Core.Common.Gui/Forms/SelectViewDialog.resx
===================================================================
diff -u -r67e117952bef2b1524aebb434c654c2c9be77dbd -ra600b08ffb5dac8164691824fe6dc7f4e96814d0
--- Core/Common/src/Core.Common.Gui/Forms/SelectViewDialog.resx	(.../SelectViewDialog.resx)	(revision 67e117952bef2b1524aebb434c654c2c9be77dbd)
+++ Core/Common/src/Core.Common.Gui/Forms/SelectViewDialog.resx	(.../SelectViewDialog.resx)	(revision a600b08ffb5dac8164691824fe6dc7f4e96814d0)
@@ -181,7 +181,7 @@
     <value>12, 26</value>
   </data>
   <data name="listBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>380, 251</value>
+    <value>380, 264</value>
   </data>
   <data name="listBox.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -205,7 +205,7 @@
     <value>12, 9</value>
   </data>
   <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>110, 13</value>
+    <value>145, 13</value>
   </data>
   <data name="label1.TabIndex" type="System.Int32, mscorlib">
     <value>4</value>
@@ -235,7 +235,7 @@
     <value>12, 306</value>
   </data>
   <data name="checkBoxDefault.Size" type="System.Drawing.Size, System.Drawing">
-    <value>94, 17</value>
+    <value>141, 17</value>
   </data>
   <data name="checkBoxDefault.TabIndex" type="System.Int32, mscorlib">
     <value>5</value>
Index: Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewResolver.cs
===================================================================
diff -u -r2ea5055c818880a8c2e03f74e2f4e19a427fbb8e -ra600b08ffb5dac8164691824fe6dc7f4e96814d0
--- Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewResolver.cs	(.../ViewResolver.cs)	(revision 2ea5055c818880a8c2e03f74e2f4e19a427fbb8e)
+++ Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewResolver.cs	(.../ViewResolver.cs)	(revision a600b08ffb5dac8164691824fe6dc7f4e96814d0)
@@ -16,11 +16,13 @@
 
         private readonly ViewList viewList;
         private readonly IList<ViewInfo> viewInfos;
+        private readonly IWin32Window owner;
 
-        public ViewResolver(ViewList viewList, IEnumerable<ViewInfo> viewInfos)
+        public ViewResolver(ViewList viewList, IEnumerable<ViewInfo> viewInfos, IWin32Window owner)
         {
             this.viewList = viewList;
             this.viewInfos = viewInfos.ToList();
+            this.owner = owner;
         }
 
         public IDictionary<Type, Type> DefaultViewTypes
@@ -349,14 +351,13 @@
                                       : null;
 
             var viewTypeDictionary = viewInfoList.ToDictionary(vi => vi.Description ?? vi.ViewType.Name);
-            var viewSelector = new SelectViewDialog
+            var viewSelector = new SelectViewDialog(owner)
             {
                 DefaultViewName = defaultViewName,
                 Items = viewTypeDictionary.Keys.ToList()
             };
 
-            // TODO : get MainWindow for ShowDialog
-            if (viewSelector.ShowDialog( /*gui.MainWindow as Form*/) != DialogResult.OK)
+            if (viewSelector.ShowDialog() != DialogResult.OK)
             {
                 return null;
             }
Index: Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs
===================================================================
diff -u -r557535d821dfa44886f3bcd358e474fc5a08da3d -ra600b08ffb5dac8164691824fe6dc7f4e96814d0
--- Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 557535d821dfa44886f3bcd358e474fc5a08da3d)
+++ Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision a600b08ffb5dac8164691824fe6dc7f4e96814d0)
@@ -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.
@@ -241,6 +241,16 @@
         }
         
         /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
+        /// </summary>
+        public static System.Drawing.Icon arrow_000_medium_question_mark {
+            get {
+                object obj = ResourceManager.GetObject("arrow_000_medium_question_mark", resourceCulture);
+                return ((System.Drawing.Icon)(obj));
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Documentvenster is al toegevoegd. Activeer de weergave in plaats van het toe te voegen..
         /// </summary>
         public static string AvalonDockDockingManager_Add_View_was_already_added_activate_it_instead_of_add {
Index: Core/Common/src/Core.Common.Gui/Properties/Resources.resx
===================================================================
diff -u -r557535d821dfa44886f3bcd358e474fc5a08da3d -ra600b08ffb5dac8164691824fe6dc7f4e96814d0
--- Core/Common/src/Core.Common.Gui/Properties/Resources.resx	(.../Resources.resx)	(revision 557535d821dfa44886f3bcd358e474fc5a08da3d)
+++ Core/Common/src/Core.Common.Gui/Properties/Resources.resx	(.../Resources.resx)	(revision a600b08ffb5dac8164691824fe6dc7f4e96814d0)
@@ -916,4 +916,7 @@
   <data name="FailureMechanismContributionView_GridColumn_Assessment" xml:space="preserve">
     <value>Toetsspoor</value>
   </data>
+  <data name="arrow_000_medium_question_mark" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\arrow-000-medium-question-mark.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/Common/src/Core.Common.Gui/Resources/arrow-000-medium-question-mark.ico
===================================================================
diff -u
Binary files differ
Index: Core/Common/src/Core.Common.Gui/RingtoetsGui.cs
===================================================================
diff -u -r10b304d4b5cb2283801cdb16204baf2a42ab5967 -ra600b08ffb5dac8164691824fe6dc7f4e96814d0
--- Core/Common/src/Core.Common.Gui/RingtoetsGui.cs	(.../RingtoetsGui.cs)	(revision 10b304d4b5cb2283801cdb16204baf2a42ab5967)
+++ Core/Common/src/Core.Common.Gui/RingtoetsGui.cs	(.../RingtoetsGui.cs)	(revision a600b08ffb5dac8164691824fe6dc7f4e96814d0)
@@ -783,7 +783,7 @@
 
             documentViews = documentViewManager;
 
-            DocumentViewsResolver = new ViewResolver(documentViews, Plugins.SelectMany(p => p.GetViewInfoObjects()));
+            DocumentViewsResolver = new ViewResolver(documentViews, Plugins.SelectMany(p => p.GetViewInfoObjects()), mainWindow);
             PropertyResolver = new PropertyResolver(Plugins.SelectMany(p => p.GetPropertyInfos()));
 
             var allowedToolWindowLocations = new[]
Index: Core/Common/test/Core.Common.Test/Gui/ViewListTest.cs
===================================================================
diff -u -r41c77f9f36ae74a406fd382187426cc06d2b0200 -ra600b08ffb5dac8164691824fe6dc7f4e96814d0
--- Core/Common/test/Core.Common.Test/Gui/ViewListTest.cs	(.../ViewListTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
+++ Core/Common/test/Core.Common.Test/Gui/ViewListTest.cs	(.../ViewListTest.cs)	(revision a600b08ffb5dac8164691824fe6dc7f4e96814d0)
@@ -73,7 +73,7 @@
             {
                 new ViewInfo<object, TestView>(),
                 new ViewInfo<object, AdditionalView>()
-            });
+            }, null);
 
             var testObject = new object();
 
@@ -92,7 +92,7 @@
             var viewResolver = new ViewResolver(viewList, new ViewInfo[]
             {
                 new ViewInfo<object, TestView>()
-            });
+            }, null);
 
             var testObject = new object();
 
@@ -117,7 +117,7 @@
             var viewResolver = new ViewResolver(viewList, new ViewInfo[]
             {
                 new ViewInfo<object, TestReusableView>()
-            });
+            }, null);
 
             var testObject = new object();
             viewResolver.OpenViewForData(testObject);
@@ -143,7 +143,7 @@
             var viewResolver = new ViewResolver(viewList, new ViewInfo[]
             {
                 new ViewInfo<object, TestView>()
-            });
+            }, null);
 
             var testObject = new object();
             viewResolver.OpenViewForData(testObject);
@@ -168,7 +168,7 @@
             var viewResolver = new ViewResolver(viewList, new ViewInfo[]
             {
                 new ViewInfo<object, TestReusableView>()
-            });
+            }, null);
 
             var testObject = new object();
             viewResolver.OpenViewForData(testObject);
@@ -238,7 +238,7 @@
             var viewResolver = new ViewResolver(viewList, new ViewInfo[]
             {
                 new ViewInfo<Url, HtmlPageView>()
-            });
+            }, null);
 
             viewResolver.OpenViewForData(url);
 
@@ -260,7 +260,7 @@
                 {
                     GetViewData = o => o.RealData
                 }
-            });
+            }, null);
 
             var someDataObject = "some data object";
             var wrapper = new TestWrapper
@@ -296,7 +296,7 @@
                 {
                     Description = "String view"
                 } // string inherits from object 
-            });
+            }, null);
 
             var data = "string data";
             viewResolver.OpenViewForData(data);