Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r2018b9555ce1ea7636921c6303f6477a934015cb -r0d4d9548637cbf814359cece7b551ca85b8378c3
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 2018b9555ce1ea7636921c6303f6477a934015cb)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 0d4d9548637cbf814359cece7b551ca85b8378c3)
@@ -92,6 +92,42 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Kleur.
+        /// </summary>
+        public static string AssemblyCategory_Color_DisplayName {
+            get {
+                return ResourceManager.GetString("AssemblyCategory_Color_DisplayName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Categorie.
+        /// </summary>
+        public static string AssemblyCategory_Group_DisplayName {
+            get {
+                return ResourceManager.GetString("AssemblyCategory_Group_DisplayName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Ondergrens [1/jaar].
+        /// </summary>
+        public static string AssemblyCategory_LowerBoundary_DisplayName {
+            get {
+                return ResourceManager.GetString("AssemblyCategory_LowerBoundary_DisplayName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Bovengrens [1/jaar].
+        /// </summary>
+        public static string AssemblyCategory_UpperBoundary_DisplayName {
+            get {
+                return ResourceManager.GetString("AssemblyCategory_UpperBoundary_DisplayName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Waterstand met een overschrijdingsfrequentie gelijk aan de trajectnorm..
         /// </summary>
         public static string AssessmentLevel_Description {
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx
===================================================================
diff -u -r2018b9555ce1ea7636921c6303f6477a934015cb -r0d4d9548637cbf814359cece7b551ca85b8378c3
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 2018b9555ce1ea7636921c6303f6477a934015cb)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 0d4d9548637cbf814359cece7b551ca85b8378c3)
@@ -1419,4 +1419,16 @@
   <data name="CategoryProperties_UpperBoundary_DisplayName" xml:space="preserve">
     <value>Bovengrens [1/jaar]</value>
   </data>
+  <data name="AssemblyCategory_Color_DisplayName" xml:space="preserve">
+    <value>Kleur</value>
+  </data>
+  <data name="AssemblyCategory_Group_DisplayName" xml:space="preserve">
+    <value>Categorie</value>
+  </data>
+  <data name="AssemblyCategory_LowerBoundary_DisplayName" xml:space="preserve">
+    <value>Ondergrens [1/jaar]</value>
+  </data>
+  <data name="AssemblyCategory_UpperBoundary_DisplayName" xml:space="preserve">
+    <value>Bovengrens [1/jaar]</value>
+  </data>
 </root>
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r2018b9555ce1ea7636921c6303f6477a934015cb -r0d4d9548637cbf814359cece7b551ca85b8378c3
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 2018b9555ce1ea7636921c6303f6477a934015cb)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 0d4d9548637cbf814359cece7b551ca85b8378c3)
@@ -101,15 +101,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Categorie.
-        /// </summary>
-        public static string AssemblyCategory_Group_DisplayName {
-            get {
-                return ResourceManager.GetString("AssemblyCategory_Group_DisplayName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Assemblage.
         /// </summary>
         public static string AssemblyResultCategoryTreeFolder_DisplayName {
@@ -237,33 +228,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Kleur.
-        /// </summary>
-        public static string AssessmentSectionAssemblyCategory_Color_DisplayName {
-            get {
-                return ResourceManager.GetString("AssessmentSectionAssemblyCategory_Color_DisplayName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Ondergrens [1/jaar].
-        /// </summary>
-        public static string AssessmentSectionAssemblyCategory_LowerBoundary_DisplayName {
-            get {
-                return ResourceManager.GetString("AssessmentSectionAssemblyCategory_LowerBoundary_DisplayName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Bovengrens [1/jaar].
-        /// </summary>
-        public static string AssessmentSectionAssemblyCategory_UpperBoundary_DisplayName {
-            get {
-                return ResourceManager.GetString("AssessmentSectionAssemblyCategory_UpperBoundary_DisplayName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Selecteer het type traject, bepalend voor de faalkansbegroting..
         /// </summary>
         public static string AssessmentSectionComposition_Composition_Description {
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx
===================================================================
diff -u -r2018b9555ce1ea7636921c6303f6477a934015cb -r0d4d9548637cbf814359cece7b551ca85b8378c3
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 2018b9555ce1ea7636921c6303f6477a934015cb)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 0d4d9548637cbf814359cece7b551ca85b8378c3)
@@ -339,18 +339,6 @@
   <data name="FailureMechanismProperties_Contribution_Other_Percentage_0" xml:space="preserve">
     <value>Overig ({0})</value>
   </data>
-  <data name="AssessmentSectionAssemblyCategory_Color_DisplayName" xml:space="preserve">
-    <value>Kleur</value>
-  </data>
-  <data name="AssemblyCategory_Group_DisplayName" xml:space="preserve">
-    <value>Categorie</value>
-  </data>
-  <data name="AssessmentSectionAssemblyCategory_LowerBoundary_DisplayName" xml:space="preserve">
-    <value>Ondergrens [1/jaar]</value>
-  </data>
-  <data name="AssessmentSectionAssemblyCategory_UpperBoundary_DisplayName" xml:space="preserve">
-    <value>Bovengrens [1/jaar]</value>
-  </data>
   <data name="AssemblyResultCategoryTreeFolder_DisplayName" xml:space="preserve">
     <value>Assemblage</value>
   </data>
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj
===================================================================
diff -u -r2018b9555ce1ea7636921c6303f6477a934015cb -r0d4d9548637cbf814359cece7b551ca85b8378c3
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj	(.../Ringtoets.Integration.Forms.csproj)	(revision 2018b9555ce1ea7636921c6303f6477a934015cb)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj	(.../Ringtoets.Integration.Forms.csproj)	(revision 0d4d9548637cbf814359cece7b551ca85b8378c3)
@@ -109,8 +109,8 @@
       <DependentUpon>DesignWaterLevelCalculationsView.cs</DependentUpon>
     </Compile>
     <Compile Include="PropertyClasses\IAssessmentSectionCompositionChangeHandler.cs" />
-    <Compile Include="Views\AssessmentSectionAssemblyCategoryRow.cs" />
-    <Compile Include="Views\AssessmentSectionAssemblyCategoriesTable.cs">
+    <Compile Include="Views\AssemblyCategoryRow.cs" />
+    <Compile Include="Views\AssemblyCategoriesTable.cs">
       <SubType>UserControl</SubType>
     </Compile>
     <Compile Include="Views\AssessmentSectionAssemblyCategoriesView.cs">
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssemblyCategoriesTable.cs
===================================================================
diff -u
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssemblyCategoriesTable.cs	(revision 0)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssemblyCategoriesTable.cs	(revision 0d4d9548637cbf814359cece7b551ca85b8378c3)
@@ -0,0 +1,75 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using Core.Common.Controls.DataGrid;
+using Ringtoets.AssemblyTool.Data;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
+
+namespace Ringtoets.Integration.Forms.Views
+{
+    /// <summary>
+    /// This class defines a table in which properties of <see cref="AssemblyCategory"/> instances
+    /// are shown as rows.
+    /// </summary>
+    public class AssemblyCategoriesTable<T> : DataGridViewControl 
+        where T : struct
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="AssemblyCategoriesTable{T}"/>.
+        /// </summary>
+        public AssemblyCategoriesTable()
+        {
+            AddColumns();
+        }
+
+        /// <summary>
+        /// Sets the given <paramref name="categories"/> for which the properties
+        /// are shown in the table.
+        /// </summary>
+        /// <param name="categories">The collection of categories to show.</param>
+        public void SetData(IEnumerable<Tuple<AssemblyCategory, Color, T>> categories)
+        {
+            SetDataSource(categories?.Select(category => new AssemblyCategoryRow<T>(category.Item1, category.Item2, category.Item3)).ToArray());
+        }
+
+        private void AddColumns()
+        {
+            AddTextBoxColumn(nameof(AssemblyCategoryRow<T>.Group),
+                             RingtoetsCommonFormsResources.AssemblyCategory_Group_DisplayName,
+                             true);
+
+            AddColorColumn(nameof(AssemblyCategoryRow<T>.Color),
+                           RingtoetsCommonFormsResources.AssemblyCategory_Color_DisplayName);
+
+            AddTextBoxColumn(nameof(AssemblyCategoryRow<T>.LowerBoundary),
+                             RingtoetsCommonFormsResources.AssemblyCategory_LowerBoundary_DisplayName,
+                             true);
+
+            AddTextBoxColumn(nameof(AssemblyCategoryRow<T>.UpperBoundary),
+                             RingtoetsCommonFormsResources.AssemblyCategory_UpperBoundary_DisplayName,
+                             true);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssemblyCategoryRow.cs
===================================================================
diff -u
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssemblyCategoryRow.cs	(revision 0)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssemblyCategoryRow.cs	(revision 0d4d9548637cbf814359cece7b551ca85b8378c3)
@@ -0,0 +1,83 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using Core.Common.Util;
+using Ringtoets.AssemblyTool.Data;
+using Ringtoets.Common.Forms.TypeConverters;
+
+namespace Ringtoets.Integration.Forms.Views
+{
+    /// <summary>
+    /// This class represents a row displaying the properties of a <see cref="AssemblyCategory"/>.
+    /// </summary>
+    internal class AssemblyCategoryRow<T>
+        where T : struct
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="AssemblyCategoryRow{T}"/>.
+        /// </summary>
+        /// <param name="assemblyCategory">The <see cref="AssemblyCategory"/> to use.</param>
+        /// <param name="assemblyColor">The <see cref="Color"/> belonging to this category.</param>
+        /// <param name="assemblyCategoryGroup">The category group of this category.</param>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="assemblyCategory"/>
+        /// is <c>null</c>.</exception>
+        public AssemblyCategoryRow(AssemblyCategory assemblyCategory,
+                                   Color assemblyColor,
+                                   T assemblyCategoryGroup)
+        {
+            if (assemblyCategory == null)
+            {
+                throw new ArgumentNullException(nameof(assemblyCategory));
+            }
+
+            Group = assemblyCategoryGroup;
+            Color = assemblyColor;
+            UpperBoundary = assemblyCategory.UpperBoundary;
+            LowerBoundary = assemblyCategory.LowerBoundary;
+        }
+
+        /// <summary>
+        /// Gets the display name of the category group.
+        /// </summary>
+        [TypeConverter(typeof(EnumTypeConverter))]
+        public T Group { get; }
+
+        /// <summary>
+        /// Gets the color of the category.
+        /// </summary>
+        public Color Color { get; }
+
+        /// <summary>
+        /// Gets the lower boundary of the category.
+        /// </summary>
+        [TypeConverter(typeof(NoProbabilityValueDoubleConverter))]
+        public double LowerBoundary { get; }
+
+        /// <summary>
+        /// Gets the upper boundary of the category.
+        /// </summary>
+        [TypeConverter(typeof(NoProbabilityValueDoubleConverter))]
+        public double UpperBoundary { get; }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssemblyResultTotalView.cs
===================================================================
diff -u -rc704dafc81a213131e51f78b19fee63c14a9a5a5 -r0d4d9548637cbf814359cece7b551ca85b8378c3
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssemblyResultTotalView.cs	(.../AssemblyResultTotalView.cs)	(revision c704dafc81a213131e51f78b19fee63c14a9a5a5)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssemblyResultTotalView.cs	(.../AssemblyResultTotalView.cs)	(revision 0d4d9548637cbf814359cece7b551ca85b8378c3)
@@ -134,7 +134,7 @@
                                                  true);
 
             dataGridViewControl.AddTextBoxColumn(nameof(FailureMechanismAssemblyResultRowBase.CategoryGroup),
-                                                 Resources.AssemblyCategory_Group_DisplayName,
+                                                 RingtoetsCommonFormsResources.AssemblyCategory_Group_DisplayName,
                                                  true);
 
             dataGridViewControl.AddTextBoxColumn(nameof(FailureMechanismAssemblyResultRowBase.Probablity),
Fisheye: Tag 0d4d9548637cbf814359cece7b551ca85b8378c3 refers to a dead (removed) revision in file `Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssessmentSectionAssemblyCategoriesTable.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssessmentSectionAssemblyCategoriesView.Designer.cs
===================================================================
diff -u -r2a88a8c275a4e795e771affc75aa31f475d97079 -r0d4d9548637cbf814359cece7b551ca85b8378c3
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssessmentSectionAssemblyCategoriesView.Designer.cs	(.../AssessmentSectionAssemblyCategoriesView.Designer.cs)	(revision 2a88a8c275a4e795e771affc75aa31f475d97079)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssessmentSectionAssemblyCategoriesView.Designer.cs	(.../AssessmentSectionAssemblyCategoriesView.Designer.cs)	(revision 0d4d9548637cbf814359cece7b551ca85b8378c3)
@@ -19,6 +19,8 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using Ringtoets.AssemblyTool.Data;
+
 namespace Ringtoets.Integration.Forms.Views
 {
     partial class AssessmentSectionAssemblyCategoriesView
@@ -38,19 +40,19 @@
         private void InitializeComponent()
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AssessmentSectionAssemblyCategoriesView));
-            this.assessmentSectionAssemblyCategoriesTable = new Ringtoets.Integration.Forms.Views.AssessmentSectionAssemblyCategoriesTable();
+            this.assemblyCategoriesTable = new Ringtoets.Integration.Forms.Views.AssemblyCategoriesTable<AssessmentSectionAssemblyCategoryGroup>();
             this.SuspendLayout();
             // 
             // assessmentSectionAssemblyCategoriesTable
             // 
-            resources.ApplyResources(this.assessmentSectionAssemblyCategoriesTable, "assessmentSectionAssemblyCategoriesTable");
-            this.assessmentSectionAssemblyCategoriesTable.MultiSelect = true;
-            this.assessmentSectionAssemblyCategoriesTable.Name = "assessmentSectionAssemblyCategoriesTable";
-            this.assessmentSectionAssemblyCategoriesTable.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.RowHeaderSelect;
+            resources.ApplyResources(this.assemblyCategoriesTable, "assemblyCategoriesTable");
+            this.assemblyCategoriesTable.MultiSelect = true;
+            this.assemblyCategoriesTable.Name = "assemblyCategoriesTable";
+            this.assemblyCategoriesTable.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.RowHeaderSelect;
             // 
             // FailureMechanismSectionsView
             // 
-            this.Controls.Add(this.assessmentSectionAssemblyCategoriesTable);
+            this.Controls.Add(this.assemblyCategoriesTable);
             this.Name = "AssessmentSectionAssemblyCategoriesView";
             resources.ApplyResources(this, "$this");
             this.ResumeLayout(false);
@@ -60,6 +62,6 @@
 
         #endregion
 
-        private AssessmentSectionAssemblyCategoriesTable assessmentSectionAssemblyCategoriesTable;
+        private AssemblyCategoriesTable<AssessmentSectionAssemblyCategoryGroup> assemblyCategoriesTable;
     }
 }
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssessmentSectionAssemblyCategoriesView.cs
===================================================================
diff -u -rf147b624dadd780d3186ec19c301d9ed1634504e -r0d4d9548637cbf814359cece7b551ca85b8378c3
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssessmentSectionAssemblyCategoriesView.cs	(.../AssessmentSectionAssemblyCategoriesView.cs)	(revision f147b624dadd780d3186ec19c301d9ed1634504e)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssessmentSectionAssemblyCategoriesView.cs	(.../AssessmentSectionAssemblyCategoriesView.cs)	(revision 0d4d9548637cbf814359cece7b551ca85b8378c3)
@@ -20,12 +20,15 @@
 // All rights reserved.
 
 using System;
+using System.Drawing;
+using System.Linq;
 using System.Windows.Forms;
 using Core.Common.Base;
 using Core.Common.Controls.Views;
 using Ringtoets.AssemblyTool.Data;
 using Ringtoets.Common.Data.AssemblyTool;
 using Ringtoets.Common.Data.Contribution;
+using Ringtoets.Common.Forms.Helpers;
 
 namespace Ringtoets.Integration.Forms.Views
 {
@@ -68,7 +71,7 @@
         public FailureMechanismContribution FailureMechanismContribution { get; }
 
         public object Data { get; set; }
-        
+
         protected override void Dispose(bool disposing)
         {
             failureMechanismContributionObserver.Dispose();
@@ -83,9 +86,14 @@
 
         private void UpdateTableData()
         {
-            assessmentSectionAssemblyCategoriesTable.SetData(AssemblyToolCategoriesFactory.CreateAssessmentSectionAssemblyCategories(
-                                                                 FailureMechanismContribution.SignalingNorm,
-                                                                 FailureMechanismContribution.LowerLimitNorm));
+            assemblyCategoriesTable.SetData(
+                AssemblyToolCategoriesFactory.CreateAssessmentSectionAssemblyCategories(
+                                                 FailureMechanismContribution.SignalingNorm,
+                                                 FailureMechanismContribution.LowerLimitNorm)
+                                             .Select(category => new Tuple<AssemblyCategory, Color, AssessmentSectionAssemblyCategoryGroup>(
+                                                         category,
+                                                         AssemblyCategoryGroupColorHelper.GetAssessmentSectionAssemblyCategoryGroupColor(category.Group),
+                                                         category.Group)));
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssessmentSectionAssemblyCategoriesView.resx
===================================================================
diff -u -r4d5f18805638d24f450406e9eda206b2f3591c36 -r0d4d9548637cbf814359cece7b551ca85b8378c3
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssessmentSectionAssemblyCategoriesView.resx	(.../AssessmentSectionAssemblyCategoriesView.resx)	(revision 4d5f18805638d24f450406e9eda206b2f3591c36)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssessmentSectionAssemblyCategoriesView.resx	(.../AssessmentSectionAssemblyCategoriesView.resx)	(revision 0d4d9548637cbf814359cece7b551ca85b8378c3)
@@ -118,30 +118,30 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="assessmentSectionAssemblyCategoriesTable.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+  <data name="assemblyCategoriesTable.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Fill</value>
   </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="assessmentSectionAssemblyCategoriesTable.Location" type="System.Drawing.Point, System.Drawing">
+  <data name="assemblyCategoriesTable.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
-  <data name="assessmentSectionAssemblyCategoriesTable.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="assemblyCategoriesTable.Size" type="System.Drawing.Size, System.Drawing">
     <value>750, 420</value>
   </data>
   <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="assessmentSectionAssemblyCategoriesTable.TabIndex" type="System.Int32, mscorlib">
+  <data name="assemblyCategoriesTable.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
   </data>
-  <data name="&gt;&gt;assessmentSectionAssemblyCategoriesTable.Name" xml:space="preserve">
-    <value>assessmentSectionAssemblyCategoriesTable</value>
+  <data name="&gt;&gt;assemblyCategoriesTable.Name" xml:space="preserve">
+    <value>assemblyCategoriesTable</value>
   </data>
-  <data name="&gt;&gt;assessmentSectionAssemblyCategoriesTable.Type" xml:space="preserve">
+  <data name="&gt;&gt;assemblyCategoriesTable.Type" xml:space="preserve">
     <value>Ringtoets.Integration.Forms.Views.AssessmentSectionAssemblyCategoriesTable, Ringtoets.Common.Forms, Version=18.1.1.1, Culture=neutral, PublicKeyToken=null</value>
   </data>
-  <data name="&gt;&gt;assessmentSectionAssemblyCategoriesTable.Parent" xml:space="preserve">
+  <data name="&gt;&gt;assemblyCategoriesTable.Parent" xml:space="preserve">
     <value>$this</value>
   </data>
-  <data name="&gt;&gt;assessmentSectionAssemblyCategoriesTable.ZOrder" xml:space="preserve">
+  <data name="&gt;&gt;assemblyCategoriesTable.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
Fisheye: Tag 0d4d9548637cbf814359cece7b551ca85b8378c3 refers to a dead (removed) revision in file `Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssessmentSectionAssemblyCategoryRow.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj
===================================================================
diff -u -r2018b9555ce1ea7636921c6303f6477a934015cb -r0d4d9548637cbf814359cece7b551ca85b8378c3
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj	(.../Ringtoets.Integration.Forms.Test.csproj)	(revision 2018b9555ce1ea7636921c6303f6477a934015cb)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj	(.../Ringtoets.Integration.Forms.Test.csproj)	(revision 0d4d9548637cbf814359cece7b551ca85b8378c3)
@@ -70,9 +70,9 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="PropertyClasses\AssessmentSectionPropertiesTest.cs" />
     <Compile Include="Views\AssemblyResultPerSectionViewTest.cs" />
-    <Compile Include="Views\AssessmentSectionAssemblyCategoriesTableTest.cs" />
+    <Compile Include="Views\AssemblyCategoriesTableTest.cs" />
     <Compile Include="Views\AssessmentSectionAssemblyCategoriesViewTest.cs" />
-    <Compile Include="Views\AssessmentSectionAssemblyCategoryRowTest.cs" />
+    <Compile Include="Views\AssemblyCategoryRowTest.cs" />
     <Compile Include="Views\AssemblyResultTotalViewTest.cs" />
     <Compile Include="Views\CombinedFailureMechanismSectionAssemblyResultRowTest.cs" />
     <Compile Include="Views\FailureMechanismAssemblyResultRowBaseTest.cs" />
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssemblyCategoriesTableTest.cs
===================================================================
diff -u
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssemblyCategoriesTableTest.cs	(revision 0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssemblyCategoriesTableTest.cs	(revision 0d4d9548637cbf814359cece7b551ca85b8378c3)
@@ -0,0 +1,192 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+using Core.Common.Controls.DataGrid;
+using Core.Common.TestUtil;
+using NUnit.Framework;
+using Ringtoets.AssemblyTool.Data;
+using Ringtoets.Integration.Forms.Views;
+
+namespace Ringtoets.Integration.Forms.Test.Views
+{
+    [TestFixture]
+    public class AssemblyCategoriesTableTest
+    {
+        private const int categoryGroupColumnIndex = 0;
+        private const int colorColumnIndex = 1;
+        private const int lowerBoundaryColumnIndex = 2;
+        private const int upperBoundaryColumnIndex = 3;
+
+        [Test]
+        public void Constructor_InitializesWithColumns()
+        {
+            // Call
+            using (var table = new AssemblyCategoriesTable<TestAssemblyCategoryGroup>())
+            {
+                // Assert
+                Assert.IsInstanceOf<DataGridViewControl>(table);
+
+                DataGridViewColumn groupColumn = table.GetColumnFromIndex(categoryGroupColumnIndex);
+                Assert.AreEqual("Categorie", groupColumn.HeaderText);
+                Assert.IsTrue(groupColumn.ReadOnly);
+                Assert.IsInstanceOf<DataGridViewTextBoxColumn>(groupColumn);
+
+                DataGridViewColumn colorColumn = table.GetColumnFromIndex(colorColumnIndex);
+                Assert.AreEqual("Kleur", colorColumn.HeaderText);
+                Assert.IsTrue(colorColumn.ReadOnly);
+                Assert.IsInstanceOf<DataGridViewColorColumn>(colorColumn);
+
+                DataGridViewColumn lowerBoundaryColumn = table.GetColumnFromIndex(lowerBoundaryColumnIndex);
+                Assert.AreEqual("Ondergrens [1/jaar]", lowerBoundaryColumn.HeaderText);
+                Assert.IsTrue(lowerBoundaryColumn.ReadOnly);
+                Assert.IsInstanceOf<DataGridViewTextBoxColumn>(lowerBoundaryColumn);
+
+                DataGridViewColumn upperBoundaryColumn = table.GetColumnFromIndex(upperBoundaryColumnIndex);
+                Assert.AreEqual("Bovengrens [1/jaar]", upperBoundaryColumn.HeaderText);
+                Assert.IsTrue(upperBoundaryColumn.ReadOnly);
+                Assert.IsInstanceOf<DataGridViewTextBoxColumn>(upperBoundaryColumn);
+
+                Assert.Throws<ArgumentOutOfRangeException>(() => table.GetColumnFromIndex(upperBoundaryColumnIndex + 1));
+
+                CollectionAssert.IsEmpty(table.Rows);
+            }
+        }
+
+        [Test]
+        public void SetData_NoDataAlreadySet_SetNewData()
+        {
+            // Setup
+            using (var table = new AssemblyCategoriesTable<TestAssemblyCategoryGroup>())
+            {
+                Tuple<AssemblyCategory, Color, TestAssemblyCategoryGroup>[] categories =
+                {
+                    CreateAssessmentSectionAssemblyCategory(),
+                    CreateAssessmentSectionAssemblyCategory(),
+                    CreateAssessmentSectionAssemblyCategory()
+                };
+
+                // Call
+                table.SetData(categories);
+
+                // Assert
+                Assert.AreEqual(categories.Length, table.Rows.Count);
+            }
+        }
+
+        [Test]
+        public void SetData_SetNullDataAfterDataAlreadySet_ClearsData()
+        {
+            // Setup
+            using (var table = new AssemblyCategoriesTable<TestAssemblyCategoryGroup>())
+            {
+                Tuple<AssemblyCategory, Color, TestAssemblyCategoryGroup>[] categories =
+                {
+                    CreateAssessmentSectionAssemblyCategory(),
+                    CreateAssessmentSectionAssemblyCategory(),
+                    CreateAssessmentSectionAssemblyCategory()
+                };
+                table.SetData(categories);
+
+                // Call
+                table.SetData(null);
+
+                // Assert
+                Assert.AreEqual(0, table.Rows.Count);
+            }
+        }
+
+        [Test]
+        public void SetData_SetNewDataAfterDataAlreadySet_ClearDataAndAddNewData()
+        {
+            // Setup
+            using (var table = new AssemblyCategoriesTable<TestAssemblyCategoryGroup>())
+            {
+                table.SetData(new[]
+                {
+                    CreateAssessmentSectionAssemblyCategory()
+                });
+
+                Tuple<AssemblyCategory, Color, TestAssemblyCategoryGroup>[] newCategories =
+                {
+                    CreateAssessmentSectionAssemblyCategory(),
+                    CreateAssessmentSectionAssemblyCategory(),
+                    CreateAssessmentSectionAssemblyCategory()
+                };
+
+                // Call
+                table.SetData(newCategories);
+
+                // Assert
+                Assert.AreEqual(newCategories.Length, table.Rows.Count);
+            }
+        }
+
+        [Test]
+        public void SetData_WithData_ExpectedValuesInTable()
+        {
+            // Setup
+            using (var table = new AssemblyCategoriesTable<TestAssemblyCategoryGroup>())
+            {
+                Tuple<AssemblyCategory, Color, TestAssemblyCategoryGroup>[] categories =
+                {
+                    CreateAssessmentSectionAssemblyCategory(),
+                    CreateAssessmentSectionAssemblyCategory(),
+                    CreateAssessmentSectionAssemblyCategory()
+                };
+
+                // Call
+                table.SetData(categories);
+
+                // Assert
+                Assert.AreEqual(categories.Length, table.Rows.Count);
+                for (var i = 0; i < table.Rows.Count; i++)
+                {
+                    Tuple<AssemblyCategory, Color, TestAssemblyCategoryGroup> category = categories[i];
+                    DataGridViewCellCollection rowCells = table.Rows[i].Cells;
+
+                    Assert.AreEqual(category.Item3, rowCells[categoryGroupColumnIndex].Value);
+                    Assert.AreEqual(category.Item2, rowCells[colorColumnIndex].Value);
+                    Assert.AreEqual(category.Item1.LowerBoundary, rowCells[lowerBoundaryColumnIndex].Value);
+                    Assert.AreEqual(category.Item1.UpperBoundary, rowCells[upperBoundaryColumnIndex].Value);
+                }
+            }
+        }
+
+        private static Tuple<AssemblyCategory, Color, TestAssemblyCategoryGroup> CreateAssessmentSectionAssemblyCategory()
+        {
+            var random = new Random(39);
+            return new Tuple<AssemblyCategory, Color, TestAssemblyCategoryGroup>(new TestAssemblyCategory(random.NextDouble(), random.NextDouble()),
+                                                                                 Color.FromKnownColor(random.NextEnumValue<KnownColor>()),
+                                                                                 random.NextEnumValue<TestAssemblyCategoryGroup>());
+        }
+
+        private class TestAssemblyCategory : AssemblyCategory
+        {
+            public TestAssemblyCategory(double lowerBoundary, double upperBoundary)
+                : base(lowerBoundary, upperBoundary) {}
+        }
+
+        private enum TestAssemblyCategoryGroup {}
+    }
+}
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssemblyCategoryRowTest.cs
===================================================================
diff -u
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssemblyCategoryRowTest.cs	(revision 0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssemblyCategoryRowTest.cs	(revision 0d4d9548637cbf814359cece7b551ca85b8378c3)
@@ -0,0 +1,90 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Drawing;
+using Core.Common.TestUtil;
+using Core.Common.Util;
+using NUnit.Framework;
+using Ringtoets.AssemblyTool.Data;
+using Ringtoets.Common.Forms.TypeConverters;
+using Ringtoets.Integration.Forms.Views;
+
+namespace Ringtoets.Integration.Forms.Test.Views
+{
+    [TestFixture]
+    public class AssemblyCategoryRowTest
+    {
+        [Test]
+        public void Constructor_AssemblyCategoryNull_ThrowsArgumentNullException()
+        {
+            // Setup
+            var random = new Random(39);
+
+            // Call
+            TestDelegate test = () => new AssemblyCategoryRow<TestAssemblyCategoryGroup>(null, 
+                                                                                         Color.FromKnownColor(random.NextEnumValue<KnownColor>()),
+                                                                                         random.NextEnumValue<TestAssemblyCategoryGroup>());
+
+            // Assert
+            string paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
+            Assert.AreEqual("assemblyCategory", paramName);
+        }
+
+        [Test]
+        public void Constructor_WithAssessmentSectionAssemblyCategory_ExpectedValues()
+        {
+            // Setup
+            var random = new Random(39);
+            double lowerBoundary = random.NextDouble();
+            double upperBoundary = random.NextDouble();
+            var categoryGroup = random.NextEnumValue<TestAssemblyCategoryGroup>();
+            Color categoryColor = Color.FromKnownColor(random.NextEnumValue<KnownColor>());
+            var category = new TestAssemblyCategory(lowerBoundary, upperBoundary);
+
+            // Call
+            var categoryRow = new AssemblyCategoryRow<TestAssemblyCategoryGroup>(category, categoryColor, categoryGroup);
+
+            // Assert
+            Assert.AreEqual(categoryGroup, categoryRow.Group);
+            Assert.AreEqual(categoryColor, categoryRow.Color);
+            Assert.AreEqual(lowerBoundary, categoryRow.LowerBoundary);
+            Assert.AreEqual(upperBoundary, categoryRow.UpperBoundary);
+
+            TestHelper.AssertTypeConverter<AssemblyCategoryRow<TestAssemblyCategoryGroup>,
+                EnumTypeConverter>(nameof(AssemblyCategoryRow<TestAssemblyCategoryGroup>.Group));
+            TestHelper.AssertTypeConverter<AssemblyCategoryRow<TestAssemblyCategoryGroup>,
+                NoProbabilityValueDoubleConverter>(
+                nameof(AssemblyCategoryRow<TestAssemblyCategoryGroup>.LowerBoundary));
+            TestHelper.AssertTypeConverter<AssemblyCategoryRow<TestAssemblyCategoryGroup>,
+                NoProbabilityValueDoubleConverter>(
+                nameof(AssemblyCategoryRow<TestAssemblyCategoryGroup>.UpperBoundary));
+        }
+
+        private class TestAssemblyCategory : AssemblyCategory
+        {
+            public TestAssemblyCategory(double lowerBoundary, double upperBoundary)
+                : base(lowerBoundary, upperBoundary) {}
+        }
+
+        private enum TestAssemblyCategoryGroup {}
+    }
+}
\ No newline at end of file
Fisheye: Tag 0d4d9548637cbf814359cece7b551ca85b8378c3 refers to a dead (removed) revision in file `Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionAssemblyCategoriesTableTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionAssemblyCategoriesViewTest.cs
===================================================================
diff -u -rf147b624dadd780d3186ec19c301d9ed1634504e -r0d4d9548637cbf814359cece7b551ca85b8378c3
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionAssemblyCategoriesViewTest.cs	(.../AssessmentSectionAssemblyCategoriesViewTest.cs)	(revision f147b624dadd780d3186ec19c301d9ed1634504e)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionAssemblyCategoriesViewTest.cs	(.../AssessmentSectionAssemblyCategoriesViewTest.cs)	(revision 0d4d9548637cbf814359cece7b551ca85b8378c3)
@@ -69,7 +69,7 @@
                 Assert.AreEqual(1, view.Controls.Count);
                 Assert.AreSame(failureMechanismContribution, view.FailureMechanismContribution);
 
-                AssessmentSectionAssemblyCategoriesTable tableControl = GetCategoriesTable(view);
+                AssemblyCategoriesTable<AssessmentSectionAssemblyCategoryGroup> tableControl = GetCategoriesTable(view);
                 Assert.NotNull(tableControl);
                 Assert.AreEqual(DockStyle.Fill, tableControl.Dock);
 
@@ -99,7 +99,7 @@
                 var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance;
                 AssemblyCategoriesCalculatorStub calculator = calculatorFactory.LastCreatedAssemblyCategoriesCalculator;
 
-                AssessmentSectionAssemblyCategoriesTable categoriesTable = GetCategoriesTable(view);
+                AssemblyCategoriesTable<AssessmentSectionAssemblyCategoryGroup> categoriesTable = GetCategoriesTable(view);
 
                 // Precondition
                 Assert.AreEqual(calculator.AssessmentSectionCategoriesOutput.Count(), categoriesTable.Rows.Count);
@@ -121,9 +121,10 @@
             mocks.VerifyAll();
         }
 
-        private static AssessmentSectionAssemblyCategoriesTable GetCategoriesTable(AssessmentSectionAssemblyCategoriesView view)
+        private static AssemblyCategoriesTable<AssessmentSectionAssemblyCategoryGroup> GetCategoriesTable(AssessmentSectionAssemblyCategoriesView view)
         {
-            return ControlTestHelper.GetControls<AssessmentSectionAssemblyCategoriesTable>(view, "assessmentSectionAssemblyCategoriesTable").Single();
+            return ControlTestHelper.GetControls<AssemblyCategoriesTable<AssessmentSectionAssemblyCategoryGroup>>(
+                view, "assessmentSectionAssemblyCategoriesTable").Single();
         }
     }
 }
\ No newline at end of file
Fisheye: Tag 0d4d9548637cbf814359cece7b551ca85b8378c3 refers to a dead (removed) revision in file `Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionAssemblyCategoryRowTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?