Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Plugin/ClosingStructuresPlugin.cs
===================================================================
diff -u -r62b8135dcc02e56da0616c5d6f4e345198994393 -r91fdf2e233540b706aaea20136e4eca87b0875d6
--- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision 62b8135dcc02e56da0616c5d6f4e345198994393)
+++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision 91fdf2e233540b706aaea20136e4eca87b0875d6)
@@ -97,14 +97,12 @@
             yield return new RiskeerViewInfo<ClosingStructuresCalculationsContext, ClosingStructuresFailureMechanismView>(() => Gui)
             {
                 GetViewName = (view, context) => context.WrappedData.Name,
-                Image = RiskeerCommonFormsResources.FailureMechanismIcon,
                 CreateInstance = context => new ClosingStructuresFailureMechanismView(context.WrappedData, context.Parent)
             };
 
             yield return new RiskeerViewInfo<ClosingStructuresFailurePathContext, ClosingStructuresFailurePathView>(() => Gui)
             {
                 GetViewName = (view, context) => context.WrappedData.Name,
-                Image = RiskeerCommonFormsResources.FailureMechanismIcon,
                 AdditionalDataCheck = context => context.WrappedData.InAssembly,
                 CreateInstance = context => new ClosingStructuresFailurePathView(context.WrappedData, context.Parent),
                 CloseForData = CloseFailurePathViewForData
@@ -116,7 +114,6 @@
                 ClosingStructuresFailureMechanismResultView>(() => Gui)
             {
                 GetViewName = (view, context) => RiskeerCommonFormsResources.FailureMechanism_AssessmentResult_DisplayName,
-                Image = RiskeerCommonFormsResources.FailureMechanismSectionResultIcon,
                 CloseForData = CloseFailureMechanismResultViewForData,
                 GetViewData = context => context.WrappedData,
                 CreateInstance = context => new ClosingStructuresFailureMechanismResultView(
@@ -128,7 +125,6 @@
             {
                 GetViewData = context => context.WrappedData,
                 GetViewName = (view, context) => RiskeerCommonFormsResources.Scenarios_DisplayName,
-                Image = RiskeerCommonFormsResources.ScenariosIcon,
                 CreateInstance = context => new ClosingStructuresScenariosView(context.WrappedData, context.ParentFailureMechanism),
                 CloseForData = CloseScenariosViewForData
             };
@@ -138,7 +134,6 @@
                 CreateInstance = context => new ClosingStructuresCalculationsView(context.WrappedData, context.FailureMechanism, context.AssessmentSection),
                 GetViewData = context => context.WrappedData,
                 GetViewName = (view, context) => context.WrappedData.Name,
-                Image = RiskeerCommonFormsResources.GeneralFolderIcon,
                 AdditionalDataCheck = context => context.WrappedData == context.FailureMechanism.CalculationsGroup,
                 CloseForData = CloseCalculationsViewForData
             };
Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/ViewInfos/ClosingStructuresCalculationsViewInfoTest.cs
===================================================================
diff -u -rab898752550072651405ede02c5085df7800a602 -r91fdf2e233540b706aaea20136e4eca87b0875d6
--- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/ViewInfos/ClosingStructuresCalculationsViewInfoTest.cs	(.../ClosingStructuresCalculationsViewInfoTest.cs)	(revision ab898752550072651405ede02c5085df7800a602)
+++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/ViewInfos/ClosingStructuresCalculationsViewInfoTest.cs	(.../ClosingStructuresCalculationsViewInfoTest.cs)	(revision 91fdf2e233540b706aaea20136e4eca87b0875d6)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using System.Linq;
-using Core.Common.TestUtil;
 using Core.Gui.Plugin;
 using NUnit.Framework;
 using Rhino.Mocks;
@@ -61,7 +60,6 @@
             // Assert
             Assert.AreEqual(typeof(ClosingStructuresCalculationGroupContext), info.DataType);
             Assert.AreEqual(typeof(CalculationGroup), info.ViewDataType);
-            TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.GeneralFolderIcon, info.Image);
         }
 
         [Test]
Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/ViewInfos/ClosingStructuresFailureMechanismResultViewInfoTest.cs
===================================================================
diff -u -rd9f5273ce881cc71adaf9a3fd62a6517eda39983 -r91fdf2e233540b706aaea20136e4eca87b0875d6
--- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/ViewInfos/ClosingStructuresFailureMechanismResultViewInfoTest.cs	(.../ClosingStructuresFailureMechanismResultViewInfoTest.cs)	(revision d9f5273ce881cc71adaf9a3fd62a6517eda39983)
+++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/ViewInfos/ClosingStructuresFailureMechanismResultViewInfoTest.cs	(.../ClosingStructuresFailureMechanismResultViewInfoTest.cs)	(revision 91fdf2e233540b706aaea20136e4eca87b0875d6)
@@ -19,11 +19,9 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System.Drawing;
 using System.Linq;
 using Core.Common.Base;
 using Core.Common.Controls.Views;
