Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Builders/FailureMechanismSectionResultViewColumnBuilder.cs
===================================================================
diff -u -rb29487c198d87b176783f2396c2b59cd76b9f246 -r32abca44b759d2532e1bb10090cda0ec073c34ff
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Builders/FailureMechanismSectionResultViewColumnBuilder.cs	(.../FailureMechanismSectionResultViewColumnBuilder.cs)	(revision b29487c198d87b176783f2396c2b59cd76b9f246)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Builders/FailureMechanismSectionResultViewColumnBuilder.cs	(.../FailureMechanismSectionResultViewColumnBuilder.cs)	(revision 32abca44b759d2532e1bb10090cda0ec073c34ff)
@@ -25,6 +25,7 @@
 using Core.Common.Controls.DataGrid;
 using Core.Common.Util;
 using Ringtoets.AssemblyTool.Data;
+using Ringtoets.AssemblyTool.Forms;
 using Ringtoets.Common.Forms.Properties;
 using Ringtoets.Common.Primitives;
 
@@ -436,14 +437,14 @@
                 throw new ArgumentNullException(nameof(dataPropertyName));
             }
 
-            IEnumerable<EnumDisplayWrapper<FailureMechanismSectionAssemblyCategoryGroup>> dataSource = CreateEnumDisplayWrappers<FailureMechanismSectionAssemblyCategoryGroup>();
+            IEnumerable<EnumDisplayWrapper<SelectableFailureMechanismSectionAssemblyCategoryGroup>> dataSource = CreateEnumDisplayWrappers<SelectableFailureMechanismSectionAssemblyCategoryGroup>();
 
             dataGridViewControl.AddComboBoxColumn(
                 dataPropertyName,
                 Resources.FailureMechanismResultView_ManualAssembly_DisplayName,
                 dataSource,
-                nameof(EnumDisplayWrapper<FailureMechanismSectionAssemblyCategoryGroup>.Value),
-                nameof(EnumDisplayWrapper<FailureMechanismSectionAssemblyCategoryGroup>.DisplayName));
+                nameof(EnumDisplayWrapper<SelectableFailureMechanismSectionAssemblyCategoryGroup>.Value),
+                nameof(EnumDisplayWrapper<SelectableFailureMechanismSectionAssemblyCategoryGroup>.DisplayName));
         }
 
         /// <summary>
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj
===================================================================
diff -u -r5785cc13c0454eaabed7ede4dad8e885db7efd50 -r32abca44b759d2532e1bb10090cda0ec073c34ff
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj	(.../Ringtoets.Common.Forms.csproj)	(revision 5785cc13c0454eaabed7ede4dad8e885db7efd50)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj	(.../Ringtoets.Common.Forms.csproj)	(revision 32abca44b759d2532e1bb10090cda0ec073c34ff)
@@ -347,6 +347,11 @@
       <Name>Ringtoets.AssemblyTool.Data</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\AssemblyTool\src\Ringtoets.AssemblyTool.Forms\Ringtoets.AssemblyTool.Forms.csproj">
+      <Project>{22C5DDB8-2491-4BC6-BDC6-2A7B7EBF40C1}</Project>
+      <Name>Ringtoets.AssemblyTool.Forms</Name>
+      <Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\HydraRing\src\Ringtoets.HydraRing.Calculation\Ringtoets.HydraRing.Calculation.csproj">
       <Project>{888d4097-8bc2-4703-9fb1-8744c94d525e}</Project>
       <Name>Ringtoets.HydraRing.Calculation</Name>
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Builders/FailureMechanismSectionResultViewColumnBuilderTest.cs
===================================================================
diff -u -rb29487c198d87b176783f2396c2b59cd76b9f246 -r32abca44b759d2532e1bb10090cda0ec073c34ff
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Builders/FailureMechanismSectionResultViewColumnBuilderTest.cs	(.../FailureMechanismSectionResultViewColumnBuilderTest.cs)	(revision b29487c198d87b176783f2396c2b59cd76b9f246)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Builders/FailureMechanismSectionResultViewColumnBuilderTest.cs	(.../FailureMechanismSectionResultViewColumnBuilderTest.cs)	(revision 32abca44b759d2532e1bb10090cda0ec073c34ff)
@@ -27,7 +27,7 @@
 using Core.Common.Util;
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
-using Ringtoets.AssemblyTool.Data;
+using Ringtoets.AssemblyTool.Forms;
 using Ringtoets.Common.Forms.Builders;
 using Ringtoets.Common.Primitives;
 
@@ -838,9 +838,9 @@
                 Assert.AreEqual("Value", columnData.ValueMember);
                 Assert.AreEqual("DisplayName", columnData.DisplayMember);
 
