Index: Core/Common/src/Core.Common.Gui/Commands/GuiExportHandler.cs
===================================================================
diff -u -r93c061881e610c245377298c964e7f0b1e2828fb -r92056906158ddd85bd0b82da96167997e08c289a
--- Core/Common/src/Core.Common.Gui/Commands/GuiExportHandler.cs	(.../GuiExportHandler.cs)	(revision 93c061881e610c245377298c964e7f0b1e2828fb)
+++ Core/Common/src/Core.Common.Gui/Commands/GuiExportHandler.cs	(.../GuiExportHandler.cs)	(revision 92056906158ddd85bd0b82da96167997e08c289a)
@@ -103,13 +103,11 @@
 
             using (var selectExportInfoDialog = new SelectItemDialog(dialogParent, Resources.GuiExportHandler_GetSupportedExportInfoUsingDialog_Select_exporter))
             {
-                foreach (var exportInfo in supportedExportInfos)
+                foreach (ExportInfo exportInfo in supportedExportInfos)
                 {
                     selectExportInfoDialog.AddItemType(exportInfo.Name,
-                                                       !string.IsNullOrEmpty(exportInfo.Category)
-                                                           ? exportInfo.Category
-                                                           : Resources.GuiExportHandler_Default_category,
-                                                       exportInfo.Image ?? Resources.ExportIcon,
+                                                       exportInfo.Category,
+                                                       exportInfo.Image,
                                                        null);
                 }
 
Index: Core/Common/src/Core.Common.Gui/Commands/GuiImportHandler.cs
===================================================================
diff -u -r69eb17523e5ae490637e29718a4a563cbcaacc3c -r92056906158ddd85bd0b82da96167997e08c289a
--- Core/Common/src/Core.Common.Gui/Commands/GuiImportHandler.cs	(.../GuiImportHandler.cs)	(revision 69eb17523e5ae490637e29718a4a563cbcaacc3c)
+++ Core/Common/src/Core.Common.Gui/Commands/GuiImportHandler.cs	(.../GuiImportHandler.cs)	(revision 92056906158ddd85bd0b82da96167997e08c289a)
@@ -121,12 +121,7 @@
             {
                 foreach (ImportInfo importInfo in supportedImportInfos)
                 {
-                    string category = string.IsNullOrEmpty(importInfo.Category) ?
-                                          Resources.GuiImportHandler_GetSupportedImporterForTargetType_Data_Import :
-                                          importInfo.Category;
-                    Image itemImage = importInfo.Image ?? Resources.brick;
-
-                    selectImporterDialog.AddItemType(importInfo.Name, category, itemImage, null);
+                    selectImporterDialog.AddItemType(importInfo.Name, importInfo.Category, importInfo.Image, null);
                 }
 
                 if (selectImporterDialog.ShowDialog() == DialogResult.OK)
Index: Core/Common/src/Core.Common.Gui/Commands/GuiUpdateHandler.cs
===================================================================
diff -u -r69eb17523e5ae490637e29718a4a563cbcaacc3c -r92056906158ddd85bd0b82da96167997e08c289a
--- Core/Common/src/Core.Common.Gui/Commands/GuiUpdateHandler.cs	(.../GuiUpdateHandler.cs)	(revision 69eb17523e5ae490637e29718a4a563cbcaacc3c)
+++ Core/Common/src/Core.Common.Gui/Commands/GuiUpdateHandler.cs	(.../GuiUpdateHandler.cs)	(revision 92056906158ddd85bd0b82da96167997e08c289a)
@@ -121,12 +121,7 @@
             {
                 foreach (UpdateInfo updateInfo in supportedUpdateInfo)
                 {
-                    string category = string.IsNullOrEmpty(updateInfo.Category) ?
-                                          Resources.GuiUpdateHandler_GetSupportedUpdaterForTargetType_Data_Update :
-                                          updateInfo.Category;
-                    Image itemImage = updateInfo.Image ?? Resources.brick;
-
-                    selectUpdaterDialog.AddItemType(updateInfo.Name, category, itemImage, null);
+                    selectUpdaterDialog.AddItemType(updateInfo.Name, updateInfo.Category, updateInfo.Image, null);
                 }
 
                 if (selectUpdaterDialog.ShowDialog() == DialogResult.OK)
Index: Core/Common/src/Core.Common.Gui/Plugin/ExportInfo.cs
===================================================================
diff -u -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 -r92056906158ddd85bd0b82da96167997e08c289a
--- Core/Common/src/Core.Common.Gui/Plugin/ExportInfo.cs	(.../ExportInfo.cs)	(revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2)
+++ Core/Common/src/Core.Common.Gui/Plugin/ExportInfo.cs	(.../ExportInfo.cs)	(revision 92056906158ddd85bd0b82da96167997e08c289a)
@@ -22,6 +22,7 @@
 using System;
 using System.Drawing;
 using Core.Common.Base.IO;
+using Core.Common.Gui.Properties;
 
 namespace Core.Common.Gui.Plugin
 {
@@ -62,12 +63,14 @@
         /// <summary>
         /// Gets or sets the category of the export information.
         /// </summary>
-        public string Category { get; set; }
+        /// <remarks>Should never return null.</remarks>
+        public string Category { get; set; } = Resources.ExportInfo_Default_category;
 
         /// <summary>
         /// Gets or sets the image of the export information.
         /// </summary>
-        public Image Image { get; set; }
+        /// <remarks>Should never return null.</remarks>
+        public Image Image { get; set; } = Resources.ExportIcon;
 
         /// <summary>
         /// Gets or sets the file filter generator of the export information used to make file filters.
@@ -119,12 +122,14 @@
         /// <summary>
         /// Gets or sets the category of the export information.
         /// </summary>
-        public string Category { get; set; }
+        /// <remarks>Should never return null.</remarks>
+        public string Category { get; set; } = Resources.ExportInfo_Default_category;
 
         /// <summary>
         /// Gets or sets the image of the export information.
         /// </summary>
-        public Image Image { get; set; }
+        /// <remarks>Should never return null.</remarks>
+        public Image Image { get; set; } = Resources.ExportIcon;
 
         /// <summary>
         /// Gets or sets the file filter generator of the export information used to make file filters.
Index: Core/Common/src/Core.Common.Gui/Plugin/ImportInfo.cs
===================================================================
diff -u -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 -r92056906158ddd85bd0b82da96167997e08c289a
--- Core/Common/src/Core.Common.Gui/Plugin/ImportInfo.cs	(.../ImportInfo.cs)	(revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2)
+++ Core/Common/src/Core.Common.Gui/Plugin/ImportInfo.cs	(.../ImportInfo.cs)	(revision 92056906158ddd85bd0b82da96167997e08c289a)
@@ -22,6 +22,7 @@
 using System;
 using System.Drawing;
 using Core.Common.Base.IO;
+using Core.Common.Gui.Properties;
 
 namespace Core.Common.Gui.Plugin
 {
@@ -68,12 +69,14 @@
         /// <summary>
         /// Gets or sets the category of the import information.
         /// </summary>
-        public string Category { get; set; }
+        /// <remarks>This should never return null.</remarks>
+        public string Category { get; set; } = Resources.ImportInfo_Default_category;
 
         /// <summary>
         /// Gets or sets the image of the import information.
         /// </summary>
-        public Image Image { get; set; }
+        /// <remarks>This should never return null.</remarks>
+        public Image Image { get; set; } = Resources.brick;
 
         /// <summary>
         /// Gets or sets the file filter generator of the import information used to make file filters.
@@ -131,12 +134,14 @@
         /// <summary>
         /// Gets or sets the category of the import information.
         /// </summary>
-        public string Category { get; set; }
+        /// <remarks>This should never return null.</remarks>
+        public string Category { get; set; } = Resources.ImportInfo_Default_category;
 
         /// <summary>
         /// Gets or sets the image of the import information.
         /// </summary>
-        public Image Image { get; set; }
+        /// <remarks>This should never return null.</remarks>
+        public Image Image { get; set; } = Resources.brick;
 
         /// <summary>
         /// Gets or sets the file filter generator of the import information used to make file filters.
Index: Core/Common/src/Core.Common.Gui/Plugin/UpdateInfo.cs
===================================================================
diff -u -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 -r92056906158ddd85bd0b82da96167997e08c289a
--- Core/Common/src/Core.Common.Gui/Plugin/UpdateInfo.cs	(.../UpdateInfo.cs)	(revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2)
+++ Core/Common/src/Core.Common.Gui/Plugin/UpdateInfo.cs	(.../UpdateInfo.cs)	(revision 92056906158ddd85bd0b82da96167997e08c289a)
@@ -22,6 +22,7 @@
 using System;
 using System.Drawing;
 using Core.Common.Base.IO;
+using Core.Common.Gui.Properties;
 
 namespace Core.Common.Gui.Plugin
 {
@@ -74,12 +75,14 @@
         /// <summary>
         /// Gets or sets the category of the update information.
         /// </summary>
-        public string Category { get; set; }
+        /// <remarks>Should never return null.</remarks>
+        public string Category { get; set; } = Resources.UpdateInfo_Default_category;
 
         /// <summary>
         /// Gets or sets the image of the update information.
         /// </summary>
-        public Image Image { get; set; }
+        /// <remarks>Should never return null.</remarks>
+        public Image Image { get; set; } = Resources.brick;
 
         /// <summary>
         /// Gets or sets the file filter generator of the update information used to make file filters.
@@ -143,12 +146,14 @@
         /// <summary>
         /// Gets or sets the category of the update information.
         /// </summary>
-        public string Category { get; set; }
+        /// <remarks>Should never return null.</remarks>
+        public string Category { get; set; } = Resources.UpdateInfo_Default_category;
 
         /// <summary>
         /// Gets or sets the image of the update information.
         /// </summary>
-        public Image Image { get; set; }
+        /// <remarks>Should never return null.</remarks>
+        public Image Image { get; set; } = Resources.brick;
 
         /// <summary>
         /// Gets or sets the file filter generator of the update information used to make file filters.
Index: Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs
===================================================================
diff -u -r93c061881e610c245377298c964e7f0b1e2828fb -r92056906158ddd85bd0b82da96167997e08c289a
--- Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 93c061881e610c245377298c964e7f0b1e2828fb)
+++ Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 92056906158ddd85bd0b82da96167997e08c289a)
@@ -646,6 +646,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Algemeen.
+        /// </summary>
+        public static string ExportInfo_Default_category {
+            get {
+                return ResourceManager.GetString("ExportInfo_Default_category", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Toetsspoor.
         /// </summary>
         public static string FailureMechanismContributionView_GridColumn_Assessment {
@@ -787,15 +796,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Algemeen.
-        /// </summary>
-        public static string GuiExportHandler_Default_category {
-            get {
-                return ResourceManager.GetString("GuiExportHandler_Default_category", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Exporteren is mislukt..
         /// </summary>
         public static string GuiExportHandler_ExportItemUsingDialog_Export_failed {
@@ -861,15 +861,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Importeren gegevens.
-        /// </summary>
-        public static string GuiImportHandler_GetSupportedImporterForTargetType_Data_Import {
-            get {
-                return ResourceManager.GetString("GuiImportHandler_GetSupportedImporterForTargetType_Data_Import", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Fout.
         /// </summary>
         public static string GuiImportHandler_GetSupportedImporterForTargetType_Error {
@@ -926,15 +917,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Bijwerken gegevens.
-        /// </summary>
-        public static string GuiUpdateHandler_GetSupportedUpdaterForTargetType_Data_Update {
-            get {
-                return ResourceManager.GetString("GuiUpdateHandler_GetSupportedUpdaterForTargetType_Data_Update", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Fout.
         /// </summary>
         public static string GuiUpdateHandler_GetSupportedUpdaterForTargetType_Error {
@@ -1029,6 +1011,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Importeren gegevens.
+        /// </summary>
+        public static string ImportInfo_Default_category {
+            get {
+                return ResourceManager.GetString("ImportInfo_Default_category", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         public static System.Drawing.Bitmap information {
@@ -1673,5 +1664,14 @@
                 return ResourceManager.GetString("Update_ToolTip", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Bijwerken gegevens.
+        /// </summary>
+        public static string UpdateInfo_Default_category {
+            get {
+                return ResourceManager.GetString("UpdateInfo_Default_category", resourceCulture);
+            }
+        }
     }
 }
Index: Core/Common/src/Core.Common.Gui/Properties/Resources.resx
===================================================================
diff -u -r93c061881e610c245377298c964e7f0b1e2828fb -r92056906158ddd85bd0b82da96167997e08c289a
--- Core/Common/src/Core.Common.Gui/Properties/Resources.resx	(.../Resources.resx)	(revision 93c061881e610c245377298c964e7f0b1e2828fb)
+++ Core/Common/src/Core.Common.Gui/Properties/Resources.resx	(.../Resources.resx)	(revision 92056906158ddd85bd0b82da96167997e08c289a)
@@ -298,10 +298,10 @@
   <data name="MessageWindow_MessageWindow_Messages" xml:space="preserve">
     <value>Berichten</value>
   </data>
-  <data name="GuiImportHandler_GetSupportedImporterForTargetType_Data_Import" xml:space="preserve">
+  <data name="ImportInfo_Default_category" xml:space="preserve">
     <value>Importeren gegevens</value>
   </data>
-  <data name="GuiUpdateHandler_GetSupportedUpdaterForTargetType_Data_Update" xml:space="preserve">
+  <data name="UpdateInfo_Default_category" xml:space="preserve">
     <value>Bijwerken gegevens</value>
   </data>
   <data name="icon_clear_all_messages" type="System.Resources.ResXFileRef, System.Windows.Forms">
@@ -628,7 +628,7 @@
   <data name="SaveProjectActivity_ProgressTextStepName_SavingProject" xml:space="preserve">
     <value>Project opslaan</value>
   </data>
-  <data name="GuiExportHandler_Default_category" xml:space="preserve">
+  <data name="ExportInfo_Default_category" xml:space="preserve">
     <value>Algemeen</value>
   </data>
 </root>
\ No newline at end of file
Index: Core/Common/test/Core.Common.Gui.Test/Plugin/ExportInfoTest.cs
===================================================================
diff -u -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 -r92056906158ddd85bd0b82da96167997e08c289a
--- Core/Common/test/Core.Common.Gui.Test/Plugin/ExportInfoTest.cs	(.../ExportInfoTest.cs)	(revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2)
+++ Core/Common/test/Core.Common.Gui.Test/Plugin/ExportInfoTest.cs	(.../ExportInfoTest.cs)	(revision 92056906158ddd85bd0b82da96167997e08c289a)
@@ -22,6 +22,8 @@
 using System.Drawing;
 using Core.Common.Base.IO;
 using Core.Common.Gui.Plugin;
+using Core.Common.Gui.Properties;
+using Core.Common.TestUtil;
 using NUnit.Framework;
 using Rhino.Mocks;
 
@@ -41,8 +43,8 @@
             Assert.IsNull(info.CreateFileExporter);
             Assert.IsNull(info.IsEnabled);
             Assert.IsNull(info.Name);
-            Assert.IsNull(info.Category);
-            Assert.IsNull(info.Image);
+            Assert.AreEqual("Algemeen", info.Category);
+            TestHelper.AssertImagesAreEqual(Resources.ExportIcon, info.Image);
             Assert.IsNull(info.FileFilterGenerator);
         }
 
@@ -57,8 +59,8 @@
             Assert.IsNull(info.CreateFileExporter);
             Assert.IsNull(info.IsEnabled);
             Assert.IsNull(info.Name);
-            Assert.IsNull(info.Category);
-            Assert.IsNull(info.Image);
+            Assert.AreEqual("Algemeen", info.Category);
+            TestHelper.AssertImagesAreEqual(Resources.ExportIcon, info.Image);
             Assert.IsNull(info.FileFilterGenerator);
         }
 
@@ -126,8 +128,8 @@
             Assert.IsNotNull(convertedInfo.IsEnabled);
             Assert.IsTrue(convertedInfo.IsEnabled(new object()));
             Assert.IsNull(info.Name);
-            Assert.IsNull(info.Category);
-            Assert.IsNull(info.Image);
+            Assert.AreEqual("Algemeen", info.Category);
+            TestHelper.AssertImagesAreEqual(Resources.ExportIcon, info.Image);
             Assert.IsNull(info.FileFilterGenerator);
         }
     }
Index: Core/Common/test/Core.Common.Gui.Test/Plugin/ImportInfoTest.cs
===================================================================
diff -u -r50159826a713183c37ff03330d65d591dcdfd71b -r92056906158ddd85bd0b82da96167997e08c289a
--- Core/Common/test/Core.Common.Gui.Test/Plugin/ImportInfoTest.cs	(.../ImportInfoTest.cs)	(revision 50159826a713183c37ff03330d65d591dcdfd71b)
+++ Core/Common/test/Core.Common.Gui.Test/Plugin/ImportInfoTest.cs	(.../ImportInfoTest.cs)	(revision 92056906158ddd85bd0b82da96167997e08c289a)
@@ -22,6 +22,8 @@
 using System.Drawing;
 using Core.Common.Base.IO;
 using Core.Common.Gui.Plugin;
+using Core.Common.Gui.Properties;
+using Core.Common.TestUtil;
 using NUnit.Framework;
 using Rhino.Mocks;
 
@@ -41,8 +43,8 @@
             Assert.IsNull(info.CreateFileImporter);
             Assert.IsNull(info.IsEnabled);
             Assert.IsNull(info.Name);
-            Assert.IsNull(info.Category);
-            Assert.IsNull(info.Image);
+            Assert.AreEqual("Importeren gegevens", info.Category);
+            TestHelper.AssertImagesAreEqual(Resources.brick, info.Image);
             Assert.IsNull(info.FileFilterGenerator);
             Assert.IsNull(info.VerifyUpdates);
         }
@@ -58,8 +60,8 @@
             Assert.IsNull(info.CreateFileImporter);
             Assert.IsNull(info.IsEnabled);
             Assert.IsNull(info.Name);
-            Assert.IsNull(info.Category);
-            Assert.IsNull(info.Image);
+            Assert.AreEqual("Importeren gegevens", info.Category);
+            TestHelper.AssertImagesAreEqual(Resources.brick, info.Image);
             Assert.IsNull(info.FileFilterGenerator);
             Assert.IsNull(info.VerifyUpdates);
         }
@@ -131,8 +133,8 @@
             Assert.IsNotNull(convertedInfo.IsEnabled);
             Assert.IsTrue(convertedInfo.IsEnabled(12));
             Assert.IsNull(info.Name);
-            Assert.IsNull(info.Category);
-            Assert.IsNull(info.Image);
+            Assert.AreEqual("Importeren gegevens", info.Category);
+            TestHelper.AssertImagesAreEqual(Resources.brick, info.Image);
             Assert.IsNull(info.FileFilterGenerator);
             Assert.IsNull(info.VerifyUpdates);
         }
Index: Core/Common/test/Core.Common.Gui.Test/Plugin/UpdateInfoTest.cs
===================================================================
diff -u -r50159826a713183c37ff03330d65d591dcdfd71b -r92056906158ddd85bd0b82da96167997e08c289a
--- Core/Common/test/Core.Common.Gui.Test/Plugin/UpdateInfoTest.cs	(.../UpdateInfoTest.cs)	(revision 50159826a713183c37ff03330d65d591dcdfd71b)
+++ Core/Common/test/Core.Common.Gui.Test/Plugin/UpdateInfoTest.cs	(.../UpdateInfoTest.cs)	(revision 92056906158ddd85bd0b82da96167997e08c289a)
@@ -22,6 +22,8 @@
 using System.Drawing;
 using Core.Common.Base.IO;
 using Core.Common.Gui.Plugin;
+using Core.Common.Gui.Properties;
+using Core.Common.TestUtil;
 using NUnit.Framework;
 using Rhino.Mocks;
 
@@ -41,8 +43,8 @@
             Assert.IsNull(info.CreateFileImporter);
             Assert.IsNull(info.IsEnabled);
             Assert.IsNull(info.Name);
-            Assert.IsNull(info.Category);
-            Assert.IsNull(info.Image);
+            Assert.AreEqual("Bijwerken gegevens", info.Category);
+            TestHelper.AssertImagesAreEqual(Resources.brick, info.Image);
             Assert.IsNull(info.FileFilterGenerator);
             Assert.IsNull(info.CurrentPath);
             Assert.IsNull(info.VerifyUpdates);
@@ -59,8 +61,8 @@
             Assert.IsNull(info.CreateFileImporter);
             Assert.IsNull(info.IsEnabled);
             Assert.IsNull(info.Name);
-            Assert.IsNull(info.Category);
-            Assert.IsNull(info.Image);
+            Assert.AreEqual("Bijwerken gegevens", info.Category);
+            TestHelper.AssertImagesAreEqual(Resources.brick, info.Image);
             Assert.IsNull(info.FileFilterGenerator);
             Assert.IsNull(info.CurrentPath);
             Assert.IsNull(info.VerifyUpdates);
@@ -137,8 +139,8 @@
             Assert.IsNotNull(convertedInfo.IsEnabled);
             Assert.IsTrue(convertedInfo.IsEnabled(12));
             Assert.IsNull(info.Name);
-            Assert.IsNull(info.Category);
-            Assert.IsNull(info.Image);
+            Assert.AreEqual("Bijwerken gegevens", info.Category);
+            TestHelper.AssertImagesAreEqual(Resources.brick, info.Image);
             Assert.IsNull(info.FileFilterGenerator);
             Assert.IsNull(info.CurrentPath);
             Assert.IsNull(info.VerifyUpdates);
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/ExportInfos/DuneLocationsContextExportInfoTest.cs
===================================================================
diff -u -ra55fbdcfdabac6419a6ebe4e2bd908289ddfd1ba -r92056906158ddd85bd0b82da96167997e08c289a
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/ExportInfos/DuneLocationsContextExportInfoTest.cs	(.../DuneLocationsContextExportInfoTest.cs)	(revision a55fbdcfdabac6419a6ebe4e2bd908289ddfd1ba)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/ExportInfos/DuneLocationsContextExportInfoTest.cs	(.../DuneLocationsContextExportInfoTest.cs)	(revision 92056906158ddd85bd0b82da96167997e08c289a)
@@ -23,13 +23,15 @@
 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.DuneErosion.Data;
 using Ringtoets.DuneErosion.Data.TestUtil;
 using Ringtoets.DuneErosion.Forms.PresentationObjects;
 using Ringtoets.DuneErosion.IO;
+using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources;
 
 namespace Ringtoets.DuneErosion.Plugin.Test.ExportInfos
 {
@@ -49,8 +51,8 @@
                 Assert.IsNotNull(info.CreateFileExporter);
                 Assert.IsNotNull(info.IsEnabled);
                 Assert.IsNull(info.Name);
-                Assert.IsNull(info.Category);
-                Assert.IsNull(info.Image);
+                Assert.AreEqual("Algemeen", info.Category);
+                TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, info.Image);
                 Assert.IsNotNull(info.FileFilterGenerator);
             }
         }
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/ExportInfos/GrassCoverErosionInwardsCalculationContextExportInfoTest.cs
===================================================================
diff -u -r96cd93f1a08294e5af3fec5f5ae0b59cbe914c4b -r92056906158ddd85bd0b82da96167997e08c289a
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/ExportInfos/GrassCoverErosionInwardsCalculationContextExportInfoTest.cs	(.../GrassCoverErosionInwardsCalculationContextExportInfoTest.cs)	(revision 96cd93f1a08294e5af3fec5f5ae0b59cbe914c4b)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/ExportInfos/GrassCoverErosionInwardsCalculationContextExportInfoTest.cs	(.../GrassCoverErosionInwardsCalculationContextExportInfoTest.cs)	(revision 92056906158ddd85bd0b82da96167997e08c289a)
@@ -23,12 +23,14 @@
 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.GrassCoverErosionInwards.Data;
 using Ringtoets.GrassCoverErosionInwards.Forms.PresentationObjects;
 using Ringtoets.GrassCoverErosionInwards.IO.Exporters;
+using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources;
 
 namespace Ringtoets.GrassCoverErosionInwards.Plugin.Test.ExportInfos
 {
@@ -48,8 +50,8 @@
                 Assert.IsNotNull(info.CreateFileExporter);
                 Assert.IsNotNull(info.IsEnabled);
                 Assert.IsNull(info.Name);
-                Assert.IsNull(info.Category);
-                Assert.IsNull(info.Image);
+                Assert.AreEqual("Algemeen", info.Category);
+                TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, info.Image);
                 Assert.IsNotNull(info.FileFilterGenerator);
             }
         }
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/ExportInfos/GrassCoverErosionInwardsCalculationGroupContextExportInfoTest.cs
===================================================================
diff -u -r96cd93f1a08294e5af3fec5f5ae0b59cbe914c4b -r92056906158ddd85bd0b82da96167997e08c289a
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/ExportInfos/GrassCoverErosionInwardsCalculationGroupContextExportInfoTest.cs	(.../GrassCoverErosionInwardsCalculationGroupContextExportInfoTest.cs)	(revision 96cd93f1a08294e5af3fec5f5ae0b59cbe914c4b)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/ExportInfos/GrassCoverErosionInwardsCalculationGroupContextExportInfoTest.cs	(.../GrassCoverErosionInwardsCalculationGroupContextExportInfoTest.cs)	(revision 92056906158ddd85bd0b82da96167997e08c289a)
@@ -23,13 +23,15 @@
 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.Calculation;
 using Ringtoets.GrassCoverErosionInwards.Data;
 using Ringtoets.GrassCoverErosionInwards.Forms.PresentationObjects;
 using Ringtoets.GrassCoverErosionInwards.IO.Exporters;
+using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources;
 
 namespace Ringtoets.GrassCoverErosionInwards.Plugin.Test.ExportInfos
 {
@@ -49,8 +51,8 @@
                 Assert.IsNotNull(info.CreateFileExporter);
                 Assert.IsNotNull(info.IsEnabled);
                 Assert.IsNull(info.Name);
-                Assert.IsNull(info.Category);
-                Assert.IsNull(info.Image);
+                Assert.AreEqual("Algemeen", info.Category);
+                TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, info.Image);
                 Assert.IsNotNull(info.FileFilterGenerator);
             }
         }
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextConfigurationExportInfoTest.cs
===================================================================
diff -u -r637f851f0b3e92ae9bc1d09f1f462332fc3eef73 -r92056906158ddd85bd0b82da96167997e08c289a
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextConfigurationExportInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationContextConfigurationExportInfoTest.cs)	(revision 637f851f0b3e92ae9bc1d09f1f462332fc3eef73)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextConfigurationExportInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationContextConfigurationExportInfoTest.cs)	(revision 92056906158ddd85bd0b82da96167997e08c289a)
@@ -23,12 +23,14 @@
 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 CoreCommonGuiResources = Core.Common.Gui.Properties.Resources;
 
 namespace Ringtoets.GrassCoverErosionOutwards.Plugin.Test.ExportInfos
 {
@@ -54,8 +56,8 @@
             // Assert
             Assert.IsNotNull(exportInfo.CreateFileExporter);
             Assert.IsNotNull(exportInfo.IsEnabled);
-            Assert.IsNull(exportInfo.Category);
-            Assert.IsNull(exportInfo.Image);
+            Assert.AreEqual("Algemeen", exportInfo.Category);
+            TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, exportInfo.Image);
             Assert.IsNotNull(exportInfo.FileFilterGenerator);
         }
 
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextWaveConditionsExportInfoTest.cs
===================================================================
diff -u -r9b74444dd480cd55762fb34129883f90b8616356 -r92056906158ddd85bd0b82da96167997e08c289a
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextWaveConditionsExportInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationContextWaveConditionsExportInfoTest.cs)	(revision 9b74444dd480cd55762fb34129883f90b8616356)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextWaveConditionsExportInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationContextWaveConditionsExportInfoTest.cs)	(revision 92056906158ddd85bd0b82da96167997e08c289a)
@@ -23,13 +23,15 @@
 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.Revetment.IO.Exporters;
 using Ringtoets.Revetment.TestUtil;
+using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources;
 
 namespace Ringtoets.GrassCoverErosionOutwards.Plugin.Test.ExportInfos
 {
@@ -55,8 +57,8 @@
             // Assert
             Assert.IsNotNull(exportInfo.CreateFileExporter);
             Assert.IsNotNull(exportInfo.IsEnabled);
-            Assert.IsNull(exportInfo.Category);
-            Assert.IsNull(exportInfo.Image);
+            Assert.AreEqual("Algemeen", exportInfo.Category);
+            TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, exportInfo.Image);
             Assert.IsNotNull(exportInfo.FileFilterGenerator);
         }
 
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextConfigurationExportInfoTest.cs
===================================================================
diff -u -r9b74444dd480cd55762fb34129883f90b8616356 -r92056906158ddd85bd0b82da96167997e08c289a
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextConfigurationExportInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextConfigurationExportInfoTest.cs)	(revision 9b74444dd480cd55762fb34129883f90b8616356)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextConfigurationExportInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextConfigurationExportInfoTest.cs)	(revision 92056906158ddd85bd0b82da96167997e08c289a)
@@ -23,13 +23,15 @@
 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.Calculation;
 using Ringtoets.GrassCoverErosionOutwards.Data;
 using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects;
 using Ringtoets.GrassCoverErosionOutwards.IO.Exporters;
+using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources;
 
 namespace Ringtoets.GrassCoverErosionOutwards.Plugin.Test.ExportInfos
 {
@@ -55,8 +57,8 @@
             // Assert
             Assert.IsNotNull(exportInfo.CreateFileExporter);
             Assert.IsNotNull(exportInfo.IsEnabled);
-            Assert.IsNull(exportInfo.Category);
-            Assert.IsNull(exportInfo.Image);
+            Assert.AreEqual("Algemeen", exportInfo.Category);
+            TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, exportInfo.Image);
             Assert.IsNotNull(exportInfo.FileFilterGenerator);
         }
 
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs
===================================================================
diff -u -r9b74444dd480cd55762fb34129883f90b8616356 -r92056906158ddd85bd0b82da96167997e08c289a
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs)	(revision 9b74444dd480cd55762fb34129883f90b8616356)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs)	(revision 92056906158ddd85bd0b82da96167997e08c289a)
@@ -23,6 +23,7 @@
 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;
