Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r887b289acf19a81f62d78f371ab70c3f82812b95 -rabb2667229e96d5b8158981c890a5c7046e9ca66
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision 887b289acf19a81f62d78f371ab70c3f82812b95)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision abb2667229e96d5b8158981c890a5c7046e9ca66)
@@ -35,7 +35,6 @@
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
 using Rhino.Mocks;
-using Ringtoets.Common.Data;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.FailureMechanism;
@@ -48,6 +47,7 @@
 using RingtoetsFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 using PipingFormsResources = Ringtoets.Piping.Forms.Properties.Resources;
 using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.Piping.Forms.Test.TreeNodeInfos
 {
@@ -111,7 +111,7 @@
             var image = info.Image(null);
 
             // Assert
-            TestHelper.AssertImagesAreEqual(PipingFormsResources.FolderIcon, image);
+            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GeneralFolderIcon, image);
         }
 
         [Test]
@@ -256,9 +256,9 @@
             // Assert
             Assert.AreEqual(17, menu.Items.Count);
             TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndex,
-                                                          PipingFormsResources.PipingCalculationGroup_Add_PipingCalculationGroup,
+                                                          RingtoetsCommonFormsResources.CalculationGroup_Add_CalculationGroup,
                                                           "Voeg een nieuwe berekeningsmap toe aan deze berekeningsmap.",
-                                                          PipingFormsResources.AddFolderIcon);
+                                                          RingtoetsCommonFormsResources.AddFolderIcon);
             TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationIndex,
                                                           PipingFormsResources.PipingCalculationGroup_Add_PipingCalculation,
                                                           "Voeg een nieuwe berekening toe aan deze berekeningsmap.",
@@ -368,9 +368,9 @@
             // Assert
             Assert.AreEqual(16, menu.Items.Count);
             TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndex,
-                                                          PipingFormsResources.PipingCalculationGroup_Add_PipingCalculationGroup,
+                                                          RingtoetsCommonFormsResources.CalculationGroup_Add_CalculationGroup,
                                                           "Voeg een nieuwe berekeningsmap toe aan deze berekeningsmap.",
-                                                          PipingFormsResources.AddFolderIcon);
+                                                          RingtoetsCommonFormsResources.AddFolderIcon);
             TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationIndex,
                                                           PipingFormsResources.PipingCalculationGroup_Add_PipingCalculation,
                                                           "Voeg een nieuwe berekening toe aan deze berekeningsmap.",
@@ -475,9 +475,9 @@
             var mainCalculationGroupContextMenuItemOffset = 4;
             Assert.AreEqual(18, menu.Items.Count);
             TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndex + mainCalculationGroupContextMenuItemOffset,
-                                                          PipingFormsResources.PipingCalculationGroup_Add_PipingCalculationGroup,
+                                                          RingtoetsCommonFormsResources.CalculationGroup_Add_CalculationGroup,
                                                           "Voeg een nieuwe berekeningsmap toe aan deze berekeningsmap.",
-                                                          PipingFormsResources.AddFolderIcon);
+                                                          RingtoetsCommonFormsResources.AddFolderIcon);
             TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationIndex + mainCalculationGroupContextMenuItemOffset,
                                                           PipingFormsResources.PipingCalculationGroup_Add_PipingCalculation,
                                                           "Voeg een nieuwe berekening toe aan deze berekeningsmap.",