Index: Core/Gui/src/Core.Gui/Commands/GuiImportHandler.cs
===================================================================
diff -u -r434415295de74c310ce6d3cdd0100c28838cf9ea -r35d50f2dc9503e252bde030526816f6adeaaf003
--- Core/Gui/src/Core.Gui/Commands/GuiImportHandler.cs	(.../GuiImportHandler.cs)	(revision 434415295de74c310ce6d3cdd0100c28838cf9ea)
+++ Core/Gui/src/Core.Gui/Commands/GuiImportHandler.cs	(.../GuiImportHandler.cs)	(revision 35d50f2dc9503e252bde030526816f6adeaaf003)
@@ -42,7 +42,7 @@
     {
         private static readonly ILog log = LogManager.GetLogger(typeof(GuiImportHandler));
 
-        private readonly IWin32Window dialogParent;
+        private readonly IViewParent dialogParent;
         private readonly IEnumerable<ImportInfo> importInfos;
         private readonly IInquiryHelper inquiryHelper;
 
@@ -53,7 +53,7 @@
         /// <param name="importInfos">An enumeration of <see cref="ImportInfo"/>.</param>
         /// <param name="inquiryHelper">Helper responsible for performing information inquiries.</param>
         /// <exception cref="ArgumentNullException">Thrown when any input parameter is <c>null</c>.</exception>
-        public GuiImportHandler(IWin32Window dialogParent, IEnumerable<ImportInfo> importInfos, IInquiryHelper inquiryHelper)
+        public GuiImportHandler(IViewParent dialogParent, IEnumerable<ImportInfo> importInfos, IInquiryHelper inquiryHelper)
         {
             if (dialogParent == null)
             {
Index: Core/Gui/src/Core.Gui/Commands/GuiUpdateHandler.cs
===================================================================
diff -u -r434415295de74c310ce6d3cdd0100c28838cf9ea -r35d50f2dc9503e252bde030526816f6adeaaf003
--- Core/Gui/src/Core.Gui/Commands/GuiUpdateHandler.cs	(.../GuiUpdateHandler.cs)	(revision 434415295de74c310ce6d3cdd0100c28838cf9ea)
+++ Core/Gui/src/Core.Gui/Commands/GuiUpdateHandler.cs	(.../GuiUpdateHandler.cs)	(revision 35d50f2dc9503e252bde030526816f6adeaaf003)
@@ -43,7 +43,7 @@
     {
         private static readonly ILog log = LogManager.GetLogger(typeof(GuiUpdateHandler));
 
-        private readonly IWin32Window dialogParent;
+        private readonly IViewParent dialogParent;
         private readonly IEnumerable<UpdateInfo> updateInfos;
         private readonly IInquiryHelper inquiryHelper;
 
@@ -54,7 +54,7 @@
         /// <param name="updateInfos">An enumeration of <see cref="UpdateInfo"/>.</param>
         /// <param name="inquiryHelper">Helper responsible for performing information inquiries.</param>
         /// <exception cref="ArgumentNullException">Thrown when any input parameter is <c>null</c>.</exception>
-        public GuiUpdateHandler(IWin32Window dialogParent, IEnumerable<UpdateInfo> updateInfos, IInquiryHelper inquiryHelper)
+        public GuiUpdateHandler(IViewParent dialogParent, IEnumerable<UpdateInfo> updateInfos, IInquiryHelper inquiryHelper)
         {
             if (dialogParent == null)
             {
Index: Core/Gui/src/Core.Gui/Forms/ProgressDialog/ActivityProgressDialog.cs
===================================================================
diff -u -r434415295de74c310ce6d3cdd0100c28838cf9ea -r35d50f2dc9503e252bde030526816f6adeaaf003
--- Core/Gui/src/Core.Gui/Forms/ProgressDialog/ActivityProgressDialog.cs	(.../ActivityProgressDialog.cs)	(revision 434415295de74c310ce6d3cdd0100c28838cf9ea)
+++ Core/Gui/src/Core.Gui/Forms/ProgressDialog/ActivityProgressDialog.cs	(.../ActivityProgressDialog.cs)	(revision 35d50f2dc9503e252bde030526816f6adeaaf003)
@@ -72,7 +72,8 @@
         /// </summary>
         /// <param name="dialogParent">The dialog parent for which this dialog should be shown on top.</param>
         /// <param name="activities">The activities to be executed when the dialog is shown.</param>
-        public ActivityProgressDialog(IWin32Window dialogParent, IEnumerable<Activity> activities) : base(dialogParent, Resources.Riskeer, 520, 150)
+        public ActivityProgressDialog(IViewParent dialogParent, IEnumerable<Activity> activities)
+            : base(dialogParent, dialogParent.ApplicationIcon, 520, 150)
         {
             InitializeComponent();
 
Index: Core/Gui/src/Core.Gui/Forms/ProgressDialog/ActivityProgressDialogRunner.cs
===================================================================
diff -u -r434415295de74c310ce6d3cdd0100c28838cf9ea -r35d50f2dc9503e252bde030526816f6adeaaf003
--- Core/Gui/src/Core.Gui/Forms/ProgressDialog/ActivityProgressDialogRunner.cs	(.../ActivityProgressDialogRunner.cs)	(revision 434415295de74c310ce6d3cdd0100c28838cf9ea)
+++ Core/Gui/src/Core.Gui/Forms/ProgressDialog/ActivityProgressDialogRunner.cs	(.../ActivityProgressDialogRunner.cs)	(revision 35d50f2dc9503e252bde030526816f6adeaaf003)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using System.Collections.Generic;
-using System.Windows.Forms;
 using Core.Common.Base.Service;
 
 namespace Core.Gui.Forms.ProgressDialog
@@ -35,7 +34,7 @@
         /// </summary>
         /// <param name="dialogParent">The dialog parent for which the progress dialog should be shown on top.</param>
         /// <param name="activity">The activity to be executed.</param>
-        public static void Run(IWin32Window dialogParent, Activity activity)
+        public static void Run(IViewParent dialogParent, Activity activity)
         {
             Run(dialogParent, new[]
             {
@@ -49,7 +48,7 @@
         /// <typeparam name="TActivity">The activity type.</typeparam>
         /// <param name="dialogParent">The dialog parent for which the progress dialog should be shown on top.</param>
         /// <param name="activities">The activities to be executed.</param>
-        public static void Run<TActivity>(IWin32Window dialogParent, IEnumerable<TActivity> activities)
+        public static void Run<TActivity>(IViewParent dialogParent, IEnumerable<TActivity> activities)
             where TActivity : Activity
         {
             using (var activityProgressDialog = new ActivityProgressDialog(dialogParent, activities))
Index: Riskeer/Common/src/Riskeer.Common.Forms/GuiServices/HydraulicBoundaryLocationCalculationGuiService.cs
===================================================================
diff -u -ref9f41ef150aee02d286c53de24660a19d948e02 -r35d50f2dc9503e252bde030526816f6adeaaf003
--- Riskeer/Common/src/Riskeer.Common.Forms/GuiServices/HydraulicBoundaryLocationCalculationGuiService.cs	(.../HydraulicBoundaryLocationCalculationGuiService.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
+++ Riskeer/Common/src/Riskeer.Common.Forms/GuiServices/HydraulicBoundaryLocationCalculationGuiService.cs	(.../HydraulicBoundaryLocationCalculationGuiService.cs)	(revision 35d50f2dc9503e252bde030526816f6adeaaf003)
@@ -21,7 +21,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.Windows.Forms;
+using Core.Gui.Forms;
 using Core.Gui.Forms.ProgressDialog;
 using log4net;
 using Riskeer.Common.Data.AssessmentSection;
@@ -38,14 +38,14 @@
     public class HydraulicBoundaryLocationCalculationGuiService : IHydraulicBoundaryLocationCalculationGuiService
     {
         private static readonly ILog log = LogManager.GetLogger(typeof(HydraulicBoundaryLocationCalculationGuiService));
-        private readonly IWin32Window viewParent;
+        private readonly IViewParent viewParent;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="HydraulicBoundaryLocationCalculationGuiService"/> class.
         /// </summary>
         /// <param name="viewParent">The parent of the view.</param>
         /// <exception cref="ArgumentNullException">Thrown when the input parameter is <c>null</c>.</exception>
-        public HydraulicBoundaryLocationCalculationGuiService(IWin32Window viewParent)
+        public HydraulicBoundaryLocationCalculationGuiService(IViewParent viewParent)
         {
             if (viewParent == null)
             {
Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/GuiServices/DuneLocationCalculationGuiService.cs
===================================================================
diff -u -r3af63470ea5601aef5eb9f1f796bf2342b406fca -r35d50f2dc9503e252bde030526816f6adeaaf003
--- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/GuiServices/DuneLocationCalculationGuiService.cs	(.../DuneLocationCalculationGuiService.cs)	(revision 3af63470ea5601aef5eb9f1f796bf2342b406fca)
+++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/GuiServices/DuneLocationCalculationGuiService.cs	(.../DuneLocationCalculationGuiService.cs)	(revision 35d50f2dc9503e252bde030526816f6adeaaf003)
@@ -21,7 +21,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.Windows.Forms;
+using Core.Gui.Forms;
 using Core.Gui.Forms.ProgressDialog;
 using log4net;
 using Riskeer.Common.Data.AssessmentSection;
@@ -40,14 +40,14 @@
     public class DuneLocationCalculationGuiService
     {
         private static readonly ILog log = LogManager.GetLogger(typeof(DuneLocationCalculationGuiService));
-        private readonly IWin32Window viewParent;
+        private readonly IViewParent viewParent;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="DuneLocationCalculationGuiService"/> class.
         /// </summary>
         /// <param name="viewParent">The parent of the view.</param>
         /// <exception cref="ArgumentNullException">Thrown when the input parameter is <c>null</c>.</exception>
-        public DuneLocationCalculationGuiService(IWin32Window viewParent)
+        public DuneLocationCalculationGuiService(IViewParent viewParent)
         {
             if (viewParent == null)
             {
Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/HydraulicLocationConfigurationDatabaseImportHandler.cs
===================================================================
diff -u -r48244f68eee25ef1d91701d82e4c4867f0252ffc -r35d50f2dc9503e252bde030526816f6adeaaf003
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/HydraulicLocationConfigurationDatabaseImportHandler.cs	(.../HydraulicLocationConfigurationDatabaseImportHandler.cs)	(revision 48244f68eee25ef1d91701d82e4c4867f0252ffc)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/HydraulicLocationConfigurationDatabaseImportHandler.cs	(.../HydraulicLocationConfigurationDatabaseImportHandler.cs)	(revision 35d50f2dc9503e252bde030526816f6adeaaf003)
@@ -20,8 +20,8 @@
 // All rights reserved.
 
 using System;
-using System.Windows.Forms;
 using Core.Common.Base.Service;
+using Core.Gui.Forms;
 using Core.Gui.Forms.ProgressDialog;
 using Riskeer.Common.Data.Hydraulics;
 using Riskeer.Integration.Forms.PropertyClasses;
@@ -36,7 +36,7 @@
     /// </summary>
     public class HydraulicLocationConfigurationDatabaseImportHandler : IHydraulicLocationConfigurationDatabaseImportHandler
     {
-        private readonly IWin32Window viewParent;
+        private readonly IViewParent viewParent;
         private readonly IHydraulicLocationConfigurationDatabaseUpdateHandler updateHandler;
         private readonly HydraulicBoundaryDatabase hydraulicBoundaryDatabase;
 
@@ -47,7 +47,7 @@
         /// <param name="updateHandler">The object responsible for updating the <see cref="HydraulicLocationConfigurationSettings"/>.</param>
         /// <param name="hydraulicBoundaryDatabase">The hydraulic boundary database to import the data to.</param>
         /// <exception cref="ArgumentNullException">Thrown when any argument is <c>null</c>.</exception>
-        public HydraulicLocationConfigurationDatabaseImportHandler(IWin32Window viewParent,
+        public HydraulicLocationConfigurationDatabaseImportHandler(IViewParent viewParent,
                                                                    IHydraulicLocationConfigurationDatabaseUpdateHandler updateHandler,
                                                                    HydraulicBoundaryDatabase hydraulicBoundaryDatabase)
         {
Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Merge/AssessmentSectionProvider.cs
===================================================================
diff -u -r48244f68eee25ef1d91701d82e4c4867f0252ffc -r35d50f2dc9503e252bde030526816f6adeaaf003
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/Merge/AssessmentSectionProvider.cs	(.../AssessmentSectionProvider.cs)	(revision 48244f68eee25ef1d91701d82e4c4867f0252ffc)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Merge/AssessmentSectionProvider.cs	(.../AssessmentSectionProvider.cs)	(revision 35d50f2dc9503e252bde030526816f6adeaaf003)
@@ -21,8 +21,8 @@
 
 using System;
 using System.Collections.Generic;
-using System.Windows.Forms;
 using Core.Common.Base.Storage;
+using Core.Gui.Forms;
 using Core.Gui.Forms.ProgressDialog;
 using Riskeer.Integration.Data;
 using Riskeer.Integration.Data.Merge;
@@ -35,7 +35,7 @@
     /// </summary>
     public class AssessmentSectionProvider : IAssessmentSectionProvider
     {
-        private readonly IWin32Window viewParent;
+        private readonly IViewParent viewParent;
         private readonly IStoreProject projectStorage;
 
         /// <summary>
@@ -45,7 +45,7 @@
         /// /// <param name="projectStorage">Class responsible for loading the project.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter
         /// is <c>null</c>.</exception>
-        public AssessmentSectionProvider(IWin32Window viewParent, IStoreProject projectStorage)
+        public AssessmentSectionProvider(IViewParent viewParent, IStoreProject projectStorage)
         {
             if (viewParent == null)
             {