Index: Core/Common/test/Core.Common.TestUtil/TestHelper.cs
===================================================================
diff -u -rfc38d18fc6ff1749476da0ea43281d5d80568283 -r20415b2886919a103cb4677f56a8f61abbb7aa8a
--- Core/Common/test/Core.Common.TestUtil/TestHelper.cs	(.../TestHelper.cs)	(revision fc38d18fc6ff1749476da0ea43281d5d80568283)
+++ Core/Common/test/Core.Common.TestUtil/TestHelper.cs	(.../TestHelper.cs)	(revision 20415b2886919a103cb4677f56a8f61abbb7aa8a)
@@ -534,7 +534,7 @@
             {
                 for (int j = 0; j < bitmap.Width; j++)
                 {
-                    imageColors[index] = bitmap.GetPixel(i, j);
+                    imageColors[index++] = bitmap.GetPixel(i, j);
                 }
             }
             return imageColors;
Index: Core/Common/test/Core.Common.Utils.Test/Core.Common.Utils.Test.csproj
===================================================================
diff -u -r5341ef6e47326ef870d7e6f918c9085d7073d3c9 -r20415b2886919a103cb4677f56a8f61abbb7aa8a
--- Core/Common/test/Core.Common.Utils.Test/Core.Common.Utils.Test.csproj	(.../Core.Common.Utils.Test.csproj)	(revision 5341ef6e47326ef870d7e6f918c9085d7073d3c9)
+++ Core/Common/test/Core.Common.Utils.Test/Core.Common.Utils.Test.csproj	(.../Core.Common.Utils.Test.csproj)	(revision 20415b2886919a103cb4677f56a8f61abbb7aa8a)
@@ -152,9 +152,6 @@
     <None Include="Resources\Black2x2.png" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\TestImageHalfOpacityOnBlack2x2.png" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="Resources\TestImageWithBlack.png" />
   </ItemGroup>
   <ItemGroup>
@@ -169,6 +166,9 @@
   <ItemGroup>
     <None Include="Resources\NonEmbeddedResource.txt" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Resources\TestImageHalfOpacityOnBlack2x2.bmp" />
+  </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: Core/Common/test/Core.Common.Utils.Test/Properties/Resources.Designer.cs
===================================================================
diff -u -rea99af5c043eadf5c2ba83b82a847ae009181191 -r20415b2886919a103cb4677f56a8f61abbb7aa8a
--- Core/Common/test/Core.Common.Utils.Test/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision ea99af5c043eadf5c2ba83b82a847ae009181191)
+++ Core/Common/test/Core.Common.Utils.Test/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 20415b2886919a103cb4677f56a8f61abbb7aa8a)
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.34209
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
Index: Core/Common/test/Core.Common.Utils.Test/Properties/Resources.resx
===================================================================
diff -u -rea99af5c043eadf5c2ba83b82a847ae009181191 -r20415b2886919a103cb4677f56a8f61abbb7aa8a
--- Core/Common/test/Core.Common.Utils.Test/Properties/Resources.resx	(.../Resources.resx)	(revision ea99af5c043eadf5c2ba83b82a847ae009181191)
+++ Core/Common/test/Core.Common.Utils.Test/Properties/Resources.resx	(.../Resources.resx)	(revision 20415b2886919a103cb4677f56a8f61abbb7aa8a)
@@ -134,7 +134,7 @@
     <value>..\Resources\TestImage.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="TestImageHalfOpacityOnBlack2x2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\TestImageHalfOpacityOnBlack2x2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\TestImageHalfOpacityOnBlack2x2.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="TestImageWithBlack2x2" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\TestImageWithBlack.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
Index: Core/Common/test/Core.Common.Utils.Test/Resources/TestImageHalfOpacityOnBlack2x2.bmp
===================================================================
diff -u
Binary files differ
Index: Core/Plugins/test/Core.Plugins.DotSpatial.Test/Legend/MapDataCollectionTreeNodeInfoTest.cs
===================================================================
diff -u -rc9396d0af18873fda14c7e486decbfca7d4e8b21 -r20415b2886919a103cb4677f56a8f61abbb7aa8a
--- Core/Plugins/test/Core.Plugins.DotSpatial.Test/Legend/MapDataCollectionTreeNodeInfoTest.cs	(.../MapDataCollectionTreeNodeInfoTest.cs)	(revision c9396d0af18873fda14c7e486decbfca7d4e8b21)
+++ Core/Plugins/test/Core.Plugins.DotSpatial.Test/Legend/MapDataCollectionTreeNodeInfoTest.cs	(.../MapDataCollectionTreeNodeInfoTest.cs)	(revision 20415b2886919a103cb4677f56a8f61abbb7aa8a)
@@ -293,7 +293,7 @@
                 var contextMenu = info.ContextMenuStrip(mapDataCollection, null, treeViewControl);
 
                 // Assert
-                TestHelper.AssertContextMenuStripContainsItem(contextMenu, 0, expectedItemText, expectedItemTooltip, DotSpatialResources.MapIcon);
+                TestHelper.AssertContextMenuStripContainsItem(contextMenu, 0, expectedItemText, expectedItemTooltip, DotSpatialResources.MapPlusIcon);
             }
         }
     }
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsContextMenuBuilderTest.cs
===================================================================
diff -u -rc73100fd8408a2865d6fb32bd17608502686b605 -r20415b2886919a103cb4677f56a8f61abbb7aa8a
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsContextMenuBuilderTest.cs	(.../RingtoetsContextMenuBuilderTest.cs)	(revision c73100fd8408a2865d6fb32bd17608502686b605)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsContextMenuBuilderTest.cs	(.../RingtoetsContextMenuBuilderTest.cs)	(revision 20415b2886919a103cb4677f56a8f61abbb7aa8a)
@@ -281,7 +281,7 @@
                 // Assert
                 Assert.IsInstanceOf<ContextMenuStrip>(result);
                 Assert.AreEqual(1, result.Items.Count);
-                var checkboxIcon = isRelevant ? RingtoetsFormsResources.Checkbox_empty : RingtoetsFormsResources.Checkbox_ticked;
+                var checkboxIcon = isRelevant ? RingtoetsFormsResources.Checkbox_ticked : RingtoetsFormsResources.Checkbox_empty;
                 TestHelper.AssertContextMenuStripContainsItem(result, 0,
                                                               RingtoetsFormsResources.FailureMechanismContextMenuStrip_Is_relevant,
                                                               RingtoetsFormsResources.FailureMechanismContextMenuStrip_Is_relevant_Tooltip,
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsContextMenuItemFactoryTest.cs
===================================================================
diff -u -rc73100fd8408a2865d6fb32bd17608502686b605 -r20415b2886919a103cb4677f56a8f61abbb7aa8a
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsContextMenuItemFactoryTest.cs	(.../RingtoetsContextMenuItemFactoryTest.cs)	(revision c73100fd8408a2865d6fb32bd17608502686b605)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsContextMenuItemFactoryTest.cs	(.../RingtoetsContextMenuItemFactoryTest.cs)	(revision 20415b2886919a103cb4677f56a8f61abbb7aa8a)
@@ -455,7 +455,7 @@
             // Assert
             Assert.AreEqual(RingtoetsFormsResources.FailureMechanismContextMenuStrip_Is_relevant, toolStripItem.Text);
             Assert.AreEqual(RingtoetsFormsResources.FailureMechanismContextMenuStrip_Is_relevant_Tooltip, toolStripItem.ToolTipText);
-            var checkboxIcon = isRelevant ? RingtoetsFormsResources.Checkbox_empty : RingtoetsFormsResources.Checkbox_ticked;
+            var checkboxIcon = isRelevant ? RingtoetsFormsResources.Checkbox_ticked : RingtoetsFormsResources.Checkbox_empty;
             TestHelper.AssertImagesAreEqual(checkboxIcon, toolStripItem.Image);
             Assert.IsTrue(toolStripItem.Enabled);
             mocks.VerifyAll();
@@ -917,7 +917,7 @@
             // Assert
             Assert.AreEqual(RingtoetsFormsResources.Validate_all, toolStripItem.Text);
             Assert.AreEqual(RingtoetsFormsResources.CalculationGroup_Validate_all_ToolTip, toolStripItem.ToolTipText);
-            TestHelper.AssertImagesAreEqual(RingtoetsFormsResources.CalculateAllIcon, toolStripItem.Image);
+            TestHelper.AssertImagesAreEqual(RingtoetsFormsResources.ValidateAllIcon, toolStripItem.Image);
             Assert.IsTrue(toolStripItem.Enabled);
         }
 
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/FailureMechanismSectionResultContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc9396d0af18873fda14c7e486decbfca7d4e8b21 -r20415b2886919a103cb4677f56a8f61abbb7aa8a
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/FailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../FailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision c9396d0af18873fda14c7e486decbfca7d4e8b21)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/FailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../FailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 20415b2886919a103cb4677f56a8f61abbb7aa8a)
@@ -107,7 +107,7 @@
             var image = info.Image(null);
 
             // Assert
-            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, image);
+            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, image);
         }
 
         [Test]
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc9396d0af18873fda14c7e486decbfca7d4e8b21 -r20415b2886919a103cb4677f56a8f61abbb7aa8a
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs)	(revision c9396d0af18873fda14c7e486decbfca7d4e8b21)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 20415b2886919a103cb4677f56a8f61abbb7aa8a)
@@ -244,12 +244,12 @@
                 TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndexRootGroup,
                                                               RingtoetsFormsResources.Validate_all,
                                                               RingtoetsFormsResources.ValidateAll_No_calculations_to_validate,
-                                                              RingtoetsFormsResources.ValidateIcon,
+                                                              RingtoetsFormsResources.ValidateAllIcon,
                                                               false);
                 TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndexRootGroup,
                                                               RingtoetsFormsResources.Calculate_all,
                                                               RingtoetsFormsResources.CalculationGroup_CalculateAll_No_calculations_to_run,
-                                                              RingtoetsFormsResources.CalculateIcon,
+                                                              RingtoetsFormsResources.CalculateAllIcon,
                                                               false);
                 TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearAllIndexRootGroup,
                                                               RingtoetsFormsResources.Clear_all_output,
@@ -350,7 +350,7 @@
                 TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndexNestedGroup,
                                                               RingtoetsFormsResources.Calculate_all,
                                                               RingtoetsFormsResources.CalculationGroup_CalculateAll_No_calculations_to_run,
-                                                              RingtoetsFormsResources.CalculateIcon,
+                                                              RingtoetsFormsResources.CalculateAllIcon,
                                                               false);
                 TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearAllIndexNestedGroup,
                                                               RingtoetsFormsResources.Clear_all_output,
@@ -540,28 +540,22 @@
             var nodeData = new GrassCoverErosionInwardsCalculationGroupContext(group,
                                                                                failureMechanism,
                                                                                assessmentSectionMock);
+            var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
 
-            var applicationFeatureCommandHandlerStub = mocks.Stub<IApplicationFeatureCommands>();
-            var exportImportHandlerStub = mocks.Stub<IExportImportCommandHandler>();
-            var viewCommandsHandlerMock = mocks.StrictMock<IViewCommands>();
-
             using (var treeViewControl = new TreeViewControl())
             {
-                var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandlerStub, exportImportHandlerStub, viewCommandsHandlerMock, nodeData, treeViewControl);
                 guiMock.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder);
 
-                viewCommandsHandlerMock.Expect(vc => vc.CanOpenViewFor(nodeData)).Return(false);
-
                 mocks.ReplayAll();
 
                 // Call
                 ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl);
 
                 // Assert
