Index: Core/Common/src/Core.Common.Gui/Commands/GuiExportHandler.cs
===================================================================
diff -u -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 -r95364cd8155bbd5f25bf2ee83b5731fca744373a
--- Core/Common/src/Core.Common.Gui/Commands/GuiExportHandler.cs	(.../GuiExportHandler.cs)	(revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2)
+++ Core/Common/src/Core.Common.Gui/Commands/GuiExportHandler.cs	(.../GuiExportHandler.cs)	(revision 95364cd8155bbd5f25bf2ee83b5731fca744373a)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using System.Collections.Generic;
-using System.Drawing;
 using System.Globalization;
 using System.Linq;
 using System.Windows.Forms;
@@ -39,7 +38,6 @@
     public class GuiExportHandler : IExportCommandHandler
     {
         private static readonly ILog log = LogManager.GetLogger(typeof(GuiExportHandler));
-        private static readonly Bitmap brickImage = Resources.brick;
 
         private readonly IWin32Window dialogParent;
         private readonly IEnumerable<ExportInfo> exportInfos;
@@ -107,7 +105,7 @@
             {
                 foreach (var exportInfo in supportedExportInfos)
                 {
-                    selectExportInfoDialog.AddItemType(exportInfo.Name, exportInfo.Category, exportInfo.Image ?? brickImage, null);
+                    selectExportInfoDialog.AddItemType(exportInfo.Name, exportInfo.Category, exportInfo.Image ?? Resources.ExportIcon, null);
                 }
 
                 if (selectExportInfoDialog.ShowDialog() == DialogResult.OK)
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs
===================================================================
diff -u -r92df0a0ac0a4e0ccd5d7505d748f55167c2aac81 -r95364cd8155bbd5f25bf2ee83b5731fca744373a
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision 92df0a0ac0a4e0ccd5d7505d748f55167c2aac81)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision 95364cd8155bbd5f25bf2ee83b5731fca744373a)
@@ -245,8 +245,6 @@
             yield return new ExportInfo<HydraulicBoundariesGroupContext>
             {
                 Name = RingtoetsCommonFormsResources.HydraulicBoundaryLocationsExporter_DisplayName,
-                Category = RingtoetsCommonFormsResources.Ringtoets_Category,
-                Image = RingtoetsCommonFormsResources.PointShapefileIcon,
                 CreateFileExporter = (context, filePath) =>
                     new HydraulicBoundaryLocationsExporter(context.WrappedData,
                                                            filePath, Resources.DesignWaterLevel_Description, Resources.WaveHeight_Description),
@@ -258,8 +256,6 @@
             yield return new ExportInfo<HydraulicBoundariesGroupContext>
             {
                 Name = RingtoetsCommonFormsResources.WaveConditionsExporter_DisplayName,
-                Category = RingtoetsCommonFormsResources.Ringtoets_Category,
-                Image = RingtoetsCommonFormsResources.GeneralOutputIcon,
                 CreateFileExporter = (context, filePath) =>
                 {
                     var calculations = context.FailureMechanism.WaveConditionsCalculationGroup.GetCalculations().Cast<GrassCoverErosionOutwardsWaveConditionsCalculation>();
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/HydraulicBoundariesGroupContextLocationsExportInfoTest.cs
===================================================================
diff -u -r2fd96187f75c7b24ccb411ecf5b6c8f0dcc591bb -r95364cd8155bbd5f25bf2ee83b5731fca744373a
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/HydraulicBoundariesGroupContextLocationsExportInfoTest.cs	(.../HydraulicBoundariesGroupContextLocationsExportInfoTest.cs)	(revision 2fd96187f75c7b24ccb411ecf5b6c8f0dcc591bb)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/HydraulicBoundariesGroupContextLocationsExportInfoTest.cs	(.../HydraulicBoundariesGroupContextLocationsExportInfoTest.cs)	(revision 95364cd8155bbd5f25bf2ee83b5731fca744373a)
@@ -19,20 +19,17 @@
 // 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.IO;
 using Core.Common.Gui;
 using Core.Common.Gui.Plugin;
-using Core.Common.TestUtil;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.IO.Hydraulics;
 using Ringtoets.GrassCoverErosionOutwards.Data;
 using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects;
-using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.GrassCoverErosionOutwards.Plugin.Test.ExportInfos
 {
@@ -53,26 +50,17 @@
         }
 
         [Test]
-        public void Category_Always_ReturnExpectedCategory()
+        public void Initialized_Always_ExpectedPropertiesSet()
         {
-            // Call
-            string category = exportInfo.Category;
-
             // Assert
-            Assert.AreEqual("Algemeen", category);
+            Assert.IsNotNull(exportInfo.CreateFileExporter);
+            Assert.IsNotNull(exportInfo.IsEnabled);
+            Assert.IsNull(exportInfo.Category);
+            Assert.IsNull(exportInfo.Image);
+            Assert.IsNotNull(exportInfo.FileFilterGenerator);
         }
 
         [Test]
-        public void Image_Always_ReturnExpectedImage()
-        {
-            // Call
-            Image image = exportInfo.Image;
-
-            // Assert
-            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.PointShapefileIcon, image);
-        }
-
-        [Test]
         public void CreateFileExporter_Always_ReturnFileExporter()
         {
             // Setup
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/HydraulicBoundariesGroupContextWaveConditionsExportInfoTest.cs
===================================================================
diff -u -r2fd96187f75c7b24ccb411ecf5b6c8f0dcc591bb -r95364cd8155bbd5f25bf2ee83b5731fca744373a
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/HydraulicBoundariesGroupContextWaveConditionsExportInfoTest.cs	(.../HydraulicBoundariesGroupContextWaveConditionsExportInfoTest.cs)	(revision 2fd96187f75c7b24ccb411ecf5b6c8f0dcc591bb)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/HydraulicBoundariesGroupContextWaveConditionsExportInfoTest.cs	(.../HydraulicBoundariesGroupContextWaveConditionsExportInfoTest.cs)	(revision 95364cd8155bbd5f25bf2ee83b5731fca744373a)
@@ -19,20 +19,17 @@
 // 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.IO;
 using Core.Common.Gui;
 using Core.Common.Gui.Plugin;
-using Core.Common.TestUtil;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.GrassCoverErosionOutwards.Data;
 using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects;
 using Ringtoets.GrassCoverErosionOutwards.IO.Exporters;
 using Ringtoets.Revetment.Data;
-using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.GrassCoverErosionOutwards.Plugin.Test.ExportInfos
 {
@@ -53,26 +50,17 @@
         }
 
         [Test]
-        public void Category_Always_ReturnExpectedCategory()
+        public void Initialized_Always_ExpectedPropertiesSet()
         {
-            // Setup
-            string category = exportInfo.Category;
-
             // Assert
-            Assert.AreEqual("Algemeen", category);
+            Assert.IsNotNull(exportInfo.CreateFileExporter);
+            Assert.IsNotNull(exportInfo.IsEnabled);
+            Assert.IsNull(exportInfo.Category);
+            Assert.IsNull(exportInfo.Image);
+            Assert.IsNotNull(exportInfo.FileFilterGenerator);
         }
 
         [Test]
-        public void Image_Always_ReturnExpectedImage()
-        {
-            // Call
-            Image image = exportInfo.Image;
-
-            // Assert
-            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GeneralOutputIcon, image);
-        }
-
-        [Test]
         public void CreateFileExporter_Always_ReturnFileExporter()
         {
             // Setup