Index: Ringtoets/Common/src/Ringtoets.Common.Forms/NodePresenters/CategoryTreeFolderNodePresenter.cs
===================================================================
diff -u -re388ea76d1d044298cc89156c8744fbea1bcb736 -r61161720b379645f400606e868e2a1286c17348d
--- Ringtoets/Common/src/Ringtoets.Common.Forms/NodePresenters/CategoryTreeFolderNodePresenter.cs	(.../CategoryTreeFolderNodePresenter.cs)	(revision e388ea76d1d044298cc89156c8744fbea1bcb736)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/NodePresenters/CategoryTreeFolderNodePresenter.cs	(.../CategoryTreeFolderNodePresenter.cs)	(revision 61161720b379645f400606e868e2a1286c17348d)
@@ -19,6 +19,7 @@
         {
             node.Text = nodeData.Name;
             node.Image = GetFolderIcon(nodeData.Category);
+            node.ForegroundColor = Color.FromKnownColor(KnownColor.ControlText);
         }
 
         protected override IEnumerable GetChildNodeObjects(CategoryTreeFolder nodeData)
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/NodePresenters/CategoryTreeFolderNodePresenterTest.cs
===================================================================
diff -u -re388ea76d1d044298cc89156c8744fbea1bcb736 -r61161720b379645f400606e868e2a1286c17348d
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/NodePresenters/CategoryTreeFolderNodePresenterTest.cs	(.../CategoryTreeFolderNodePresenterTest.cs)	(revision e388ea76d1d044298cc89156c8744fbea1bcb736)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/NodePresenters/CategoryTreeFolderNodePresenterTest.cs	(.../CategoryTreeFolderNodePresenterTest.cs)	(revision 61161720b379645f400606e868e2a1286c17348d)
@@ -41,6 +41,7 @@
             var mocks = new MockRepository();
             var parentNode = mocks.StrictMock<ITreeNode>();
             var currentNode = mocks.Stub<ITreeNode>();
+            currentNode.ForegroundColor = Color.AliceBlue;
             mocks.ReplayAll();
 
             var nodePresenter = new CategoryTreeFolderNodePresenter();
@@ -51,6 +52,7 @@
 
             // Assert
             Assert.AreEqual(folder.Name, currentNode.Text);
+            Assert.AreEqual(Color.FromKnownColor(KnownColor.ControlText), currentNode.ForegroundColor);
             TestHelper.AssertImagesAreEqual(GetExpectedIconForCategory(category), currentNode.Image);
             mocks.VerifyAll();
         }
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/NodePresenters/AssessmentSectionBaseNodePresenter.cs
===================================================================
diff -u -re388ea76d1d044298cc89156c8744fbea1bcb736 -r61161720b379645f400606e868e2a1286c17348d
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/NodePresenters/AssessmentSectionBaseNodePresenter.cs	(.../AssessmentSectionBaseNodePresenter.cs)	(revision e388ea76d1d044298cc89156c8744fbea1bcb736)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/NodePresenters/AssessmentSectionBaseNodePresenter.cs	(.../AssessmentSectionBaseNodePresenter.cs)	(revision 61161720b379645f400606e868e2a1286c17348d)
@@ -1,4 +1,5 @@
 using System.Collections;
+using System.Drawing;
 
 using Core.Common.Base;
 using Core.Common.Controls;
@@ -19,6 +20,7 @@
         {
             node.Text = nodeData.Name;
             node.Image = RingtoetsFormsResources.AssessmentSectionFolderIcon;
+            node.ForegroundColor = Color.FromKnownColor(KnownColor.ControlText);
         }
 
         protected override IEnumerable GetChildNodeObjects(AssessmentSectionBase nodeData)
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/NodePresenters/AssessmentSectionBaseNodePresenterTest.cs
===================================================================
diff -u -re388ea76d1d044298cc89156c8744fbea1bcb736 -r61161720b379645f400606e868e2a1286c17348d
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/NodePresenters/AssessmentSectionBaseNodePresenterTest.cs	(.../AssessmentSectionBaseNodePresenterTest.cs)	(revision e388ea76d1d044298cc89156c8744fbea1bcb736)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/NodePresenters/AssessmentSectionBaseNodePresenterTest.cs	(.../AssessmentSectionBaseNodePresenterTest.cs)	(revision 61161720b379645f400606e868e2a1286c17348d)
@@ -1,8 +1,10 @@
 using System.ComponentModel;