-                TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearAllIndexRootGroup,
+                TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndexRootGroup,
                                                               RingtoetsFormsResources.Calculate_all,
                                                               RingtoetsFormsResources.CalculationGroup_CalculateAll_ToolTip,
-                                                              RingtoetsFormsResources.CalculateIcon);
+                                                              RingtoetsFormsResources.CalculateAllIcon);
             }
         }
 
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc9396d0af18873fda14c7e486decbfca7d4e8b21 -r20415b2886919a103cb4677f56a8f61abbb7aa8a
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs)	(revision c9396d0af18873fda14c7e486decbfca7d4e8b21)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs)	(revision 20415b2886919a103cb4677f56a8f61abbb7aa8a)
@@ -328,7 +328,7 @@
                 TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuRelevancyIndexWhenNotRelevant,
                                                               RingtoetsCommonFormsResources.FailureMechanismContextMenuStrip_Is_relevant,
                                                               RingtoetsCommonFormsResources.FailureMechanismContextMenuStrip_Is_relevant_Tooltip,
-                                                              RingtoetsCommonFormsResources.Checkbox_ticked);
+                                                              RingtoetsCommonFormsResources.Checkbox_empty);
             }
         }
 
@@ -421,7 +421,7 @@
                 TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndex,
                                                               RingtoetsFormsResources.Calculate_all,
                                                               RingtoetsFormsResources.GuiPlugin_AllDataAvailable_No_failure_mechanism_sections_imported,
-                                                              RingtoetsFormsResources.CalculateIcon,
+                                                              RingtoetsFormsResources.CalculateAllIcon,
                                                               false);
             }
         }
@@ -574,7 +574,7 @@
                 TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndex,
                                                               RingtoetsFormsResources.Validate_all,
                                                               RingtoetsFormsResources.GuiPlugin_AllDataAvailable_No_failure_mechanism_sections_imported,
-                                                              RingtoetsFormsResources.ValidateIcon,
+                                                              RingtoetsFormsResources.ValidateAllIcon,
                                                               false);
             }
         }
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresGuiPlugin.cs
===================================================================
diff -u -r5e6eacaf76f765ba77febee673e9e94895e46feb -r20415b2886919a103cb4677f56a8f61abbb7aa8a
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresGuiPlugin.cs	(.../HeightStructuresGuiPlugin.cs)	(revision 5e6eacaf76f765ba77febee673e9e94895e46feb)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresGuiPlugin.cs	(.../HeightStructuresGuiPlugin.cs)	(revision 20415b2886919a103cb4677f56a8f61abbb7aa8a)
@@ -243,6 +243,10 @@
                           .AddSeparator()
                           .AddToggleRelevancyOfFailureMechanismItem(context, RemoveAllViewsForItem)
                           .AddSeparator()
+                          .AddValidateAllCalculationsInFailureMechanismItem(
+                               context,
+                               c => ValidateAll(c.WrappedData.Calculations.OfType<HeightStructuresCalculation>(), c.Parent),
+                               ValidateAllDataAvailableAndGetErrorMessageForCalculationsInFailureMechanism)
                           .AddPerformAllCalculationsInFailureMechanismItem(context, CalculateAll, ValidateAllDataAvailableAndGetErrorMessageForCalculationsInFailureMechanism)
                           .AddClearAllCalculationOutputInFailureMechanismItem(context.WrappedData)
                           .AddSeparator()
@@ -331,6 +335,10 @@
             builder.AddCreateCalculationGroupItem(group)
                    .AddCreateCalculationItem(context, AddCalculation)
                    .AddSeparator()
+                   .AddValidateAllCalculationsInGroupItem(
+                       context, 
+                       c => ValidateAll(c.WrappedData.GetCalculations().OfType<HeightStructuresCalculation>(), c.AssessmentSection), 
+                       ValidateAllDataAvailableAndGetErrorMessageForCalculationsInGroup)
                    .AddPerformAllCalculationsInGroupItem(group, context, CalculateAll, ValidateAllDataAvailableAndGetErrorMessageForCalculationsInGroup)
                    .AddClearAllCalculationOutputInGroupItem(group)
                    .AddSeparator();
@@ -352,6 +360,14 @@
                           .Build();
         }
 
+        private void ValidateAll(IEnumerable<HeightStructuresCalculation> heightStructuresCalculations, IAssessmentSection assessmentSection)
+        {
+            foreach (var calculation in heightStructuresCalculations)
+            {
+                HeightStructuresCalculationService.Validate(calculation, assessmentSection);
+            }
+        }
+
         private static void CalculationGroupContextOnNodeRemoved(HeightStructuresCalculationGroupContext context, object parentNodeData)
         {
             var parentGroupContext = (HeightStructuresCalculationGroupContext) parentNodeData;
@@ -413,7 +429,11 @@
 
             HeightStructuresCalculation calculation = context.WrappedData;
 
-            return builder.AddPerformCalculationItem(calculation, context, Calculate, ValidateAllDataAvailableAndGetErrorMessageForCalculation)
+            return builder.AddValidateCalculationItem(
+                                context,
+                                c => HeightStructuresCalculationService.Validate(c.WrappedData, c.AssessmentSection),
+                                ValidateAllDataAvailableAndGetErrorMessageForCalculation)
+                          .AddPerformCalculationItem(calculation, context, Calculate, ValidateAllDataAvailableAndGetErrorMessageForCalculation)
                           .AddClearCalculationOutputItem(calculation)
                           .AddSeparator()
                           .AddRenameItem()
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs
===================================================================
diff -u -re88fa1dfcf62085f7fabc453b73dbc8ac3ff9223 -r20415b2886919a103cb4677f56a8f61abbb7aa8a
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs	(.../HeightStructuresCalculationService.cs)	(revision e88fa1dfcf62085f7fabc453b73dbc8ac3ff9223)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs	(.../HeightStructuresCalculationService.cs)	(revision 20415b2886919a103cb4677f56a8f61abbb7aa8a)
@@ -38,7 +38,7 @@
     /// <summary>
     /// Service that provides methods for performing Hydra-Ring calculations for height structures calculations.
     /// </summary>
-    internal static class HeightStructuresCalculationService
+    public static class HeightStructuresCalculationService
     {
         /// <summary>
         /// Performs validation over the values on the given <paramref name="calculation"/>. Error and status information is logged during
@@ -47,7 +47,7 @@
         /// <param name="calculation">The <see cref="HeightStructuresCalculation"/> for which to validate the values.</param>
         /// <param name="assessmentSection">The <see cref="IAssessmentSection"/> for which to validate the values.</param>
         /// <returns><c>True</c>c> if <paramref name="calculation"/> has no validation errors; <c>False</c>c> otherwise.</returns>
-        internal static bool Validate(HeightStructuresCalculation calculation, IAssessmentSection assessmentSection)
+        public static bool Validate(HeightStructuresCalculation calculation, IAssessmentSection assessmentSection)
         {
             return CalculationServiceHelper.PerformValidation(calculation.Name, () => ValidateInput(calculation.InputParameters, assessmentSection));
         }
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc9396d0af18873fda14c7e486decbfca7d4e8b21 -r20415b2886919a103cb4677f56a8f61abbb7aa8a
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationContextTreeNodeInfoTest.cs)	(revision c9396d0af18873fda14c7e486decbfca7d4e8b21)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationContextTreeNodeInfoTest.cs)	(revision 20415b2886919a103cb4677f56a8f61abbb7aa8a)
@@ -188,6 +188,7 @@
 
             menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock);
             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.AddRenameItem()).Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.AddDeleteItem()).Return(menuBuilderMock);
@@ -239,8 +240,14 @@
                 var menu = info.ContextMenuStrip(nodeData, assessmentSectionMock, treeViewControl);
 
                 // Assert
-                Assert.AreEqual(6, menu.Items.Count);
+                Assert.AreEqual(7, menu.Items.Count);
 
+                TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateIndex,
+                                                              RingtoetsCommonFormsResources.Validate,
+                                                              RingtoetsCommonFormsResources.GuiPlugin_AllDataAvailable_No_failure_mechanism_sections_imported,
+                                                              RingtoetsCommonFormsResources.ValidateIcon,
+                                                              false);
+
                 TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateIndex,
                                                               RingtoetsCommonFormsResources.Calculate,
                                                               RingtoetsCommonFormsResources.GuiPlugin_AllDataAvailable_No_failure_mechanism_sections_imported,
@@ -298,8 +305,7 @@
                 new Point2D(0, 0)
             }));
 
-            var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
-            assessmentSectionMock.Expect(asm => asm.HydraulicBoundaryDatabase).Return(null);
+            var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
 
             var calculation = new HeightStructuresCalculation();
             var nodeData = new HeightStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
@@ -409,13 +415,168 @@
         }
 
         [Test]
+        public void ContextMenuStrip_NoFailureMechanismSections_ContextMenuItemValidateCalculationDisabledAndTooltipSet()
+        {
+            // Setup
+            var failureMechanism = new HeightStructuresFailureMechanism();
+            var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
+            var calculation = new HeightStructuresCalculation();
+
+            var nodeData = new HeightStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
+            var guiMock = mocks.StrictMock<IGui>();
+
+            using (var treeViewControl = new TreeViewControl())
+            {
+                guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
+
+                mocks.ReplayAll();
+
+                plugin.Gui = guiMock;
+
+                // Call
+                var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl);
+
+                // Assert
+                TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuValidateIndex,
+                                                              RingtoetsCommonFormsResources.Validate,
+                                                              RingtoetsCommonFormsResources.GuiPlugin_AllDataAvailable_No_failure_mechanism_sections_imported,
+                                                              RingtoetsCommonFormsResources.ValidateIcon,
+                                                              false);
+            }
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void ContextMenuStrip_FailureMechanismSectionsSetNoHydraulicBoundaryDatabase_ContextMenuItemValidateCalculationDisabledAndTooltipSet()
+        {
+            // Setup
+            var guiMock = mocks.StrictMock<IGui>();
+
+            var failureMechanism = new HeightStructuresFailureMechanism();
+            failureMechanism.AddSection(new FailureMechanismSection("test", new[]
+            {
+                new Point2D(0, 0)
+            }));
+
+            var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
+
+            var calculation = new HeightStructuresCalculation();
+            var nodeData = new HeightStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
+
+            using (var treeViewControl = new TreeViewControl())
+            {
+                guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
+
+                mocks.ReplayAll();
+
+                plugin.Gui = guiMock;
+
+                // Call
+                var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl);
+
+                // Assert
+                TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuValidateIndex,
+                                                              RingtoetsCommonFormsResources.Validate,
+                                                              RingtoetsCommonFormsResources.GuiPlugin_AllDataAvailable_No_hydraulic_boundary_database_imported,
+                                                              RingtoetsCommonFormsResources.ValidateIcon,
+                                                              false);
+            }
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void ContextMenuStrip_FailureMechanismSectionsSetHydraulicBoundaryDatabaseNotValid_ContextMenuItemValidateCalculationDisabledAndTooltipSet()
+        {
+            // Setup
+            var guiMock = mocks.StrictMock<IGui>();
+
+            var failureMechanism = new HeightStructuresFailureMechanism();
+            failureMechanism.AddSection(new FailureMechanismSection("test", new[]
+            {
+                new Point2D(0, 0)
+            }));
+
+            var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
+            assessmentSectionMock.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
+
+            var calculation = new HeightStructuresCalculation();
+            var nodeData = new HeightStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
+
+            using (var treeViewControl = new TreeViewControl())
+            {
+                guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
+
+                mocks.ReplayAll();
+
+                plugin.Gui = guiMock;
+
+                // Call
+                ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl);
+
+                // Assert
+                ToolStripItem contextMenuItem = contextMenu.Items[contextMenuValidateIndex];
+
+                Assert.AreEqual(RingtoetsCommonFormsResources.Validate, contextMenuItem.Text);
+                StringAssert.Contains(String.Format(RingtoetsCommonFormsResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText);
+                TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.ValidateIcon, contextMenuItem.Image);
+                Assert.IsFalse(contextMenuItem.Enabled);
+            }
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void ContextMenuStrip_FailureMechanismSectionsAndHydraulicBoundaryDatabaseSet_ContextMenuItemValidateCalculationEnabled()
+        {
+            // Setup
+            var guiMock = mocks.StrictMock<IGui>();
+
+            string validFilePath = Path.Combine(testDataPath, "complete.sqlite");
+
+            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
+            {
+                FilePath = validFilePath,
+                Version = "1.0"
+            };
+
+            var failureMechanism = new HeightStructuresFailureMechanism();
+            failureMechanism.AddSection(new FailureMechanismSection("test", new[]
+            {
+                new Point2D(0, 0)
+            }));
+
+            var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
+            assessmentSectionMock.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
+
+            var calculation = new HeightStructuresCalculation();
+            var nodeData = new HeightStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
+
+            using (var treeViewControl = new TreeViewControl())
+            {
+                guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
+
+                mocks.ReplayAll();
+
+                plugin.Gui = guiMock;
+
+                // Call
+                var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl);
+
+                // Assert
+                TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuValidateIndex,
+                                                              RingtoetsCommonFormsResources.Validate,
+                                                              RingtoetsCommonFormsResources.Validate_ToolTip,
+                                                              RingtoetsCommonFormsResources.ValidateIcon);
+            }
+            mocks.VerifyAll();
+        }
+
+        [Test]
         public void GivenCalculationWithNonExistingFilePath_WhenCalculatingFromContextMenu_ThenOutputClearedLogMessagesAddedObserversNotNotified()
         {
             // Given
             var gui = mocks.DynamicMock<IGui>();
             var mainWindow = mocks.DynamicMock<IMainWindow>();
             var observerMock = mocks.StrictMock<IObserver>();
-            var calculateContextMenuItemIndex = 0;
 
             var section = new FailureMechanismSection("A", new[]
             {
@@ -435,11 +596,10 @@
                 Version = "random"
             };
             hydraulicBoundaryDatabase.Locations.Add(hydraulicBoundaryLocation);
+            
+            var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
+            assessmentSectionMock.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
 
-            var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike)
-            {
-                HydraulicBoundaryDatabase = hydraulicBoundaryDatabase
-            };
             var calculation = new HeightStructuresCalculation
             {
                 Output = new ProbabilityAssessmentOutput(double.NaN, double.NaN, double.NaN, double.NaN, double.NaN),
@@ -449,7 +609,7 @@
                 }
             };
 
