Index: Application/Ringtoets/src/Application.Ringtoets/App.xaml.cs
===================================================================
diff -u -rd74518566abeb501ea88b25f3111f9749853c5ed -rb0af17a5bd9c637b182784a75123ad2ca898b152
--- Application/Ringtoets/src/Application.Ringtoets/App.xaml.cs	(.../App.xaml.cs)	(revision d74518566abeb501ea88b25f3111f9749853c5ed)
+++ Application/Ringtoets/src/Application.Ringtoets/App.xaml.cs	(.../App.xaml.cs)	(revision b0af17a5bd9c637b182784a75123ad2ca898b152)
@@ -51,6 +51,7 @@
 using Ringtoets.GrassCoverErosionOutwards.Plugin;
 using Ringtoets.HeightStructures.Plugin;
 using Ringtoets.Integration.Data;
+using Ringtoets.Integration.Forms;
 using Ringtoets.Integration.Plugin;
 using Ringtoets.Piping.Plugin;
 using Ringtoets.StabilityPointStructures.Plugin;
@@ -143,6 +144,7 @@
 
             Resources.Add(SystemParameters.MenuPopupAnimationKey, PopupAnimation.None);
 
+            SettingsHelper.Instance = new RingtoetsSettingsHelper();
             var settings = new GuiCoreSettings
             {
                 SupportEmailAddress = "www.helpdeskwater.nl",
Index: Application/Ringtoets/src/Application.Ringtoets/Application.Ringtoets.csproj
===================================================================
diff -u -r23d1e296e2da4364fbfe346e68d582dfcf966bb0 -rb0af17a5bd9c637b182784a75123ad2ca898b152
--- Application/Ringtoets/src/Application.Ringtoets/Application.Ringtoets.csproj	(.../Application.Ringtoets.csproj)	(revision 23d1e296e2da4364fbfe346e68d582dfcf966bb0)
+++ Application/Ringtoets/src/Application.Ringtoets/Application.Ringtoets.csproj	(.../Application.Ringtoets.csproj)	(revision b0af17a5bd9c637b182784a75123ad2ca898b152)
@@ -172,6 +172,11 @@
       <Name>Ringtoets.DuneErosion.Plugin</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Ringtoets\Integration\src\Ringtoets.Integration.Forms\Ringtoets.Integration.Forms.csproj">
+      <Project>{AD0CDC89-0A00-4068-AEEC-9838863C2FE8}</Project>
+      <Name>Ringtoets.Integration.Forms</Name>
+      <Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Ringtoets\StabilityPointStructures\src\Ringtoets.StabilityPointStructures.Plugin\Ringtoets.StabilityPointStructures.Plugin.csproj">
       <Project>{E3DF5559-97D9-4038-BBE6-2E3DFB4F4C68}</Project>
       <Name>Ringtoets.StabilityPointStructures.Plugin</Name>
Index: Core/Common/test/Core.Common.TestUtil.Test/TestHelperTest.cs
===================================================================
diff -u -r2650526158a18c2ac5bf518957e5fa260d882538 -rb0af17a5bd9c637b182784a75123ad2ca898b152
--- Core/Common/test/Core.Common.TestUtil.Test/TestHelperTest.cs	(.../TestHelperTest.cs)	(revision 2650526158a18c2ac5bf518957e5fa260d882538)
+++ Core/Common/test/Core.Common.TestUtil.Test/TestHelperTest.cs	(.../TestHelperTest.cs)	(revision b0af17a5bd9c637b182784a75123ad2ca898b152)
@@ -23,7 +23,6 @@
 using System.Drawing;
 using System.IO;
 using System.Security.AccessControl;
-using System.Threading;
 using System.Windows.Forms;
 using Core.Common.TestUtil.Test.Properties;
 using log4net;
@@ -165,31 +164,6 @@
         }
 
         [Test]
-        [Apartment(ApartmentState.STA)]
-        public void GetScratchPadPath_WithoutPathAndFolderDoesntExist_ThrowIOException()
-        {
-            // Setup
-            string actualPath = Path.Combine(Path.GetDirectoryName(TestHelper.SolutionRoot), "Scratchpad");
-
-            try
-            {
-                Directory.Delete(actualPath, true);
-
-                // Call
-                TestDelegate call = () => TestHelper.GetScratchPadPath();
-
-                // Assert
-                string message = Assert.Throws<IOException>(call).Message;
-                const string expectedMessage = "The 'Scratchpad' folder has been deleted from the trunk, while tests require the existence of this folder for writing to disk temporarily.";
-                Assert.AreEqual(expectedMessage, message);
-            }
-            finally
-            {
-                Directory.CreateDirectory(actualPath);
-            }
-        }
-
-        [Test]
         public void GetScratchPadPath_WithSubPath_ReturnPathInScratchPad()
         {
             // Setup
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs
===================================================================
diff -u -r2ecb6f0551396f53cdb041e6b77275084d097ab7 -rb0af17a5bd9c637b182784a75123ad2ca898b152
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision 2ecb6f0551396f53cdb041e6b77275084d097ab7)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision b0af17a5bd9c637b182784a75123ad2ca898b152)
@@ -34,7 +34,6 @@
 using Core.Common.Gui.ContextMenu;
 using Core.Common.Gui.Forms;
 using Core.Common.Gui.Plugin;
-using Core.Common.Gui.Settings;
 using Core.Common.IO.Exceptions;
 using Core.Common.Utils.Extensions;
 using Core.Components.Gis;
@@ -263,8 +262,6 @@
             assessmentSectionFromFileCommandHandler = new AssessmentSectionFromFileCommandHandler(Gui.MainWindow, Gui, Gui.DocumentViewController);
             hydraulicBoundaryLocationCalculationGuiService = new HydraulicBoundaryLocationCalculationGuiService(Gui.MainWindow);
 
-            SettingsHelper.Instance = new RingtoetsSettingsHelper();
-
             ribbonCommandHandler = new RingtoetsRibbon
             {
                 AddAssessmentSectionButtonCommand = new AddAssessmentSectionCommand(assessmentSectionFromFileCommandHandler)
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs
===================================================================
diff -u -r0cc64a130e25bd1cb8ffa996799b2556c7798269 -rb0af17a5bd9c637b182784a75123ad2ca898b152
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs	(.../RingtoetsPluginTest.cs)	(revision 0cc64a130e25bd1cb8ffa996799b2556c7798269)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs	(.../RingtoetsPluginTest.cs)	(revision b0af17a5bd9c637b182784a75123ad2ca898b152)
@@ -544,7 +544,6 @@
 
                 // Assert
                 Assert.IsInstanceOf<RingtoetsRibbon>(plugin.RibbonCommandHandler);
-                Assert.IsInstanceOf<RingtoetsSettingsHelper>(SettingsHelper.Instance);
             }
 
             mockRepository.VerifyAll();