diff --git a/MachiningsDbPage/MachiningTreeView.vb b/MachiningsDbPage/MachiningTreeView.vb
index 867437e..9916c9c 100644
--- a/MachiningsDbPage/MachiningTreeView.vb
+++ b/MachiningsDbPage/MachiningTreeView.vb
@@ -199,7 +199,7 @@ Public Class MachiningTreeViewItem
             Else
                If EgtMdbIsCurrMachiningModified() And Me.IsValid Then
 
-                  Select Case MsgBox(EgtMsg(MSG_MACHININGSERRORS), MsgBoxStyle.YesNo, EgtMsg(MSG_MACHININGSERRORS + 1))
+                  Select Case MsgBox(EgtMsg(MSG_MACHININGSERRORS + 30), MsgBoxStyle.YesNo, EgtMsg(MSG_MACHININGSERRORS + 31))
                      Case MsgBoxResult.Yes
                         m_NewMachining = False
                         EgtMdbSaveCurrMachining()
diff --git a/MachiningsDbPage/MachiningsDbView.xaml b/MachiningsDbPage/MachiningsDbView.xaml
index 4c5fa5d..90f7c96 100644
--- a/MachiningsDbPage/MachiningsDbView.xaml
+++ b/MachiningsDbPage/MachiningsDbView.xaml
@@ -207,8 +207,8 @@
                        Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
                                    Converter={StaticResource MachiningParamVisibilityConverter},
                                    ConverterParameter={StaticResource Invert}}"/>
-            <EgtWPFLib5:EgtTextBox Name="InvertTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_MachiningsTextBox}"
-                                   Text="{Binding Path=SelectedItem.Invert,
+            <CheckBox Name="InvertTxBx" Grid.Column="1"
+                                   IsChecked="{Binding Path=SelectedItem.Invert,
                                          ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
                                    Visibility="{Binding Path=SelectedItem.Type,
                                                ElementName=MachiningsTreeView,
@@ -235,8 +235,8 @@
                        Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
                                    Converter={StaticResource MachiningParamVisibilityConverter},
                                    ConverterParameter={StaticResource LeaveTab}}"/>
-            <EgtWPFLib5:EgtTextBox Name="LeaveTabTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_MachiningsTextBox}"
-                                   Text="{Binding Path=SelectedItem.LeaveTab,
+            <CheckBox Name="LeaveTabTxBx" Grid.Column="1"
+                                   IsChecked="{Binding Path=SelectedItem.LeaveTab,
                                          ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
                                    Visibility="{Binding Path=SelectedItem.Type,
                                                ElementName=MachiningsTreeView,
@@ -249,7 +249,7 @@
 
          </Grid>
 
-         <Grid Grid.Column="0" Grid.Row="2">
+         <!--<Grid Grid.Column="0" Grid.Row="2">
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="1*"/>
                <ColumnDefinition Width="1*"/>
@@ -264,18 +264,18 @@
                                    Converter={StaticResource MachiningParamVisibilityConverter},
                                    ConverterParameter={StaticResource Type}}"/>
             <EgtWPFLib5:EgtTextBox Name="TypeTxBx" Grid.Column="1" Style="{StaticResource EgtCAM5_MachiningsTextBox}"
-                                   Text="{Binding Path=SelectedItem.LeaveTab,
+                                   Text="{Binding Path=SelectedItem.Type,
                                          ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
                                    Visibility="{Binding Path=SelectedItem.Type,
                                                ElementName=MachiningsTreeView,
                                                Converter={StaticResource MachiningParamVisibilityConverter},
                                                ConverterParameter={StaticResource Type}}"/>
-            <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+            --><!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
                Content="{Binding ElementName=TypeTxBx,
                         Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>-->
+                        UpdateSourceTrigger=PropertyChanged}"/>--><!--
 
-         </Grid>
+         </Grid>-->
 
          <Grid Grid.Column="0" Grid.Row="3">
             <Grid.ColumnDefinitions>
diff --git a/ProjectPage/OptionPanel/DrawOptionPanel/SimulationExpander/SimulationExpanderViewModel.vb b/ProjectPage/OptionPanel/DrawOptionPanel/SimulationExpander/SimulationExpanderViewModel.vb
index 5c5048e..5a5e4fe 100644
--- a/ProjectPage/OptionPanel/DrawOptionPanel/SimulationExpander/SimulationExpanderViewModel.vb
+++ b/ProjectPage/OptionPanel/DrawOptionPanel/SimulationExpander/SimulationExpanderViewModel.vb
@@ -299,11 +299,15 @@ Namespace EgtCAM5
             m_nStatus = SIM_ST.ST_STEP
             ExecSim()
             ' Aggiorno bottone
+            m_bPlay = True
+            OnPropertyChanged("PlayPauseImage")
             'SetPlayPauseBtnToPlay()
             ' Alrimenti imposto solo il nuovo stato
          Else
             m_nStatus = SIM_ST.ST_STEP
             ' Aggiornamenti per bottone Play/Pause
+            m_bPlay = False
+            OnPropertyChanged("PlayPauseImage")
             'SetPlayPauseBtnToPause()
          End If
       End Sub