-using Core.Common.TestUtil;
 using Core.Gui.Plugin;
 using NUnit.Framework;
 using Rhino.Mocks;
@@ -97,18 +95,8 @@
             // Assert
             Assert.AreEqual("Resultaat", viewName);
         }
-
+        
         [Test]
-        public void Image_Always_ReturnsFailureMechanismSectionResultIcon()
-        {
-            // Call
-            Image image = info.Image;
-
-            // Assert
-            TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.FailureMechanismSectionResultIcon, image);
-        }
-
-        [Test]
         public void CloseForData_AssessmentSectionRemovedWithoutFailureMechanism_ReturnsFalse()
         {
             // Setup
Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/ViewInfos/ClosingStructuresFailureMechanismViewInfoTest.cs
===================================================================
diff -u -rfc05d28b1d3b14433c890521c0f276ab14b73506 -r91fdf2e233540b706aaea20136e4eca87b0875d6
--- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/ViewInfos/ClosingStructuresFailureMechanismViewInfoTest.cs	(.../ClosingStructuresFailureMechanismViewInfoTest.cs)	(revision fc05d28b1d3b14433c890521c0f276ab14b73506)
+++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/ViewInfos/ClosingStructuresFailureMechanismViewInfoTest.cs	(.../ClosingStructuresFailureMechanismViewInfoTest.cs)	(revision 91fdf2e233540b706aaea20136e4eca87b0875d6)
@@ -19,11 +19,9 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System.Drawing;
 using System.Linq;
 using System.Threading;
 using System.Windows.Forms;
-using Core.Common.TestUtil;
 using Core.Gui.Plugin;
 using NUnit.Framework;
 using Rhino.Mocks;
@@ -81,18 +79,8 @@
             // Assert
             Assert.AreEqual(failureMechanism.Name, viewName);
         }
-
+        
         [Test]
-        public void Image_Always_ReturnsGenericInputOutputIcon()
-        {
-            // Call
-            Image image = info.Image;
-
-            // Assert
-            TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.FailureMechanismIcon, image);
-        }
-
-        [Test]
         [Apartment(ApartmentState.STA)]
         public void CreateInstance_WithContext_ReturnClosingStructuresFailureMechanismView()
         {
Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/ViewInfos/ClosingStructuresFailurePathViewInfoTest.cs
===================================================================
diff -u -r68b02d607d704885a5d113d2766b237c207a1de6 -r91fdf2e233540b706aaea20136e4eca87b0875d6
--- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/ViewInfos/ClosingStructuresFailurePathViewInfoTest.cs	(.../ClosingStructuresFailurePathViewInfoTest.cs)	(revision 68b02d607d704885a5d113d2766b237c207a1de6)
+++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/ViewInfos/ClosingStructuresFailurePathViewInfoTest.cs	(.../ClosingStructuresFailurePathViewInfoTest.cs)	(revision 91fdf2e233540b706aaea20136e4eca87b0875d6)
@@ -19,11 +19,9 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System.Drawing;
 using System.Linq;
 using System.Threading;
 using System.Windows.Forms;
-using Core.Common.TestUtil;
 using Core.Gui.Plugin;
 using NUnit.Framework;
 using Rhino.Mocks;
@@ -83,16 +81,6 @@
         }
 
         [Test]
-        public void Image_Always_ReturnsGenericInputOutputIcon()
-        {
-            // Call
-            Image image = info.Image;
-
-            // Assert
-            TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.FailureMechanismIcon, image);
-        }
-
-        [Test]
         [TestCase(true)]
         [TestCase(false)]
         public void AdditionalDataCheck_Always_ReturnTrueOnlyIfFailureMechanismInAssembly(bool inAssembly)
Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/ViewInfos/ClosingStructuresScenariosViewInfoTest.cs
===================================================================
diff -u -rc1d55fb683f59ce76644603288c4494f2b569655 -r91fdf2e233540b706aaea20136e4eca87b0875d6
--- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/ViewInfos/ClosingStructuresScenariosViewInfoTest.cs	(.../ClosingStructuresScenariosViewInfoTest.cs)	(revision c1d55fb683f59ce76644603288c4494f2b569655)
+++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/ViewInfos/ClosingStructuresScenariosViewInfoTest.cs	(.../ClosingStructuresScenariosViewInfoTest.cs)	(revision 91fdf2e233540b706aaea20136e4eca87b0875d6)
@@ -19,10 +19,8 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System.Drawing;
 using System.Linq;
 using Core.Common.Controls.Views;