-                IEnumerable<EnumDisplayWrapper<FailureMechanismSectionAssemblyCategoryGroup>> expectedDataSource =
-                    CreateExpectedEnumDisplayWrappers<FailureMechanismSectionAssemblyCategoryGroup>();
-                AssertEnumDisplayWrappersAreEqual(expectedDataSource, (EnumDisplayWrapper<FailureMechanismSectionAssemblyCategoryGroup>[]) columnData.DataSource);
+                IEnumerable<EnumDisplayWrapper<SelectableFailureMechanismSectionAssemblyCategoryGroup>> expectedDataSource =
+                    CreateExpectedEnumDisplayWrappers<SelectableFailureMechanismSectionAssemblyCategoryGroup>();
+                AssertEnumDisplayWrappersAreEqual(expectedDataSource, (EnumDisplayWrapper<SelectableFailureMechanismSectionAssemblyCategoryGroup>[]) columnData.DataSource);
             }
         }
 
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj
===================================================================
diff -u -r5785cc13c0454eaabed7ede4dad8e885db7efd50 -r32abca44b759d2532e1bb10090cda0ec073c34ff
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj	(.../Ringtoets.Common.Forms.Test.csproj)	(revision 5785cc13c0454eaabed7ede4dad8e885db7efd50)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj	(.../Ringtoets.Common.Forms.Test.csproj)	(revision 32abca44b759d2532e1bb10090cda0ec073c34ff)
@@ -230,6 +230,10 @@
       <Project>{420ED9C3-0C33-47EA-B893-121A9C0DB4F1}</Project>
       <Name>Ringtoets.AssemblyTool.Data</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\AssemblyTool\src\Ringtoets.AssemblyTool.Forms\Ringtoets.AssemblyTool.Forms.csproj">
+      <Project>{22C5DDB8-2491-4BC6-BDC6-2A7B7EBF40C1}</Project>
+      <Name>Ringtoets.AssemblyTool.Forms</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\HydraRing\src\Ringtoets.HydraRing.Calculation\Ringtoets.HydraRing.Calculation.csproj">
       <Project>{888D4097-8BC2-4703-9FB1-8744C94D525E}</Project>
       <Name>Ringtoets.HydraRing.Calculation</Name>
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj
===================================================================
diff -u -r8996c6a9d118bab0d65339b0876e2b78f78a7c31 -r32abca44b759d2532e1bb10090cda0ec073c34ff
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj	(.../Ringtoets.Integration.Forms.csproj)	(revision 8996c6a9d118bab0d65339b0876e2b78f78a7c31)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj	(.../Ringtoets.Integration.Forms.csproj)	(revision 32abca44b759d2532e1bb10090cda0ec073c34ff)
@@ -166,6 +166,11 @@
       <Name>Ringtoets.AssemblyTool.Data</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\AssemblyTool\src\Ringtoets.AssemblyTool.Forms\Ringtoets.AssemblyTool.Forms.csproj">
+      <Project>{22C5DDB8-2491-4BC6-BDC6-2A7B7EBF40C1}</Project>
+      <Name>Ringtoets.AssemblyTool.Forms</Name>
+      <Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.Data\Ringtoets.Common.Data.csproj">
       <Project>{d4200f43-3f72-4f42-af0a-8ced416a38ec}</Project>
       <Name>Ringtoets.Common.Data</Name>
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultRows/MacroStabilityOutwardsSectionResultRow.cs
===================================================================
diff -u -re328ec3e8da13dbceb282e09e103871f543bbe3f -r32abca44b759d2532e1bb10090cda0ec073c34ff
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultRows/MacroStabilityOutwardsSectionResultRow.cs	(.../MacroStabilityOutwardsSectionResultRow.cs)	(revision e328ec3e8da13dbceb282e09e103871f543bbe3f)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultRows/MacroStabilityOutwardsSectionResultRow.cs	(.../MacroStabilityOutwardsSectionResultRow.cs)	(revision 32abca44b759d2532e1bb10090cda0ec073c34ff)
@@ -23,6 +23,7 @@
 using System.ComponentModel;
 using Core.Common.Controls.DataGrid;
 using Ringtoets.AssemblyTool.Data;
+using Ringtoets.AssemblyTool.Forms;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Exceptions;
 using Ringtoets.Common.Forms.Helpers;
@@ -243,17 +244,16 @@
         /// <summary>
         /// Gets or sets the manually selected assembly category group.
         /// </summary>
-        public FailureMechanismSectionAssemblyCategoryGroup ManualAssemblyCategoryGroup
+        public SelectableFailureMechanismSectionAssemblyCategoryGroup ManualAssemblyCategoryGroup
         {
             get
             {
-                return SectionResult.ManualAssemblyCategoryGroup;
+                return SelectableFailureMechanismSectionAssemblyCategoryGroupConverter.ConvertTo(SectionResult.ManualAssemblyCategoryGroup);
             }
             set
             {
-                SectionResult.ManualAssemblyCategoryGroup = value;
-                Update();
-                SectionResult.NotifyObservers();
+                SectionResult.ManualAssemblyCategoryGroup = SelectableFailureMechanismSectionAssemblyCategoryGroupConverter.ConvertFrom(value);
+                UpdateInternalData();
             }
         }
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj
===================================================================
diff -u -r8996c6a9d118bab0d65339b0876e2b78f78a7c31 -r32abca44b759d2532e1bb10090cda0ec073c34ff
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj	(.../Ringtoets.Integration.Forms.Test.csproj)	(revision 8996c6a9d118bab0d65339b0876e2b78f78a7c31)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj	(.../Ringtoets.Integration.Forms.Test.csproj)	(revision 32abca44b759d2532e1bb10090cda0ec073c34ff)
@@ -152,6 +152,10 @@
       <Project>{420ed9c3-0c33-47ea-b893-121a9c0db4f1}</Project>
       <Name>Ringtoets.AssemblyTool.Data</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\AssemblyTool\src\Ringtoets.AssemblyTool.Forms\Ringtoets.AssemblyTool.Forms.csproj">
