Index: Core/Common/src/Core.Common.Controls/PresentationObjects/WrappedObjectContextBase.cs
===================================================================
diff -u -r59fccb6e0e34d12c43db9b9ea467b14396d78f5d -r684b8c0ca681ea2da3cc988bd60e9223037e5a16
--- Core/Common/src/Core.Common.Controls/PresentationObjects/WrappedObjectContextBase.cs	(.../WrappedObjectContextBase.cs)	(revision 59fccb6e0e34d12c43db9b9ea467b14396d78f5d)
+++ Core/Common/src/Core.Common.Controls/PresentationObjects/WrappedObjectContextBase.cs	(.../WrappedObjectContextBase.cs)	(revision 684b8c0ca681ea2da3cc988bd60e9223037e5a16)
@@ -1,5 +1,26 @@
-using System;
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
 
+using System;
+
 using Core.Common.Base;
 
 namespace Core.Common.Controls.PresentationObjects
Index: Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs
===================================================================
diff -u -r86980636aab6d77f5a7d072210edc5d6303a59f4 -r684b8c0ca681ea2da3cc988bd60e9223037e5a16
--- Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 86980636aab6d77f5a7d072210edc5d6303a59f4)
+++ Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 684b8c0ca681ea2da3cc988bd60e9223037e5a16)
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     Runtime Version:4.0.30319.18444
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -606,6 +606,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Algemeen filter.
+        /// </summary>
+        public static string FailureMechanismContributionView_GridColumn_RelevancyFilter {
+            get {
+                return ResourceManager.GetString("FailureMechanismContributionView_GridColumn_RelevancyFilter", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         public static System.Drawing.Bitmap folder {
Index: Core/Common/src/Core.Common.Gui/Properties/Resources.resx
===================================================================
diff -u -r86980636aab6d77f5a7d072210edc5d6303a59f4 -r684b8c0ca681ea2da3cc988bd60e9223037e5a16
--- Core/Common/src/Core.Common.Gui/Properties/Resources.resx	(.../Resources.resx)	(revision 86980636aab6d77f5a7d072210edc5d6303a59f4)
+++ Core/Common/src/Core.Common.Gui/Properties/Resources.resx	(.../Resources.resx)	(revision 684b8c0ca681ea2da3cc988bd60e9223037e5a16)
@@ -688,4 +688,7 @@
   <data name="StorageCommandHandler_NewProject_Creating_new_project_cancelled" xml:space="preserve">
     <value>Openen van een nieuw Ringtoetsproject geannuleerd.</value>
   </data>
+  <data name="FailureMechanismContributionView_GridColumn_RelevancyFilter" xml:space="preserve">
+    <value>Algemeen filter</value>
+  </data>
 </root>
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/FailureMechanismContext.cs
===================================================================
diff -u -rc4d2af65ad23757fb3bd11f93458839bc1787ded -r684b8c0ca681ea2da3cc988bd60e9223037e5a16
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/FailureMechanismContext.cs	(.../FailureMechanismContext.cs)	(revision c4d2af65ad23757fb3bd11f93458839bc1787ded)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/FailureMechanismContext.cs	(.../FailureMechanismContext.cs)	(revision 684b8c0ca681ea2da3cc988bd60e9223037e5a16)
@@ -20,6 +20,9 @@
 // All rights reserved.
 
 using System;
+
+using Core.Common.Controls.PresentationObjects;
+
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.FailureMechanism;
 
@@ -28,74 +31,32 @@
     /// <summary>
     /// This class is a presentation object for a <see cref="IFailureMechanism"/> instance.
     /// </summary>
-    public abstract class FailureMechanismContext<T> where T : IFailureMechanism
+    public abstract class FailureMechanismContext<T> : WrappedObjectContextBase<T> where T : IFailureMechanism
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="FailureMechanismContext{T}"/> class.
         /// </summary>
         /// <param name="wrappedFailureMechanism">The failure mechanism.</param>
         /// <param name="parent">The parent of <paramref name="wrappedFailureMechanism"/>.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="wrappedFailureMechanism"/> or <paramref name="parent"/> are <c>null</c>.</exception>
-        protected FailureMechanismContext(T wrappedFailureMechanism, IAssessmentSection parent)
+        protected FailureMechanismContext(T wrappedFailureMechanism, IAssessmentSection parent) : base(wrappedFailureMechanism)
         {
-            AssertInputsAreNotNull(wrappedFailureMechanism, parent);
+            AssertInputsAreNotNull(parent);
 
-            WrappedData = wrappedFailureMechanism;
             Parent = parent;
         }
 
         /// <summary>
-        /// Gets the parent of <see cref="WrappedData"/>.
+        /// Gets the parent of <see cref="WrappedObjectContextBase{T}.WrappedData"/>.
         /// </summary>
         public IAssessmentSection Parent { get; private set; }
 
-        /// <summary>
-        /// Gets the wrapped failure mechanism.
-        /// </summary>
-        public T WrappedData { get; private set; }
-
-        private void AssertInputsAreNotNull(T wrappedFailureMechanism, IAssessmentSection parent)
+        private void AssertInputsAreNotNull(IAssessmentSection parent)
         {
-            if (wrappedFailureMechanism == null)
-            {
-                throw new ArgumentNullException("wrappedFailureMechanism", "Failure mechanism cannot be null.");
-            }
-
             if (parent == null)
             {
                 throw new ArgumentNullException("parent", "The assessment section cannot be null.");
             }
         }
-
-        #region Equals implementation
-
-        public override bool Equals(object obj)
-        {
-            if (ReferenceEquals(null, obj))
-            {
-                return false;
-            }
-            if (ReferenceEquals(this, obj))
-            {
-                return true;
-            }
-            if (obj.GetType() != GetType())
-            {
-                return false;
-            }
-            return Equals((FailureMechanismContext<T>) obj);
-        }
-
-        public override int GetHashCode()
-        {
-            return WrappedData.GetHashCode();
-        }
-
-        private bool Equals(FailureMechanismContext<T> other)
-        {
-            return WrappedData.Equals(other.WrappedData);
-        }
-
-        #endregion
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -rf7a9f7239374705ff1d732e9666c0cb62ebaafd0 -r684b8c0ca681ea2da3cc988bd60e9223037e5a16
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision f7a9f7239374705ff1d732e9666c0cb62ebaafd0)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 684b8c0ca681ea2da3cc988bd60e9223037e5a16)
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.17929
+//     Runtime Version:4.0.30319.18444
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -239,6 +239,16 @@
         }
         
         /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap FailureMechanismIcon {
+            get {
+                object obj = ResourceManager.GetObject("FailureMechanismIcon", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Niet alle berekeningen voor dit vak zijn uitgevoerd..
         /// </summary>
         public static string FailureMechanismResultView_DataGridViewCellFormatting_Not_all_calculations_are_executed {
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx
===================================================================
diff -u -rf7a9f7239374705ff1d732e9666c0cb62ebaafd0 -r684b8c0ca681ea2da3cc988bd60e9223037e5a16
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision f7a9f7239374705ff1d732e9666c0cb62ebaafd0)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 684b8c0ca681ea2da3cc988bd60e9223037e5a16)
@@ -253,4 +253,7 @@
   <data name="FailureMechanismSectionResultRow_AssessmentLayerTwoA_No_result_dash" xml:space="preserve">
     <value>-</value>
   </data>
+  <data name="FailureMechanismIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\control_equalizer_blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Resources/control_equalizer_blue.png
===================================================================
diff -u
Binary files differ
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj
===================================================================
diff -u -r0b081b2391e73b7e3ff04ef31fafd2df1b1571e3 -r684b8c0ca681ea2da3cc988bd60e9223037e5a16
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj	(.../Ringtoets.Common.Forms.csproj)	(revision 0b081b2391e73b7e3ff04ef31fafd2df1b1571e3)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj	(.../Ringtoets.Common.Forms.csproj)	(revision 684b8c0ca681ea2da3cc988bd60e9223037e5a16)
@@ -59,6 +59,7 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
+    <Compile Include="TreeNodeInfos\DefaultFailureMechanismTreeNodeInfo.cs" />
     <Compile Include="Views\CommentView.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -92,11 +93,19 @@
       <Name>Core.Common.Base</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls.TreeView\Core.Common.Controls.TreeView.csproj">
+      <Project>{1d27f91f-4e62-4eaf-a0a8-a32708b9a9b1}</Project>
+      <Name>Core.Common.Controls.TreeView</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls\Core.Common.Controls.csproj">
       <Project>{9a2d67e6-26ac-4d17-b11a-2b4372f2f572}</Project>
       <Name>Core.Common.Controls</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Gui\Core.Common.Gui.csproj">
+      <Project>{30e4c2ae-719e-4d70-9fa9-668a9767fbfa}</Project>
+      <Name>Core.Common.Gui</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Version\Core.Common.Version.csproj">
       <Project>{c90b77da-e421-43cc-b82e-529651bc21ac}</Project>
       <Name>Core.Common.Version</Name>
@@ -138,6 +147,7 @@
     <None Include="Resources\blue-document--pencil.png" />
     <None Include="Resources\document-task.png" />
     <None Include="Resources\chart-pie-separate.png" />
+    <None Include="Resources\control_equalizer_blue.png" />
     <Content Include="Resources\PlayHS.png" />
     <None Include="Resources\Sections.png" />
     <Content Include="Resources\tickAll.png" />
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/TreeNodeInfos/DefaultFailureMechanismTreeNodeInfo.cs
===================================================================
diff -u
--- Ringtoets/Common/src/Ringtoets.Common.Forms/TreeNodeInfos/DefaultFailureMechanismTreeNodeInfo.cs	(revision 0)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/TreeNodeInfos/DefaultFailureMechanismTreeNodeInfo.cs	(revision 684b8c0ca681ea2da3cc988bd60e9223037e5a16)
@@ -0,0 +1,85 @@
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+
+using Core.Common.Controls.TreeView;
+using Core.Common.Gui.ContextMenu;
+
+using Ringtoets.Common.Data;
+using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Forms.PresentationObjects;
+using Ringtoets.Common.Forms.Properties;
+
+namespace Ringtoets.Common.Forms.TreeNodeInfos
+{
+    public class DefaultFailureMechanismTreeNodeInfo<TContext, TFailureMechanism> : TreeNodeInfo<TContext> where TContext : FailureMechanismContext<TFailureMechanism> where TFailureMechanism: IFailureMechanism
+    {
+        private readonly Func<TContext, object[]> getEnabledFailureMechanismChildNodes;
+        private readonly Func<TContext, object, TreeViewControl, ContextMenuStrip> getEnabledFailureMechanismContextMenuStrip;
+        private readonly IContextMenuBuilderProvider contextMenuBuilderProvider;
+
+        public DefaultFailureMechanismTreeNodeInfo(Func<TContext, object[]> getEnabledFailureMechanismChildNodes,
+            Func<TContext, object, TreeViewControl, ContextMenuStrip> getEnabledFailureMechanismContextMenuStrip,
+            IContextMenuBuilderProvider provider)
+        {
+            this.getEnabledFailureMechanismChildNodes = getEnabledFailureMechanismChildNodes;
+            this.getEnabledFailureMechanismContextMenuStrip = getEnabledFailureMechanismContextMenuStrip;
+            contextMenuBuilderProvider = provider;
+
+            Text = GetNodeText;
+            Image = GetImage;
+            ForeColor = GetForeColor;
+            ChildNodeObjects = GetChildNodeObjects;
+            ContextMenuStrip = GetContextMenuStrip;
+        }
+
+        private ContextMenuStrip GetContextMenuStrip(TContext context, object parent, TreeViewControl treeView)
+        {
+            if (context.WrappedData.IsRelevant && getEnabledFailureMechanismContextMenuStrip != null)
+            {
+                return getEnabledFailureMechanismContextMenuStrip(context, parent, treeView);
+            }
+            return contextMenuBuilderProvider.Get(context, treeView)
+                                             .AddExpandAllItem()
+                                             .AddCollapseAllItem()
+                                             .Build();
+        }
+
+        private object[] GetChildNodeObjects(TContext failureMechanismContext)
+        {
+            if (failureMechanismContext.WrappedData.IsRelevant)
+            {
+                return getEnabledFailureMechanismChildNodes != null ? 
+                    getEnabledFailureMechanismChildNodes(failureMechanismContext) : 
+                    new object[0];
+            }
+
+            return GetDisbledFailureMechanismChildNodeObjects(failureMechanismContext);
+        }
+
+        private static object[] GetDisbledFailureMechanismChildNodeObjects(TContext failureMechanismContext)
+        {
+            return new object[]
+            {
+                new CommentContext<ICommentable>(failureMechanismContext.WrappedData)
+            };
+        }
+
+        private Color GetForeColor(TContext failureMechanismContext)
+        {
+            return failureMechanismContext.WrappedData.IsRelevant ?
+                       Color.FromKnownColor(KnownColor.ControlText) :
+                       Color.FromKnownColor(KnownColor.GrayText);
+        }
+
+        private Image GetImage(TContext failureMechanismContext)
+        {
+            return Resources.FailureMechanismIcon;
+        }
+
+        private string GetNodeText(TContext failureMechanismContext)
+        {
+            return failureMechanismContext.WrappedData.Name;
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/FailureMechanismContextTest.cs
===================================================================
diff -u -ra9aafffab97152303562110b1d789bacb465ce24 -r684b8c0ca681ea2da3cc988bd60e9223037e5a16
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/FailureMechanismContextTest.cs	(.../FailureMechanismContextTest.cs)	(revision a9aafffab97152303562110b1d789bacb465ce24)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/FailureMechanismContextTest.cs	(.../FailureMechanismContextTest.cs)	(revision 684b8c0ca681ea2da3cc988bd60e9223037e5a16)
@@ -3,7 +3,6 @@
 
 using Rhino.Mocks;
 
-using Ringtoets.Common.Data;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Forms.PresentationObjects;
@@ -44,7 +43,7 @@
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
-            Assert.AreEqual("wrappedFailureMechanism", exception.ParamName);
+            Assert.AreEqual("wrappedData", exception.ParamName);
         }
 
         [Test]
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj
===================================================================
diff -u -rf1bd17ba95b3fbae5928d4240523d50d8b83b64d -r684b8c0ca681ea2da3cc988bd60e9223037e5a16
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj	(.../Ringtoets.Common.Forms.Test.csproj)	(revision f1bd17ba95b3fbae5928d4240523d50d8b83b64d)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj	(.../Ringtoets.Common.Forms.Test.csproj)	(revision 684b8c0ca681ea2da3cc988bd60e9223037e5a16)
@@ -66,6 +66,7 @@
     <Compile Include="PresentationObjects\FailureMechanismSectionsContextTest.cs" />
     <Compile Include="PresentationObjects\ReferenceLineContextTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="TreeNodeInfos\DefaultFailureMechanismTreeNodeInfoTest.cs" />
     <Compile Include="Views\CommentViewTest.cs" />
     <Compile Include="Views\FailureMechanismResultViewTest.cs" />
   </ItemGroup>
@@ -77,7 +78,7 @@
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls.TreeView\Core.Common.Controls.TreeView.csproj">
       <Project>{1d27f91f-4e62-4eaf-a0a8-a32708b9a9b1}</Project>
       <Name>Core.Common.Controls.TreeView</Name>
-      <Private>False</Private>
+      <Private>True</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls\Core.Common.Controls.csproj">
       <Project>{9a2d67e6-26ac-4d17-b11a-2b4372f2f572}</Project>
@@ -114,6 +115,7 @@
     </None>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/DefaultFailureMechanismTreeNodeInfoTest.cs
===================================================================
diff -u
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/DefaultFailureMechanismTreeNodeInfoTest.cs	(revision 0)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/DefaultFailureMechanismTreeNodeInfoTest.cs	(revision 684b8c0ca681ea2da3cc988bd60e9223037e5a16)
@@ -0,0 +1,329 @@
+using System.Drawing;
+using System.Windows.Forms;
+
+using Core.Common.Controls.TreeView;
+using Core.Common.Gui.ContextMenu;
+using Core.Common.TestUtil;
+
+using NUnit.Framework;
+
+using Rhino.Mocks;
+
+using Ringtoets.Common.Data;
+using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Forms.PresentationObjects;
+using Ringtoets.Common.Forms.TreeNodeInfos;
+
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
+
+namespace Ringtoets.Common.Forms.Test.TreeNodeInfos
+{
+    [TestFixture]
+    public class DefaultFailureMechanismTreeNodeInfoTest
+    {
+        [Test]
+        public void Constructor_DefaultImplementationsForSomeMethods()
+        {
+            // Call
+            var treeNodeInfo = new DefaultFailureMechanismTreeNodeInfo<SimpleFailureMechanismContext, IFailureMechanism>(null, null, null);
+
+            // Assert
+            Assert.IsNotNull(treeNodeInfo.Text);
+            Assert.IsNotNull(treeNodeInfo.Image);
+            Assert.IsNotNull(treeNodeInfo.ForeColor);
+            Assert.IsNotNull(treeNodeInfo.ChildNodeObjects);
+            Assert.IsNotNull(treeNodeInfo.ContextMenuStrip);
+
+            Assert.IsNull(treeNodeInfo.CanCheck);
+            Assert.IsNull(treeNodeInfo.CanDrop);
+            Assert.IsNull(treeNodeInfo.CanInsert);
+            Assert.IsNull(treeNodeInfo.CanRemove);
+            Assert.IsNull(treeNodeInfo.CanRename);
+            Assert.IsNull(treeNodeInfo.CanDrag);
+            Assert.IsNull(treeNodeInfo.EnsureVisibleOnCreate);
+            Assert.IsNull(treeNodeInfo.IsChecked);
+            Assert.IsNull(treeNodeInfo.OnDrop);
+            Assert.IsNull(treeNodeInfo.OnNodeRenamed);
+            Assert.IsNull(treeNodeInfo.OnNodeChecked);
+            Assert.IsNull(treeNodeInfo.OnNodeRemoved);
+        }
+
+        [Test]
+        public void ForeColor_FailureMechanismIsRelevant_ReturnControlText()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var failureMechanism = mocks.Stub<IFailureMechanism>();
+            failureMechanism.IsRelevant = true;
+
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            mocks.ReplayAll();
+
+            var context = new SimpleFailureMechanismContext(failureMechanism, assessmentSection);
+
+            var treeNodeInfo = new DefaultFailureMechanismTreeNodeInfo<SimpleFailureMechanismContext, IFailureMechanism>(null, null, null);
+
+            // Call
+            Color color = treeNodeInfo.ForeColor(context);
+
+            // Assert
+            Assert.AreEqual(Color.FromKnownColor(KnownColor.ControlText), color);
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void ForeColor_FailureMechanismIsNotRelevant_ReturnGrayText()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var failureMechanism = mocks.Stub<IFailureMechanism>();
+            failureMechanism.IsRelevant = false;
+
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            mocks.ReplayAll();
+
+            var context = new SimpleFailureMechanismContext(failureMechanism, assessmentSection);
+
+            var treeNodeInfo = new DefaultFailureMechanismTreeNodeInfo<SimpleFailureMechanismContext, IFailureMechanism>(null, null, null);
+
+            // Call
+            Color color = treeNodeInfo.ForeColor(context);
+
+            // Assert
+            Assert.AreEqual(Color.FromKnownColor(KnownColor.GrayText), color);
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void GetImage_Always_ReturnFailureMechanismIcon()
+        {
+            // Setup
+            var treeNodeInfo = new DefaultFailureMechanismTreeNodeInfo<SimpleFailureMechanismContext, IFailureMechanism>(null, null, null);
+
+            // Call
+            Image image = treeNodeInfo.Image(null);
+
+            // Assert
+            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.FailureMechanismIcon, image);
+        }
+
+        [Test]
+        public void Text_Always_ReturnFailureMechanismName()
+        {
+            // Setup
+            const string name = "A";
+
+            var mocks = new MockRepository();
+            var failureMechanism = mocks.Stub<IFailureMechanism>();
+            failureMechanism.Stub(fm => fm.Name).Return(name);
+
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            mocks.ReplayAll();
+
+            var context = new SimpleFailureMechanismContext(failureMechanism, assessmentSection);
+
+            var treeNodeInfo = new DefaultFailureMechanismTreeNodeInfo<SimpleFailureMechanismContext, IFailureMechanism>(null, null, null);
+
+            // Call
+            string text = treeNodeInfo.Text(context);
+
+            // Assert
+            Assert.AreEqual(name, text);
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void ChildNodeObjects_FailureMechanismIsNotRelevant_ReturnOnlyFailureMechanismComments()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var failureMechanism = mocks.Stub<IFailureMechanism>();
+            failureMechanism.IsRelevant = false;
+
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            mocks.ReplayAll();
+
+            var context = new SimpleFailureMechanismContext(failureMechanism, assessmentSection);
+
+            var treeNodeInfo = new DefaultFailureMechanismTreeNodeInfo<SimpleFailureMechanismContext, IFailureMechanism>(null, null, null);
+
+            // Call
+            object[] children = treeNodeInfo.ChildNodeObjects(context);
+
+            // Assert
+            Assert.AreEqual(1, children.Length);
+            var commentContext = (CommentContext<ICommentable>)children[0];
+            Assert.AreSame(failureMechanism, commentContext.CommentContainer);
+
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void ChildNodeObjects_FailureMechanismIsRelevant_ReturnResultFromConstructorMethod()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var failureMechanism = mocks.Stub<IFailureMechanism>();
+            failureMechanism.IsRelevant = true;
+
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            mocks.ReplayAll();
+
+            var context = new SimpleFailureMechanismContext(failureMechanism, assessmentSection);
+
+            var result = new[]
+            {
+                new object(),
+                1.1
+            };
+
+            var treeNodeInfo = new DefaultFailureMechanismTreeNodeInfo<SimpleFailureMechanismContext, IFailureMechanism>(
+                mechanismContext => result, null, null);
+
+            // Call
+            object[] children = treeNodeInfo.ChildNodeObjects(context);
+
+            // Assert
+            CollectionAssert.AreEqual(result, children);
+
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void ChildNodeObjects_FailureMechanismIsRelevantButMethodIsNull_ReturnEmptyArray()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var failureMechanism = mocks.Stub<IFailureMechanism>();
+            failureMechanism.IsRelevant = true;
+
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            mocks.ReplayAll();
+
+            var context = new SimpleFailureMechanismContext(failureMechanism, assessmentSection);
+
+            var treeNodeInfo = new DefaultFailureMechanismTreeNodeInfo<SimpleFailureMechanismContext, IFailureMechanism>(null, null, null);
+
+            // Call
+            object[] children = treeNodeInfo.ChildNodeObjects(context);
+
+            // Assert
+            CollectionAssert.IsEmpty(children);
+
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void ContextMenuStrip_FailureMechanismIsNotRelevant_ReturnStripWithOnlyExpandAndCollapseAllNodes()
+        {
+            // Setup
+            using (var treeView = new TreeViewControl())
+            using (var contextMenuStrip = new ContextMenuStrip())
+            {
+                var mocks = new MockRepository();
+                var failureMechanism = mocks.Stub<IFailureMechanism>();
+                failureMechanism.IsRelevant = false;
+
+                var assessmentSection = mocks.Stub<IAssessmentSection>();
+
+                var context = new SimpleFailureMechanismContext(failureMechanism, assessmentSection);
+
+                var builder = mocks.Stub<IContextMenuBuilder>();
+                builder.Expect(b => b.AddExpandAllItem()).Return(builder);
+                builder.Expect(b => b.AddCollapseAllItem()).Return(builder);
+                builder.Expect(b => b.Build()).Return(contextMenuStrip);
+
+                var provider = mocks.Stub<IContextMenuBuilderProvider>();
+                provider.Expect(p => p.Get(context, treeView)).Return(builder);
+                mocks.ReplayAll();
+
+                var treeNodeInfo = new DefaultFailureMechanismTreeNodeInfo<SimpleFailureMechanismContext, IFailureMechanism>(
+                    null, null, provider);
+
+                // Call
+                ContextMenuStrip result = treeNodeInfo.ContextMenuStrip(context, assessmentSection, treeView);
+
+                // Assert
+                Assert.AreSame(contextMenuStrip, result);
+                mocks.VerifyAll();
+            }
+        }
+
+        [Test]
+        public void ContextMenuStrip_FailureMechanismIsRelevant_ReturnResultFromConstructorMethod()
+        {
+            // Setup
+            using (var treeView = new TreeViewControl())
+            using (var contextMenuStrip = new ContextMenuStrip())
+            {
+                var mocks = new MockRepository();
+                var failureMechanism = mocks.Stub<IFailureMechanism>();
+                failureMechanism.IsRelevant = true;
+
+                var assessmentSection = mocks.Stub<IAssessmentSection>();
+                mocks.ReplayAll();
+
+                var context = new SimpleFailureMechanismContext(failureMechanism, assessmentSection);
+
+                var treeNodeInfo = new DefaultFailureMechanismTreeNodeInfo<SimpleFailureMechanismContext, IFailureMechanism>(
+                    null, (mechanismContext, parent, treeViewControl) =>
+                    {
+                        Assert.AreEqual(context, mechanismContext);
+                        Assert.AreEqual(assessmentSection, parent);
+                        Assert.AreEqual(treeView, treeViewControl);
+
+                        return contextMenuStrip;
+                    }, null);
+
+                // Call
+                ContextMenuStrip result = treeNodeInfo.ContextMenuStrip(context, assessmentSection, treeView);
+
+                // Assert
+                Assert.AreSame(contextMenuStrip, result);
+                mocks.VerifyAll();
+            }
+        }
+
+        [Test]
+        public void ChildNodeObjects_FailureMechanismIsRelevantButMethodIsNull_ReturnStripWithOnlyExpandAndCollapseAllNodes()
+        {
+            // Setup
+            using (var treeView = new TreeViewControl())
+            using (var contextMenuStrip = new ContextMenuStrip())
+            {
+                var mocks = new MockRepository();
+                var failureMechanism = mocks.Stub<IFailureMechanism>();
+                failureMechanism.IsRelevant = true;
+
+                var assessmentSection = mocks.Stub<IAssessmentSection>();
+
+                var context = new SimpleFailureMechanismContext(failureMechanism, assessmentSection);
+
+                var builder = mocks.Stub<IContextMenuBuilder>();
+                builder.Expect(b => b.AddExpandAllItem()).Return(builder);
+                builder.Expect(b => b.AddCollapseAllItem()).Return(builder);
+                builder.Expect(b => b.Build()).Return(contextMenuStrip);
+
+                var provider = mocks.Stub<IContextMenuBuilderProvider>();
+                provider.Expect(p => p.Get(context, treeView)).Return(builder);
+                mocks.ReplayAll();
+
+                var treeNodeInfo = new DefaultFailureMechanismTreeNodeInfo<SimpleFailureMechanismContext, IFailureMechanism>(
+                    null, null, provider);
+
+                // Call
+                ContextMenuStrip result = treeNodeInfo.ContextMenuStrip(context, assessmentSection, treeView);
+
+                // Assert
+                Assert.AreSame(contextMenuStrip, result);
+                mocks.VerifyAll();
+            }
+        }
+
+        private class SimpleFailureMechanismContext : FailureMechanismContext<IFailureMechanism>
+        {
+            public SimpleFailureMechanismContext(IFailureMechanism wrappedFailureMechanism, IAssessmentSection parent) : base(wrappedFailureMechanism, parent) {}
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Ringtoets.GrassCoverErosionInwards.Forms.csproj
===================================================================
diff -u -r14fd4a18a1bc2aa2d11eca464a93856dd89ffcf7 -r684b8c0ca681ea2da3cc988bd60e9223037e5a16
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Ringtoets.GrassCoverErosionInwards.Forms.csproj	(.../Ringtoets.GrassCoverErosionInwards.Forms.csproj)	(revision 14fd4a18a1bc2aa2d11eca464a93856dd89ffcf7)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Ringtoets.GrassCoverErosionInwards.Forms.csproj	(.../Ringtoets.GrassCoverErosionInwards.Forms.csproj)	(revision 684b8c0ca681ea2da3cc988bd60e9223037e5a16)
@@ -65,6 +65,10 @@
       <Name>Core.Common.Base</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls\Core.Common.Controls.csproj">
+      <Project>{9a2d67e6-26ac-4d17-b11a-2b4372f2f572}</Project>
+      <Name>Core.Common.Controls</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.Data\Ringtoets.Common.Data.csproj">
       <Project>{d4200f43-3f72-4f42-af0a-8ced416a38ec}</Project>
       <Name>Ringtoets.Common.Data</Name>
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsGuiPlugin.cs
===================================================================
diff -u -r86c5aff166a7a2822ac8d77be371249ee3a155b6 -r684b8c0ca681ea2da3cc988bd60e9223037e5a16
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsGuiPlugin.cs	(.../GrassCoverErosionInwardsGuiPlugin.cs)	(revision 86c5aff166a7a2822ac8d77be371249ee3a155b6)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsGuiPlugin.cs	(.../GrassCoverErosionInwardsGuiPlugin.cs)	(revision 684b8c0ca681ea2da3cc988bd60e9223037e5a16)
@@ -22,6 +22,9 @@
 using System.Collections.Generic;
 using Core.Common.Controls.TreeView;
 using Core.Common.Gui.Plugin;
+
+using Ringtoets.Common.Forms.TreeNodeInfos;
+using Ringtoets.GrassCoverErosionInwards.Data;
 using Ringtoets.GrassCoverErosionInwards.Forms.PresentationObjects;
 using GrassCoverErosionInwardsFormsResources = Ringtoets.GrassCoverErosionInwards.Forms.Properties.Resources;
 
@@ -34,11 +37,7 @@
     {
         public override IEnumerable<TreeNodeInfo> GetTreeNodeInfos()
         {
-            yield return new TreeNodeInfo<GrassCoverErosionInwardsFailureMechanismContext>
-            {
-                Text = pipingFailureMechanism => pipingFailureMechanism.WrappedData.Name,
-                Image = pipingFailureMechanism => GrassCoverErosionInwardsFormsResources.GrassCoverErosionInwardsIcon
-            };
+            yield return new DefaultFailureMechanismTreeNodeInfo<GrassCoverErosionInwardsFailureMechanismContext, GrassCoverErosionInwardsFailureMechanism>(null, null, Gui);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/Ringtoets.GrassCoverErosionInwards.Plugin.csproj
===================================================================
diff -u -r14fd4a18a1bc2aa2d11eca464a93856dd89ffcf7 -r684b8c0ca681ea2da3cc988bd60e9223037e5a16
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/Ringtoets.GrassCoverErosionInwards.Plugin.csproj	(.../Ringtoets.GrassCoverErosionInwards.Plugin.csproj)	(revision 14fd4a18a1bc2aa2d11eca464a93856dd89ffcf7)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/Ringtoets.GrassCoverErosionInwards.Plugin.csproj	(.../Ringtoets.GrassCoverErosionInwards.Plugin.csproj)	(revision 684b8c0ca681ea2da3cc988bd60e9223037e5a16)
@@ -36,6 +36,7 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -65,6 +66,10 @@
       <Name>Core.Common.Controls.TreeView</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls\Core.Common.Controls.csproj">
+      <Project>{9a2d67e6-26ac-4d17-b11a-2b4372f2f572}</Project>
+      <Name>Core.Common.Controls</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Gui\Core.Common.Gui.csproj">
       <Project>{30E4C2AE-719E-4D70-9FA9-668A9767FBFA}</Project>
       <Name>Core.Common.Gui</Name>
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Ringtoets.GrassCoverErosionInwards.Forms.Test.csproj
===================================================================
diff -u -r86c5aff166a7a2822ac8d77be371249ee3a155b6 -r684b8c0ca681ea2da3cc988bd60e9223037e5a16
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Ringtoets.GrassCoverErosionInwards.Forms.Test.csproj	(.../Ringtoets.GrassCoverErosionInwards.Forms.Test.csproj)	(revision 86c5aff166a7a2822ac8d77be371249ee3a155b6)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Ringtoets.GrassCoverErosionInwards.Forms.Test.csproj	(.../Ringtoets.GrassCoverErosionInwards.Forms.Test.csproj)	(revision 684b8c0ca681ea2da3cc988bd60e9223037e5a16)
@@ -87,6 +87,10 @@
       <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
       <Name>Core.Common.TestUtil</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls\Core.Common.Controls.csproj">
+      <Project>{9a2d67e6-26ac-4d17-b11a-2b4372f2f572}</Project>
+      <Name>Core.Common.Controls</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.Data\Ringtoets.Common.Data.csproj">
       <Project>{D4200F43-3F72-4F42-AF0A-8CED416A38EC}</Project>
       <Name>Ringtoets.Common.Data</Name>
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismTreeNodeInfoTest.cs
===================================================================
diff -u -r86c5aff166a7a2822ac8d77be371249ee3a155b6 -r684b8c0ca681ea2da3cc988bd60e9223037e5a16
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsFailureMechanismTreeNodeInfoTest.cs)	(revision 86c5aff166a7a2822ac8d77be371249ee3a155b6)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsFailureMechanismTreeNodeInfoTest.cs)	(revision 684b8c0ca681ea2da3cc988bd60e9223037e5a16)
@@ -53,7 +53,7 @@
         {
             // Assert
             Assert.AreEqual(typeof(GrassCoverErosionInwardsFailureMechanismContext), info.TagType);
-            Assert.IsNull(info.ForeColor);
+            Assert.IsNotNull(info.ForeColor);
             Assert.IsNull(info.EnsureVisibleOnCreate);
             Assert.IsNull(info.CanRename);
             Assert.IsNull(info.OnNodeRenamed);
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/Ringtoets.GrassCoverErosionInwards.Plugin.Test.csproj
===================================================================
diff -u -rb28f56d6bb3f14141bd003dd43378f8002a9e87a -r684b8c0ca681ea2da3cc988bd60e9223037e5a16
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/Ringtoets.GrassCoverErosionInwards.Plugin.Test.csproj	(.../Ringtoets.GrassCoverErosionInwards.Plugin.Test.csproj)	(revision b28f56d6bb3f14141bd003dd43378f8002a9e87a)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/Ringtoets.GrassCoverErosionInwards.Plugin.Test.csproj	(.../Ringtoets.GrassCoverErosionInwards.Plugin.Test.csproj)	(revision 684b8c0ca681ea2da3cc988bd60e9223037e5a16)
@@ -73,6 +73,10 @@
       <Project>{1d27f91f-4e62-4eaf-a0a8-a32708b9a9b1}</Project>
       <Name>Core.Common.Controls.TreeView</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls\Core.Common.Controls.csproj">
+      <Project>{9a2d67e6-26ac-4d17-b11a-2b4372f2f572}</Project>
+      <Name>Core.Common.Controls</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Gui\Core.Common.Gui.csproj">
       <Project>{30e4c2ae-719e-4d70-9fa9-668a9767fbfa}</Project>
       <Name>Core.Common.Gui</Name>
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -rc0e456ab36271684a2c79488db3ed550d6962b0d -r684b8c0ca681ea2da3cc988bd60e9223037e5a16
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision c0e456ab36271684a2c79488db3ed550d6962b0d)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 684b8c0ca681ea2da3cc988bd60e9223037e5a16)
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     Runtime Version:4.0.30319.18444
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -184,16 +184,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        public static System.Drawing.Bitmap FailureMechanismIcon {
-            get {
-                object obj = ResourceManager.GetObject("FailureMechanismIcon", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to &amp;Koppel aan database....
         /// </summary>
         public static string HydraulicBoundaryDatabase_Connect {
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx
===================================================================
diff -u -rc0e456ab36271684a2c79488db3ed550d6962b0d -r684b8c0ca681ea2da3cc988bd60e9223037e5a16
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision c0e456ab36271684a2c79488db3ed550d6962b0d)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 684b8c0ca681ea2da3cc988bd60e9223037e5a16)
@@ -133,9 +133,6 @@
   <data name="AssessmentSectionFolderIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\folder-stand.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="FailureMechanismIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\control_equalizer_blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="PlaceholderIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\control-record.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Resources/control_equalizer_blue.png
===================================================================
diff -u -raa5c3620f316831e71797c558a13a0b73a8109df -r684b8c0ca681ea2da3cc988bd60e9223037e5a16
Binary files differ
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj
===================================================================
diff -u -r90307fb6c2eaec58d793e95090f4dfa12b117501 -r684b8c0ca681ea2da3cc988bd60e9223037e5a16
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj	(.../Ringtoets.Integration.Forms.csproj)	(revision 90307fb6c2eaec58d793e95090f4dfa12b117501)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj	(.../Ringtoets.Integration.Forms.csproj)	(revision 684b8c0ca681ea2da3cc988bd60e9223037e5a16)
@@ -150,9 +150,6 @@
     <None Include="Resources\folder-stand.png" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\control_equalizer_blue.png" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="Resources\blue-document-list.png" />
   </ItemGroup>
   <ItemGroup>
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismContributionView.cs
===================================================================
diff -u -r103f8cf52c957309a116106dc9ae31169ff83169 -r684b8c0ca681ea2da3cc988bd60e9223037e5a16
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismContributionView.cs	(.../FailureMechanismContributionView.cs)	(revision 103f8cf52c957309a116106dc9ae31169ff83169)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismContributionView.cs	(.../FailureMechanismContributionView.cs)	(revision 684b8c0ca681ea2da3cc988bd60e9223037e5a16)
@@ -264,10 +264,9 @@
             var isRelevantColumn = new DataGridViewCheckBoxColumn
             {
                 DataPropertyName = isRelevantName,
-                HeaderText = "Algemeen filter",
+                HeaderText = CommonGuiResources.FailureMechanismContributionView_GridColumn_RelevancyFilter,
                 Name = string.Format(columnNameFormat, isRelevantName),
-                AutoSizeMode = DataGridViewAutoSizeColumnMode.ColumnHeader,
-                ReadOnly = true
+                AutoSizeMode = DataGridViewAutoSizeColumnMode.ColumnHeader
             };
 
             var assessmentName = TypeUtils.GetMemberName<FailureMechanismContributionItemRow>(fmci => fmci.Assessment);
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs
===================================================================
diff -u -r7553a8467cc0e92de7af361cefaee1da29d1283a -r684b8c0ca681ea2da3cc988bd60e9223037e5a16
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs	(.../RingtoetsGuiPlugin.cs)	(revision 7553a8467cc0e92de7af361cefaee1da29d1283a)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs	(.../RingtoetsGuiPlugin.cs)	(revision 684b8c0ca681ea2da3cc988bd60e9223037e5a16)
@@ -26,6 +26,7 @@
 using System.IO;
 using System.Linq;
 using System.Windows.Forms;
+
 using Core.Common.Base.Data;
 using Core.Common.Controls.TreeView;
 using Core.Common.Gui;
@@ -34,12 +35,15 @@
 using Core.Common.Gui.Forms.ProgressDialog;
 using Core.Common.Gui.Plugin;
 using Core.Common.IO.Exceptions;
+
 using log4net;
+
 using Ringtoets.Common.Data;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Contribution;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Forms.PresentationObjects;
+using Ringtoets.Common.Forms.TreeNodeInfos;
 using Ringtoets.Common.Forms.Views;
 using Ringtoets.Common.Placeholder;
 using Ringtoets.GrassCoverErosionInwards.Data;
@@ -58,6 +62,7 @@
 using Ringtoets.Integration.Plugin.Properties;
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Forms.PresentationObjects;
+
 using RingtoetsDataResources = Ringtoets.Integration.Data.Properties.Resources;
 using RingtoetsFormsResources = Ringtoets.Integration.Forms.Properties.Resources;
 using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
@@ -167,7 +172,7 @@
                 Text = assessmentSection => assessmentSection.Name,
                 Image = assessmentSection => RingtoetsFormsResources.AssessmentSectionFolderIcon,
                 EnsureVisibleOnCreate = assessmentSection => true,
-                ChildNodeObjects = assessmentSectionChildNodeObjects,
+                ChildNodeObjects = AssessmentSectionChildNodeObjects,
                 ContextMenuStrip = AssessmentSectionContextMenuStrip,
                 CanRename = (assessmentSection, parentData) => true,
                 OnNodeRenamed = AssessmentSectionOnNodeRenamed,
@@ -186,14 +191,10 @@
                                    Gui.Get(nodeData, treeViewControl).AddImportItem().Build()
             };
 
-            yield return new TreeNodeInfo<FailureMechanismPlaceholderContext>
-            {
-                Text = failureMechanismPlaceholder => failureMechanismPlaceholder.WrappedData.Name,
-                Image = failureMechanismPlaceholder => RingtoetsFormsResources.FailureMechanismIcon,
-                ForeColor = failureMechanismPlaceholder => Color.FromKnownColor(KnownColor.GrayText),
-                ChildNodeObjects = FailureMechanismPlaceholderChildNodeObjects,
-                ContextMenuStrip = FailureMechanismPlaceholderContextMenuStrip
-            };
+            yield return new DefaultFailureMechanismTreeNodeInfo<FailureMechanismPlaceholderContext, FailureMechanismPlaceholder>(
+                FailureMechanismPlaceholderChildNodeObjects,
+                FailureMechanismPlaceholderContextMenuStrip,
+                Gui);
 
             yield return new TreeNodeInfo<FailureMechanismSectionsContext>
             {
@@ -379,7 +380,7 @@
 
         # region assessmentSection
 
-        private object[] assessmentSectionChildNodeObjects(IAssessmentSection nodeData)
+        private object[] AssessmentSectionChildNodeObjects(IAssessmentSection nodeData)
         {
             var childNodes = new List<object>
             {
@@ -389,7 +390,7 @@
                 new CommentContext<ICommentable>(nodeData)
             };
 
-            var failureMechanismContexts = WrapFailureMechanismsInContexts(nodeData);
+            IEnumerable<object> failureMechanismContexts = WrapFailureMechanismsInContexts(nodeData);
             childNodes.AddRange(failureMechanismContexts);
 
             return childNodes.ToArray();
@@ -429,7 +430,7 @@
 
         private void AssessmentSectionOnNodeRemoved(IAssessmentSection nodeData, object parentNodeData)
         {
-            var parentProject = (Project) parentNodeData;
+            var parentProject = (Project)parentNodeData;
 
             parentProject.Items.Remove(nodeData);
             parentProject.NotifyObservers();
@@ -610,7 +611,7 @@
             var designWaterLevelItem = new StrictContextMenuItem(
                 RingtoetsFormsResources.DesignWaterLevel_Calculate,
                 RingtoetsFormsResources.DesignWaterLevel_Calculate_ToolTip,
-                RingtoetsFormsResources.FailureMechanismIcon,
+                RingtoetsCommonFormsResources.FailureMechanismIcon,
                 (sender, args) =>
                 {
                     var hrdFile = nodeData.Parent.HydraulicBoundaryDatabase.FilePath;
@@ -715,7 +716,7 @@
                 assessmentSection.Name, // TODO: Provide name of reference line instead
                 HydraRingTimeIntegrationSchemeType.FBC,
                 HydraRingUncertaintiesType.All,
-                new AssessmentLevelCalculationInput((int) hydraulicBoundaryLocation.Id, assessmentSection.FailureMechanismContribution.Norm),
+                new AssessmentLevelCalculationInput((int)hydraulicBoundaryLocation.Id, assessmentSection.FailureMechanismContribution.Norm),
                 output => { ParseHydraRingOutput(hydraulicBoundaryLocation, output); });
         }
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj
===================================================================
diff -u -r638c0c354f63b4c8be69feb448712b004d8bb933 -r684b8c0ca681ea2da3cc988bd60e9223037e5a16
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj	(.../Ringtoets.Integration.Forms.Test.csproj)	(revision 638c0c354f63b4c8be69feb448712b004d8bb933)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj	(.../Ringtoets.Integration.Forms.Test.csproj)	(revision 684b8c0ca681ea2da3cc988bd60e9223037e5a16)
@@ -66,6 +66,7 @@
     <Compile Include="TreeNodeInfos\AssessmentSectionTreeNodeInfoTest.cs" />
     <Compile Include="TreeNodeInfos\CommentContextTreeNodeInfoTest.cs" />
     <Compile Include="TreeNodeInfos\CategoryTreeFolderTreeNodeInfoTest.cs" />
+    <Compile Include="TreeNodeInfos\DisabledFailureMechanismTreeNodeInfoTest.cs" />
     <Compile Include="TreeNodeInfos\FailureMechanismContributionContextTreeNodeInfoTest.cs" />
     <Compile Include="TreeNodeInfos\FailureMechanismPlaceholderTreeNodeInfoTest.cs" />
     <Compile Include="TreeNodeInfos\FailureMechanismSectionsContextTreeNodeInfoTest.cs" />
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/DisabledFailureMechanismTreeNodeInfoTest.cs
===================================================================
diff -u
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/DisabledFailureMechanismTreeNodeInfoTest.cs	(revision 0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/DisabledFailureMechanismTreeNodeInfoTest.cs	(revision 684b8c0ca681ea2da3cc988bd60e9223037e5a16)
@@ -0,0 +1,178 @@
+using System.Drawing;
+using System.Linq;
+
+using Core.Common.Controls.TreeView;
+using Core.Common.Gui;
+using Core.Common.Gui.ContextMenu;
+using Core.Common.TestUtil;
+
+using NUnit.Framework;
+
+using Rhino.Mocks;
+
+using Ringtoets.Common.Data;
+using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Forms.PresentationObjects;
+using Ringtoets.Integration.Plugin;
+
+using RingtoetsIntegrationFormsResources = Ringtoets.Integration.Forms.Properties.Resources;
+
+namespace Ringtoets.Integration.Forms.Test.TreeNodeInfos
+{
+    [TestFixture]
+    public class DisabledFailureMechanismTreeNodeInfoTest
+    {
+        //[Test]
+        //public void Initialized_Always_ExpectedPropertiesSet()
+        //{
+        //    // Call
+        //    using (var plugin = new RingtoetsGuiPlugin())
+        //    {
+        //        TreeNodeInfo info = GetDisabledFailureMechanismContextTreeNodeInfo(plugin);
+
+        //        // Assert
+        //        Assert.AreEqual(typeof(DisabledFailureMechanismContext), info.TagType);
+        //        Assert.IsNull(info.EnsureVisibleOnCreate);
+        //        Assert.IsNull(info.CanRename);
+        //        Assert.IsNull(info.OnNodeRenamed);
+        //        Assert.IsNull(info.CanRemove);
+        //        Assert.IsNull(info.OnNodeRemoved);
+        //        Assert.IsNull(info.CanCheck);
+        //        Assert.IsNull(info.IsChecked);
+        //        Assert.IsNull(info.OnNodeChecked);
+        //        Assert.IsNull(info.CanDrag);
+        //        Assert.IsNull(info.CanDrop);
+        //        Assert.IsNull(info.CanInsert);
+        //        Assert.IsNull(info.OnDrop);
+        //    }
+        //}
+
+        //[Test]
+        //public void Text_Always_ReturnsName()
+        //{
+        //    // Setup
+        //    const string name = "cool name bro!";
+
+        //    var mocks = new MockRepository();
+        //    var failureMechanism = mocks.Stub<IFailureMechanism>();
+        //    failureMechanism.Stub(fm => fm.Name).Return(name);
+        //    mocks.ReplayAll();
+
+        //    var context = new DisabledFailureMechanismContext(failureMechanism);
+
+        //    using (var plugin = new RingtoetsGuiPlugin())
+        //    {
+        //        TreeNodeInfo info = GetDisabledFailureMechanismContextTreeNodeInfo(plugin);
+
+        //        // Call
+        //        string text = info.Text(context);
+
+        //        // Assert
+        //        Assert.AreEqual(name, text);
+        //    }
+        //    mocks.VerifyAll();
+        //}
+
+        //[Test]
+        //public void Image_Always_ReturnFailureMechanismIcon()
+        //{
+        //    // Setup
+        //    using (var plugin = new RingtoetsGuiPlugin())
+        //    {
+        //        TreeNodeInfo info = GetDisabledFailureMechanismContextTreeNodeInfo(plugin);
+
+        //        // Call
+        //        Image image = info.Image(null);
+
+        //        // Assert
+        //        TestHelper.AssertImagesAreEqual(RingtoetsIntegrationFormsResources.FailureMechanismIcon, image);
+        //    }
+        //}
+
+        //[Test]
+        //public void ForeColor_Always_ReturnsGrayText()
+        //{
+        //    // Setup
+        //    using (var plugin = new RingtoetsGuiPlugin())
+        //    {
+        //        var info = GetDisabledFailureMechanismContextTreeNodeInfo(plugin);
+
+        //        // Call
+        //        var textColor = info.ForeColor(null);
+
+        //        // Assert
+        //        Assert.AreEqual(Color.FromKnownColor(KnownColor.GrayText), textColor);
+        //    }
+        //}
+
+        //[Test]
+        //public void ChildNodeObjects_Always_ReturnFailureMechanismComments()
+        //{
+        //    // Setup
+        //    var mocks = new MockRepository();
+        //    var failureMechanism = mocks.Stub<IFailureMechanism>();
+        //    failureMechanism.IsRelevant = false;
+        //    mocks.ReplayAll();
+
+        //    var context = new DisabledFailureMechanismContext(failureMechanism);
+
+        //    using (var plugin = new RingtoetsGuiPlugin())
+        //    {
+        //        TreeNodeInfo info = GetDisabledFailureMechanismContextTreeNodeInfo(plugin);
+
+        //        // Call
+        //        object[] children = info.ChildNodeObjects(context);
+
+        //        // Assert
+        //        Assert.AreEqual(1, children.Length);
+        //        var commentContext = (CommentContext<ICommentable>)children[0];
+        //        Assert.AreSame(failureMechanism, commentContext.CommentContainer);
+        //    }
+        //    mocks.VerifyAll();
+        //}
+
+        //[Test]
+        //public void ContextMenuStrip_Always_CallsContextMenuBuilderMethods()
+        //{
+        //    // Setup
+        //    using (var treeViewControl = new TreeViewControl())
+        //    {
+        //        var mocks = new MockRepository();
+        //        var failureMechanism = mocks.Stub<IFailureMechanism>();
+        //        var context = new DisabledFailureMechanismContext(failureMechanism);
+
+        //        var menuBuilder = mocks.Stub<IContextMenuBuilder>();
+        //        menuBuilder.Expect(mb => mb.AddExpandAllItem()).Return(menuBuilder);
+        //        menuBuilder.Expect(mb => mb.AddCollapseAllItem()).Return(menuBuilder);
+        //        menuBuilder.Expect(mb => mb.Build()).Return(null);
+
+        //        var gui = mocks.Stub<IGui>();
+        //        gui.Stub(g => g.ProjectOpened += null).IgnoreArguments();
+        //        gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments();
+        //        gui.Expect(cmp => cmp.Get(context, treeViewControl)).Return(menuBuilder);
+
+        //        mocks.ReplayAll();
+
+        //        using (var plugin = new RingtoetsGuiPlugin
+        //        {
+        //            Gui = gui
+        //        })
+        //        {
+        //            TreeNodeInfo info = GetDisabledFailureMechanismContextTreeNodeInfo(plugin);
+
+        //            // Call
+        //            info.ContextMenuStrip(context, null, treeViewControl);
+        //        }
+
+        //        // Assert
+        //        mocks.VerifyAll();
+        //    }
+        //}
+
+        //private static TreeNodeInfo GetDisabledFailureMechanismContextTreeNodeInfo(RingtoetsGuiPlugin guiPlugin)
+        //{
+        //    return guiPlugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(DisabledFailureMechanismContext));
+        //}
+    }
+}
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismPlaceholderTreeNodeInfoTest.cs
===================================================================
diff -u -rfa424689d48793c024e73bfcee1c202559eea3e0 -r684b8c0ca681ea2da3cc988bd60e9223037e5a16
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismPlaceholderTreeNodeInfoTest.cs	(.../FailureMechanismPlaceholderTreeNodeInfoTest.cs)	(revision fa424689d48793c024e73bfcee1c202559eea3e0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismPlaceholderTreeNodeInfoTest.cs	(.../FailureMechanismPlaceholderTreeNodeInfoTest.cs)	(revision 684b8c0ca681ea2da3cc988bd60e9223037e5a16)
@@ -94,23 +94,30 @@
                 var image = info.Image(null);
 
                 // Assert
-                TestHelper.AssertImagesAreEqual(RingtoetsFormsResources.FailureMechanismIcon, image);
+                TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.FailureMechanismIcon, image);
             }
         }
 
         [Test]
-        public void ForeColor_Always_ReturnsGrayText()
+        public void ForeColor_Always_ReturnsControlText()
         {
             // Setup
             using (var plugin = new RingtoetsGuiPlugin())
             {
                 var info = GetInfo(plugin);
+                var assessmentSection = mocks.Stub<IAssessmentSection>();
+                mocks.ReplayAll();
 
+                var failureMechanism = new FailureMechanismPlaceholder("C");
+                var context = new FailureMechanismPlaceholderContext(failureMechanism, assessmentSection);
+
                 // Call
-                var textColor = info.ForeColor(null);
+                var textColor = info.ForeColor(context);
 
                 // Assert
-                Assert.AreEqual(Color.FromKnownColor(KnownColor.GrayText), textColor);
+                Assert.AreEqual(Color.FromKnownColor(KnownColor.ControlText), textColor);
+                
+                mocks.VerifyAll();
             }
         }
 
@@ -169,78 +176,91 @@
         public void ContextMenuStrip_Always_CallsContextMenuBuilderMethods()
         {
             // Setup
-            var gui = mocks.StrictMock<IGui>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
-            var menuBuilderMock = mocks.StrictMock<IContextMenuBuilder>();
+            using (var treeView = new TreeViewControl())
+            {
+                var failureMechanism = new FailureMechanismPlaceholder("A");
+                var assessmentSection = mocks.Stub<IAssessmentSection>();
+                var context = new FailureMechanismPlaceholderContext(failureMechanism, assessmentSection);
 
-            menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddImportItem()).Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddExportItem()).Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddExpandAllItem()).Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddCollapseAllItem()).Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.Build()).Return(null);
+                var gui = mocks.StrictMock<IGui>();
+                var menuBuilderMock = mocks.StrictMock<IContextMenuBuilder>();
 
-            gui.Expect(cmp => cmp.Get(null, treeViewControlMock)).Return(menuBuilderMock);
-            gui.Stub(g => g.ProjectOpened += null).IgnoreArguments();
-            gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments();
+                menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddImportItem()).Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddExportItem()).Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddExpandAllItem()).Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddCollapseAllItem()).Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.Build()).Return(null);
 
-            mocks.ReplayAll();
+                gui.Expect(cmp => cmp.Get(context, treeView)).Return(menuBuilderMock);
+                gui.Stub(g => g.ProjectOpened += null).IgnoreArguments();
+                gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments();
 
-            using (var plugin = new RingtoetsGuiPlugin())
-            {
-                var info = GetInfo(plugin);
+                mocks.ReplayAll();
 
-                plugin.Gui = gui;
+                using (var plugin = new RingtoetsGuiPlugin())
+                {
+                    var info = GetInfo(plugin);
 
-                // Call
-                info.ContextMenuStrip(null, null, treeViewControlMock);
+                    plugin.Gui = gui;
+
+                    // Call
+                    info.ContextMenuStrip(context, assessmentSection, treeView);
+                }
+                // Assert
+                mocks.VerifyAll();
             }
-            // Assert
-            mocks.VerifyAll();
         }
 
         [Test]
         public void ContextMenuStrip_Always_CalculateAllAndClearAllItemDisabled()
         {
             // Setup
-            var gui = mocks.StrictMock<IGui>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
-            var menuBuilderMock = new CustomItemsOnlyContextMenuBuilder();
+            using (var treeView = new TreeViewControl())
+            {
+                var assessmentSection = mocks.Stub<IAssessmentSection>();
+                var failureMechanism = new FailureMechanismPlaceholder("A");
+                var context = new FailureMechanismPlaceholderContext(failureMechanism, assessmentSection);
 
-            gui.Expect(cmp => cmp.Get(null, treeViewControlMock)).Return(menuBuilderMock);
-            gui.Stub(g => g.ProjectOpened += null).IgnoreArguments();
-            gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments();
+                var menuBuilderMock = new CustomItemsOnlyContextMenuBuilder();
 
-            mocks.ReplayAll();
+                var gui = mocks.StrictMock<IGui>();
+                gui.Expect(cmp => cmp.Get(context, treeView)).Return(menuBuilderMock);
+                gui.Stub(g => g.ProjectOpened += null).IgnoreArguments();
+                gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments();
 
-            using (var plugin = new RingtoetsGuiPlugin())
-            {
-                var info = GetInfo(plugin);
 
-                plugin.Gui = gui;
+                mocks.ReplayAll();
 
-                // Call
-                var menu = info.ContextMenuStrip(null, null, treeViewControlMock);
+                using (var plugin = new RingtoetsGuiPlugin())
+                {
+                    plugin.Gui = gui;
 
-                TestHelper.AssertContextMenuStripContainsItem(menu, 0,
-                                                              RingtoetsCommonFormsResources.Calculate_all,
-                                                              RingtoetsCommonFormsResources.Calculate_all_ToolTip,
-                                                              RingtoetsCommonFormsResources.CalculateAllIcon,
-                                                              false);
-                TestHelper.AssertContextMenuStripContainsItem(menu, 1,
-                                                              RingtoetsCommonFormsResources.Clear_all_output,
-                                                              RingtoetsCommonFormsResources.Clear_all_output_ToolTip,
-                                                              RingtoetsCommonFormsResources.ClearIcon,
-                                                              false);
-            }
+                    var info = GetInfo(plugin);
 
-            // Assert
-            mocks.VerifyAll();
+                    // Call
+                    var menu = info.ContextMenuStrip(context, assessmentSection, treeView);
+
+                    TestHelper.AssertContextMenuStripContainsItem(menu, 0,
+                                                                  RingtoetsCommonFormsResources.Calculate_all,
+                                                                  RingtoetsCommonFormsResources.Calculate_all_ToolTip,
+                                                                  RingtoetsCommonFormsResources.CalculateAllIcon,
+                                                                  false);
+                    TestHelper.AssertContextMenuStripContainsItem(menu, 1,
+                                                                  RingtoetsCommonFormsResources.Clear_all_output,
+                                                                  RingtoetsCommonFormsResources.Clear_all_output_ToolTip,
+                                                                  RingtoetsCommonFormsResources.ClearIcon,
+                                                                  false);
+                }
+
+                // Assert
+                mocks.VerifyAll();
+            }
         }
 
         private TreeNodeInfo GetInfo(RingtoetsGuiPlugin guiPlugin)
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs
===================================================================
diff -u -r52bb7ac3ae5191063f4b26ea26cb4b2ce5f486ed -r684b8c0ca681ea2da3cc988bd60e9223037e5a16
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs	(.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs)	(revision 52bb7ac3ae5191063f4b26ea26cb4b2ce5f486ed)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs	(.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs)	(revision 684b8c0ca681ea2da3cc988bd60e9223037e5a16)
@@ -1,14 +1,13 @@
 using System;
 using System.Drawing;
 using System.Linq;
-using Core.Common.Base;
+
 using Core.Common.Controls.TreeView;
 using Core.Common.Gui;
 using Core.Common.Gui.ContextMenu;
-using Core.Common.Gui.Forms.MainWindow;
 using Core.Common.Gui.TestUtil.ContextMenu;
 using Core.Common.TestUtil;
-using NUnit.Extensions.Forms;
+
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
@@ -178,7 +177,7 @@
 
                 const string expectedItemText = "&Toetspeilen berekenen";
                 const string expectedItemTooltip = "Er is geen hydraulische randvoorwaarden database beschikbaar om de toetspeilen te berekenen.";
-                TestHelper.AssertContextMenuStripContainsItem(contextMenu, 3, expectedItemText, expectedItemTooltip, RingtoetsFormsResources.FailureMechanismIcon, false);
+                TestHelper.AssertContextMenuStripContainsItem(contextMenu, 3, expectedItemText, expectedItemTooltip, RingtoetsCommonFormsResources.FailureMechanismIcon, false);
             }
             // Assert
             mocks.VerifyAll(); // Expect no calls on arguments