@@ -31,6 +32,7 @@
 using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects;
 using Ringtoets.Revetment.IO.Exporters;
 using Ringtoets.Revetment.TestUtil;
+using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources;
 
 namespace Ringtoets.GrassCoverErosionOutwards.Plugin.Test.ExportInfos
 {
@@ -56,8 +58,8 @@
             // Assert
             Assert.IsNotNull(exportInfo.CreateFileExporter);
             Assert.IsNotNull(exportInfo.IsEnabled);
-            Assert.IsNull(exportInfo.Category);
-            Assert.IsNull(exportInfo.Image);
+            Assert.AreEqual("Algemeen", exportInfo.Category);
+            TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, exportInfo.Image);
             Assert.IsNotNull(exportInfo.FileFilterGenerator);
         }
 
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/HydraulicBoundariesGroupContextLocationsExportInfoTest.cs
===================================================================
diff -u -r95364cd8155bbd5f25bf2ee83b5731fca744373a -r92056906158ddd85bd0b82da96167997e08c289a
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/HydraulicBoundariesGroupContextLocationsExportInfoTest.cs	(.../HydraulicBoundariesGroupContextLocationsExportInfoTest.cs)	(revision 95364cd8155bbd5f25bf2ee83b5731fca744373a)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/HydraulicBoundariesGroupContextLocationsExportInfoTest.cs	(.../HydraulicBoundariesGroupContextLocationsExportInfoTest.cs)	(revision 92056906158ddd85bd0b82da96167997e08c289a)
@@ -23,13 +23,15 @@
 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 CoreCommonGuiResources = Core.Common.Gui.Properties.Resources;
 
 namespace Ringtoets.GrassCoverErosionOutwards.Plugin.Test.ExportInfos
 {
@@ -55,8 +57,8 @@
             // Assert
             Assert.IsNotNull(exportInfo.CreateFileExporter);
             Assert.IsNotNull(exportInfo.IsEnabled);
-            Assert.IsNull(exportInfo.Category);
-            Assert.IsNull(exportInfo.Image);
+            Assert.AreEqual("Algemeen", exportInfo.Category);
+            TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, exportInfo.Image);
             Assert.IsNotNull(exportInfo.FileFilterGenerator);
         }
 
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/HydraulicBoundariesGroupContextWaveConditionsExportInfoTest.cs
===================================================================
diff -u -r95364cd8155bbd5f25bf2ee83b5731fca744373a -r92056906158ddd85bd0b82da96167997e08c289a
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/HydraulicBoundariesGroupContextWaveConditionsExportInfoTest.cs	(.../HydraulicBoundariesGroupContextWaveConditionsExportInfoTest.cs)	(revision 95364cd8155bbd5f25bf2ee83b5731fca744373a)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/HydraulicBoundariesGroupContextWaveConditionsExportInfoTest.cs	(.../HydraulicBoundariesGroupContextWaveConditionsExportInfoTest.cs)	(revision 92056906158ddd85bd0b82da96167997e08c289a)
@@ -23,13 +23,15 @@
 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 CoreCommonGuiResources = Core.Common.Gui.Properties.Resources;
 
 namespace Ringtoets.GrassCoverErosionOutwards.Plugin.Test.ExportInfos
 {
@@ -55,8 +57,8 @@
             // Assert
             Assert.IsNotNull(exportInfo.CreateFileExporter);
             Assert.IsNotNull(exportInfo.IsEnabled);
-            Assert.IsNull(exportInfo.Category);
-            Assert.IsNull(exportInfo.Image);
+            Assert.AreEqual("Algemeen", exportInfo.Category);
+            TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, exportInfo.Image);
             Assert.IsNotNull(exportInfo.FileFilterGenerator);
         }
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/HydraulicBoundaryDatabaseContextExportInfoTest.cs
===================================================================
diff -u -ra55fbdcfdabac6419a6ebe4e2bd908289ddfd1ba -r92056906158ddd85bd0b82da96167997e08c289a
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/HydraulicBoundaryDatabaseContextExportInfoTest.cs	(.../HydraulicBoundaryDatabaseContextExportInfoTest.cs)	(revision a55fbdcfdabac6419a6ebe4e2bd908289ddfd1ba)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/HydraulicBoundaryDatabaseContextExportInfoTest.cs	(.../HydraulicBoundaryDatabaseContextExportInfoTest.cs)	(revision 92056906158ddd85bd0b82da96167997e08c289a)
@@ -23,12 +23,14 @@
 using Core.Common.Base.IO;
 using Core.Common.Gui;
 using Core.Common.Gui.Plugin;