-            var calculationContext = new HeightStructuresCalculationContext(calculation, failureMechanism, assessmentSection);
+            var calculationContext = new HeightStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
 
             using (var treeViewControl = new TreeViewControl())
             {
@@ -470,7 +630,7 @@
                 };
 
                 // When
-                Action action = () => { contextMenuAdapter.Items[calculateContextMenuItemIndex].PerformClick(); };
+                Action action = () => { contextMenuAdapter.Items[contextMenuCalculateIndex].PerformClick(); };
 
                 // Then
                 TestHelper.AssertLogMessages(action, messages =>
@@ -488,6 +648,71 @@
         }
 
         [Test]
+        public void GivenCalculationWithNonExistingFilePath_WhenValidatingFromContextMenu_ThenLogMessagesAdded()
+        {
+            // Given
+            var gui = mocks.DynamicMock<IGui>();
+            var observerMock = mocks.StrictMock<IObserver>();
+
+            var section = new FailureMechanismSection("A", new[]
+            {
+                new Point2D(1, 2),
+                new Point2D(3, 4)
+            });
+
+            var failureMechanism = new HeightStructuresFailureMechanism();
+            failureMechanism.AddSection(section);
+
+            string validFilePath = Path.Combine(testDataPath, "complete.sqlite");
+
+            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0.0, 1.1);
+            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
+            {
+                FilePath = validFilePath,
+                Version = "random"
+            };
+            hydraulicBoundaryDatabase.Locations.Add(hydraulicBoundaryLocation);
+            
+            var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
+            assessmentSectionMock.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
+
+            var calculation = new HeightStructuresCalculation
+            {
+                InputParameters =
+                {
+                    HydraulicBoundaryLocation = hydraulicBoundaryLocation
+                }
+            };
+
+            var calculationContext = new HeightStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
+
+            using (var treeViewControl = new TreeViewControl())
+            {
+                gui.Expect(g => g.Get(calculationContext, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
+
+                mocks.ReplayAll();
+
+                plugin.Gui = gui;
+
+                calculation.Attach(observerMock);
+
+                var contextMenuAdapter = info.ContextMenuStrip(calculationContext, null, treeViewControl);
+
+                // When
+                Action action = () => { contextMenuAdapter.Items[contextMenuValidateIndex].PerformClick(); };
+
+                // Then
+                TestHelper.AssertLogMessages(action, messages =>
+                {
+                    var msgs = messages.ToArray();
+                    StringAssert.StartsWith(String.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]);
+                    StringAssert.StartsWith(String.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]);
+                });
+            }
+            mocks.VerifyAll();
+        }
+
+        [Test]
         public void OnNodeRemoved_ParentIsCalculationGroupContext_RemoveCalculationFromGroup()
         {
             // Setup
@@ -524,8 +749,9 @@
 
         }
 
-        private const int contextMenuCalculateIndex = 0;
-        private const int contextMenuClearIndex = 1;
+        private const int contextMenuValidateIndex = 0;
+        private const int contextMenuCalculateIndex = 1;
+        private const int contextMenuClearIndex = 2;
 
         private class TestHeightStructuresOutput : ProbabilityAssessmentOutput
         {
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc9396d0af18873fda14c7e486decbfca7d4e8b21 -r20415b2886919a103cb4677f56a8f61abbb7aa8a
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision c9396d0af18873fda14c7e486decbfca7d4e8b21)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision 20415b2886919a103cb4677f56a8f61abbb7aa8a)
@@ -180,6 +180,7 @@
             menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock);
             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);
@@ -225,7 +226,7 @@
                 ContextMenuStrip menu = info.ContextMenuStrip(groupContext, null, treeViewControl);
 
                 // Assert
-                Assert.AreEqual(9, menu.Items.Count);
+                Assert.AreEqual(10, menu.Items.Count);
 
                 TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndexRootGroup,
                                                               RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup,
@@ -236,10 +237,15 @@
                                                               RingtoetsFormsResources.CalculationGroup_Add_Calculation_Tooltip,
                                                               RingtoetsFormsResources.FailureMechanismIcon);
 
+                TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndexRootGroup,
+                                                              RingtoetsFormsResources.Validate_all,
+                                                              RingtoetsFormsResources.ValidateAll_No_calculations_to_validate,
+                                                              RingtoetsFormsResources.ValidateAllIcon,
+                                                              false);
                 TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndexRootGroup,
                                                               RingtoetsFormsResources.Calculate_all,
                                                               RingtoetsFormsResources.CalculationGroup_CalculateAll_No_calculations_to_run,
-                                                              RingtoetsFormsResources.CalculateIcon,
+                                                              RingtoetsFormsResources.CalculateAllIcon,
                                                               false);
                 TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearAllIndexRootGroup,
                                                               RingtoetsFormsResources.Clear_all_output,
@@ -270,6 +276,7 @@
             menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock);
             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.AddRenameItem()).Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.AddDeleteItem()).Return(menuBuilderMock);
@@ -322,7 +329,7 @@
                 ContextMenuStrip menu = info.ContextMenuStrip(groupContext, parentGroupContext, treeViewControl);
 
                 // Assert
-                Assert.AreEqual(9, menu.Items.Count);
+                Assert.AreEqual(10, menu.Items.Count);
 
                 TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndexNestedGroup,
                                                               RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup,
@@ -333,10 +340,15 @@
                                                               RingtoetsFormsResources.CalculationGroup_Add_Calculation_Tooltip,
                                                               RingtoetsFormsResources.FailureMechanismIcon);
 
+                TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndexNestedGroup,
+                                                              RingtoetsFormsResources.Validate_all,
+                                                              RingtoetsFormsResources.ValidateAll_No_calculations_to_validate,
+                                                              RingtoetsFormsResources.ValidateAllIcon,
+                                                              false);
                 TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndexNestedGroup,
                                                               RingtoetsFormsResources.Calculate_all,
                                                               RingtoetsFormsResources.CalculationGroup_CalculateAll_No_calculations_to_run,
-                                                              RingtoetsFormsResources.CalculateIcon,
+                                                              RingtoetsFormsResources.CalculateAllIcon,
                                                               false);
                 TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearAllIndexNestedGroup,
                                                               RingtoetsFormsResources.Clear_all_output,
@@ -365,24 +377,19 @@
                                                                                failureMechanism,
                                                                                assessmentSectionMock);
 
-            var applicationFeatureCommandHandlerStub = mocks.Stub<IApplicationFeatureCommands>();
-            var exportImportHandlerStub = mocks.Stub<IExportImportCommandHandler>();
-            var viewCommandsHandlerMock = mocks.StrictMock<IViewCommands>();
+            var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
 
             using (var treeViewControl = new TreeViewControl())
             {
-                var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandlerStub, exportImportHandlerStub, viewCommandsHandlerMock, nodeData, treeViewControl);
                 guiMock.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder);
 
-                viewCommandsHandlerMock.Expect(vc => vc.CanOpenViewFor(nodeData)).Return(false);
-
                 mocks.ReplayAll();
 
                 // Call
                 ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl);
 
                 // Assert
-                TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearAllIndexRootGroup,
+                TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndexRootGroup,
                                                               RingtoetsFormsResources.Calculate_all,
                                                               RingtoetsFormsResources.GuiPlugin_AllDataAvailable_No_failure_mechanism_sections_imported,
                                                               RingtoetsFormsResources.CalculateAllIcon,
@@ -416,24 +423,19 @@
                                                                                failureMechanism,
                                                                                assessmentSectionMock);
 
-            var applicationFeatureCommandHandlerStub = mocks.Stub<IApplicationFeatureCommands>();
-            var exportImportHandlerStub = mocks.Stub<IExportImportCommandHandler>();
-            var viewCommandsHandlerMock = mocks.StrictMock<IViewCommands>();
+            var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
 
             using (var treeViewControl = new TreeViewControl())
             {
-                var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandlerStub, exportImportHandlerStub, viewCommandsHandlerMock, nodeData, treeViewControl);
                 guiMock.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder);
 
-                viewCommandsHandlerMock.Expect(vc => vc.CanOpenViewFor(nodeData)).Return(false);
-
                 mocks.ReplayAll();
 
                 // Call
                 var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl);
 
                 // Assert
-                TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuClearAllIndexRootGroup,
+                TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuCalculateAllIndexRootGroup,
                                                               RingtoetsFormsResources.Calculate_all,
                                                               RingtoetsFormsResources.GuiPlugin_AllDataAvailable_No_hydraulic_boundary_database_imported,
                                                               RingtoetsFormsResources.CalculateAllIcon,
@@ -467,24 +469,19 @@
                                                                                failureMechanism,
                                                                                assessmentSectionMock);
 
-            var applicationFeatureCommandHandlerStub = mocks.Stub<IApplicationFeatureCommands>();
-            var exportImportHandlerStub = mocks.Stub<IExportImportCommandHandler>();
-            var viewCommandsHandlerMock = mocks.StrictMock<IViewCommands>();
+            var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
 
             using (var treeViewControl = new TreeViewControl())
             {
-                var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandlerStub, exportImportHandlerStub, viewCommandsHandlerMock, nodeData, treeViewControl);
                 guiMock.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder);
 