+using System.Drawing;
 using System.Linq;
 
 using Core.Common.Base;
 using Core.Common.Controls;
+using Core.Common.TestUtils;
 using Core.Common.Utils.Collections;
 
 using NUnit.Framework;
@@ -13,6 +15,8 @@
 using Ringtoets.Integration.Data;
 using Ringtoets.Integration.Forms.NodePresenters;
 
+using RingtoetsIntegrationFormsResources = Ringtoets.Integration.Forms.Properties.Resources;
+
 namespace Ringtoets.Integration.Forms.Test.NodePresenters
 {
     [TestFixture]
@@ -52,8 +56,8 @@
 
             // Assert
             Assert.AreEqual(projectName, projectNode.Text);
-            Assert.AreEqual(16, projectNode.Image.Height);
-            Assert.AreEqual(16, projectNode.Image.Width);
+            Assert.AreEqual(Color.FromKnownColor(KnownColor.ControlText), projectNode.ForegroundColor);
+            TestHelper.AssertImagesAreEqual(RingtoetsIntegrationFormsResources.AssessmentSectionFolderIcon, projectNode.Image);
         }
 
         [Test]
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingCalculationContextNodePresenter.cs
===================================================================
diff -u -r495647ee1c652fecc15eea7fefeab29ae01347fe -r61161720b379645f400606e868e2a1286c17348d
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingCalculationContextNodePresenter.cs	(.../PipingCalculationContextNodePresenter.cs)	(revision 495647ee1c652fecc15eea7fefeab29ae01347fe)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingCalculationContextNodePresenter.cs	(.../PipingCalculationContextNodePresenter.cs)	(revision 61161720b379645f400606e868e2a1286c17348d)
@@ -1,5 +1,6 @@
 using System;
 using System.Collections;
+using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
 using Core.Common.Base.Workflow;
@@ -32,6 +33,7 @@
         {
             node.Text = pipingCalculationContext.WrappedData.Name;
             node.Image = Resources.PipingIcon;
+            node.ForegroundColor = Color.FromKnownColor(KnownColor.ControlText);
         }
 
         protected override IEnumerable GetChildNodeObjects(PipingCalculationContext pipingCalculationContext)
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingCalculationGroupContextNodePresenter.cs
===================================================================
diff -u -r495647ee1c652fecc15eea7fefeab29ae01347fe -r61161720b379645f400606e868e2a1286c17348d
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingCalculationGroupContextNodePresenter.cs	(.../PipingCalculationGroupContextNodePresenter.cs)	(revision 495647ee1c652fecc15eea7fefeab29ae01347fe)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingCalculationGroupContextNodePresenter.cs	(.../PipingCalculationGroupContextNodePresenter.cs)	(revision 61161720b379645f400606e868e2a1286c17348d)
@@ -1,5 +1,6 @@
 using System;
 using System.Collections;
+using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
 
@@ -43,6 +44,7 @@
         {
             node.Text = nodeData.WrappedData.Name;
             node.Image = PipingFormsResources.FolderIcon;
+            node.ForegroundColor = Color.FromKnownColor(KnownColor.ControlText);
         }
 
         protected override void OnNodeRenamed(PipingCalculationGroupContext nodeData, string newName)
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingFailureMechanismNodePresenter.cs
===================================================================
diff -u -r495647ee1c652fecc15eea7fefeab29ae01347fe -r61161720b379645f400606e868e2a1286c17348d
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingFailureMechanismNodePresenter.cs	(.../PipingFailureMechanismNodePresenter.cs)	(revision 495647ee1c652fecc15eea7fefeab29ae01347fe)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingFailureMechanismNodePresenter.cs	(.../PipingFailureMechanismNodePresenter.cs)	(revision 61161720b379645f400606e868e2a1286c17348d)
@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
 