-using Core.Common.TestUtil;
 using Core.Gui.Plugin;
 using NUnit.Framework;
 using Rhino.Mocks;
@@ -89,16 +87,6 @@
         }
 
         [Test]
-        public void Image_Always_ReturnScenariosIcon()
-        {
-            // Call
-            Image image = info.Image;
-
-            // Assert
-            TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.ScenariosIcon, image);
-        }
-
-        [Test]
         public void CloseForData_ViewNotCorrespondingToRemovedFailureMechanism_ReturnFalse()
         {
             using (var view = new ClosingStructuresScenariosView(new CalculationGroup(), new ClosingStructuresFailureMechanism()))
Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Plugin/DuneErosionPlugin.cs
===================================================================
diff -u -r62b8135dcc02e56da0616c5d6f4e345198994393 -r91fdf2e233540b706aaea20136e4eca87b0875d6
--- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Plugin/DuneErosionPlugin.cs	(.../DuneErosionPlugin.cs)	(revision 62b8135dcc02e56da0616c5d6f4e345198994393)
+++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Plugin/DuneErosionPlugin.cs	(.../DuneErosionPlugin.cs)	(revision 91fdf2e233540b706aaea20136e4eca87b0875d6)
@@ -170,7 +170,6 @@
                 DuneErosionFailureMechanismResultView>(() => Gui)
             {
                 GetViewName = (view, context) => RiskeerCommonFormsResources.FailureMechanism_AssessmentResult_DisplayName,
-                Image = RiskeerCommonFormsResources.FailureMechanismSectionResultIcon,
                 CloseForData = CloseFailureMechanismResultViewForData,
                 GetViewData = context => context.WrappedData,
                 CreateInstance = context => new DuneErosionFailureMechanismResultView(
@@ -181,14 +180,12 @@
             yield return new RiskeerViewInfo<DuneErosionHydraulicLoadsContext, DuneErosionFailureMechanismView>(() => Gui)
             {
                 GetViewName = (view, context) => context.WrappedData.Name,
-                Image = RiskeerCommonFormsResources.FailureMechanismIcon,
                 CreateInstance = context => new DuneErosionFailureMechanismView(context.WrappedData, context.Parent)
             };
 
             yield return new RiskeerViewInfo<DuneErosionFailurePathContext, DuneErosionFailurePathView>(() => Gui)
             {
                 GetViewName = (view, context) => context.WrappedData.Name,
-                Image = RiskeerCommonFormsResources.FailureMechanismIcon,
                 AdditionalDataCheck = context => context.WrappedData.InAssembly,
                 CreateInstance = context => new DuneErosionFailurePathView(context.WrappedData, context.Parent),
                 CloseForData = CloseFailurePathViewForData
@@ -197,7 +194,6 @@
             yield return new RiskeerViewInfo<DuneLocationCalculationsForUserDefinedTargetProbabilityContext, IObservableEnumerable<DuneLocationCalculation>, DuneLocationCalculationsView>(() => Gui)
             {
                 GetViewName = (view, context) => GetDuneLocationCalculationsViewName(context.WrappedData, context.FailureMechanism.DuneLocationCalculationsForUserDefinedTargetProbabilities),
-                Image = RiskeerCommonFormsResources.GenericInputOutputIcon,
                 GetViewData = context => context.WrappedData.DuneLocationCalculations,
                 CloseForData = CloseDuneLocationCalculationsViewForData,
                 CreateInstance = context => new DuneLocationCalculationsView(context.WrappedData.DuneLocationCalculations,
Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/ViewInfos/DuneErosionFailureMechanismResultViewInfoTest.cs
===================================================================
diff -u -r1da7a31b01a917278adefdefd61276733b31a0bb -r91fdf2e233540b706aaea20136e4eca87b0875d6
--- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/ViewInfos/DuneErosionFailureMechanismResultViewInfoTest.cs	(.../DuneErosionFailureMechanismResultViewInfoTest.cs)	(revision 1da7a31b01a917278adefdefd61276733b31a0bb)
+++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/ViewInfos/DuneErosionFailureMechanismResultViewInfoTest.cs	(.../DuneErosionFailureMechanismResultViewInfoTest.cs)	(revision 91fdf2e233540b706aaea20136e4eca87b0875d6)
@@ -19,11 +19,9 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System.Drawing;
 using System.Linq;
 using Core.Common.Base;
 using Core.Common.Controls.Views;
-using Core.Common.TestUtil;
 using Core.Gui.Plugin;
 using NUnit.Framework;
 using Rhino.Mocks;
@@ -94,16 +92,6 @@
         }
 
         [Test]
-        public void Image_Always_ReturnsGenericInputOutputIcon()
-        {
-            // Call
-            Image image = info.Image;
-
-            // Assert
-            TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.FailureMechanismSectionResultIcon, image);
-        }
-
-        [Test]
         public void CloseForData_AssessmentSectionRemovedWithoutFailureMechanism_ReturnsFalse()
         {
             // Setup
Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/ViewInfos/DuneErosionFailureMechanismViewInfoTest.cs
===================================================================
diff -u -r1dd2c22368f99235c15314f434505d4b5fc27a90 -r91fdf2e233540b706aaea20136e4eca87b0875d6
--- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/ViewInfos/DuneErosionFailureMechanismViewInfoTest.cs	(.../DuneErosionFailureMechanismViewInfoTest.cs)	(revision 1dd2c22368f99235c15314f434505d4b5fc27a90)
+++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/ViewInfos/DuneErosionFailureMechanismViewInfoTest.cs	(.../DuneErosionFailureMechanismViewInfoTest.cs)	(revision 91fdf2e233540b706aaea20136e4eca87b0875d6)
@@ -22,7 +22,6 @@
 using System.Linq;
 using System.Threading;
 using System.Windows.Forms;
-using Core.Common.TestUtil;
 using Core.Gui.Plugin;
 using NUnit.Framework;
 using Rhino.Mocks;
@@ -62,7 +61,6 @@
             // Assert
             Assert.AreEqual(typeof(DuneErosionHydraulicLoadsContext), info.DataType);
             Assert.AreEqual(typeof(DuneErosionHydraulicLoadsContext), info.ViewDataType);
-            TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.FailureMechanismIcon, info.Image);
         }
 
         [Test]
Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/ViewInfos/DuneErosionFailurePathViewInfoTest.cs
===================================================================
diff -u -r68b02d607d704885a5d113d2766b237c207a1de6 -r91fdf2e233540b706aaea20136e4eca87b0875d6
--- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/ViewInfos/DuneErosionFailurePathViewInfoTest.cs	(.../DuneErosionFailurePathViewInfoTest.cs)	(revision 68b02d607d704885a5d113d2766b237c207a1de6)
+++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/ViewInfos/DuneErosionFailurePathViewInfoTest.cs	(.../DuneErosionFailurePathViewInfoTest.cs)	(revision 91fdf2e233540b706aaea20136e4eca87b0875d6)
@@ -22,7 +22,6 @@
 using System.Linq;
 using System.Threading;
 using System.Windows.Forms;
-using Core.Common.TestUtil;
 using Core.Gui.Plugin;
 using NUnit.Framework;
 using Rhino.Mocks;
@@ -62,7 +61,6 @@
             // Assert
             Assert.AreEqual(typeof(DuneErosionFailurePathContext), info.DataType);
             Assert.AreEqual(typeof(DuneErosionFailurePathContext), info.ViewDataType);
-            TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.FailureMechanismIcon, info.Image);
         }
 
         [Test]
Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/ViewInfos/DuneLocationCalculationsViewInfoTest.cs
===================================================================
diff -u -r64bbbbacbbc8c8e78c687825dbea04c753e7ded4 -r91fdf2e233540b706aaea20136e4eca87b0875d6
--- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/ViewInfos/DuneLocationCalculationsViewInfoTest.cs	(.../DuneLocationCalculationsViewInfoTest.cs)	(revision 64bbbbacbbc8c8e78c687825dbea04c753e7ded4)
+++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/ViewInfos/DuneLocationCalculationsViewInfoTest.cs	(.../DuneLocationCalculationsViewInfoTest.cs)	(revision 91fdf2e233540b706aaea20136e4eca87b0875d6)
@@ -20,10 +20,8 @@
 // All rights reserved.
 
 using System;
-using System.Drawing;
 using System.Linq;
 using Core.Common.Base;
-using Core.Common.TestUtil;
 using Core.Gui;
 using Core.Gui.Forms.Main;
 using Core.Gui.Forms.ViewHost;
@@ -118,22 +116,6 @@
         }
 
         [Test]
-        public void Image_Always_ReturnsGenericInputOutputIcon()
-        {
-            // Setup
-            using (var plugin = new DuneErosionPlugin())
-            {
-                ViewInfo info = GetInfo(plugin);
-
-                // Call
-                Image image = info.Image;
-
-                // Assert
-                TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.GenericInputOutputIcon, image);
-            }
-        }
-
-        [Test]
         public void GetViewData_Always_ReturnsDuneLocationCalculations()
         {
             // Setup