Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Factories/RingtoetsChartDataFactory.cs
===================================================================
diff -u -r93036b575ee81b4517b29db51f1eadf81454fb93 -r83c8f376bcd0ebf1bdfc1301d5fea953e98a3f12
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Factories/RingtoetsChartDataFactory.cs	(.../RingtoetsChartDataFactory.cs)	(revision 93036b575ee81b4517b29db51f1eadf81454fb93)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Factories/RingtoetsChartDataFactory.cs	(.../RingtoetsChartDataFactory.cs)	(revision 83c8f376bcd0ebf1bdfc1301d5fea953e98a3f12)
@@ -45,5 +45,29 @@
                                          DashStyle = ChartLineDashStyle.Solid
                                      });
         }
+
+        /// <summary>
+        /// Create <see cref="ChartLineData"/> with default styling for a surface line.
+        /// </summary>
+        /// <returns>The created <see cref="ChartLineData"/>.</returns>
+        public static ChartLineData CreateSurfaceLineChartData()
+        {
+            return new ChartLineData(Resources.SurfaceLine_DisplayName,
+                                     new ChartLineStyle
+                                     {
+                                         Color = Color.Sienna,
+                                         Width = 2,
+                                         DashStyle = ChartLineDashStyle.Solid
+                                     });
+        }
+
+        /// <summary>
+        /// Create a <see cref="ChartDataCollection"/> for a surface line.
+        /// </summary>
+        /// <returns>The created <see cref="ChartDataCollection"/>.</returns>
+        public static ChartDataCollection CreateSoilProfileChartData()
+        {
+            return new ChartDataCollection(Resources.StochasticSoilProfileProperties_DisplayName);
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r36089e883fc170498c85a840b883f786b96023d8 -r83c8f376bcd0ebf1bdfc1301d5fea953e98a3f12
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 36089e883fc170498c85a840b883f786b96023d8)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 83c8f376bcd0ebf1bdfc1301d5fea953e98a3f12)
@@ -2350,6 +2350,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Ondergrondschematisatie.
+        /// </summary>
+        public static string StochasticSoilProfileProperties_DisplayName {
+            get {
+                return ResourceManager.GetString("StochasticSoilProfileProperties_DisplayName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Toegestane peilverhoging komberging..
         /// </summary>
         public static string Structure_AllowedLevelIncreaseStorage_Description {
@@ -2865,6 +2874,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Profielschematisatie.
+        /// </summary>
+        public static string SurfaceLine_DisplayName {
+            get {
+                return ResourceManager.GetString("SurfaceLine_DisplayName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Naam van de profielschematisatie..
         /// </summary>
         public static string SurfaceLine_Name_Description {
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx
===================================================================
diff -u -r36089e883fc170498c85a840b883f786b96023d8 -r83c8f376bcd0ebf1bdfc1301d5fea953e98a3f12
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 36089e883fc170498c85a840b883f786b96023d8)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 83c8f376bcd0ebf1bdfc1301d5fea953e98a3f12)
@@ -1119,4 +1119,10 @@
   <data name="Categories_Characteristic_points" xml:space="preserve">
     <value>Karakteristieke punten</value>
   </data>
+  <data name="StochasticSoilProfileProperties_DisplayName" xml:space="preserve">
+    <value>Ondergrondschematisatie</value>
+  </data>
+  <data name="SurfaceLine_DisplayName" xml:space="preserve">
+    <value>Profielschematisatie</value>
+  </data>
 </root>
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Factories/RingtoetsChartDataFactoryTest.cs
===================================================================
diff -u -r93036b575ee81b4517b29db51f1eadf81454fb93 -r83c8f376bcd0ebf1bdfc1301d5fea953e98a3f12
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Factories/RingtoetsChartDataFactoryTest.cs	(.../RingtoetsChartDataFactoryTest.cs)	(revision 93036b575ee81b4517b29db51f1eadf81454fb93)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Factories/RingtoetsChartDataFactoryTest.cs	(.../RingtoetsChartDataFactoryTest.cs)	(revision 83c8f376bcd0ebf1bdfc1301d5fea953e98a3f12)
@@ -37,10 +37,34 @@
             ChartLineData data = RingtoetsChartDataFactory.CreateForeshoreGeometryChartData();
 
             // Assert
+            Assert.IsEmpty(data.Points);
             Assert.AreEqual("Voorlandprofiel", data.Name);
             AssertEqualStyle(data.Style, Color.DarkOrange, 2, ChartLineDashStyle.Solid);
         }
 
+        [Test]
+        public void CreateSurfaceLineChartData_ReturnsChartLineDataWithDefaultStyling()
+        {
+            // Call
+            ChartLineData data = RingtoetsChartDataFactory.CreateSurfaceLineChartData();
+
+            // Assert
+            Assert.IsEmpty(data.Points);
+            Assert.AreEqual("Profielschematisatie", data.Name);
+            AssertEqualStyle(data.Style, Color.Sienna, 2, ChartLineDashStyle.Solid);
+        }
+
+        [Test]
+        public void CreateSoilProfileChartData_ReturnsChartDataCollectionWithDefaultStyling()
+        {
+            // Call
+            ChartDataCollection data = RingtoetsChartDataFactory.CreateSoilProfileChartData();
+
+            // Assert
+            Assert.IsEmpty(data.Collection);
+            Assert.AreEqual("Ondergrondschematisatie", data.Name);
+        }
+
         private static void AssertEqualStyle(ChartLineStyle lineStyle, Color color, int width, ChartLineDashStyle style)
         {
             Assert.AreEqual(color, lineStyle.Color);
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsChartDataFactory.cs
===================================================================
diff -u -r93036b575ee81b4517b29db51f1eadf81454fb93 -r83c8f376bcd0ebf1bdfc1301d5fea953e98a3f12
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsChartDataFactory.cs	(.../MacroStabilityInwardsChartDataFactory.cs)	(revision 93036b575ee81b4517b29db51f1eadf81454fb93)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsChartDataFactory.cs	(.../MacroStabilityInwardsChartDataFactory.cs)	(revision 83c8f376bcd0ebf1bdfc1301d5fea953e98a3f12)
@@ -35,30 +35,6 @@
     internal static class MacroStabilityInwardsChartDataFactory
     {
         /// <summary>
-        /// Create <see cref="ChartLineData"/> with default styling for a <see cref="RingtoetsMacroStabilityInwardsSurfaceLine"/>.
-        /// </summary>
-        /// <returns>The created <see cref="ChartLineData"/>.</returns>
-        public static ChartLineData CreateSurfaceLineChartData()
-        {
-            return new ChartLineData(Resources.RingtoetsMacroStabilityInwardsSurfaceLine_DisplayName,
-                                     new ChartLineStyle
-                                     {
-                                         Color = Color.Sienna,
-                                         Width = 2,
-                                         DashStyle = ChartLineDashStyle.Solid
-                                     });
-        }
-
-        /// <summary>
-        /// Create a <see cref="ChartDataCollection"/> for a <see cref="MacroStabilityInwardsSoilProfile"/>.
-        /// </summary>
-        /// <returns>The created <see cref="ChartDataCollection"/>.</returns>
-        public static ChartDataCollection CreateSoilProfileChartData()
-        {
-            return new ChartDataCollection(Resources.StochasticSoilProfileProperties_DisplayName);
-        }
-
-        /// <summary>
         /// Create <see cref="ChartData"/> for a <see cref="MacroStabilityInwardsSoilLayer"/> based on its color.
         /// </summary>
         /// <param name="soilLayerIndex">The index of the <see cref="MacroStabilityInwardsSoilLayer"/> in <paramref name="soilProfile"/> for which to create <see cref="ChartData"/>.</param>
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsInputView.cs
===================================================================
diff -u -r93036b575ee81b4517b29db51f1eadf81454fb93 -r83c8f376bcd0ebf1bdfc1301d5fea953e98a3f12
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsInputView.cs	(.../MacroStabilityInwardsInputView.cs)	(revision 93036b575ee81b4517b29db51f1eadf81454fb93)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsInputView.cs	(.../MacroStabilityInwardsInputView.cs)	(revision 83c8f376bcd0ebf1bdfc1301d5fea953e98a3f12)
@@ -26,6 +26,7 @@
 using Core.Common.Utils.Extensions;
 using Core.Components.Chart.Data;
 using Core.Components.Chart.Forms;
+using Ringtoets.Common.Forms.Factories;
 using Ringtoets.MacroStabilityInwards.Data;
 using Ringtoets.MacroStabilityInwards.Forms.Factories;
 using Ringtoets.MacroStabilityInwards.Primitives;
@@ -62,8 +63,8 @@
             calculationInputObserver = new Observer(UpdateViewData);
 
             chartDataCollection = new ChartDataCollection(RingtoetsCommonFormsResources.Calculation_Input);
-            soilProfileChartData = MacroStabilityInwardsChartDataFactory.CreateSoilProfileChartData();
-            surfaceLineChartData = MacroStabilityInwardsChartDataFactory.CreateSurfaceLineChartData();
+            soilProfileChartData = RingtoetsChartDataFactory.CreateSoilProfileChartData();
+            surfaceLineChartData = RingtoetsChartDataFactory.CreateSurfaceLineChartData();
 
             chartDataCollection.Add(soilProfileChartData);
             chartDataCollection.Add(surfaceLineChartData);
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsChartDataFactoryTest.cs
===================================================================
diff -u -r93036b575ee81b4517b29db51f1eadf81454fb93 -r83c8f376bcd0ebf1bdfc1301d5fea953e98a3f12
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsChartDataFactoryTest.cs	(.../MacroStabilityInwardsChartDataFactoryTest.cs)	(revision 93036b575ee81b4517b29db51f1eadf81454fb93)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsChartDataFactoryTest.cs	(.../MacroStabilityInwardsChartDataFactoryTest.cs)	(revision 83c8f376bcd0ebf1bdfc1301d5fea953e98a3f12)
@@ -35,29 +35,6 @@
     public class MacroStabilityInwardsChartDataFactoryTest
     {
         [Test]
-        public void CreateSurfaceLineChartData_ReturnsEmptyChartLineDataWithDefaultStyling()
-        {
-            // Call
-            ChartLineData data = MacroStabilityInwardsChartDataFactory.CreateSurfaceLineChartData();
-
-            // Assert
-            Assert.IsEmpty(data.Points);
-            Assert.AreEqual("Profielschematisatie", data.Name);
-            AssertEqualStyle(data.Style, Color.Sienna, 2, ChartLineDashStyle.Solid);
-        }
-
-        [Test]
-        public void CreateSoilLayerChartData_ReturnsEmptyChartDataCollectionWithDefaultStyling()
-        {
-            // Call
-            ChartDataCollection data = MacroStabilityInwardsChartDataFactory.CreateSoilProfileChartData();
-
-            // Assert
-            Assert.IsEmpty(data.Collection);
-            Assert.AreEqual("Ondergrondschematisatie", data.Name);
-        }
-
-        [Test]
         public void CreateSoilLayerChartData_SoilProfileNull_ThrowsArgumentNullException()
         {
             // Call
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Factories/PipingChartDataFactory.cs
===================================================================
diff -u -r93036b575ee81b4517b29db51f1eadf81454fb93 -r83c8f376bcd0ebf1bdfc1301d5fea953e98a3f12
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Factories/PipingChartDataFactory.cs	(.../PipingChartDataFactory.cs)	(revision 93036b575ee81b4517b29db51f1eadf81454fb93)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Factories/PipingChartDataFactory.cs	(.../PipingChartDataFactory.cs)	(revision 83c8f376bcd0ebf1bdfc1301d5fea953e98a3f12)
@@ -36,21 +36,6 @@
     internal static class PipingChartDataFactory
     {
         /// <summary>
-        /// Create <see cref="ChartLineData"/> with default styling for a <see cref="RingtoetsPipingSurfaceLine"/>.
-        /// </summary>
-        /// <returns>The created <see cref="ChartLineData"/>.</returns>
-        public static ChartLineData CreateSurfaceLineChartData()
-        {
-            return new ChartLineData(Resources.RingtoetsPipingSurfaceLine_DisplayName,
-                                     new ChartLineStyle
-                                     {
-                                         Color = Color.Sienna,
-                                         Width = 2,
-                                         DashStyle = ChartLineDashStyle.Solid
-                                     });
-        }
-
-        /// <summary>
         /// Create <see cref="ChartPointData"/> with default styling for an entry point.
         /// </summary>
         /// <returns>The created <see cref="ChartPointData"/>.</returns>
@@ -131,15 +116,6 @@
         }
 
         /// <summary>
-        /// Create a <see cref="ChartDataCollection"/> for a <see cref="PipingSoilProfile"/>.
-        /// </summary>
-        /// <returns>The created <see cref="ChartDataCollection"/>.</returns>
-        public static ChartDataCollection CreateSoilProfileChartData()
-        {
-            return new ChartDataCollection(Resources.StochasticSoilProfileProperties_DisplayName);
-        }
-
-        /// <summary>
         /// Create <see cref="ChartData"/> for a <see cref="PipingSoilLayer"/> based on its color.
         /// </summary>
         /// <param name="soilLayerIndex">The index of the <see cref="PipingSoilLayer"/> in <paramref name="soilProfile"/> for which to create <see cref="ChartData"/>.</param>
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingInputView.cs
===================================================================
diff -u -r93036b575ee81b4517b29db51f1eadf81454fb93 -r83c8f376bcd0ebf1bdfc1301d5fea953e98a3f12
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingInputView.cs	(.../PipingInputView.cs)	(revision 93036b575ee81b4517b29db51f1eadf81454fb93)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingInputView.cs	(.../PipingInputView.cs)	(revision 83c8f376bcd0ebf1bdfc1301d5fea953e98a3f12)
@@ -26,6 +26,7 @@
 using Core.Common.Utils.Extensions;
 using Core.Components.Chart.Data;
 using Core.Components.Chart.Forms;
+using Ringtoets.Common.Forms.Factories;
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Forms.Factories;
 using Ringtoets.Piping.Primitives;
@@ -70,8 +71,8 @@
             calculationInputObserver = new Observer(UpdateViewData);
 
             chartDataCollection = new ChartDataCollection(RingtoetsCommonFormsResources.Calculation_Input);
-            soilProfileChartData = PipingChartDataFactory.CreateSoilProfileChartData();
-            surfaceLineChartData = PipingChartDataFactory.CreateSurfaceLineChartData();
+            soilProfileChartData = RingtoetsChartDataFactory.CreateSoilProfileChartData();
+            surfaceLineChartData = RingtoetsChartDataFactory.CreateSurfaceLineChartData();
             ditchPolderSideChartData = PipingChartDataFactory.CreateDitchPolderSideChartData();
             bottomDitchPolderSideChartData = PipingChartDataFactory.CreateBottomDitchPolderSideChartData();
             bottomDitchDikeSideChartData = PipingChartDataFactory.CreateBottomDitchDikeSideChartData();
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Factories/PipingChartDataFactoryTest.cs
===================================================================
diff -u -r93036b575ee81b4517b29db51f1eadf81454fb93 -r83c8f376bcd0ebf1bdfc1301d5fea953e98a3f12
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Factories/PipingChartDataFactoryTest.cs	(.../PipingChartDataFactoryTest.cs)	(revision 93036b575ee81b4517b29db51f1eadf81454fb93)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Factories/PipingChartDataFactoryTest.cs	(.../PipingChartDataFactoryTest.cs)	(revision 83c8f376bcd0ebf1bdfc1301d5fea953e98a3f12)
@@ -35,18 +35,6 @@
     public class PipingChartDataFactoryTest
     {
         [Test]
-        public void CreateSurfaceLineChartData_ReturnsEmptyChartLineDataWithDefaultStyling()
-        {
-            // Call
-            ChartLineData data = PipingChartDataFactory.CreateSurfaceLineChartData();
-
-            // Assert
-            Assert.IsEmpty(data.Points);
-            Assert.AreEqual("Profielschematisatie", data.Name);
-            AssertEqualStyle(data.Style, Color.Sienna, 2, ChartLineDashStyle.Solid);
-        }
-
-        [Test]
         public void CreateEntryPointChartData_ReturnsEmptyChartPointDataWithDefaultStyling()
         {
             // Call
@@ -143,17 +131,6 @@
         }
 
         [Test]
-        public void CreateSoilLayerChartData_ReturnsEmptyChartDataCollectionWithDefaultStyling()
-        {
-            // Call
-            ChartDataCollection data = PipingChartDataFactory.CreateSoilProfileChartData();
-
-            // Assert
-            Assert.IsEmpty(data.Collection);
-            Assert.AreEqual("Ondergrondschematisatie", data.Name);
-        }
-
-        [Test]
         public void CreateSoilLayerChartData_SoilProfileNull_ThrowsArgumentNullException()
         {
             // Call