@@ -36,6 +37,7 @@
         {
             node.Text = Resources.PipingFailureMechanism_DisplayName;
             node.Image = Resources.PipingIcon;
+            node.ForegroundColor = Color.FromKnownColor(KnownColor.ControlText);
         }
 
         protected override IEnumerable GetChildNodeObjects(PipingFailureMechanism failureMechanism)
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingInputContextNodePresenter.cs
===================================================================
diff -u -r79e69f1b4b303862f3572d0f6cb60acf63a957e9 -r61161720b379645f400606e868e2a1286c17348d
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingInputContextNodePresenter.cs	(.../PipingInputContextNodePresenter.cs)	(revision 79e69f1b4b303862f3572d0f6cb60acf63a957e9)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingInputContextNodePresenter.cs	(.../PipingInputContextNodePresenter.cs)	(revision 61161720b379645f400606e868e2a1286c17348d)
@@ -1,5 +1,7 @@
-using Core.Common.Controls;
+using System.Drawing;
 
+using Core.Common.Controls;
+
 using Ringtoets.Common.Forms.NodePresenters;
 using Ringtoets.Piping.Forms.PresentationObjects;
 using Ringtoets.Piping.Forms.Properties;
@@ -15,6 +17,7 @@
         {
             node.Text = "Invoer";
             node.Image = Resources.PipingInputIcon;
+            node.ForegroundColor = Color.FromKnownColor(KnownColor.ControlText);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingOutputNodePresenter.cs
===================================================================
diff -u -rfb32e3411873a7b4c567792b9f335eba462e2702 -r61161720b379645f400606e868e2a1286c17348d
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingOutputNodePresenter.cs	(.../PipingOutputNodePresenter.cs)	(revision fb32e3411873a7b4c567792b9f335eba462e2702)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingOutputNodePresenter.cs	(.../PipingOutputNodePresenter.cs)	(revision 61161720b379645f400606e868e2a1286c17348d)
@@ -1,5 +1,7 @@
-using Core.Common.Controls;
+using System.Drawing;
 
+using Core.Common.Controls;
+
 using Ringtoets.Common.Forms.NodePresenters;
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Forms.PresentationObjects;
@@ -16,6 +18,7 @@
         {
             node.Text = Resources.PipingOutput_DisplayName;
             node.Image = Resources.PipingOutputIcon;
+            node.ForegroundColor = Color.FromKnownColor(KnownColor.ControlText);
         }
 
         protected override bool CanRemove(object parentNodeData, PipingOutput nodeData)
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingSoilProfileCollectionNodePresenter.cs
===================================================================
diff -u -re388ea76d1d044298cc89156c8744fbea1bcb736 -r61161720b379645f400606e868e2a1286c17348d
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingSoilProfileCollectionNodePresenter.cs	(.../PipingSoilProfileCollectionNodePresenter.cs)	(revision e388ea76d1d044298cc89156c8744fbea1bcb736)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingSoilProfileCollectionNodePresenter.cs	(.../PipingSoilProfileCollectionNodePresenter.cs)	(revision 61161720b379645f400606e868e2a1286c17348d)
@@ -53,7 +53,7 @@
         private static Color GetTextColor(object nodeData)
         {
             var pipingSoilProfiles = (IEnumerable<PipingSoilProfile>) nodeData;
-            return Color.FromKnownColor(pipingSoilProfiles.Any() ? KnownColor.Black : KnownColor.GrayText);
+            return Color.FromKnownColor(pipingSoilProfiles.Any() ? KnownColor.ControlText : KnownColor.GrayText);
         }
 
         private ContextMenuStrip CreateContextMenu()
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingSoilProfileNodePresenter.cs
===================================================================
diff -u -rca87cfba59d1e35ba9a281b92e5e90f8c8121db0 -r61161720b379645f400606e868e2a1286c17348d
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingSoilProfileNodePresenter.cs	(.../PipingSoilProfileNodePresenter.cs)	(revision ca87cfba59d1e35ba9a281b92e5e90f8c8121db0)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingSoilProfileNodePresenter.cs	(.../PipingSoilProfileNodePresenter.cs)	(revision 61161720b379645f400606e868e2a1286c17348d)
@@ -1,5 +1,7 @@
-using Core.Common.Controls;
+using System.Drawing;
 
+using Core.Common.Controls;
+
 using Ringtoets.Common.Forms.NodePresenters;
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Forms.Properties;
@@ -12,6 +14,7 @@
         {
             node.Text = nodeData.Name;
             node.Image = Resources.PipingSoilProfileIcon;
+            node.ForegroundColor = Color.FromKnownColor(KnownColor.ControlText);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingSurfaceLineNodePresenter.cs
===================================================================
diff -u -rca87cfba59d1e35ba9a281b92e5e90f8c8121db0 -r61161720b379645f400606e868e2a1286c17348d
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingSurfaceLineNodePresenter.cs	(.../PipingSurfaceLineNodePresenter.cs)	(revision ca87cfba59d1e35ba9a281b92e5e90f8c8121db0)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingSurfaceLineNodePresenter.cs	(.../PipingSurfaceLineNodePresenter.cs)	(revision 61161720b379645f400606e868e2a1286c17348d)
@@ -1,5 +1,7 @@
-using Core.Common.Controls;
+using System.Drawing;
 
+using Core.Common.Controls;
+
 using Ringtoets.Common.Forms.NodePresenters;
 using Ringtoets.Piping.Data;
 
@@ -16,6 +18,7 @@
         {
             node.Text = nodeData.Name;
             node.Image = Resources.PipingSurfaceLineIcon;
+            node.ForegroundColor = Color.FromKnownColor(KnownColor.ControlText);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationGroupContextNodePresenterTest.cs
===================================================================
diff -u -r495647ee1c652fecc15eea7fefeab29ae01347fe -r61161720b379645f400606e868e2a1286c17348d
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationGroupContextNodePresenterTest.cs	(.../PipingCalculationGroupContextNodePresenterTest.cs)	(revision 495647ee1c652fecc15eea7fefeab29ae01347fe)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationGroupContextNodePresenterTest.cs	(.../PipingCalculationGroupContextNodePresenterTest.cs)	(revision 61161720b379645f400606e868e2a1286c17348d)
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
 
@@ -55,6 +56,7 @@
             var mocks = new MockRepository();
             var parentNode = mocks.StrictMock<ITreeNode>();
             var node = mocks.Stub<ITreeNode>();
+            node.ForegroundColor = Color.AliceBlue;
             mocks.ReplayAll();
             
             var group = new PipingCalculationGroup();
@@ -69,6 +71,7 @@
 
             // Assert
             Assert.AreEqual(group.Name, node.Text);
+            Assert.AreEqual(Color.FromKnownColor(KnownColor.ControlText), node.ForegroundColor);
             TestHelper.AssertImagesAreEqual(PipingFormsResources.FolderIcon, node.Image);
             mocks.VerifyAll();
         }
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingFailureMechanismNodePresenterTest.cs
===================================================================
diff -u -r495647ee1c652fecc15eea7fefeab29ae01347fe -r61161720b379645f400606e868e2a1286c17348d
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingFailureMechanismNodePresenterTest.cs	(.../PipingFailureMechanismNodePresenterTest.cs)	(revision 495647ee1c652fecc15eea7fefeab29ae01347fe)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingFailureMechanismNodePresenterTest.cs	(.../PipingFailureMechanismNodePresenterTest.cs)	(revision 61161720b379645f400606e868e2a1286c17348d)
@@ -1,5 +1,6 @@
 using System;
 using System.ComponentModel;
+using System.Drawing;
 using System.Linq;
 using Core.Common.Base;
 using Core.Common.Controls;
@@ -46,6 +47,7 @@
             // Setup
             var mocks = new MockRepository();
             var pipingNode = mocks.Stub<ITreeNode>();
+            pipingNode.ForegroundColor = Color.AliceBlue;
             mocks.ReplayAll();
 
             var nodePresenter = new PipingFailureMechanismNodePresenter();
@@ -57,8 +59,8 @@
 
             // Assert
             Assert.AreEqual("Dijken - Piping", pipingNode.Text);
-            Assert.AreEqual(16, pipingNode.Image.Height);
-            Assert.AreEqual(16, pipingNode.Image.Width);
+            Assert.AreEqual(Color.FromKnownColor(KnownColor.ControlText), pipingNode.ForegroundColor);
+            TestHelper.AssertImagesAreEqual(PipingFormsResources.PipingIcon, pipingNode.Image);
         }
 
         [Test]
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingInputContextNodePresenterTest.cs
===================================================================
diff -u -r79e69f1b4b303862f3572d0f6cb60acf63a957e9 -r61161720b379645f400606e868e2a1286c17348d
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingInputContextNodePresenterTest.cs	(.../PipingInputContextNodePresenterTest.cs)	(revision 79e69f1b4b303862f3572d0f6cb60acf63a957e9)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingInputContextNodePresenterTest.cs	(.../PipingInputContextNodePresenterTest.cs)	(revision 61161720b379645f400606e868e2a1286c17348d)
@@ -1,4 +1,6 @@
-using Core.Common.Controls;
+using System.Drawing;
+
+using Core.Common.Controls;
 using Core.Common.TestUtils;
 
 using NUnit.Framework;
@@ -35,6 +37,7 @@
             var mocks = new MockRepository();
             var parentNode = mocks.StrictMock<ITreeNode>();
             var currentNode = mocks.Stub<ITreeNode>();
+            currentNode.ForegroundColor = Color.AliceBlue;
             mocks.ReplayAll();
 
             var nodeData = new PipingInputContext();
@@ -46,6 +49,7 @@
 
             // Assert
             Assert.AreEqual("Invoer", currentNode.Text);
+            Assert.AreEqual(Color.FromKnownColor(KnownColor.ControlText), currentNode.ForegroundColor);
             TestHelper.AssertImagesAreEqual(PipingFormsResources.PipingInputIcon, currentNode.Image);
             mocks.VerifyAll();
         }
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingOutputNodePresenterTest.cs
===================================================================
diff -u -r495647ee1c652fecc15eea7fefeab29ae01347fe -r61161720b379645f400606e868e2a1286c17348d
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingOutputNodePresenterTest.cs	(.../PipingOutputNodePresenterTest.cs)	(revision 495647ee1c652fecc15eea7fefeab29ae01347fe)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingOutputNodePresenterTest.cs	(.../PipingOutputNodePresenterTest.cs)	(revision 61161720b379645f400606e868e2a1286c17348d)
@@ -1,7 +1,10 @@
 using System;