+using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.IO.Hydraulics;
 using Ringtoets.Integration.Data;
 using Ringtoets.Integration.Forms.PresentationObjects;
+using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources;
 
 namespace Ringtoets.Integration.Plugin.Test.ExportInfos
 {
@@ -48,8 +50,8 @@
                 Assert.IsNotNull(info.CreateFileExporter);
                 Assert.IsNotNull(info.IsEnabled);
                 Assert.IsNull(info.Name);
-                Assert.IsNull(info.Category);
-                Assert.IsNull(info.Image);
+                Assert.AreEqual("Algemeen", info.Category);
+                TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, info.Image);
                 Assert.IsNotNull(info.FileFilterGenerator);
             }
         }
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/ReferenceLineContextExportInfoTest.cs
===================================================================
diff -u -ra55fbdcfdabac6419a6ebe4e2bd908289ddfd1ba -r92056906158ddd85bd0b82da96167997e08c289a
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/ReferenceLineContextExportInfoTest.cs	(.../ReferenceLineContextExportInfoTest.cs)	(revision a55fbdcfdabac6419a6ebe4e2bd908289ddfd1ba)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/ReferenceLineContextExportInfoTest.cs	(.../ReferenceLineContextExportInfoTest.cs)	(revision 92056906158ddd85bd0b82da96167997e08c289a)
@@ -23,11 +23,13 @@
 using Core.Common.Base.IO;
 using Core.Common.Gui;
 using Core.Common.Gui.Plugin;