-                viewCommandsHandlerMock.Expect(vc => vc.CanOpenViewFor(nodeData)).Return(false);
-
                 mocks.ReplayAll();
 
                 // Call
                 ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl);
 
                 // Assert
-                ToolStripItem contextMenuItem = contextMenu.Items[contextMenuClearAllIndexRootGroup];
+                ToolStripItem contextMenuItem = contextMenu.Items[contextMenuCalculateAllIndexRootGroup];
 
                 Assert.AreEqual(RingtoetsFormsResources.Calculate_all, contextMenuItem.Text);
                 StringAssert.Contains(string.Format(RingtoetsFormsResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText);
@@ -527,31 +524,215 @@
                                                                                failureMechanism,
                                                                                assessmentSectionMock);
 
-            var applicationFeatureCommandHandlerStub = mocks.Stub<IApplicationFeatureCommands>();
-            var exportImportHandlerStub = mocks.Stub<IExportImportCommandHandler>();
-            var viewCommandsHandlerMock = mocks.StrictMock<IViewCommands>();
+            var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
 
             using (var treeViewControl = new TreeViewControl())
             {
-                var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandlerStub, exportImportHandlerStub, viewCommandsHandlerMock, nodeData, treeViewControl);
                 guiMock.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder);
 
-                viewCommandsHandlerMock.Expect(vc => vc.CanOpenViewFor(nodeData)).Return(false);
-
                 mocks.ReplayAll();
 
                 // Call
                 ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl);
 
                 // Assert
-                TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearAllIndexRootGroup,
+                TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndexRootGroup,
                                                               RingtoetsFormsResources.Calculate_all,
                                                               RingtoetsFormsResources.CalculationGroup_CalculateAll_ToolTip,
-                                                              RingtoetsFormsResources.CalculateIcon);
+                                                              RingtoetsFormsResources.CalculateAllIcon);
             }
         }
 
         [Test]
+        public void ContextMenuStrip_NoFailureMechanismSections_ContextMenuItemValidateAllDisabledAndTooltipSet()
+        {
+            // Setup
+            var failureMechanism = new HeightStructuresFailureMechanism();
+            var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
+
+            var group = new CalculationGroup
+            {
+                Children =
+                {
+                    new HeightStructuresCalculation()
+                }
+            };
+
+            var nodeData = new HeightStructuresCalculationGroupContext(group,
+                                                                               failureMechanism,
+                                                                               assessmentSectionMock);
+
+            var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
+
+            using (var treeViewControl = new TreeViewControl())
+            {
+                guiMock.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder);
+
+                mocks.ReplayAll();
+
+                // Call
+                ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl);
+
+                // Assert
+                TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndexRootGroup,
+                                                              RingtoetsFormsResources.Validate_all,
+                                                              RingtoetsFormsResources.GuiPlugin_AllDataAvailable_No_failure_mechanism_sections_imported,
+                                                              RingtoetsFormsResources.ValidateAllIcon,
+                                                              false);
+            }
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void ContextMenuStrip_FailureMechanismSectionsSetNoHydraulicBoundaryDatabase_ContextMenuItemValidateAllDisabledAndTooltipSet()
+        {
+            // Setup
+            var group = new CalculationGroup
+            {
+                Children =
+                {
+                    new HeightStructuresCalculation()
+                }
+            };
+
+            var failureMechanism = new HeightStructuresFailureMechanism();
+            failureMechanism.AddSection(new FailureMechanismSection("test", new[]
+            {
+                new Point2D(0, 0)
+            }));
+            failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation());
+
+            var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
+            assessmentSectionMock.Stub(asm => asm.HydraulicBoundaryDatabase).Return(null);
+
+            var nodeData = new HeightStructuresCalculationGroupContext(group,
+                                                                               failureMechanism,
+                                                                               assessmentSectionMock);
+
+            var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
+
+            using (var treeViewControl = new TreeViewControl())
+            {
+                guiMock.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder);
+
+                mocks.ReplayAll();
+
+                // Call
+                var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl);
+
+                // Assert
+                TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuValidateAllIndexRootGroup,
+                                                              RingtoetsFormsResources.Validate_all,
+                                                              RingtoetsFormsResources.GuiPlugin_AllDataAvailable_No_hydraulic_boundary_database_imported,
+                                                              RingtoetsFormsResources.ValidateAllIcon,
+                                                              false);
+            }
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void ContextMenuStrip_FailureMechanismSectionsSetHydraulicBoundaryDatabaseNotValid_ContextMenuItemValidateAllDisabledAndTooltipSet()
+        {
+            // Setup
+            var group = new CalculationGroup
+            {
+                Children =
+                {
+                    new HeightStructuresCalculation()
+                }
+            };
+
+            var failureMechanism = new HeightStructuresFailureMechanism();
+            failureMechanism.AddSection(new FailureMechanismSection("test", new[]
+            {
+                new Point2D(0, 0)
+            }));
+            failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation());
+
+            var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
+            assessmentSectionMock.Stub(asm => asm.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase());
+
+            var nodeData = new HeightStructuresCalculationGroupContext(group,
+                                                                               failureMechanism,
+                                                                               assessmentSectionMock);
+
+            var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
+
+            using (var treeViewControl = new TreeViewControl())
+            {
+                guiMock.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder);
+
+                mocks.ReplayAll();
+
+                // Call
+                ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl);
+
+                // Assert
+                ToolStripItem contextMenuItem = contextMenu.Items[contextMenuValidateAllIndexRootGroup];
+
+                Assert.AreEqual(RingtoetsFormsResources.Validate_all, contextMenuItem.Text);
+                StringAssert.Contains(string.Format(RingtoetsFormsResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText);
+                TestHelper.AssertImagesAreEqual(RingtoetsFormsResources.ValidateAllIcon, contextMenuItem.Image);
+                Assert.IsFalse(contextMenuItem.Enabled);
+            }
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void ContextMenuStrip_FailureMechanismSectionsAndHydraulicDatabaseSet_ContextMenuItemValidateAllEnabled()
+        {
+            // Setup
+            var group = new CalculationGroup
+            {
+                Children =
+                {
+                    new HeightStructuresCalculation()
+                }
+            };
+
+            string validFilePath = Path.Combine(testDataPath, "complete.sqlite");
+
+            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
+            {
+                FilePath = validFilePath,
+                Version = "1.0"
+            };
+
+            var failureMechanism = new HeightStructuresFailureMechanism();
+            failureMechanism.AddSection(new FailureMechanismSection("test", new[]
+            {
+                new Point2D(0, 0)
+            }));
+            failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation());
+
+            var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
+            assessmentSectionMock.Stub(asm => asm.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase);
+
+            var nodeData = new HeightStructuresCalculationGroupContext(group,
+                                                                               failureMechanism,
+                                                                               assessmentSectionMock);
+
+            var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
+
+            using (var treeViewControl = new TreeViewControl())
+            {
+                guiMock.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder);
+
+                mocks.ReplayAll();
+
+                // Call
+                ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl);
+
+                // Assert
+                TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndexRootGroup,
+                                                              RingtoetsFormsResources.Validate_all,
+                                                              RingtoetsFormsResources.CalculationGroup_Validate_all_ToolTip,
+                                                              RingtoetsFormsResources.ValidateAllIcon);
+            }
+            mocks.VerifyAll();
+        }
+
+        [Test]
         public void ContextMenuStrip_ClickOnCalculateAllItem_ScheduleAllChildCalculations()
         {
             // Setup
@@ -633,6 +814,73 @@
         }
 
         [Test]
+        public void ContextMenuStrip_ClickOnValidateAllItem_ScheduleAllChildCalculations()
+        {
+            // Setup
+            var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
+
+            var failureMechanism = new HeightStructuresFailureMechanism();
+
+            failureMechanism.AddSection(new FailureMechanismSection("A", new[]
+            {
+                new Point2D(0, 0)
+            }));
+
+            failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation
+            {
+                Name = "A",
+                InputParameters =
+                {
+                    HydraulicBoundaryLocation = new HydraulicBoundaryLocation(-1, "nonExisting", 1, 2)
+                }
+            });
+
+            failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation
+            {
+                Name = "B",
+                InputParameters =
+                {
+                    HydraulicBoundaryLocation = new HydraulicBoundaryLocation(-1, "nonExisting", 1, 2)
+                }
+            });
+
+            string validFilePath = Path.Combine(testDataPath, "complete.sqlite");
+
+            var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
+            var hydraulicBoundaryDatabaseStub = mocks.Stub<HydraulicBoundaryDatabase>();
+            hydraulicBoundaryDatabaseStub.FilePath = validFilePath;
+            assessmentSection.HydraulicBoundaryDatabase = hydraulicBoundaryDatabaseStub;
+
+            var groupContext = new HeightStructuresCalculationGroupContext(failureMechanism.CalculationsGroup,
+                                                                           failureMechanism,
+                                                                           assessmentSection);
+
+            using (var treeViewControl = new TreeViewControl())
+            {
+                guiMock.Expect(g => g.Get(groupContext, treeViewControl)).Return(menuBuilder);
+
+                mocks.ReplayAll();
+
+                plugin.Gui = guiMock;
+                var contextMenu = info.ContextMenuStrip(groupContext, null, treeViewControl);
+
+                // Call
+                TestHelper.AssertLogMessages(() => contextMenu.Items[contextMenuValidateAllIndexRootGroup].PerformClick(), messages =>
+                {
+                    var messageList = messages.ToList();
+
+                    // Assert
+                    Assert.AreEqual(4, messageList.Count);
+                    StringAssert.StartsWith("Validatie van 'A' gestart om: ", messageList[0]);
+                    StringAssert.StartsWith("Validatie van 'A' beëindigd om: ", messageList[1]);
+                    StringAssert.StartsWith("Validatie van 'B' gestart om: ", messageList[2]);
+                    StringAssert.StartsWith("Validatie van 'B' beëindigd om: ", messageList[3]);
+                });
+            }
+            mocks.VerifyAll();
+        }
+
+        [Test]
         public void ContextMenuStrip_ClickOnAddGroupItem_AddGroupToCalculationGroupAndNotifyObservers()
         {
             // Setup
@@ -791,11 +1039,13 @@
 
         private const int contextMenuAddCalculationGroupIndexRootGroup = 1;
         private const int contextMenuAddCalculationIndexRootGroup = 2;
-        private const int contextMenuCalculateAllIndexRootGroup = 4;
-        private const int contextMenuClearAllIndexRootGroup = 5;
+        private const int contextMenuValidateAllIndexRootGroup = 4;
+        private const int contextMenuCalculateAllIndexRootGroup = 5;
+        private const int contextMenuClearAllIndexRootGroup = 6;
         private const int contextMenuAddCalculationGroupIndexNestedGroup = 0;
         private const int contextMenuAddCalculationIndexNestedGroup = 1;
-        private const int contextMenuCalculateAllIndexNestedGroup = 3;
-        private const int contextMenuClearAllIndexNestedGroup = 4;
+        private const int contextMenuValidateAllIndexNestedGroup = 3;
+        private const int contextMenuCalculateAllIndexNestedGroup = 4;
+        private const int contextMenuClearAllIndexNestedGroup = 5;
     }
 }
\ No newline at end of file
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc9396d0af18873fda14c7e486decbfca7d4e8b21 -r20415b2886919a103cb4677f56a8f61abbb7aa8a
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision c9396d0af18873fda14c7e486decbfca7d4e8b21)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision 20415b2886919a103cb4677f56a8f61abbb7aa8a)
@@ -178,6 +178,7 @@
             menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock);
             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);