+using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
 using Core.Common.Controls;
+using Core.Common.TestUtils;
+
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Piping.Calculation.TestUtil;
@@ -11,6 +14,8 @@
 using Ringtoets.Piping.Forms.PresentationObjects;
 using Ringtoets.Piping.Forms.Test.Helper;
 
+using PipingFormsResources = Ringtoets.Piping.Forms.Properties.Resources;
+
 namespace Ringtoets.Piping.Forms.Test.NodePresenters
 {
     [TestFixture]
@@ -36,6 +41,7 @@
 
             var mocks = new MockRepository();
             var pipingNode = mocks.Stub<ITreeNode>();
+            pipingNode.ForegroundColor = Color.AliceBlue;
             mocks.ReplayAll();
 
             var nodePresenter = new PipingOutputNodePresenter();
@@ -47,8 +53,8 @@
 
             // Assert
             Assert.AreEqual(outputName, pipingNode.Text);
-            Assert.AreEqual(16, pipingNode.Image.Height);
-            Assert.AreEqual(16, pipingNode.Image.Width);
+            Assert.AreEqual(Color.FromKnownColor(KnownColor.ControlText), pipingNode.ForegroundColor);
+            TestHelper.AssertImagesAreEqual(PipingFormsResources.PipingOutputIcon, pipingNode.Image);
         }
 
         [Test]
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingSoilProfileCollectionNodePresenterTest.cs
===================================================================
diff -u -re388ea76d1d044298cc89156c8744fbea1bcb736 -r61161720b379645f400606e868e2a1286c17348d
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingSoilProfileCollectionNodePresenterTest.cs	(.../PipingSoilProfileCollectionNodePresenterTest.cs)	(revision e388ea76d1d044298cc89156c8744fbea1bcb736)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingSoilProfileCollectionNodePresenterTest.cs	(.../PipingSoilProfileCollectionNodePresenterTest.cs)	(revision 61161720b379645f400606e868e2a1286c17348d)
@@ -2,11 +2,14 @@
 using System.Collections.Generic;
 using System.Drawing;
 using Core.Common.Controls;