+      <Project>{22C5DDB8-2491-4BC6-BDC6-2A7B7EBF40C1}</Project>
+      <Name>Ringtoets.AssemblyTool.Forms</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\AssemblyTool\src\Ringtoets.AssemblyTool.KernelWrapper\Ringtoets.AssemblyTool.KernelWrapper.csproj">
       <Project>{358B6DA2-A1DF-477F-B6AC-C30204265CB0}</Project>
       <Name>Ringtoets.AssemblyTool.KernelWrapper</Name>
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/MacroStabilityOutwardsSectionResultRowTest.cs
===================================================================
diff -u -rc715370e848d5d61ce51ed73aabfc5a8aea329da -r32abca44b759d2532e1bb10090cda0ec073c34ff
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/MacroStabilityOutwardsSectionResultRowTest.cs	(.../MacroStabilityOutwardsSectionResultRowTest.cs)	(revision c715370e848d5d61ce51ed73aabfc5a8aea329da)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/MacroStabilityOutwardsSectionResultRowTest.cs	(.../MacroStabilityOutwardsSectionResultRowTest.cs)	(revision 32abca44b759d2532e1bb10090cda0ec073c34ff)
@@ -28,6 +28,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.AssemblyTool.Data;
+using Ringtoets.AssemblyTool.Forms;
 using Ringtoets.AssemblyTool.KernelWrapper.Calculators;
 using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators;
 using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly;
@@ -182,7 +183,8 @@
                 Assert.AreEqual(result.TailorMadeAssessmentResult, row.TailorMadeAssessmentResult);
                 Assert.AreEqual(result.TailorMadeAssessmentProbability, row.TailorMadeAssessmentProbability);
                 Assert.AreEqual(result.UseManualAssemblyCategoryGroup, row.UseManualAssemblyCategoryGroup);
-                Assert.AreEqual(result.ManualAssemblyCategoryGroup, row.ManualAssemblyCategoryGroup);
+                Assert.AreEqual(SelectableFailureMechanismSectionAssemblyCategoryGroupConverter.ConvertTo(result.ManualAssemblyCategoryGroup),
+                                row.ManualAssemblyCategoryGroup);
 
                 TestHelper.AssertTypeConverter<MacroStabilityOutwardsSectionResultRow,
                     NoProbabilityValueDoubleConverter>(
@@ -320,7 +322,7 @@
             mocks.ReplayAll();
 
             var random = new Random(39);
-            var newValue = random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>();
+            var newValue = random.NextEnumValue<SelectableFailureMechanismSectionAssemblyCategoryGroup>();
 
             FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
             var result = new MacroStabilityOutwardsFailureMechanismSectionResult(section);
@@ -335,7 +337,8 @@
                 row.ManualAssemblyCategoryGroup = newValue;
 
                 // Assert
-                Assert.AreEqual(newValue, result.ManualAssemblyCategoryGroup);
+                FailureMechanismSectionAssemblyCategoryGroup expectedCategoryGroup = SelectableFailureMechanismSectionAssemblyCategoryGroupConverter.ConvertFrom(newValue);
+                Assert.AreEqual(expectedCategoryGroup, result.ManualAssemblyCategoryGroup);
                 mocks.VerifyAll();
             }
         }
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacroStabilityOutwardsResultViewTest.cs
===================================================================
diff -u -r16155640e5a575b9b59a9614be69c5bcc9dc02f7 -r32abca44b759d2532e1bb10090cda0ec073c34ff
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacroStabilityOutwardsResultViewTest.cs	(.../MacroStabilityOutwardsResultViewTest.cs)	(revision 16155640e5a575b9b59a9614be69c5bcc9dc02f7)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacroStabilityOutwardsResultViewTest.cs	(.../MacroStabilityOutwardsResultViewTest.cs)	(revision 32abca44b759d2532e1bb10090cda0ec073c34ff)
@@ -26,6 +26,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.AssemblyTool.Data;
+using Ringtoets.AssemblyTool.Forms;
 using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.TestUtil;
@@ -195,7 +196,7 @@
                 Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.VIv, cells[tailorMadeAssemblyCategoryGroupIndex].Value);
                 Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.VIv, cells[combinedAssemblyCategoryGroupIndex].Value);
                 Assert.AreEqual(false, cells[useManualAssemblyCategoryGroupIndex].Value);
-                Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.None, cells[manualAssemblyCategoryGroupIndex].Value);
+                Assert.AreEqual(SelectableFailureMechanismSectionAssemblyCategoryGroup.None, cells[manualAssemblyCategoryGroupIndex].Value);
             }
         }
     }