@@ -213,7 +212,7 @@
 
                 const string expectedItemText = "&Toetspeilen berekenen";
                 const string expectedItemTooltip = "Bereken de toetspeilen";
-                TestHelper.AssertContextMenuStripContainsItem(contextMenu, 3, expectedItemText, expectedItemTooltip, RingtoetsFormsResources.FailureMechanismIcon);
+                TestHelper.AssertContextMenuStripContainsItem(contextMenu, 3, expectedItemText, expectedItemTooltip, RingtoetsCommonFormsResources.FailureMechanismIcon);
             }
             // Assert
             mocks.VerifyAll(); // Expect no calls on arguments
Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs
===================================================================
diff -u -r86c5aff166a7a2822ac8d77be371249ee3a155b6 -r684b8c0ca681ea2da3cc988bd60e9223037e5a16
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs	(.../PipingGuiPlugin.cs)	(revision 86c5aff166a7a2822ac8d77be371249ee3a155b6)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs	(.../PipingGuiPlugin.cs)	(revision 684b8c0ca681ea2da3cc988bd60e9223037e5a16)
@@ -34,6 +34,7 @@
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Forms.Helpers;
 using Ringtoets.Common.Forms.PresentationObjects;
+using Ringtoets.Common.Forms.TreeNodeInfos;
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Forms;
 using Ringtoets.Piping.Forms.PresentationObjects;