@@ -261,13 +262,18 @@
                 var menu = info.ContextMenuStrip(failureMechanismContext, assessmentSectionMock, treeView);
 
                 // Assert
-                Assert.AreEqual(8, menu.Items.Count);
+                Assert.AreEqual(9, menu.Items.Count);
 
                 TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuRelevancyIndexWhenRelevant,
                                                               RingtoetsCommonFormsResources.FailureMechanismContextMenuStrip_Is_relevant,
                                                               RingtoetsCommonFormsResources.FailureMechanismContextMenuStrip_Is_relevant_Tooltip,
                                                               RingtoetsCommonFormsResources.Checkbox_ticked);
 
+                TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndex,
+                                                              RingtoetsCommonFormsResources.Validate_all,
+                                                              RingtoetsCommonFormsResources.ValidateAll_No_calculations_to_validate,
+                                                              RingtoetsCommonFormsResources.ValidateAllIcon,
+                                                              false);
                 TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndex,
                                                               RingtoetsCommonFormsResources.Calculate_all,
                                                               RingtoetsCommonFormsResources.FailureMechanism_CreateCalculateAllItem_No_calculations_to_run,
@@ -314,7 +320,7 @@
                 TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuRelevancyIndexWhenNotRelevant,
                                                               RingtoetsCommonFormsResources.FailureMechanismContextMenuStrip_Is_relevant,
                                                               RingtoetsCommonFormsResources.FailureMechanismContextMenuStrip_Is_relevant_Tooltip,
-                                                              RingtoetsCommonFormsResources.Checkbox_ticked);
+                                                              RingtoetsCommonFormsResources.Checkbox_empty);
             }
         }
 
@@ -407,7 +413,7 @@
                 TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndex,
                                                               RingtoetsFormsResources.Calculate_all,
                                                               RingtoetsFormsResources.GuiPlugin_AllDataAvailable_No_failure_mechanism_sections_imported,
-                                                              RingtoetsFormsResources.CalculateIcon,
+                                                              RingtoetsFormsResources.CalculateAllIcon,
                                                               false);
             }
         }
@@ -424,8 +430,7 @@
             }));
             failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation());
 
-            var assessmentSectionMock = mocksRepository.StrictMock<IAssessmentSection>();
-            assessmentSectionMock.Expect(asm => asm.HydraulicBoundaryDatabase).Return(null);
+            var assessmentSectionMock = mocksRepository.Stub<IAssessmentSection>();
 
             var nodeData = new HeightStructuresFailureMechanismContext(failureMechanism, assessmentSectionMock);
             var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
@@ -462,8 +467,8 @@
             }));
             failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation());
 
-            var assessmentSectionMock = mocksRepository.StrictMock<IAssessmentSection>();
-            assessmentSectionMock.Stub(asm => asm.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase());
+            var assessmentSectionMock = mocksRepository.Stub<IAssessmentSection>();
+            assessmentSectionMock.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
 
             var nodeData = new HeightStructuresFailureMechanismContext(failureMechanism, assessmentSectionMock);
             var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
@@ -509,8 +514,8 @@
                 Version = "1.0"
             };
 
-            var assessmentSectionMock = mocksRepository.StrictMock<IAssessmentSection>();
-            assessmentSectionMock.Stub(asm => asm.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase);
+            var assessmentSectionMock = mocksRepository.Stub<IAssessmentSection>();
+            assessmentSectionMock.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
 
             var nodeData = new HeightStructuresFailureMechanismContext(failureMechanism, assessmentSectionMock);
             var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
@@ -535,6 +540,164 @@
         }
 
         [Test]
+        public void ContextMenuStrip_NoFailureMechanismSections_ContextMenuItemValidateAllDisabledAndTooltipSet()
+        {
+            // Setup
+            var guiMock = mocksRepository.StrictMock<IGui>();
+            var failureMechanism = new HeightStructuresFailureMechanism();
+            failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation());
+            var assessmentSectionMock = mocksRepository.StrictMock<IAssessmentSection>();
+
+            var nodeData = new HeightStructuresFailureMechanismContext(failureMechanism, assessmentSectionMock);
+            
+            var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
+
+            using (var treeViewControl = new TreeViewControl())
+            {
+                guiMock.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder);
+
+                mocksRepository.ReplayAll();
+
+                plugin.Gui = guiMock;
+
+                // Call
+                ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl);
+
+                // Assert
+                TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndex,
+                                                              RingtoetsFormsResources.Validate_all,
+                                                              RingtoetsFormsResources.GuiPlugin_AllDataAvailable_No_failure_mechanism_sections_imported,
+                                                              RingtoetsFormsResources.ValidateAllIcon,
+                                                              false);
+            }
+            mocksRepository.VerifyAll();
+        }
+
+        [Test]
+        public void ContextMenuStrip_FailureMechanismSectionsSetNoHydraulicBoundaryDatabase_ContextMenuItemValidateAllDisabledAndTooltipSet()
+        {
+            // Setup
+            var guiMock = mocksRepository.StrictMock<IGui>();
+            var failureMechanism = new HeightStructuresFailureMechanism();
+            failureMechanism.AddSection(new FailureMechanismSection("test", new[]
+            {
+                new Point2D(0, 0)
+            }));
+            failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation());
+
+            var assessmentSectionMock = mocksRepository.Stub<IAssessmentSection>();
+
+            var nodeData = new HeightStructuresFailureMechanismContext(failureMechanism, assessmentSectionMock);
+            var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
+
+            using (var treeViewControl = new TreeViewControl())
+            {
+                guiMock.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder);
+
+                mocksRepository.ReplayAll();
+
+                plugin.Gui = guiMock;
+
+                // Call
+                var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl);
+
+                // Assert
+                TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuValidateAllIndex,
+                                                              RingtoetsFormsResources.Validate_all,
+                                                              RingtoetsFormsResources.GuiPlugin_AllDataAvailable_No_hydraulic_boundary_database_imported,
+                                                              RingtoetsFormsResources.ValidateAllIcon,
+                                                              false);
+            }
+            mocksRepository.VerifyAll();
+        }
+
+        [Test]
+        public void ContextMenuStrip_FailureMechanismSectionsSetHydraulicBoundaryDatabaseNotValid_ContextMenuItemValidateAllDisabledAndTooltipSet()
+        {
+            // Setup
+            var guiMock = mocksRepository.StrictMock<IGui>();
+            var failureMechanism = new HeightStructuresFailureMechanism();
+            failureMechanism.AddSection(new FailureMechanismSection("test", new[]
+            {
+                new Point2D(0, 0)
+            }));
+            failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation());
+
+            var assessmentSectionMock = mocksRepository.Stub<IAssessmentSection>();
+            assessmentSectionMock.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
+
+            var nodeData = new HeightStructuresFailureMechanismContext(failureMechanism, assessmentSectionMock);
+            var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
+
+            using (var treeViewControl = new TreeViewControl())
+            {
+                guiMock.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder);
+
+                mocksRepository.ReplayAll();
+
+                plugin.Gui = guiMock;
+
+                // Call
+                ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl);
+
+                // Assert
+                ToolStripItem contextMenuItem = contextMenu.Items[contextMenuValidateAllIndex];
+
+                Assert.AreEqual(RingtoetsFormsResources.Validate_all, contextMenuItem.Text);
+                StringAssert.Contains(string.Format(RingtoetsFormsResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText);
+                TestHelper.AssertImagesAreEqual(RingtoetsFormsResources.ValidateAllIcon, contextMenuItem.Image);
+                Assert.IsFalse(contextMenuItem.Enabled);
+            }
+            mocksRepository.VerifyAll();
+        }
+
+        [Test]
+        public void ContextMenuStrip_FailureMechanismSectionsAndHydraulicDatabaseSet_ContextMenuItemValidateAllEnabled()
+        {
+            // Setup
+            var guiMock = mocksRepository.StrictMock<IGui>();
+            var failureMechanism = new HeightStructuresFailureMechanism();
+            failureMechanism.AddSection(new FailureMechanismSection("test", new[]
+            {
+                new Point2D(0, 0)
+            }));
+            failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation());
+
+            string validFilePath = Path.Combine(testDataPath, "complete.sqlite");
+
+            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
+            {
+                FilePath = validFilePath,
+                Version = "1.0"
+            };
+
+            var assessmentSectionMock = mocksRepository.Stub<IAssessmentSection>();
+            assessmentSectionMock.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
+
+            var nodeData = new HeightStructuresFailureMechanismContext(failureMechanism, assessmentSectionMock);
+            var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
+
+            using (var treeViewControl = new TreeViewControl())
+            {
+                guiMock.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder);
+
+                mocksRepository.ReplayAll();
+
+                plugin.Gui = guiMock;
+
+                // Call
+                ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl);
+
+                // Assert
+                TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndex,
+                                                              RingtoetsFormsResources.Validate_all,
+                                                              RingtoetsFormsResources.FailureMechanism_Validate_all_ToolTip,
+                                                              RingtoetsFormsResources.ValidateAllIcon);
+            }
+            mocksRepository.VerifyAll();
+        }
+
+        [Test]
         public void ContextMenuStrip_ClickOnCalculateAllItem_ScheduleAllChildCalculations()
         {
             // Setup
@@ -569,12 +732,14 @@
 
             string validFilePath = Path.Combine(testDataPath, "complete.sqlite");
 
-            var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
             var hydraulicBoundaryDatabaseStub = mocksRepository.Stub<HydraulicBoundaryDatabase>();
             hydraulicBoundaryDatabaseStub.FilePath = validFilePath;
-            assessmentSection.HydraulicBoundaryDatabase = hydraulicBoundaryDatabaseStub;
-            var failureMechanismContext = new HeightStructuresFailureMechanismContext(failureMechanism, assessmentSection);
 
+            var assessmentSectionMock = mocksRepository.Stub<IAssessmentSection>();
+            assessmentSectionMock.HydraulicBoundaryDatabase = hydraulicBoundaryDatabaseStub;
+
+            var failureMechanismContext = new HeightStructuresFailureMechanismContext(failureMechanism, assessmentSectionMock);
+
             using (var treeViewControl = new TreeViewControl())
             {
                 guiMock.Expect(g => g.Get(failureMechanismContext, treeViewControl)).Return(menuBuilder);
@@ -613,9 +778,77 @@
             }
         }
 