+using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.Common.IO.ReferenceLines;
 using Ringtoets.Integration.Data;
+using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources;
 
 namespace Ringtoets.Integration.Plugin.Test.ExportInfos
 {
@@ -47,8 +49,8 @@
                 Assert.IsNotNull(info.CreateFileExporter);
                 Assert.IsNotNull(info.IsEnabled);
                 Assert.IsNull(info.Name);
-                Assert.IsNull(info.Category);
-                Assert.IsNull(info.Image);
+                Assert.AreEqual("Algemeen", info.Category);
+                TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, info.Image);
                 Assert.IsNotNull(info.FileFilterGenerator);
             }
         }
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ExportInfos/PipingCalculationGroupContextExportInfoTest.cs
===================================================================
diff -u -rf9f7e585da06fc8ab1b8ab92ce4dd64bd66d8f04 -r92056906158ddd85bd0b82da96167997e08c289a
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ExportInfos/PipingCalculationGroupContextExportInfoTest.cs	(.../PipingCalculationGroupContextExportInfoTest.cs)	(revision f9f7e585da06fc8ab1b8ab92ce4dd64bd66d8f04)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ExportInfos/PipingCalculationGroupContextExportInfoTest.cs	(.../PipingCalculationGroupContextExportInfoTest.cs)	(revision 92056906158ddd85bd0b82da96167997e08c289a)
@@ -23,6 +23,7 @@
 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;
