Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs
===================================================================
diff -u -re911d908113825d0b449de99490f31b574c407fc -r6617058bc433d519ff1050ac5fb580b5f06da7ed
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision e911d908113825d0b449de99490f31b574c407fc)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision 6617058bc433d519ff1050ac5fb580b5f06da7ed)
@@ -1043,7 +1043,7 @@
             var designWaterLevelItem = new StrictContextMenuItem(
                 RingtoetsFormsResources.DesignWaterLevel_Calculate_All,
                 RingtoetsFormsResources.DesignWaterLevel_Calculate_All_ToolTip,
-                RingtoetsCommonFormsResources.FailureMechanismIcon,
+                RingtoetsCommonFormsResources.CalculateAllIcon,
                 (sender, args) =>
                 {
                     var command = new HydraulicBoundaryLocationCalculationCommandHandler(Gui.MainWindow, nodeData.WrappedData);
@@ -1058,6 +1058,7 @@
 
             return Gui.Get(nodeData, treeViewControl)
                       .AddOpenItem()
+                      .AddSeparator()
                       .AddCustomItem(designWaterLevelItem)
                       .AddSeparator()
                       .AddPropertiesItem()
@@ -1067,9 +1068,9 @@
         private ContextMenuStrip WaveHeightLocationsContextMenuStrip(WaveHeightLocationsContext nodeData, object parentData, TreeViewControl treeViewControl)
         {
             var waveHeightItem = new StrictContextMenuItem(
-                RingtoetsFormsResources.WaveHeight_Calculate,
-                RingtoetsFormsResources.WaveHeight_Calculate_ToolTip,
-                RingtoetsCommonFormsResources.FailureMechanismIcon,
+                RingtoetsFormsResources.WaveHeight_Calculate_All,
+                RingtoetsFormsResources.WaveHeight_Calculate_All_ToolTip,
+                RingtoetsCommonFormsResources.CalculateAllIcon,
                 (sender, args) =>
                 {
                     var command = new HydraulicBoundaryLocationCalculationCommandHandler(Gui.MainWindow, nodeData.WrappedData);
@@ -1083,6 +1084,8 @@
             }
 
             return Gui.Get(nodeData, treeViewControl)
+                      .AddOpenItem()
+                      .AddSeparator()
                       .AddCustomItem(waveHeightItem)
                       .AddSeparator()
                       .AddPropertiesItem()