+        [Test]
+        public void ContextMenuStrip_ClickOnValidateAllItem_ValidateAllChildCalculations()
+        {
+            // Setup
+            var guiMock = mocksRepository.StrictMock<IGui>();
+            var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
+
+            var failureMechanism = new HeightStructuresFailureMechanism();
+
+            var section = new FailureMechanismSection("A", new[]
+            {
+                new Point2D(0, 0)
+            });
+            failureMechanism.AddSection(section);
+
+            failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation
+            {
+                Name = "A",
+                InputParameters =
+                {
+                    HydraulicBoundaryLocation = new HydraulicBoundaryLocation(-1, "nonExisting", 1, 2)
+                }
+            });
+            failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation
+            {
+                Name = "B",
+                InputParameters =
+                {
+                    HydraulicBoundaryLocation = new HydraulicBoundaryLocation(-1, "nonExisting", 1, 2)
+                }
+            });
+
+            string validFilePath = Path.Combine(testDataPath, "complete.sqlite");
+
+            var hydraulicBoundaryDatabaseStub = mocksRepository.Stub<HydraulicBoundaryDatabase>();
+            hydraulicBoundaryDatabaseStub.FilePath = validFilePath;
+
+            var assessmentSectionMock = mocksRepository.Stub<IAssessmentSection>();
+            assessmentSectionMock.HydraulicBoundaryDatabase = hydraulicBoundaryDatabaseStub;
+
+            var failureMechanismContext = new HeightStructuresFailureMechanismContext(failureMechanism, assessmentSectionMock);
+
+            using (var treeViewControl = new TreeViewControl())
+            {
+                guiMock.Expect(g => g.Get(failureMechanismContext, treeViewControl)).Return(menuBuilder);
+
+                mocksRepository.ReplayAll();
+
+                plugin.Gui = guiMock;
+                var contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl);
+
+                // Call
+                TestHelper.AssertLogMessages(() => contextMenu.Items[contextMenuValidateAllIndex].PerformClick(), messages =>
+                {
+                    var messageList = messages.ToList();
+
+                    // Assert
+                    Assert.AreEqual(4, messageList.Count);
+                    StringAssert.StartsWith("Validatie van 'A' gestart om: ", messageList[0]);
+                    StringAssert.StartsWith("Validatie van 'A' beëindigd om: ", messageList[1]);
+                    StringAssert.StartsWith("Validatie van 'B' gestart om: ", messageList[2]);
+                    StringAssert.StartsWith("Validatie van 'B' beëindigd om: ", messageList[3]);
+                });
+            }
+            mocksRepository.VerifyAll();
+        }
+
         private const int contextMenuRelevancyIndexWhenRelevant = 1;
         private const int contextMenuRelevancyIndexWhenNotRelevant = 0;
-        private const int contextMenuCalculateAllIndex = 3;
-        private const int contextMenuClearAllIndex = 4;
+        private const int contextMenuValidateAllIndex = 3;
+        private const int contextMenuCalculateAllIndex = 4;
+        private const int contextMenuClearAllIndex = 5;
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/ClosingStructureFailureMechanismSectionResultContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc9396d0af18873fda14c7e486decbfca7d4e8b21 -r20415b2886919a103cb4677f56a8f61abbb7aa8a
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/ClosingStructureFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../ClosingStructureFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision c9396d0af18873fda14c7e486decbfca7d4e8b21)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/ClosingStructureFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../ClosingStructureFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 20415b2886919a103cb4677f56a8f61abbb7aa8a)
@@ -107,7 +107,7 @@
             var image = info.Image(null);
 
             // Assert
-            TestHelper.AssertImagesAreEqual(Resources.GenericInputOutputIcon, image);
+            TestHelper.AssertImagesAreEqual(Resources.FailureMechanismSectionResultIcon, image);
         }
 
         [Test]
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/DuneErosionFailureMechanismSectionResultContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc9396d0af18873fda14c7e486decbfca7d4e8b21 -r20415b2886919a103cb4677f56a8f61abbb7aa8a
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/DuneErosionFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../DuneErosionFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision c9396d0af18873fda14c7e486decbfca7d4e8b21)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/DuneErosionFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../DuneErosionFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 20415b2886919a103cb4677f56a8f61abbb7aa8a)
@@ -107,7 +107,7 @@
             var image = info.Image(null);
 
             // Assert
-            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, image);
+            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, image);
         }
 
         [Test]
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc9396d0af18873fda14c7e486decbfca7d4e8b21 -r20415b2886919a103cb4677f56a8f61abbb7aa8a
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision c9396d0af18873fda14c7e486decbfca7d4e8b21)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 20415b2886919a103cb4677f56a8f61abbb7aa8a)
@@ -107,7 +107,7 @@
             var image = info.Image(null);
 
             // Assert
-            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, image);
+            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, image);
         }
 
         [Test]
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/GrassCoverSlipOffInwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc9396d0af18873fda14c7e486decbfca7d4e8b21 -r20415b2886919a103cb4677f56a8f61abbb7aa8a
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/GrassCoverSlipOffInwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../GrassCoverSlipOffInwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision c9396d0af18873fda14c7e486decbfca7d4e8b21)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/GrassCoverSlipOffInwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../GrassCoverSlipOffInwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 20415b2886919a103cb4677f56a8f61abbb7aa8a)
@@ -107,7 +107,7 @@
             var image = info.Image(null);
 
             // Assert
-            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, image);
+            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, image);
         }
 
         [Test]
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/GrassCoverSlipOffOutwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc9396d0af18873fda14c7e486decbfca7d4e8b21 -r20415b2886919a103cb4677f56a8f61abbb7aa8a
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/GrassCoverSlipOffOutwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../GrassCoverSlipOffOutwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision c9396d0af18873fda14c7e486decbfca7d4e8b21)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/GrassCoverSlipOffOutwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../GrassCoverSlipOffOutwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 20415b2886919a103cb4677f56a8f61abbb7aa8a)
@@ -107,7 +107,7 @@
             var image = info.Image(null);
 
             // Assert
-            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, image);
+            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, image);
         }
 
         [Test]
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/MacrostabilityInwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc9396d0af18873fda14c7e486decbfca7d4e8b21 -r20415b2886919a103cb4677f56a8f61abbb7aa8a
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/MacrostabilityInwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../MacrostabilityInwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision c9396d0af18873fda14c7e486decbfca7d4e8b21)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/MacrostabilityInwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../MacrostabilityInwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 20415b2886919a103cb4677f56a8f61abbb7aa8a)
@@ -107,7 +107,7 @@
             var image = info.Image(null);
 
             // Assert
-            TestHelper.AssertImagesAreEqual(Resources.GenericInputOutputIcon, image);
+            TestHelper.AssertImagesAreEqual(Resources.FailureMechanismSectionResultIcon, image);
         }
 
         [Test]
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/MacrostabilityOutwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc9396d0af18873fda14c7e486decbfca7d4e8b21 -r20415b2886919a103cb4677f56a8f61abbb7aa8a
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/MacrostabilityOutwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../MacrostabilityOutwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision c9396d0af18873fda14c7e486decbfca7d4e8b21)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/MacrostabilityOutwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../MacrostabilityOutwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 20415b2886919a103cb4677f56a8f61abbb7aa8a)
@@ -107,7 +107,7 @@
             var image = info.Image(null);
 
             // Assert
-            TestHelper.AssertImagesAreEqual(Resources.GenericInputOutputIcon, image);
+            TestHelper.AssertImagesAreEqual(Resources.FailureMechanismSectionResultIcon, image);
         }
 
         [Test]
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/MicrostabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc9396d0af18873fda14c7e486decbfca7d4e8b21 -r20415b2886919a103cb4677f56a8f61abbb7aa8a
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/MicrostabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../MicrostabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision c9396d0af18873fda14c7e486decbfca7d4e8b21)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/MicrostabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../MicrostabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 20415b2886919a103cb4677f56a8f61abbb7aa8a)
@@ -107,7 +107,7 @@
             var image = info.Image(null);
 
             // Assert
-            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, image);
+            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, image);
         }
 
         [Test]
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/PipingStructureFailureMechanismSectionResultContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc9396d0af18873fda14c7e486decbfca7d4e8b21 -r20415b2886919a103cb4677f56a8f61abbb7aa8a
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/PipingStructureFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../PipingStructureFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision c9396d0af18873fda14c7e486decbfca7d4e8b21)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/PipingStructureFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../PipingStructureFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 20415b2886919a103cb4677f56a8f61abbb7aa8a)
@@ -107,7 +107,7 @@
             var image = info.Image(null);
 
             // Assert
-            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, image);
+            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, image);
         }
 
         [Test]
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/StabilityStoneCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc9396d0af18873fda14c7e486decbfca7d4e8b21 -r20415b2886919a103cb4677f56a8f61abbb7aa8a
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/StabilityStoneCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../StabilityStoneCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision c9396d0af18873fda14c7e486decbfca7d4e8b21)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/StabilityStoneCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../StabilityStoneCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 20415b2886919a103cb4677f56a8f61abbb7aa8a)
@@ -107,7 +107,7 @@
             var image = info.Image(null);
 
             // Assert
-            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, image);
+            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, image);
         }
 
         [Test]
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc9396d0af18873fda14c7e486decbfca7d4e8b21 -r20415b2886919a103cb4677f56a8f61abbb7aa8a
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision c9396d0af18873fda14c7e486decbfca7d4e8b21)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 20415b2886919a103cb4677f56a8f61abbb7aa8a)
@@ -107,7 +107,7 @@
             var image = info.Image(null);
 
             // Assert
-            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, image);
+            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, image);
         }
 
         [Test]
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/StrengthStabilityPointwiseConstructionFailureMechanismSectionResultContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc9396d0af18873fda14c7e486decbfca7d4e8b21 -r20415b2886919a103cb4677f56a8f61abbb7aa8a
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/StrengthStabilityPointwiseConstructionFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../StrengthStabilityPointwiseConstructionFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision c9396d0af18873fda14c7e486decbfca7d4e8b21)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/StrengthStabilityPointwiseConstructionFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../StrengthStabilityPointwiseConstructionFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 20415b2886919a103cb4677f56a8f61abbb7aa8a)
@@ -107,7 +107,7 @@
             var image = info.Image(null);
 
             // Assert
-            TestHelper.AssertImagesAreEqual(Resources.GenericInputOutputIcon, image);
+            TestHelper.AssertImagesAreEqual(Resources.FailureMechanismSectionResultIcon, image);
         }
 
         [Test]
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/TechnicalInnovationFailureMechanismSectionResultContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc9396d0af18873fda14c7e486decbfca7d4e8b21 -r20415b2886919a103cb4677f56a8f61abbb7aa8a
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/TechnicalInnovationFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../TechnicalInnovationFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision c9396d0af18873fda14c7e486decbfca7d4e8b21)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/TechnicalInnovationFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../TechnicalInnovationFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 20415b2886919a103cb4677f56a8f61abbb7aa8a)
@@ -107,7 +107,7 @@
             var image = info.Image(null);
 
             // Assert
-            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, image);
+            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, image);
         }
 
         [Test]
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/WaterPressureAsphaltCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc9396d0af18873fda14c7e486decbfca7d4e8b21 -r20415b2886919a103cb4677f56a8f61abbb7aa8a
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/WaterPressureAsphaltCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../WaterPressureAsphaltCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision c9396d0af18873fda14c7e486decbfca7d4e8b21)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/WaterPressureAsphaltCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../WaterPressureAsphaltCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 20415b2886919a103cb4677f56a8f61abbb7aa8a)
@@ -107,7 +107,7 @@
             var image = info.Image(null);
 
             // Assert
-            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, image);
+            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, image);
         }
 
         [Test]
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/WaveImpactAsphaltCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc9396d0af18873fda14c7e486decbfca7d4e8b21 -r20415b2886919a103cb4677f56a8f61abbb7aa8a
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/WaveImpactAsphaltCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision c9396d0af18873fda14c7e486decbfca7d4e8b21)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/WaveImpactAsphaltCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 20415b2886919a103cb4677f56a8f61abbb7aa8a)
@@ -108,7 +108,7 @@
             var image = info.Image(null);
 
             // Assert
-            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, image);
+            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, image);
         }
 
         [Test]
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsGuiPluginTest.cs
===================================================================
diff -u -r0a51f20ac93373a43f79bb4c6327bce1d46545c6 -r20415b2886919a103cb4677f56a8f61abbb7aa8a
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsGuiPluginTest.cs	(.../RingtoetsGuiPluginTest.cs)	(revision 0a51f20ac93373a43f79bb4c6327bce1d46545c6)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsGuiPluginTest.cs	(.../RingtoetsGuiPluginTest.cs)	(revision 20415b2886919a103cb4677f56a8f61abbb7aa8a)
@@ -255,81 +255,81 @@
                 var strengthStabilityLengthwiseConstructionResultViewInfo = viewInfos.Single(vi => vi.DataType == typeof(FailureMechanismSectionResultContext<StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult>));
                 Assert.AreEqual(typeof(IEnumerable<StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult>), strengthStabilityLengthwiseConstructionResultViewInfo.ViewDataType);
                 Assert.AreEqual(typeof(StrengthStabilityLengthwiseConstructionResultView), strengthStabilityLengthwiseConstructionResultViewInfo.ViewType);