@@ -31,6 +32,7 @@
 using Ringtoets.Piping.Forms.PresentationObjects;
 using Ringtoets.Piping.IO.Exporters;
 using Ringtoets.Piping.Primitives;
+using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources;
 
 namespace Ringtoets.Piping.Plugin.Test.ExportInfos
 {
@@ -50,8 +52,8 @@
                 Assert.IsNotNull(info.CreateFileExporter);
                 Assert.IsNotNull(info.IsEnabled);
                 Assert.IsNull(info.Name);
-                Assert.IsNull(info.Category);
-                Assert.IsNull(info.Image);
+                Assert.AreEqual("Algemeen", info.Category);
+                TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, info.Image);
                 Assert.IsNotNull(info.FileFilterGenerator);
             }
         }
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationContextConfigurationExportInfoTest.cs
===================================================================
diff -u -r882ef058f189a4e44514d192fd396590b0d9af35 -r92056906158ddd85bd0b82da96167997e08c289a
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationContextConfigurationExportInfoTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationContextConfigurationExportInfoTest.cs)	(revision 882ef058f189a4e44514d192fd396590b0d9af35)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationContextConfigurationExportInfoTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationContextConfigurationExportInfoTest.cs)	(revision 92056906158ddd85bd0b82da96167997e08c289a)
@@ -23,12 +23,14 @@
 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.StabilityStoneCover.Data;
 using Ringtoets.StabilityStoneCover.Forms.PresentationObjects;
 using Ringtoets.StabilityStoneCover.IO.Exporters;
