Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultTotalView.Designer.cs
===================================================================
diff -u -r48244f68eee25ef1d91701d82e4c4867f0252ffc -r0b81b495f2b769885bbb48d84fc1d3ed1bb2721d
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultTotalView.Designer.cs	(.../AssemblyResultTotalView.Designer.cs)	(revision 48244f68eee25ef1d91701d82e4c4867f0252ffc)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultTotalView.Designer.cs	(.../AssemblyResultTotalView.Designer.cs)	(revision 0b81b495f2b769885bbb48d84fc1d3ed1bb2721d)
@@ -51,12 +51,10 @@
             this.failureMechanismsWithoutProbabilityAssemblyControl = new Riskeer.Common.Forms.Controls.FailureMechanismAssemblyCategoryGroupControl();
             this.refreshButtonPanel = new System.Windows.Forms.Panel();
             this.warningProvider = new System.Windows.Forms.ErrorProvider(this.components);
-            this.manualAssemblyWarningProvider = new System.Windows.Forms.ErrorProvider(this.components);
             this.assemblyResultGroupBox.SuspendLayout();
             this.assemblyResultTableLayoutPanel.SuspendLayout();
             this.refreshButtonPanel.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.warningProvider)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.manualAssemblyWarningProvider)).BeginInit();
             this.SuspendLayout();
             // 
             // dataGridViewControl
@@ -193,13 +191,6 @@
             this.warningProvider.Icon = Core.Gui.Properties.Resources.warning;
             this.warningProvider.SetIconPadding(this.refreshAssemblyResultsButton, 4);
             // 
-            // manualAssemblyWarningProvider
-            // 
-            this.manualAssemblyWarningProvider.BlinkStyle = System.Windows.Forms.ErrorBlinkStyle.NeverBlink;
-            this.manualAssemblyWarningProvider.ContainerControl = this;
-            this.manualAssemblyWarningProvider.Icon = global::Riskeer.Common.Forms.Properties.Resources.PencilWarning;
-            this.manualAssemblyWarningProvider.SetIconPadding(this.refreshAssemblyResultsButton, 4);
-            // 
             // AssemblyResultTotalView
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -217,7 +208,6 @@
             this.refreshButtonPanel.ResumeLayout(false);
             this.refreshButtonPanel.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.warningProvider)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.manualAssemblyWarningProvider)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -236,6 +226,5 @@
         private Riskeer.Common.Forms.Controls.FailureMechanismAssemblyCategoryGroupControl failureMechanismsWithoutProbabilityAssemblyControl;
         private System.Windows.Forms.Panel refreshButtonPanel;
         private System.Windows.Forms.ErrorProvider warningProvider;
-        private System.Windows.Forms.ErrorProvider manualAssemblyWarningProvider;
     }
 }
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultTotalView.cs
===================================================================
diff -u -rde96586518ac36e8b2560cff66643e10ecf9ebbb -r0b81b495f2b769885bbb48d84fc1d3ed1bb2721d
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultTotalView.cs	(.../AssemblyResultTotalView.cs)	(revision de96586518ac36e8b2560cff66643e10ecf9ebbb)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultTotalView.cs	(.../AssemblyResultTotalView.cs)	(revision 0b81b495f2b769885bbb48d84fc1d3ed1bb2721d)
@@ -104,7 +104,6 @@
             base.OnLoad(e);
 
             InitializeDataGridView();
-            CheckManualAssemblyResults();
             UpdateAssemblyResultControls();
 
             dataGridViewControl.CellFormatting += HandleCellStyling;
@@ -129,7 +128,6 @@
                 refreshAssemblyResultsButton.Enabled = true;
                 warningProvider.SetError(refreshAssemblyResultsButton,
                                          Resources.AssemblyResultView_RefreshAssemblyResultsButton_Warning_Result_is_outdated_Press_Refresh_button_to_recalculate);
-                SetManualAssemblyWarningPadding();
             }
         }
 
@@ -179,8 +177,6 @@
         {
             ResetRefreshAssemblyResultsButton();
 
-            CheckManualAssemblyResults();
-
             if (updateDataSource)
             {
                 SetDataSource();
@@ -193,27 +189,11 @@
 
             UpdateAssemblyResultControls();
         }
-
-        private void CheckManualAssemblyResults()
-        {
-            if (AssessmentSectionHelper.HasManualAssemblyResults(AssessmentSection))
-            {
-                SetManualAssemblyWarningPadding();
-                manualAssemblyWarningProvider.SetError(refreshAssemblyResultsButton,
-                                                       RiskeerCommonFormsResources.ManualAssemblyWarning_FailureMechanismAssemblyResult_is_based_on_manual_assemblies);
-            }
-        }
-
-        private void SetManualAssemblyWarningPadding()
-        {
-            manualAssemblyWarningProvider.SetIconPadding(refreshAssemblyResultsButton, string.IsNullOrEmpty(warningProvider.GetError(refreshAssemblyResultsButton)) ? 4 : 24);
-        }
-
+        
         private void ResetRefreshAssemblyResultsButton()
         {
             refreshAssemblyResultsButton.Enabled = false;
             warningProvider.SetError(refreshAssemblyResultsButton, string.Empty);
-            manualAssemblyWarningProvider.SetError(refreshAssemblyResultsButton, string.Empty);
         }
 
         private void UpdateAssemblyResultControls()