@@ -101,13 +102,10 @@
 
         public override IEnumerable<TreeNodeInfo> GetTreeNodeInfos()
         {
-            yield return new TreeNodeInfo<PipingFailureMechanismContext>
-            {
-                Text = pipingFailureMechanism => pipingFailureMechanism.WrappedData.Name,
-                Image = pipingFailureMechanism => PipingFormsResources.PipingIcon,
-                ContextMenuStrip = FailureMechanismContextMenuStrip,
-                ChildNodeObjects = FailureMechanismChildNodeObjects,
-            };
+            yield return new DefaultFailureMechanismTreeNodeInfo<PipingFailureMechanismContext, PipingFailureMechanism>(
+                FailureMechanismChildNodeObjects,
+                FailureMechanismContextMenuStrip,
+                Gui);
 
             yield return new TreeNodeInfo<PipingCalculationContext>
             {
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismTreeNodeInfoTest.cs
===================================================================
diff -u -r86c5aff166a7a2822ac8d77be371249ee3a155b6 -r684b8c0ca681ea2da3cc988bd60e9223037e5a16
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismTreeNodeInfoTest.cs	(.../PipingFailureMechanismTreeNodeInfoTest.cs)	(revision 86c5aff166a7a2822ac8d77be371249ee3a155b6)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismTreeNodeInfoTest.cs	(.../PipingFailureMechanismTreeNodeInfoTest.cs)	(revision 684b8c0ca681ea2da3cc988bd60e9223037e5a16)
@@ -69,7 +69,7 @@
         {
             // Assert
             Assert.AreEqual(typeof(PipingFailureMechanismContext), info.TagType);
-            Assert.IsNull(info.ForeColor);
+            Assert.IsNotNull(info.ForeColor);
             Assert.IsNull(info.EnsureVisibleOnCreate);
             Assert.IsNull(info.CanRename);
             Assert.IsNull(info.OnNodeRenamed);