-                TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, strengthStabilityLengthwiseConstructionResultViewInfo.Image);
+                TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, strengthStabilityLengthwiseConstructionResultViewInfo.Image);
 
                 var waterPressureAsphaltCoverResultViewInfo = viewInfos.Single(vi => vi.DataType == typeof(FailureMechanismSectionResultContext<WaterPressureAsphaltCoverFailureMechanismSectionResult>));
                 Assert.AreEqual(typeof(IEnumerable<WaterPressureAsphaltCoverFailureMechanismSectionResult>), waterPressureAsphaltCoverResultViewInfo.ViewDataType);
                 Assert.AreEqual(typeof(WaterPressureAsphaltCoverResultView), waterPressureAsphaltCoverResultViewInfo.ViewType);
-                TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, waterPressureAsphaltCoverResultViewInfo.Image);
+                TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, waterPressureAsphaltCoverResultViewInfo.Image);
 
                 var waveImpactAsphaltCoverResultViewInfo = viewInfos.Single(vi => vi.DataType == typeof(FailureMechanismSectionResultContext<WaveImpactAsphaltCoverFailureMechanismSectionResult>));
                 Assert.AreEqual(typeof(IEnumerable<WaveImpactAsphaltCoverFailureMechanismSectionResult>), waveImpactAsphaltCoverResultViewInfo.ViewDataType);
                 Assert.AreEqual(typeof(WaveImpactAsphaltCoverResultView), waveImpactAsphaltCoverResultViewInfo.ViewType);
-                TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, waveImpactAsphaltCoverResultViewInfo.Image);
+                TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, waveImpactAsphaltCoverResultViewInfo.Image);
 
                 var closingStructureResultViewInfo = viewInfos.Single(vi => vi.DataType == typeof(FailureMechanismSectionResultContext<ClosingStructureFailureMechanismSectionResult>));
                 Assert.AreEqual(typeof(IEnumerable<ClosingStructureFailureMechanismSectionResult>), closingStructureResultViewInfo.ViewDataType);
                 Assert.AreEqual(typeof(ClosingStructureResultView), closingStructureResultViewInfo.ViewType);
-                TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, closingStructureResultViewInfo.Image);
+                TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, closingStructureResultViewInfo.Image);
 
                 var macrostabilityOutwardsResultViewInfo = viewInfos.Single(vi => vi.DataType == typeof(FailureMechanismSectionResultContext<MacrostabilityOutwardsFailureMechanismSectionResult>));
                 Assert.AreEqual(typeof(IEnumerable<MacrostabilityOutwardsFailureMechanismSectionResult>), macrostabilityOutwardsResultViewInfo.ViewDataType);
                 Assert.AreEqual(typeof(MacrostabilityOutwardsResultView), macrostabilityOutwardsResultViewInfo.ViewType);
-                TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, macrostabilityOutwardsResultViewInfo.Image);
+                TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, macrostabilityOutwardsResultViewInfo.Image);
 
                 var macrostabilityInwardsResultViewInfo = viewInfos.Single(vi => vi.DataType == typeof(FailureMechanismSectionResultContext<MacrostabilityInwardsFailureMechanismSectionResult>));
                 Assert.AreEqual(typeof(IEnumerable<MacrostabilityInwardsFailureMechanismSectionResult>), macrostabilityInwardsResultViewInfo.ViewDataType);
                 Assert.AreEqual(typeof(MacrostabilityInwardsResultView), macrostabilityInwardsResultViewInfo.ViewType);
-                TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, macrostabilityInwardsResultViewInfo.Image);
+                TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, macrostabilityInwardsResultViewInfo.Image);
 
                 var strengthStabilityPointConstructionResultViewInfo = viewInfos.Single(vi => vi.DataType == typeof(FailureMechanismSectionResultContext<StrengthStabilityPointConstructionFailureMechanismSectionResult>));
                 Assert.AreEqual(typeof(IEnumerable<StrengthStabilityPointConstructionFailureMechanismSectionResult>), strengthStabilityPointConstructionResultViewInfo.ViewDataType);
                 Assert.AreEqual(typeof(StrengthStabilityPointConstructionResultView), strengthStabilityPointConstructionResultViewInfo.ViewType);
-                TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, strengthStabilityPointConstructionResultViewInfo.Image);
+                TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, strengthStabilityPointConstructionResultViewInfo.Image);
 
                 var duneErosionResultViewInfo = viewInfos.Single(vi => vi.DataType == typeof(FailureMechanismSectionResultContext<DuneErosionFailureMechanismSectionResult>));
                 Assert.AreEqual(typeof(IEnumerable<DuneErosionFailureMechanismSectionResult>), duneErosionResultViewInfo.ViewDataType);
                 Assert.AreEqual(typeof(DuneErosionResultView), duneErosionResultViewInfo.ViewType);
-                TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, duneErosionResultViewInfo.Image);
+                TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, duneErosionResultViewInfo.Image);
 
                 var grassCoverErosionOutwardsResultViewInfo = viewInfos.Single(vi => vi.DataType == typeof(FailureMechanismSectionResultContext<GrassCoverErosionOutwardsFailureMechanismSectionResult>));
                 Assert.AreEqual(typeof(IEnumerable<GrassCoverErosionOutwardsFailureMechanismSectionResult>), grassCoverErosionOutwardsResultViewInfo.ViewDataType);
                 Assert.AreEqual(typeof(GrassCoverErosionOutwardsResultView), grassCoverErosionOutwardsResultViewInfo.ViewType);
-                TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, grassCoverErosionOutwardsResultViewInfo.Image);
+                TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, grassCoverErosionOutwardsResultViewInfo.Image);
 
                 var grassCoverSlipOffInwardsResultViewInfo = viewInfos.Single(vi => vi.DataType == typeof(FailureMechanismSectionResultContext<GrassCoverSlipOffInwardsFailureMechanismSectionResult>));
                 Assert.AreEqual(typeof(IEnumerable<GrassCoverSlipOffInwardsFailureMechanismSectionResult>), grassCoverSlipOffInwardsResultViewInfo.ViewDataType);
                 Assert.AreEqual(typeof(GrassCoverSlipOffInwardsResultView), grassCoverSlipOffInwardsResultViewInfo.ViewType);
-                TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, grassCoverSlipOffInwardsResultViewInfo.Image);
+                TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, grassCoverSlipOffInwardsResultViewInfo.Image);
 
                 var grassCoverSlipOffOutwardsResultViewInfo = viewInfos.Single(vi => vi.DataType == typeof(FailureMechanismSectionResultContext<GrassCoverSlipOffOutwardsFailureMechanismSectionResult>));
                 Assert.AreEqual(typeof(IEnumerable<GrassCoverSlipOffOutwardsFailureMechanismSectionResult>), grassCoverSlipOffOutwardsResultViewInfo.ViewDataType);
                 Assert.AreEqual(typeof(GrassCoverSlipOffOutwardsResultView), grassCoverSlipOffOutwardsResultViewInfo.ViewType);
-                TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, grassCoverSlipOffOutwardsResultViewInfo.Image);
+                TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, grassCoverSlipOffOutwardsResultViewInfo.Image);
 
                 var microstabilityResultViewInfo = viewInfos.Single(vi => vi.DataType == typeof(FailureMechanismSectionResultContext<MicrostabilityFailureMechanismSectionResult>));
                 Assert.AreEqual(typeof(IEnumerable<MicrostabilityFailureMechanismSectionResult>), microstabilityResultViewInfo.ViewDataType);
                 Assert.AreEqual(typeof(MicrostabilityResultView), microstabilityResultViewInfo.ViewType);
-                TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, microstabilityResultViewInfo.Image);
+                TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, microstabilityResultViewInfo.Image);
 
                 var pipingStructureResultViewInfo = viewInfos.Single(vi => vi.DataType == typeof(FailureMechanismSectionResultContext<PipingStructureFailureMechanismSectionResult>));
                 Assert.AreEqual(typeof(IEnumerable<PipingStructureFailureMechanismSectionResult>), pipingStructureResultViewInfo.ViewDataType);
                 Assert.AreEqual(typeof(PipingStructureResultView), pipingStructureResultViewInfo.ViewType);
-                TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, pipingStructureResultViewInfo.Image);
+                TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, pipingStructureResultViewInfo.Image);
 
                 var stabilityStoneCoverResultViewInfo = viewInfos.Single(vi => vi.DataType == typeof(FailureMechanismSectionResultContext<StabilityStoneCoverFailureMechanismSectionResult>));
                 Assert.AreEqual(typeof(IEnumerable<StabilityStoneCoverFailureMechanismSectionResult>), stabilityStoneCoverResultViewInfo.ViewDataType);
                 Assert.AreEqual(typeof(StabilityStoneCoverResultView), stabilityStoneCoverResultViewInfo.ViewType);
-                TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, stabilityStoneCoverResultViewInfo.Image);
+                TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, stabilityStoneCoverResultViewInfo.Image);
 
                 var technicalInnovationResultViewInfo = viewInfos.Single(vi => vi.DataType == typeof(FailureMechanismSectionResultContext<TechnicalInnovationFailureMechanismSectionResult>));
                 Assert.AreEqual(typeof(IEnumerable<TechnicalInnovationFailureMechanismSectionResult>), technicalInnovationResultViewInfo.ViewDataType);
                 Assert.AreEqual(typeof(TechnicalInnovationResultView), technicalInnovationResultViewInfo.ViewType);
-                TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, technicalInnovationResultViewInfo.Image);
+                TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, technicalInnovationResultViewInfo.Image);
 
                 var commentView = viewInfos.Single(vi => vi.DataType == typeof(CommentContext<ICommentable>));
                 Assert.AreEqual(typeof(CommentView), commentView.ViewType);
-                TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, commentView.Image);
+                TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.EditDocumentIcon, commentView.Image);
             }
         }
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/ClosingStructureResultViewInfoTest.cs
===================================================================
diff -u -r2209699cf65944d97bb2efee9da2d6754fe27745 -r20415b2886919a103cb4677f56a8f61abbb7aa8a
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/ClosingStructureResultViewInfoTest.cs	(.../ClosingStructureResultViewInfoTest.cs)	(revision 2209699cf65944d97bb2efee9da2d6754fe27745)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/ClosingStructureResultViewInfoTest.cs	(.../ClosingStructureResultViewInfoTest.cs)	(revision 20415b2886919a103cb4677f56a8f61abbb7aa8a)
@@ -133,7 +133,7 @@
             var image = info.Image;
 
             // Assert
-            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, image);
+            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, image);
         }
 
         [Test]
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/DuneErosionResultViewInfoTest.cs
===================================================================
diff -u -r2209699cf65944d97bb2efee9da2d6754fe27745 -r20415b2886919a103cb4677f56a8f61abbb7aa8a
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/DuneErosionResultViewInfoTest.cs	(.../DuneErosionResultViewInfoTest.cs)	(revision 2209699cf65944d97bb2efee9da2d6754fe27745)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/DuneErosionResultViewInfoTest.cs	(.../DuneErosionResultViewInfoTest.cs)	(revision 20415b2886919a103cb4677f56a8f61abbb7aa8a)
@@ -133,7 +133,7 @@
             var image = info.Image;
 
             // Assert