+using Core.Common.TestUtils;
+
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Piping.Calculation.TestUtil;
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Forms.NodePresenters;
+
 using RingtoetsFormsResources = Ringtoets.Piping.Forms.Properties.Resources;
 
 namespace Ringtoets.Piping.Forms.Test.NodePresenters
@@ -27,7 +30,7 @@
         }
 
         [Test]
-        public void UpdateNode_WithData_InitializeNode()
+        public void UpdateNode_WithEmptyCollection_InitializeNodeWithGreyedText()
         {
             // Setup
             var mocks = new MockRepository();
@@ -44,16 +47,38 @@
             // Assert
             Assert.AreEqual(RingtoetsFormsResources.PipingSoilProfilesCollection_DisplayName, soilProfileCollectionNodeStub.Text);
             Assert.AreEqual(Color.FromKnownColor(KnownColor.GrayText), soilProfileCollectionNodeStub.ForegroundColor);
-            Assert.AreEqual(16, soilProfileCollectionNodeStub.Image.Height);
-            Assert.AreEqual(16, soilProfileCollectionNodeStub.Image.Width);
+            TestHelper.AssertImagesAreEqual(RingtoetsFormsResources.FolderIcon, soilProfileCollectionNodeStub.Image);
         }
 
         [Test]
+        public void UpdateNode_WithData_InitializeNode()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var soilProfileCollectionNodeStub = mocks.Stub<ITreeNode>();
+            mocks.ReplayAll();
+
+            var nodePresenter = new PipingSoilProfileCollectionNodePresenter();
+
+            IEnumerable<PipingSoilProfile> soilProfilesCollection = new []
+            {
+                new TestPipingSoilProfile()
+            };
+
+            // Call
+            nodePresenter.UpdateNode(null, soilProfileCollectionNodeStub, soilProfilesCollection);
+
+            // Assert
+            Assert.AreEqual(RingtoetsFormsResources.PipingSoilProfilesCollection_DisplayName, soilProfileCollectionNodeStub.Text);
+            Assert.AreEqual(Color.FromKnownColor(KnownColor.ControlText), soilProfileCollectionNodeStub.ForegroundColor);
+            TestHelper.AssertImagesAreEqual(RingtoetsFormsResources.FolderIcon, soilProfileCollectionNodeStub.Image);
+        }
+
+        [Test]
         public void GetChildNodeObjects_WithData_ReturnCollection()
         {
             // Setup
             var mocks = new MockRepository();
-            var nodeMock = mocks.StrictMock<ITreeNode>();
             mocks.ReplayAll();
 
             var nodePresenter = new PipingSoilProfileCollectionNodePresenter();
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingSoilProfileNodePresenterTest.cs
===================================================================
diff -u -rca87cfba59d1e35ba9a281b92e5e90f8c8121db0 -r61161720b379645f400606e868e2a1286c17348d
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingSoilProfileNodePresenterTest.cs	(.../PipingSoilProfileNodePresenterTest.cs)	(revision ca87cfba59d1e35ba9a281b92e5e90f8c8121db0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingSoilProfileNodePresenterTest.cs	(.../PipingSoilProfileNodePresenterTest.cs)	(revision 61161720b379645f400606e868e2a1286c17348d)
@@ -1,13 +1,19 @@
 using System;
 using System.Collections.Generic;
+using System.Drawing;
+
 using Core.Common.Controls;
+using Core.Common.TestUtils;
+
 using NUnit.Framework;
 using Rhino.Mocks;
 
 using Ringtoets.Common.Forms.NodePresenters;
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Forms.NodePresenters;
 
+using PipingFormsResources = Ringtoets.Piping.Forms.Properties.Resources;
+
 namespace Ringtoets.Piping.Forms.Test.NodePresenters
 {
     [TestFixture]
@@ -32,6 +38,7 @@
             var mocks = new MockRepository();
             var parentNodeMock = mocks.StrictMock<ITreeNode>();
             var dataNodeMock = mocks.Stub<ITreeNode>();
+            dataNodeMock.ForegroundColor = Color.AliceBlue;
             mocks.ReplayAll();
 
             const string name = "<insert name here>";
@@ -53,8 +60,8 @@
 
             // Assert
             Assert.AreEqual(name, dataNodeMock.Text);
-            Assert.AreEqual(16, dataNodeMock.Image.Height);
-            Assert.AreEqual(16, dataNodeMock.Image.Width);
+            Assert.AreEqual(Color.FromKnownColor(KnownColor.ControlText), dataNodeMock.ForegroundColor);
+            TestHelper.AssertImagesAreEqual(PipingFormsResources.PipingSoilProfileIcon, dataNodeMock.Image);
             mocks.VerifyAll();
         }
     }
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingSurfaceLineCollectionNodePresenterTest.cs
===================================================================
diff -u -re388ea76d1d044298cc89156c8744fbea1bcb736 -r61161720b379645f400606e868e2a1286c17348d
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingSurfaceLineCollectionNodePresenterTest.cs	(.../PipingSurfaceLineCollectionNodePresenterTest.cs)	(revision e388ea76d1d044298cc89156c8744fbea1bcb736)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingSurfaceLineCollectionNodePresenterTest.cs	(.../PipingSurfaceLineCollectionNodePresenterTest.cs)	(revision 61161720b379645f400606e868e2a1286c17348d)
@@ -4,6 +4,7 @@
 using System.Drawing;
 using System.Linq;
 using Core.Common.Controls;
+using Core.Common.TestUtils;
 using Core.Common.Utils.Collections;
 using NUnit.Framework;
 using Rhino.Mocks;
@@ -12,7 +13,7 @@
 
 using Ringtoets.Piping.Forms.NodePresenters;
 
-using RingtoetsFormsResources = Ringtoets.Piping.Forms.Properties.Resources;
+using PipingFormsResources = Ringtoets.Piping.Forms.Properties.Resources;
 
 namespace Ringtoets.Piping.Forms.Test.NodePresenters
 {
@@ -47,10 +48,9 @@
             nodePresenter.UpdateNode(null, surfaceLinesCollectionNodeMock, surfaceLinesCollection);
 
             // Assert
-            Assert.AreEqual(RingtoetsFormsResources.PipingSurfaceLinesCollection_DisplayName, surfaceLinesCollectionNodeMock.Text);
+            Assert.AreEqual(PipingFormsResources.PipingSurfaceLinesCollection_DisplayName, surfaceLinesCollectionNodeMock.Text);
             Assert.AreEqual(Color.FromKnownColor(KnownColor.ControlText), surfaceLinesCollectionNodeMock.ForegroundColor);
-            Assert.AreEqual(16, surfaceLinesCollectionNodeMock.Image.Height);
-            Assert.AreEqual(16, surfaceLinesCollectionNodeMock.Image.Width);
+            TestHelper.AssertImagesAreEqual(PipingFormsResources.FolderIcon, surfaceLinesCollectionNodeMock.Image);
         }
 
         [Test]
@@ -69,18 +69,16 @@
             nodePresenter.UpdateNode(null, surfaceLinesCollectionNodeMock, surfaceLinesCollection);
 
             // Assert
-            Assert.AreEqual(RingtoetsFormsResources.PipingSurfaceLinesCollection_DisplayName, surfaceLinesCollectionNodeMock.Text);
+            Assert.AreEqual(PipingFormsResources.PipingSurfaceLinesCollection_DisplayName, surfaceLinesCollectionNodeMock.Text);
             Assert.AreEqual(Color.FromKnownColor(KnownColor.GrayText), surfaceLinesCollectionNodeMock.ForegroundColor);
-            Assert.AreEqual(16, surfaceLinesCollectionNodeMock.Image.Height);
-            Assert.AreEqual(16, surfaceLinesCollectionNodeMock.Image.Width);
+            TestHelper.AssertImagesAreEqual(PipingFormsResources.FolderIcon, surfaceLinesCollectionNodeMock.Image);
         }
 
         [Test]
         public void GetChildNodeObjects_WithData_ReturnAllItemsInCollection()
         {
             // Setup
             var mocks = new MockRepository();
-            var nodeMock = mocks.StrictMock<ITreeNode>();
             mocks.ReplayAll();
 
             var nodePresenter = new PipingSurfaceLineCollectionNodePresenter();
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingSurfaceLineNodePresenterTest.cs
===================================================================
diff -u -rca87cfba59d1e35ba9a281b92e5e90f8c8121db0 -r61161720b379645f400606e868e2a1286c17348d
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingSurfaceLineNodePresenterTest.cs	(.../PipingSurfaceLineNodePresenterTest.cs)	(revision ca87cfba59d1e35ba9a281b92e5e90f8c8121db0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingSurfaceLineNodePresenterTest.cs	(.../PipingSurfaceLineNodePresenterTest.cs)	(revision 61161720b379645f400606e868e2a1286c17348d)
@@ -1,4 +1,8 @@
-using Core.Common.Controls;
+using System.Drawing;
+
+using Core.Common.Controls;
+using Core.Common.TestUtils;
+
 using NUnit.Framework;
 
 using Rhino.Mocks;
@@ -8,6 +12,8 @@
 
 using Ringtoets.Piping.Forms.NodePresenters;
 
+using PipingFormsResources = Ringtoets.Piping.Forms.Properties.Resources;
+
 namespace Ringtoets.Piping.Forms.Test.NodePresenters
 {
     [TestFixture]
@@ -30,6 +36,7 @@
             var mocks = new MockRepository();
             var parentNodeMock = mocks.StrictMock<ITreeNode>();
             var dataNodeMock = mocks.Stub<ITreeNode>();
+            dataNodeMock.ForegroundColor = Color.AliceBlue;
             mocks.ReplayAll();
 
             const string name = "<insert name here>";
@@ -42,8 +49,8 @@
 
             // Assert
             Assert.AreEqual(name, dataNodeMock.Text);
-            Assert.AreEqual(16, dataNodeMock.Image.Height);
-            Assert.AreEqual(16, dataNodeMock.Image.Width);
+            Assert.AreEqual(Color.FromKnownColor(KnownColor.ControlText), dataNodeMock.ForegroundColor);
+            TestHelper.AssertImagesAreEqual(PipingFormsResources.PipingSurfaceLineIcon, dataNodeMock.Image);
             mocks.VerifyAll();
         }
     }