+using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources;
 
 namespace Ringtoets.StabilityStoneCover.Plugin.Test.ExportInfos
 {
@@ -54,8 +56,8 @@
             // Assert
             Assert.IsNotNull(exportInfo.CreateFileExporter);
             Assert.IsNotNull(exportInfo.IsEnabled);
-            Assert.IsNull(exportInfo.Category);
-            Assert.IsNull(exportInfo.Image);
+            Assert.AreEqual("Algemeen", exportInfo.Category);
+            TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, exportInfo.Image);
             Assert.IsNotNull(exportInfo.FileFilterGenerator);
         }
 
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationContextWaveConditionsExportInfoTest.cs
===================================================================
diff -u -r882ef058f189a4e44514d192fd396590b0d9af35 -r92056906158ddd85bd0b82da96167997e08c289a
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationContextWaveConditionsExportInfoTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationContextWaveConditionsExportInfoTest.cs)	(revision 882ef058f189a4e44514d192fd396590b0d9af35)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationContextWaveConditionsExportInfoTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationContextWaveConditionsExportInfoTest.cs)	(revision 92056906158ddd85bd0b82da96167997e08c289a)
@@ -23,13 +23,15 @@
 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.Revetment.IO.Exporters;
 using Ringtoets.Revetment.TestUtil;
 using Ringtoets.StabilityStoneCover.Data;
 using Ringtoets.StabilityStoneCover.Forms.PresentationObjects;