-            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, image);
+            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, image);
         }
 
         [Test]
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsResultViewInfoTest.cs
===================================================================
diff -u -r2209699cf65944d97bb2efee9da2d6754fe27745 -r20415b2886919a103cb4677f56a8f61abbb7aa8a
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsResultViewInfoTest.cs	(.../GrassCoverErosionOutwardsResultViewInfoTest.cs)	(revision 2209699cf65944d97bb2efee9da2d6754fe27745)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsResultViewInfoTest.cs	(.../GrassCoverErosionOutwardsResultViewInfoTest.cs)	(revision 20415b2886919a103cb4677f56a8f61abbb7aa8a)
@@ -133,7 +133,7 @@
             var image = info.Image;
 
             // Assert
-            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, image);
+            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, image);
         }
 
         [Test]
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/GrassCoverSlipOffInwardsResultViewInfoTest.cs
===================================================================
diff -u -r2209699cf65944d97bb2efee9da2d6754fe27745 -r20415b2886919a103cb4677f56a8f61abbb7aa8a
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/GrassCoverSlipOffInwardsResultViewInfoTest.cs	(.../GrassCoverSlipOffInwardsResultViewInfoTest.cs)	(revision 2209699cf65944d97bb2efee9da2d6754fe27745)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/GrassCoverSlipOffInwardsResultViewInfoTest.cs	(.../GrassCoverSlipOffInwardsResultViewInfoTest.cs)	(revision 20415b2886919a103cb4677f56a8f61abbb7aa8a)
@@ -133,7 +133,7 @@
             var image = info.Image;
 
             // Assert
-            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, image);
+            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, image);
         }
 
         [Test]
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/GrassCoverSlipOffOutwardsResultViewInfoTest.cs
===================================================================
diff -u -r2209699cf65944d97bb2efee9da2d6754fe27745 -r20415b2886919a103cb4677f56a8f61abbb7aa8a
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/GrassCoverSlipOffOutwardsResultViewInfoTest.cs	(.../GrassCoverSlipOffOutwardsResultViewInfoTest.cs)	(revision 2209699cf65944d97bb2efee9da2d6754fe27745)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/GrassCoverSlipOffOutwardsResultViewInfoTest.cs	(.../GrassCoverSlipOffOutwardsResultViewInfoTest.cs)	(revision 20415b2886919a103cb4677f56a8f61abbb7aa8a)
@@ -133,7 +133,7 @@
             var image = info.Image;
 
             // Assert
-            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, image);
+            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, image);
         }
 
         [Test]
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/MacrostabilityInwardsResultViewInfoTest.cs
===================================================================
diff -u -r2209699cf65944d97bb2efee9da2d6754fe27745 -r20415b2886919a103cb4677f56a8f61abbb7aa8a
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/MacrostabilityInwardsResultViewInfoTest.cs	(.../MacrostabilityInwardsResultViewInfoTest.cs)	(revision 2209699cf65944d97bb2efee9da2d6754fe27745)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/MacrostabilityInwardsResultViewInfoTest.cs	(.../MacrostabilityInwardsResultViewInfoTest.cs)	(revision 20415b2886919a103cb4677f56a8f61abbb7aa8a)
@@ -133,7 +133,7 @@
             var image = info.Image;
 
             // Assert
-            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, image);
+            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, image);
         }
 
         [Test]
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/MacrostabilityOutwardsResultViewInfoTest.cs
===================================================================
diff -u -r2209699cf65944d97bb2efee9da2d6754fe27745 -r20415b2886919a103cb4677f56a8f61abbb7aa8a
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/MacrostabilityOutwardsResultViewInfoTest.cs	(.../MacrostabilityOutwardsResultViewInfoTest.cs)	(revision 2209699cf65944d97bb2efee9da2d6754fe27745)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/MacrostabilityOutwardsResultViewInfoTest.cs	(.../MacrostabilityOutwardsResultViewInfoTest.cs)	(revision 20415b2886919a103cb4677f56a8f61abbb7aa8a)
@@ -133,7 +133,7 @@
             var image = info.Image;
 
             // Assert
-            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, image);
+            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, image);
         }
 
         [Test]
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/MicrostabilityResultViewInfoTest.cs
===================================================================
diff -u -r2209699cf65944d97bb2efee9da2d6754fe27745 -r20415b2886919a103cb4677f56a8f61abbb7aa8a
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/MicrostabilityResultViewInfoTest.cs	(.../MicrostabilityResultViewInfoTest.cs)	(revision 2209699cf65944d97bb2efee9da2d6754fe27745)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/MicrostabilityResultViewInfoTest.cs	(.../MicrostabilityResultViewInfoTest.cs)	(revision 20415b2886919a103cb4677f56a8f61abbb7aa8a)
@@ -133,7 +133,7 @@
             var image = info.Image;
 
             // Assert
-            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, image);
+            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, image);
         }
 
         [Test]
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/PipingStructureResultViewInfoTest.cs
===================================================================
diff -u -r2209699cf65944d97bb2efee9da2d6754fe27745 -r20415b2886919a103cb4677f56a8f61abbb7aa8a
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/PipingStructureResultViewInfoTest.cs	(.../PipingStructureResultViewInfoTest.cs)	(revision 2209699cf65944d97bb2efee9da2d6754fe27745)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/PipingStructureResultViewInfoTest.cs	(.../PipingStructureResultViewInfoTest.cs)	(revision 20415b2886919a103cb4677f56a8f61abbb7aa8a)
@@ -133,7 +133,7 @@
             var image = info.Image;
 
             // Assert
-            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, image);
+            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, image);
         }
 
         [Test]
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/StabilityStoneCoverResultViewInfoTest.cs
===================================================================
diff -u -r2209699cf65944d97bb2efee9da2d6754fe27745 -r20415b2886919a103cb4677f56a8f61abbb7aa8a
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/StabilityStoneCoverResultViewInfoTest.cs	(.../StabilityStoneCoverResultViewInfoTest.cs)	(revision 2209699cf65944d97bb2efee9da2d6754fe27745)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/StabilityStoneCoverResultViewInfoTest.cs	(.../StabilityStoneCoverResultViewInfoTest.cs)	(revision 20415b2886919a103cb4677f56a8f61abbb7aa8a)
@@ -133,7 +133,7 @@
             var image = info.Image;
 
             // Assert
-            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, image);
+            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, image);
         }
 
         [Test]
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/StrengthStabilityLengthwiseConstructionResultViewInfoTest.cs
===================================================================
diff -u -r2209699cf65944d97bb2efee9da2d6754fe27745 -r20415b2886919a103cb4677f56a8f61abbb7aa8a
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/StrengthStabilityLengthwiseConstructionResultViewInfoTest.cs	(.../StrengthStabilityLengthwiseConstructionResultViewInfoTest.cs)	(revision 2209699cf65944d97bb2efee9da2d6754fe27745)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/StrengthStabilityLengthwiseConstructionResultViewInfoTest.cs	(.../StrengthStabilityLengthwiseConstructionResultViewInfoTest.cs)	(revision 20415b2886919a103cb4677f56a8f61abbb7aa8a)
@@ -132,7 +132,7 @@
             var image = info.Image;
 
             // Assert
-            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, image);
+            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, image);
         }
 
         [Test]
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/StrengthStabilityPointConstructionResultViewInfoTest.cs
===================================================================
diff -u -r2209699cf65944d97bb2efee9da2d6754fe27745 -r20415b2886919a103cb4677f56a8f61abbb7aa8a
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/StrengthStabilityPointConstructionResultViewInfoTest.cs	(.../StrengthStabilityPointConstructionResultViewInfoTest.cs)	(revision 2209699cf65944d97bb2efee9da2d6754fe27745)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/StrengthStabilityPointConstructionResultViewInfoTest.cs	(.../StrengthStabilityPointConstructionResultViewInfoTest.cs)	(revision 20415b2886919a103cb4677f56a8f61abbb7aa8a)
@@ -133,7 +133,7 @@
             var image = info.Image;
 
             // Assert
-            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, image);
+            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, image);
         }
 
         [Test]
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/TechnicalInnovationResultViewInfoTest.cs
===================================================================
diff -u -r2209699cf65944d97bb2efee9da2d6754fe27745 -r20415b2886919a103cb4677f56a8f61abbb7aa8a
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/TechnicalInnovationResultViewInfoTest.cs	(.../TechnicalInnovationResultViewInfoTest.cs)	(revision 2209699cf65944d97bb2efee9da2d6754fe27745)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/TechnicalInnovationResultViewInfoTest.cs	(.../TechnicalInnovationResultViewInfoTest.cs)	(revision 20415b2886919a103cb4677f56a8f61abbb7aa8a)
@@ -133,7 +133,7 @@
             var image = info.Image;
 
             // Assert
-            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, image);
+            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, image);
         }
 
         [Test]
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaterPressureAsphaltCoverResultViewInfoTest.cs
===================================================================
diff -u -r2209699cf65944d97bb2efee9da2d6754fe27745 -r20415b2886919a103cb4677f56a8f61abbb7aa8a
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaterPressureAsphaltCoverResultViewInfoTest.cs	(.../WaterPressureAsphaltCoverResultViewInfoTest.cs)	(revision 2209699cf65944d97bb2efee9da2d6754fe27745)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaterPressureAsphaltCoverResultViewInfoTest.cs	(.../WaterPressureAsphaltCoverResultViewInfoTest.cs)	(revision 20415b2886919a103cb4677f56a8f61abbb7aa8a)
@@ -132,7 +132,7 @@
             var image = info.Image;
 
             // Assert
-            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, image);
+            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, image);
         }
 
         [Test]
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveImpactAsphaltCoverResultViewInfoTest.cs
===================================================================
diff -u -r2209699cf65944d97bb2efee9da2d6754fe27745 -r20415b2886919a103cb4677f56a8f61abbb7aa8a
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveImpactAsphaltCoverResultViewInfoTest.cs	(.../WaveImpactAsphaltCoverResultViewInfoTest.cs)	(revision 2209699cf65944d97bb2efee9da2d6754fe27745)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveImpactAsphaltCoverResultViewInfoTest.cs	(.../WaveImpactAsphaltCoverResultViewInfoTest.cs)	(revision 20415b2886919a103cb4677f56a8f61abbb7aa8a)
@@ -132,7 +132,7 @@
             var image = info.Image;
 
             // Assert
-            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, image);
+            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, image);
         }
 
         [Test]
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/FailureMechanismSectionResultContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc9396d0af18873fda14c7e486decbfca7d4e8b21 -r20415b2886919a103cb4677f56a8f61abbb7aa8a
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/FailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../FailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision c9396d0af18873fda14c7e486decbfca7d4e8b21)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/FailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../FailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 20415b2886919a103cb4677f56a8f61abbb7aa8a)
@@ -106,7 +106,7 @@
             var image = info.Image(null);
 
             // Assert
-            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, image);
+            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, image);
         }
 
         [Test]
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingFailureMechanismResultViewInfoTest.cs
===================================================================
diff -u -r2209699cf65944d97bb2efee9da2d6754fe27745 -r20415b2886919a103cb4677f56a8f61abbb7aa8a
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingFailureMechanismResultViewInfoTest.cs	(.../PipingFailureMechanismResultViewInfoTest.cs)	(revision 2209699cf65944d97bb2efee9da2d6754fe27745)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingFailureMechanismResultViewInfoTest.cs	(.../PipingFailureMechanismResultViewInfoTest.cs)	(revision 20415b2886919a103cb4677f56a8f61abbb7aa8a)
@@ -133,7 +133,7 @@
             var image = info.Image;
 
             // Assert
-            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, image);
+            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, image);
         }
 
         [Test]