Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r96c8a39df93bef7386b457dd067c03728cc805ed -r0758a103361e8067e8b56eec6cc28ff0c6eba12f
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 96c8a39df93bef7386b457dd067c03728cc805ed)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 0758a103361e8067e8b56eec6cc28ff0c6eba12f)
@@ -61,6 +61,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Be&amp;rekenen.
+        /// </summary>
+        public static string Calculate {
+            get {
+                return ResourceManager.GetString("Calculate", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Alles be&amp;rekenen.
         /// </summary>
         public static string Calculate_all {
@@ -79,6 +88,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Valideer en voer de berekening uit..
+        /// </summary>
+        public static string Calculate_ToolTip {
+            get {
+                return ResourceManager.GetString("Calculate_ToolTip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         public static System.Drawing.Bitmap CalculateAllIcon {
@@ -89,6 +107,16 @@
         }
         
         /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap CalculateIcon {
+            get {
+                object obj = ResourceManager.GetObject("CalculateIcon", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to &amp;Wis alle uitvoer....
         /// </summary>
         public static string Clear_all_output {
@@ -208,5 +236,61 @@
                 return ResourceManager.GetString("RingtoetsNodePresenterBase_RemoveNodeData_Cannot_delete_node_of_type_0_", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to &amp;Valideren.
+        /// </summary>
+        public static string Validate {
+            get {
+                return ResourceManager.GetString("Validate", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Alles &amp;valideren.
+        /// </summary>
+        public static string Validate_all {
+            get {
+                return ResourceManager.GetString("Validate_all", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Valideer alle berekeningen binnen het faalmechanisme..
+        /// </summary>
+        public static string Validate_all_ToolTip {
+            get {
+                return ResourceManager.GetString("Validate_all_ToolTip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Valideer de invoer voor de berekening..
+        /// </summary>
+        public static string Validate_ToolTip {
+            get {
+                return ResourceManager.GetString("Validate_ToolTip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap ValidateAllIcon {
+            get {
+                object obj = ResourceManager.GetObject("ValidateAllIcon", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap ValidateIcon {
+            get {
+                object obj = ResourceManager.GetObject("ValidateIcon", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
     }
 }
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx
===================================================================
diff -u -r96c8a39df93bef7386b457dd067c03728cc805ed -r0758a103361e8067e8b56eec6cc28ff0c6eba12f
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 96c8a39df93bef7386b457dd067c03728cc805ed)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 0758a103361e8067e8b56eec6cc28ff0c6eba12f)
@@ -166,4 +166,31 @@
   <data name="ClearIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\resources\table_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="Calculate" xml:space="preserve">
+    <value>Be&amp;rekenen</value>
+  </data>
+  <data name="CalculateIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\resources\playhs.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Calculate_ToolTip" xml:space="preserve">
+    <value>Valideer en voer de berekening uit.</value>
+  </data>
+  <data name="Validate" xml:space="preserve">
+    <value>&amp;Valideren</value>
+  </data>
+  <data name="ValidateAllIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\resources\tickall.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ValidateIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\tick.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Validate_all" xml:space="preserve">
+    <value>Alles &amp;valideren</value>
+  </data>
+  <data name="Validate_all_ToolTip" xml:space="preserve">
+    <value>Valideer alle berekeningen binnen het faalmechanisme.</value>
+  </data>
+  <data name="Validate_ToolTip" xml:space="preserve">
+    <value>Valideer de invoer voor de berekening.</value>
+  </data>
 </root>
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Resources/PlayHS.png
===================================================================
diff -u
Binary files differ
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Resources/tick.png
===================================================================
diff -u
Binary files differ
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Resources/tickAll.png
===================================================================
diff -u
Binary files differ
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj
===================================================================
diff -u -r148b5639633795054317d492507c072ee0bd5ada -r0758a103361e8067e8b56eec6cc28ff0c6eba12f
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj	(.../Ringtoets.Common.Forms.csproj)	(revision 148b5639633795054317d492507c072ee0bd5ada)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj	(.../Ringtoets.Common.Forms.csproj)	(revision 0758a103361e8067e8b56eec6cc28ff0c6eba12f)
@@ -89,6 +89,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="Resources\folder.png" />
+    <None Include="Resources\tick.png" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Resources\folder_input.png" />
@@ -105,6 +106,10 @@
   <ItemGroup>
     <None Include="Resources\table_delete.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Resources\PlayHS.png" />
+    <Content Include="Resources\tickAll.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingCalculationContextNodePresenter.cs
===================================================================
diff -u -r698721e646747d5a5b3a1850e7b4ec46a2857bfa -r0758a103361e8067e8b56eec6cc28ff0c6eba12f
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingCalculationContextNodePresenter.cs	(.../PipingCalculationContextNodePresenter.cs)	(revision 698721e646747d5a5b3a1850e7b4ec46a2857bfa)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingCalculationContextNodePresenter.cs	(.../PipingCalculationContextNodePresenter.cs)	(revision 0758a103361e8067e8b56eec6cc28ff0c6eba12f)
@@ -110,13 +110,13 @@
         protected override ContextMenuStrip GetContextMenu(ITreeNode node, PipingCalculationContext nodeData)
         {
             PipingCalculation calculation = nodeData.WrappedData;
-            var validateItem = new StrictContextMenuItem(Resources.PipingCalculationItem_Validate,
-                                                         null,
-                                                         Resources.ValidationIcon,
+            var validateItem = new StrictContextMenuItem(RingtoetsFormsResources.Validate,
+                                                         RingtoetsFormsResources.Validate_ToolTip,
+                                                         RingtoetsFormsResources.ValidateIcon,
                                                          (o, args) => { PipingCalculationService.Validate(calculation); });
-            var calculateItem = new StrictContextMenuItem(Resources.Calculate,
-                                                          null,
-                                                          Resources.Play,
+            var calculateItem = new StrictContextMenuItem(RingtoetsFormsResources.Calculate,
+                                                          RingtoetsFormsResources.Calculate_ToolTip,
+                                                          RingtoetsFormsResources.CalculateIcon,
                                                           (o, args) => { RunActivityAction(new PipingCalculationActivity(calculation)); });
 
             var clearOutputItem = new StrictContextMenuItem(Resources.Clear_output,
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingCalculationGroupContextNodePresenter.cs
===================================================================
diff -u -r8cae5d69ac2d4cf678486ac2b457c0dfe97089d5 -r0758a103361e8067e8b56eec6cc28ff0c6eba12f
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingCalculationGroupContextNodePresenter.cs	(.../PipingCalculationGroupContextNodePresenter.cs)	(revision 8cae5d69ac2d4cf678486ac2b457c0dfe97089d5)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingCalculationGroupContextNodePresenter.cs	(.../PipingCalculationGroupContextNodePresenter.cs)	(revision 0758a103361e8067e8b56eec6cc28ff0c6eba12f)
@@ -140,9 +140,9 @@
                 });
 
             var validateAllItem = new StrictContextMenuItem(
-                PipingFormsResources.PipingCalculationItem_Validate,
-                PipingFormsResources.PipingCalculationGroup_Validate_ToolTip,
-                PipingFormsResources.ValidationIcon, (o, args) =>
+                RingtoetsFormsResources.Validate_all,
+                PipingFormsResources.PipingCalculationGroup_Validate_All_ToolTip,
+                RingtoetsFormsResources.ValidateAllIcon, (o, args) =>
                 {
                     foreach (PipingCalculation calculation in group.Children.GetPipingCalculations())
                     {
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingFailureMechanismNodePresenter.cs
===================================================================
diff -u -r8cae5d69ac2d4cf678486ac2b457c0dfe97089d5 -r0758a103361e8067e8b56eec6cc28ff0c6eba12f
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingFailureMechanismNodePresenter.cs	(.../PipingFailureMechanismNodePresenter.cs)	(revision 8cae5d69ac2d4cf678486ac2b457c0dfe97089d5)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingFailureMechanismNodePresenter.cs	(.../PipingFailureMechanismNodePresenter.cs)	(revision 0758a103361e8067e8b56eec6cc28ff0c6eba12f)
@@ -72,9 +72,9 @@
                 );
 
             var validateAllItem = new StrictContextMenuItem(
-                PipingFormsResources.PipingCalculationItem_Validate,
-                PipingFormsResources.PipingFailureMechanism_ValidateAll_Tooltip,
-                PipingFormsResources.ValidationIcon,
+                RingtoetsCommonFormsResources.Validate_all,
+                RingtoetsCommonFormsResources.Validate_all_ToolTip,
+                RingtoetsCommonFormsResources.ValidateAllIcon,
                 (o, args) => ValidateAll(failureMechanism)
                 );
 
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r752bf12bb8b00ba1d544d0b7f2f8ce8ce4b1b75a -r0758a103361e8067e8b56eec6cc28ff0c6eba12f
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 752bf12bb8b00ba1d544d0b7f2f8ce8ce4b1b75a)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 0758a103361e8067e8b56eec6cc28ff0c6eba12f)
@@ -71,15 +71,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Berekenen.
-        /// </summary>
-        public static string Calculate {
-            get {
-                return ResourceManager.GetString("Calculate", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Algemeen.
         /// </summary>
         public static string Categories_General {
@@ -381,9 +372,9 @@
         /// <summary>
         ///   Looks up a localized string similar to Valideer alle berekeningen binnen deze berekeningsmap..
         /// </summary>
-        public static string PipingCalculationGroup_Validate_ToolTip {
+        public static string PipingCalculationGroup_Validate_All_ToolTip {
             get {
-                return ResourceManager.GetString("PipingCalculationGroup_Validate_ToolTip", resourceCulture);
+                return ResourceManager.GetString("PipingCalculationGroup_Validate_All_ToolTip", resourceCulture);
             }
         }
         
@@ -407,15 +398,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Valideren.
-        /// </summary>
-        public static string PipingCalculationItem_Validate {
-            get {
-                return ResourceManager.GetString("PipingCalculationItem_Validate", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         public static System.Drawing.Bitmap PipingCalculationReportIcon {
@@ -480,15 +462,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Valideer alle berekeningen binnen dit faalmechanisme..
-        /// </summary>
-        public static string PipingFailureMechanism_ValidateAll_Tooltip {
-            get {
-                return ResourceManager.GetString("PipingFailureMechanism_ValidateAll_Tooltip", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         public static System.Drawing.Bitmap PipingIcon {
@@ -1187,16 +1160,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        public static System.Drawing.Bitmap Play {
-            get {
-                object obj = ResourceManager.GetObject("Play", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to De gemiddelde waarde van de {0}..
         /// </summary>
         public static string Probabilistics_Mean_description_for_Distribution_0_ {
@@ -1312,15 +1275,5 @@
                 return ResourceManager.GetString("ShiftedLognormalDistribution_ShortName", resourceCulture);
             }
         }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        public static System.Drawing.Bitmap ValidationIcon {
-            get {
-                object obj = ResourceManager.GetObject("ValidationIcon", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
     }
 }
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx
===================================================================
diff -u -r752bf12bb8b00ba1d544d0b7f2f8ce8ce4b1b75a -r0758a103361e8067e8b56eec6cc28ff0c6eba12f
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 752bf12bb8b00ba1d544d0b7f2f8ce8ce4b1b75a)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 0758a103361e8067e8b56eec6cc28ff0c6eba12f)
@@ -310,9 +310,6 @@
   <data name="PipingSurfaceLineIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\u48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="PipingCalculationItem_Validate" xml:space="preserve">
-    <value>Valideren</value>
-  </data>
   <data name="ImportIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\table-import.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -394,12 +391,6 @@
   <data name="PipingFailureMechanism_Add_PipingCalculation_Tooltip" xml:space="preserve">
     <value>Voeg een nieuwe piping berekening toe aan het faalmechanisme.</value>
   </data>
-  <data name="Calculate" xml:space="preserve">
-    <value>Berekenen</value>
-  </data>
-  <data name="Play" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\PlayHS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="LognormalDistribution_DisplayName" xml:space="preserve">
     <value>Lognormale verdeling</value>
   </data>
@@ -475,9 +466,6 @@
   <data name="PipingFailureMechanism_Add_PipingCalculationGroup_Tooltip" xml:space="preserve">
     <value>Voeg een nieuwe berekeningsmap toe aan het faalmechanisme.</value>
   </data>
-  <data name="ValidationIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\tick.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="PipingCalculationGroupContextProperties_DisplayName" xml:space="preserve">
     <value>Berekeningsmap</value>
   </data>
@@ -514,18 +502,12 @@
   <data name="DesignVariableTypeConverter_DistributionType_Description" xml:space="preserve">
     <value>Het soort kansverdeling waarin deze parameter gedefinieerd wordt.</value>
   </data>
-  <data name="PipingFailureMechanism_ValidateAll_Tooltip" xml:space="preserve">
-    <value>Valideer alle berekeningen binnen dit faalmechanisme.</value>
-  </data>
   <data name="PipingCalculationGroup_Add_PipingCalculationGroup_ToolTip" xml:space="preserve">
     <value>Voeg een nieuwe berekeningsmap toe aan deze berekeningsmap.</value>
   </data>
   <data name="PipingCalculationGroup_Add_PipingCalculation_ToolTip" xml:space="preserve">
     <value>Voeg een nieuwe berekening toe aan deze berekeningsmap.</value>
   </data>
-  <data name="PipingCalculationGroup_Validate_ToolTip" xml:space="preserve">
-    <value>Valideer alle berekeningen binnen deze berekeningsmap.</value>
-  </data>
   <data name="PipingCalculationGroup_CalculateAll_ToolTip" xml:space="preserve">
     <value>Valideer en voer alle berekeningen binnen deze berekeningsmap uit.</value>
   </data>
@@ -535,4 +517,7 @@
   <data name="PipingCalculationGroupContextNodePresenter_GetContextMenu_Are_you_sure_clear_all_output" xml:space="preserve">
     <value>Weet u zeker dat u alle uitvoer wilt wissen?</value>
   </data>
+  <data name="PipingCalculationGroup_Validate_All_ToolTip" xml:space="preserve">
+    <value>Valideer alle berekeningen binnen deze berekeningsmap.</value>
+  </data>
 </root>
\ No newline at end of file
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Resources/PlayHS.png
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r0758a103361e8067e8b56eec6cc28ff0c6eba12f
Binary files differ
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Resources/tick.png
===================================================================
diff -u -r495647ee1c652fecc15eea7fefeab29ae01347fe -r0758a103361e8067e8b56eec6cc28ff0c6eba12f
Binary files differ
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Ringtoets.Piping.Forms.csproj
===================================================================
diff -u -r148b5639633795054317d492507c072ee0bd5ada -r0758a103361e8067e8b56eec6cc28ff0c6eba12f
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Ringtoets.Piping.Forms.csproj	(.../Ringtoets.Piping.Forms.csproj)	(revision 148b5639633795054317d492507c072ee0bd5ada)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Ringtoets.Piping.Forms.csproj	(.../Ringtoets.Piping.Forms.csproj)	(revision 0758a103361e8067e8b56eec6cc28ff0c6eba12f)
@@ -177,12 +177,9 @@
     <None Include="Resources\chart_curve.png" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\tick.png" />
     <None Include="Resources\blue-document-list.png" />
     <None Include="Resources\control-record.png" />
-    <None Include="Resources\folder-horizontal-plus.png" />
     <None Include="Resources\folder_add.png" />
-    <Content Include="Resources\PlayHS.png" />
     <None Include="Resources\table.png" />
   </ItemGroup>
   <ItemGroup />
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationContextNodePresenterTest.cs
===================================================================
diff -u -r698721e646747d5a5b3a1850e7b4ec46a2857bfa -r0758a103361e8067e8b56eec6cc28ff0c6eba12f
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationContextNodePresenterTest.cs	(.../PipingCalculationContextNodePresenterTest.cs)	(revision 698721e646747d5a5b3a1850e7b4ec46a2857bfa)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationContextNodePresenterTest.cs	(.../PipingCalculationContextNodePresenterTest.cs)	(revision 0758a103361e8067e8b56eec6cc28ff0c6eba12f)
@@ -385,8 +385,8 @@
             // Assert
             mockRepository.VerifyAll(); // Expect no calls on arguments
 
-            TestHelper.AssertContextMenuStripContainsItem(contextMenu, 0, PipingFormsResources.PipingCalculationItem_Validate, null, PipingFormsResources.ValidationIcon);
-            TestHelper.AssertContextMenuStripContainsItem(contextMenu, 1, PipingFormsResources.Calculate, null, PipingFormsResources.Play);
+            TestHelper.AssertContextMenuStripContainsItem(contextMenu, 0, RingtoetsCommonFormsResources.Validate, RingtoetsCommonFormsResources.Validate_ToolTip, RingtoetsCommonFormsResources.ValidateIcon);
+            TestHelper.AssertContextMenuStripContainsItem(contextMenu, 1, RingtoetsCommonFormsResources.Calculate, RingtoetsCommonFormsResources.Calculate_ToolTip, RingtoetsCommonFormsResources.CalculateIcon);
             TestHelper.AssertContextMenuStripContainsItem(contextMenu, 2, PipingFormsResources.Clear_output, PipingFormsResources.ClearOutput_No_output_to_clear, RingtoetsCommonFormsResources.ClearIcon, false);
         }
 
@@ -416,8 +416,8 @@
             // Assert
             mockRepository.VerifyAll(); // Expect no calls on arguments
 
-            TestHelper.AssertContextMenuStripContainsItem(contextMenu, 0, PipingFormsResources.PipingCalculationItem_Validate, null, PipingFormsResources.ValidationIcon);
-            TestHelper.AssertContextMenuStripContainsItem(contextMenu, 1, PipingFormsResources.Calculate, null, PipingFormsResources.Play);
+            TestHelper.AssertContextMenuStripContainsItem(contextMenu, 0, RingtoetsCommonFormsResources.Validate, RingtoetsCommonFormsResources.Validate_ToolTip, RingtoetsCommonFormsResources.ValidateIcon);
+            TestHelper.AssertContextMenuStripContainsItem(contextMenu, 1, RingtoetsCommonFormsResources.Calculate, RingtoetsCommonFormsResources.Calculate_ToolTip, RingtoetsCommonFormsResources.CalculateIcon);
             TestHelper.AssertContextMenuStripContainsItem(contextMenu, 2, PipingFormsResources.Clear_output, null, RingtoetsCommonFormsResources.ClearIcon);
         }
         
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationGroupContextNodePresenterTest.cs
===================================================================
diff -u -r8cae5d69ac2d4cf678486ac2b457c0dfe97089d5 -r0758a103361e8067e8b56eec6cc28ff0c6eba12f
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationGroupContextNodePresenterTest.cs	(.../PipingCalculationGroupContextNodePresenterTest.cs)	(revision 8cae5d69ac2d4cf678486ac2b457c0dfe97089d5)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationGroupContextNodePresenterTest.cs	(.../PipingCalculationGroupContextNodePresenterTest.cs)	(revision 0758a103361e8067e8b56eec6cc28ff0c6eba12f)
@@ -937,9 +937,9 @@
                                                           PipingFormsResources.PipingIcon);
 
             TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndex,
-                                                          "Valideren",
+                                                          RingtoetsFormsResources.Validate_all,
                                                           "Valideer alle berekeningen binnen deze berekeningsmap.",
-                                                          PipingFormsResources.ValidationIcon);
+                                                          RingtoetsFormsResources.ValidateAllIcon);
             TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndex,
                                                           RingtoetsFormsResources.Calculate_all,
                                                           "Valideer en voer alle berekeningen binnen deze berekeningsmap uit.",
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingFailureMechanismNodePresenterTest.cs
===================================================================
diff -u -r8cae5d69ac2d4cf678486ac2b457c0dfe97089d5 -r0758a103361e8067e8b56eec6cc28ff0c6eba12f
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingFailureMechanismNodePresenterTest.cs	(.../PipingFailureMechanismNodePresenterTest.cs)	(revision 8cae5d69ac2d4cf678486ac2b457c0dfe97089d5)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingFailureMechanismNodePresenterTest.cs	(.../PipingFailureMechanismNodePresenterTest.cs)	(revision 0758a103361e8067e8b56eec6cc28ff0c6eba12f)
@@ -473,7 +473,7 @@
             TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddFolderIndex, PipingFormsResources.PipingCalculationGroup_Add_PipingCalculationGroup, PipingFormsResources.PipingFailureMechanism_Add_PipingCalculationGroup_Tooltip, PipingFormsResources.AddFolderIcon);
             TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationIndex, PipingFormsResources.PipingCalculationGroup_Add_PipingCalculation, PipingFormsResources.PipingFailureMechanism_Add_PipingCalculation_Tooltip, PipingFormsResources.PipingIcon);
 
-            TestHelper.AssertContextMenuStripContainsItem(menu, 3, PipingFormsResources.PipingCalculationItem_Validate, PipingFormsResources.PipingFailureMechanism_ValidateAll_Tooltip, PipingFormsResources.ValidationIcon);
+            TestHelper.AssertContextMenuStripContainsItem(menu, 3, RingtoetsFormsResources.Validate_all, RingtoetsFormsResources.Validate_all_ToolTip, RingtoetsFormsResources.ValidateAllIcon);
             TestHelper.AssertContextMenuStripContainsItem(menu, 4, RingtoetsFormsResources.Calculate_all, RingtoetsFormsResources.Calculate_all_ToolTip, RingtoetsFormsResources.CalculateAllIcon);
             TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearIndex, RingtoetsFormsResources.Clear_all_output, RingtoetsFormsResources.Clear_all_output_ToolTip, RingtoetsFormsResources.ClearIcon);
 
Index: shared/icons/famfamfam_silk_icons_v013/icons/tickAll.png
===================================================================
diff -u
Binary files differ