+using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources;
 
 namespace Ringtoets.StabilityStoneCover.Plugin.Test.ExportInfos
 {
@@ -55,8 +57,8 @@
             // Assert
             Assert.IsNotNull(exportInfo.CreateFileExporter);
             Assert.IsNotNull(exportInfo.IsEnabled);
-            Assert.IsNull(exportInfo.Category);
-            Assert.IsNull(exportInfo.Image);
+            Assert.AreEqual("Algemeen", exportInfo.Category);
+            TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, exportInfo.Image);
             Assert.IsNotNull(exportInfo.FileFilterGenerator);
         }
 
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextConfigurationExportInfoTest.cs
===================================================================
diff -u -r882ef058f189a4e44514d192fd396590b0d9af35 -r92056906158ddd85bd0b82da96167997e08c289a
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextConfigurationExportInfoTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationGroupContextConfigurationExportInfoTest.cs)	(revision 882ef058f189a4e44514d192fd396590b0d9af35)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextConfigurationExportInfoTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationGroupContextConfigurationExportInfoTest.cs)	(revision 92056906158ddd85bd0b82da96167997e08c289a)
@@ -23,13 +23,15 @@
 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.Calculation;
 using Ringtoets.StabilityStoneCover.Data;
 using Ringtoets.StabilityStoneCover.Forms.PresentationObjects;
 using Ringtoets.StabilityStoneCover.IO.Exporters;
+using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources;
 
 namespace Ringtoets.StabilityStoneCover.Plugin.Test.ExportInfos
 {
@@ -55,8 +57,8 @@
             // Assert
             Assert.IsNotNull(exportInfo.CreateFileExporter);
             Assert.IsNotNull(exportInfo.IsEnabled);
-            Assert.IsNull(exportInfo.Category);
-            Assert.IsNull(exportInfo.Image);
+            Assert.AreEqual("Algemeen", exportInfo.Category);
+            TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, exportInfo.Image);
             Assert.IsNotNull(exportInfo.FileFilterGenerator);
         }
 
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs
===================================================================
diff -u -r882ef058f189a4e44514d192fd396590b0d9af35 -r92056906158ddd85bd0b82da96167997e08c289a
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs)	(revision 882ef058f189a4e44514d192fd396590b0d9af35)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs)	(revision 92056906158ddd85bd0b82da96167997e08c289a)
@@ -23,6 +23,7 @@
 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;
@@ -31,6 +32,7 @@
 using Ringtoets.Revetment.TestUtil;
 using Ringtoets.StabilityStoneCover.Data;
 using Ringtoets.StabilityStoneCover.Forms.PresentationObjects;
