Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Controls/AssemblyResultControl.cs
===================================================================
diff -u -r33b32cd89eb3963abe4908e1120548c364a2d2e1 -r602252658dcfe6cacca8ea7257323e560b9d1418
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Controls/AssemblyResultControl.cs	(.../AssemblyResultControl.cs)	(revision 33b32cd89eb3963abe4908e1120548c364a2d2e1)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Controls/AssemblyResultControl.cs	(.../AssemblyResultControl.cs)	(revision 602252658dcfe6cacca8ea7257323e560b9d1418)
@@ -78,11 +78,12 @@
         }
 
         /// <summary>
-        /// Clears the error message of the control.
+        /// Clears the messages of the control.
         /// </summary>
-        public void ClearError()
+        public void ClearMessages()
         {
             errorProvider.SetError(this, string.Empty);
+            warningProvider.SetError(this, string.Empty);
         }
 
         /// <summary>
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismResultView.cs
===================================================================
diff -u -r17f4a44cd541127f016ee7653cec93f7d9310cbc -r602252658dcfe6cacca8ea7257323e560b9d1418
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismResultView.cs	(.../FailureMechanismResultView.cs)	(revision 17f4a44cd541127f016ee7653cec93f7d9310cbc)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismResultView.cs	(.../FailureMechanismResultView.cs)	(revision 602252658dcfe6cacca8ea7257323e560b9d1418)
@@ -1,4 +1,4 @@
-// Copyright (C) Stichting Deltares 2017. All rights reserved.
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
 //
 // This file is part of Ringtoets.
 //
@@ -191,7 +191,7 @@
         private void UpdateFailureMechanismAssemblyResultControl()
         {
             FailureMechanismAssemblyResultControl.ClearAssemblyResult();
-            FailureMechanismAssemblyResultControl.ClearError();
+            FailureMechanismAssemblyResultControl.ClearMessages();
 
             try
             {
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Controls/AssemblyResultControlTest.cs
===================================================================
diff -u -r33b32cd89eb3963abe4908e1120548c364a2d2e1 -r602252658dcfe6cacca8ea7257323e560b9d1418
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Controls/AssemblyResultControlTest.cs	(.../AssemblyResultControlTest.cs)	(revision 33b32cd89eb3963abe4908e1120548c364a2d2e1)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Controls/AssemblyResultControlTest.cs	(.../AssemblyResultControlTest.cs)	(revision 602252658dcfe6cacca8ea7257323e560b9d1418)
@@ -137,17 +137,49 @@
         }
 
         [Test]
-        public void ClearError_Always_ClearsErrorMessageOnControl()
+        [TestCase(true, 24)]
+        [TestCase(false, 4)]
+        public void GivenControlWithOrWithoutErrorMessage_WhenSetWarning_ThenWarningSetWithExpectedPadding(bool hasError, int expectedPadding)
         {
-            // Setup
+            // Given
             using (var resultControl = new TestAssemblyResultControl())
             {
-                // Call
-                resultControl.ClearError();
+                if (hasError)
+                {
+                    resultControl.SetError("Error");
+                }
 
-                // Assert
+                // Precondition
                 ErrorProvider errorProvider = GetErrorProvider(resultControl);
+                Assert.AreEqual(hasError, !string.IsNullOrEmpty(errorProvider.GetError(resultControl)));
+
+                // When
+                resultControl.SetWarning("Warning");
+
+                // Then
+                ErrorProvider warningProvider = GetWarningProvider(resultControl);
+                Assert.AreEqual(expectedPadding, warningProvider.GetIconPadding(resultControl));
+            }
+        }
+
+        [Test]
+        public void GivenControlWithMessages_WhenClearMessages_ThenMessagesCleared()
+        {
+            // Given
+            using (var resultControl = new TestAssemblyResultControl())
+            {
+                resultControl.SetError("Error");
+                resultControl.SetWarning("Warning");
+
+                // When
+                resultControl.ClearMessages();
+
+                // Then
+                ErrorProvider errorProvider = GetErrorProvider(resultControl);
                 Assert.IsEmpty(errorProvider.GetError(resultControl));
+
+                ErrorProvider warningProvider = GetWarningProvider(resultControl);
+                Assert.IsEmpty(warningProvider.GetError(resultControl));
             }
         }
 
@@ -170,32 +202,6 @@
             }
         }
 
-        [Test]
-        [TestCase(true, 24)]
-        [TestCase(false, 4)]
-        public void GivenControlWithOrWithoutErrorMessage_WhenSetWarning_ThenWarningSetWithExpectedPadding(bool hasError, int expectedPadding)
-        {
-            // Given
-            using (var resultControl = new TestAssemblyResultControl())
-            {
-                if (hasError)
-                {
-                    resultControl.SetError("Error");
-                }
-
-                // Precondition
-                ErrorProvider errorProvider = GetErrorProvider(resultControl);
-                Assert.AreEqual(hasError, !string.IsNullOrEmpty(errorProvider.GetError(resultControl)));
-
-                // When
-                resultControl.SetWarning("Warning");
-
-                // Then
-                ErrorProvider warningProvider = GetWarningProvider(resultControl);
-                Assert.AreEqual(expectedPadding, warningProvider.GetIconPadding(resultControl));
-            }
-        }
-
         private static ErrorProvider GetErrorProvider(AssemblyResultControl resultControl)
         {
             return TypeUtils.GetField<ErrorProvider>(resultControl, "errorProvider");
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssemblyResultTotalView.cs
===================================================================
diff -u -r4617dd7727849e7c05d315098d48f3616f31ac72 -r602252658dcfe6cacca8ea7257323e560b9d1418
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssemblyResultTotalView.cs	(.../AssemblyResultTotalView.cs)	(revision 4617dd7727849e7c05d315098d48f3616f31ac72)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssemblyResultTotalView.cs	(.../AssemblyResultTotalView.cs)	(revision 602252658dcfe6cacca8ea7257323e560b9d1418)
@@ -211,7 +211,7 @@
         private void UpdateFailureMechanismsWithoutProbabilityAssemblyControl()
         {
             failureMechanismsWithoutProbabilityAssemblyControl.ClearAssemblyResult();
-            failureMechanismsWithoutProbabilityAssemblyControl.ClearError();
+            failureMechanismsWithoutProbabilityAssemblyControl.ClearMessages();
 
             try
             {
@@ -227,7 +227,7 @@
         private void UpdateFailureMechanismsWithProbabilityAssemblyControl()
         {
             failureMechanismsWithProbabilityAssemblyControl.ClearAssemblyResult();
-            failureMechanismsWithProbabilityAssemblyControl.ClearError();
+            failureMechanismsWithProbabilityAssemblyControl.ClearMessages();
 
             try
             {
@@ -243,7 +243,7 @@
         private void UpdateTotalAssemblyCategoryGroupControl()
         {
             totalAssemblyCategoryGroupControl.ClearAssemblyResult();
-            totalAssemblyCategoryGroupControl.ClearError();
+            totalAssemblyCategoryGroupControl.ClearMessages();
 
             try
             {