+using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources;
 
 namespace Ringtoets.StabilityStoneCover.Plugin.Test.ExportInfos
 {
@@ -56,8 +58,8 @@
             // Assert
             Assert.IsNotNull(exportInfo.CreateFileExporter);
             Assert.IsNotNull(exportInfo.IsEnabled);
-            Assert.IsNull(exportInfo.Category);
-            Assert.IsNull(exportInfo.Image);
+            Assert.AreEqual("Algemeen", exportInfo.Category);
+            TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, exportInfo.Image);
             Assert.IsNotNull(exportInfo.FileFilterGenerator);
         }
 
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextConfigurationExportInfoTest.cs
===================================================================
diff -u -r68e42f759b0e3ca925c9ef38fb5ce905f9cc6ba8 -r92056906158ddd85bd0b82da96167997e08c289a
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextConfigurationExportInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationContextConfigurationExportInfoTest.cs)	(revision 68e42f759b0e3ca925c9ef38fb5ce905f9cc6ba8)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextConfigurationExportInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationContextConfigurationExportInfoTest.cs)	(revision 92056906158ddd85bd0b82da96167997e08c289a)
@@ -23,12 +23,14 @@
 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.WaveImpactAsphaltCover.Data;
 using Ringtoets.WaveImpactAsphaltCover.Forms.PresentationObjects;
 using Ringtoets.WaveImpactAsphaltCover.IO.Exporters;
+using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources;
 
 namespace Ringtoets.WaveImpactAsphaltCover.Plugin.Test.ExportInfos
 {
@@ -54,8 +56,8 @@
             // Assert
             Assert.IsNotNull(exportInfo.CreateFileExporter);
             Assert.IsNotNull(exportInfo.IsEnabled);
-            Assert.IsNull(exportInfo.Category);
-            Assert.IsNull(exportInfo.Image);
+            Assert.AreEqual("Algemeen", exportInfo.Category);
+            TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, exportInfo.Image);
             Assert.IsNotNull(exportInfo.FileFilterGenerator);
         }
 
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextWaveConditionsExportInfoTest.cs
===================================================================
diff -u -rfc420e71eb31a4717c4948f40084a1946238bf3d -r92056906158ddd85bd0b82da96167997e08c289a
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextWaveConditionsExportInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationContextWaveConditionsExportInfoTest.cs)	(revision fc420e71eb31a4717c4948f40084a1946238bf3d)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextWaveConditionsExportInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationContextWaveConditionsExportInfoTest.cs)	(revision 92056906158ddd85bd0b82da96167997e08c289a)
@@ -23,13 +23,15 @@
 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.Revetment.TestUtil;
 using Ringtoets.WaveImpactAsphaltCover.Data;
 using Ringtoets.WaveImpactAsphaltCover.Forms.PresentationObjects;
 using Ringtoets.WaveImpactAsphaltCover.IO.Exporters;
+using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources;
 
 namespace Ringtoets.WaveImpactAsphaltCover.Plugin.Test.ExportInfos
 {
@@ -55,8 +57,8 @@
             // Assert
             Assert.IsNotNull(exportInfo.CreateFileExporter);
             Assert.IsNotNull(exportInfo.IsEnabled);
-            Assert.IsNull(exportInfo.Category);
-            Assert.IsNull(exportInfo.Image);
+            Assert.AreEqual("Algemeen", exportInfo.Category);
+            TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, exportInfo.Image);
             Assert.IsNotNull(exportInfo.FileFilterGenerator);
         }
 
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextConfigurationExportInfoTest.cs
===================================================================
diff -u -r68e42f759b0e3ca925c9ef38fb5ce905f9cc6ba8 -r92056906158ddd85bd0b82da96167997e08c289a
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextConfigurationExportInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextConfigurationExportInfoTest.cs)	(revision 68e42f759b0e3ca925c9ef38fb5ce905f9cc6ba8)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextConfigurationExportInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextConfigurationExportInfoTest.cs)	(revision 92056906158ddd85bd0b82da96167997e08c289a)
@@ -23,13 +23,15 @@
 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.Calculation;
 using Ringtoets.WaveImpactAsphaltCover.Data;
 using Ringtoets.WaveImpactAsphaltCover.Forms.PresentationObjects;
 using Ringtoets.WaveImpactAsphaltCover.IO.Exporters;
+using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources;
 
 namespace Ringtoets.WaveImpactAsphaltCover.Plugin.Test.ExportInfos
 {
@@ -55,8 +57,8 @@
             // Assert
             Assert.IsNotNull(exportInfo.CreateFileExporter);
             Assert.IsNotNull(exportInfo.IsEnabled);
-            Assert.IsNull(exportInfo.Category);
-            Assert.IsNull(exportInfo.Image);
+            Assert.AreEqual("Algemeen", exportInfo.Category);
+            TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, exportInfo.Image);
             Assert.IsNotNull(exportInfo.FileFilterGenerator);
         }
 
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs
===================================================================
diff -u -r68e42f759b0e3ca925c9ef38fb5ce905f9cc6ba8 -r92056906158ddd85bd0b82da96167997e08c289a
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs)	(revision 68e42f759b0e3ca925c9ef38fb5ce905f9cc6ba8)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs)	(revision 92056906158ddd85bd0b82da96167997e08c289a)
@@ -23,6 +23,7 @@
 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;
@@ -31,6 +32,7 @@
 using Ringtoets.Revetment.TestUtil;
 using Ringtoets.WaveImpactAsphaltCover.Data;
 using Ringtoets.WaveImpactAsphaltCover.Forms.PresentationObjects;
+using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources;
 
 namespace Ringtoets.WaveImpactAsphaltCover.Plugin.Test.ExportInfos
 {
@@ -56,8 +58,8 @@
             // Assert
             Assert.IsNotNull(exportInfo.CreateFileExporter);
             Assert.IsNotNull(exportInfo.IsEnabled);
-            Assert.IsNull(exportInfo.Category);
-            Assert.IsNull(exportInfo.Image);
+            Assert.AreEqual("Algemeen", exportInfo.Category);
+            TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, exportInfo.Image);
             Assert.IsNotNull(exportInfo.FileFilterGenerator);
         }