diff --git a/Constants/ConstMsg.vb b/Constants/ConstMsg.vb
index 96486f7..55cd1d1 100644
--- a/Constants/ConstMsg.vb
+++ b/Constants/ConstMsg.vb
@@ -10,9 +10,9 @@
    Public Const MSG_GRIDVIEWPANEL As Integer = MSG_EGTCAM5 + 250
    Public Const MSG_SIMULATION As Integer = MSG_EGTCAM5 + 300
    Public Const MSG_TOOLSDBPAGE As Integer = MSG_EGTCAM5 + 1000
-   Public Const MSG_TOOLSERRORS As Integer = MSG_EGTCAM5 + 1080
-   Public Const MSG_MACHININGSDBPAGE As Integer = MSG_EGTCAM5 + 1100
-   Public Const MSG_MACHININGSERRORS As Integer = MSG_EGTCAM5 + 1220
+   Public Const MSG_TOOLSERRORS As Integer = MSG_EGTCAM5 + 1100
+   Public Const MSG_MACHININGSDBPAGE As Integer = MSG_EGTCAM5 + 1200
+   Public Const MSG_MACHININGSERRORS As Integer = MSG_EGTCAM5 + 1320
    Public Const MSG_MISSINGKEYWD As Integer = 10100
    'Public Const MSG_CADCUTPAGEUC As Integer = MSG_OMAGCUT + 300
    'Public Const MSG_NESTPAGEUC As Integer = MSG_OMAGCUT + 330
diff --git a/EgtCAM5Resources.xaml b/EgtCAM5Resources.xaml
index 4bcf44c..dee9431 100644
--- a/EgtCAM5Resources.xaml
+++ b/EgtCAM5Resources.xaml
@@ -113,6 +113,270 @@
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
+   <!-- Expander Style -->
+
+   <SolidColorBrush x:Key="Expander.MouseOver.Circle.Stroke" Color="#FF5593FF"/>
+   <SolidColorBrush x:Key="Expander.MouseOver.Circle.Fill" Color="#FFF3F9FF"/>
+   <SolidColorBrush x:Key="Expander.MouseOver.Arrow.Stroke" Color="#FF000000"/>
+   <SolidColorBrush x:Key="Expander.Pressed.Circle.Stroke" Color="#FF3C77DD"/>
+   <SolidColorBrush x:Key="Expander.Pressed.Circle.Fill" Color="#FFD9ECFF"/>
+   <SolidColorBrush x:Key="Expander.Pressed.Arrow.Stroke" Color="#FF000000"/>
+   <SolidColorBrush x:Key="Expander.Disabled.Circle.Stroke" Color="#FFBCBCBC"/>
+   <SolidColorBrush x:Key="Expander.Disabled.Circle.Fill" Color="#FFE6E6E6"/>
+   <SolidColorBrush x:Key="Expander.Disabled.Arrow.Stroke" Color="#FF707070"/>
+   <SolidColorBrush x:Key="Expander.Static.Circle.Fill" Color="#FFFFFFFF"/>
+   <SolidColorBrush x:Key="Expander.Static.Circle.Stroke" Color="#FF333333"/>
+   <SolidColorBrush x:Key="Expander.Static.Arrow.Stroke" Color="#FF333333"/>
+   <Style x:Key="ExpanderRightHeaderStyle" TargetType="{x:Type ToggleButton}">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type ToggleButton}">
+               <Border Padding="{TemplateBinding Padding}">
+                  <Grid Background="Transparent" SnapsToDevicePixels="False">
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="19"/>
+                        <RowDefinition Height="*"/>
+                     </Grid.RowDefinitions>
+                     <Grid>
+                        <Grid.LayoutTransform>
+                           <TransformGroup>
+                              <TransformGroup.Children>
+                                 <TransformCollection>
+                                    <RotateTransform Angle="-90"/>
+                                 </TransformCollection>
+                              </TransformGroup.Children>
+                           </TransformGroup>
+                        </Grid.LayoutTransform>
+                        <Ellipse x:Name="circle" Fill="{StaticResource Expander.Static.Circle.Fill}" HorizontalAlignment="Center" Height="19" Stroke="{StaticResource Expander.Static.Circle.Stroke}" VerticalAlignment="Center" Width="19"/>
+                        <Path x:Name="arrow" Data="M 1,1.5 L 4.5,5 L 8,1.5" HorizontalAlignment="Center" SnapsToDevicePixels="false" Stroke="{StaticResource Expander.Static.Arrow.Stroke}" StrokeThickness="2" VerticalAlignment="Center"/>
+                     </Grid>
+                     <ContentPresenter HorizontalAlignment="Center" Margin="0,4,0,0" Grid.Row="1" RecognizesAccessKey="True" SnapsToDevicePixels="True" VerticalAlignment="Stretch"/>
+                  </Grid>
+               </Border>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsChecked" Value="true">
+                     <Setter Property="Data" TargetName="arrow" Value="M 1,4.5  L 4.5,1  L 8,4.5"/>
+                  </Trigger>
+                  <Trigger Property="IsMouseOver" Value="true">
+                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Stroke}"/>
+                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Fill}"/>
+                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.MouseOver.Arrow.Stroke}"/>
+                  </Trigger>
+                  <Trigger Property="IsPressed" Value="true">
+                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Stroke}"/>
+                     <Setter Property="StrokeThickness" TargetName="circle" Value="1.5"/>
+                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Fill}"/>
+                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Pressed.Arrow.Stroke}"/>
+                  </Trigger>
+                  <Trigger Property="IsEnabled" Value="false">
+                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Stroke}"/>
+                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Fill}"/>
+                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Disabled.Arrow.Stroke}"/>
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+   <Style x:Key="ExpanderUpHeaderStyle" TargetType="{x:Type ToggleButton}">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type ToggleButton}">
+               <Border Padding="{TemplateBinding Padding}">
+                  <Grid Background="Transparent" SnapsToDevicePixels="False">
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="19"/>
+                        <ColumnDefinition Width="*"/>
+                     </Grid.ColumnDefinitions>
+                     <Grid>
+                        <Grid.LayoutTransform>
+                           <TransformGroup>
+                              <TransformGroup.Children>
+                                 <TransformCollection>
+                                    <RotateTransform Angle="180"/>
+                                 </TransformCollection>
+                              </TransformGroup.Children>
+                           </TransformGroup>
+                        </Grid.LayoutTransform>
+                        <Ellipse x:Name="circle" Fill="{StaticResource Expander.Static.Circle.Fill}" HorizontalAlignment="Center" Height="19" Stroke="{StaticResource Expander.Static.Circle.Stroke}" VerticalAlignment="Center" Width="19"/>
+                        <Path x:Name="arrow" Data="M 1,1.5 L 4.5,5 L 8,1.5" HorizontalAlignment="Center" SnapsToDevicePixels="false" Stroke="{StaticResource Expander.Static.Arrow.Stroke}" StrokeThickness="2" VerticalAlignment="Center"/>
+                     </Grid>
+                     <ContentPresenter Grid.Column="1" HorizontalAlignment="Stretch" Margin="4,0,0,0" RecognizesAccessKey="True" SnapsToDevicePixels="True" VerticalAlignment="Center"/>
+                  </Grid>
+               </Border>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsChecked" Value="true">
+                     <Setter Property="Data" TargetName="arrow" Value="M 1,4.5  L 4.5,1  L 8,4.5"/>
+                  </Trigger>
+                  <Trigger Property="IsMouseOver" Value="true">
+                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Stroke}"/>
+                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Fill}"/>
+                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.MouseOver.Arrow.Stroke}"/>
+                  </Trigger>
+                  <Trigger Property="IsPressed" Value="true">
+                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Stroke}"/>
+                     <Setter Property="StrokeThickness" TargetName="circle" Value="1.5"/>
+                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Fill}"/>
+                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Pressed.Arrow.Stroke}"/>
+                  </Trigger>
+                  <Trigger Property="IsEnabled" Value="false">
+                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Stroke}"/>
+                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Fill}"/>
+                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Disabled.Arrow.Stroke}"/>
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+   <Style x:Key="ExpanderLeftHeaderStyle" TargetType="{x:Type ToggleButton}">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type ToggleButton}">
+               <Border Padding="{TemplateBinding Padding}">
+                  <Grid Background="Transparent" SnapsToDevicePixels="False">
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="19"/>
+                        <RowDefinition Height="*"/>
+                     </Grid.RowDefinitions>
+                     <Grid>
+                        <Grid.LayoutTransform>
+                           <TransformGroup>
+                              <TransformGroup.Children>
+                                 <TransformCollection>
+                                    <RotateTransform Angle="90"/>
+                                 </TransformCollection>
+                              </TransformGroup.Children>
+                           </TransformGroup>
+                        </Grid.LayoutTransform>
+                        <Ellipse x:Name="circle" Fill="{StaticResource Expander.Static.Circle.Fill}" HorizontalAlignment="Center" Height="19" Stroke="{StaticResource Expander.Static.Circle.Stroke}" VerticalAlignment="Center" Width="19"/>
+                        <Path x:Name="arrow" Data="M 1,1.5 L 4.5,5 L 8,1.5" HorizontalAlignment="Center" SnapsToDevicePixels="false" Stroke="{StaticResource Expander.Static.Arrow.Stroke}" StrokeThickness="2" VerticalAlignment="Center"/>
+                     </Grid>
+                     <ContentPresenter HorizontalAlignment="Center" Margin="0,4,0,0" Grid.Row="1" RecognizesAccessKey="True" SnapsToDevicePixels="True" VerticalAlignment="Stretch"/>
+                  </Grid>
+               </Border>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsChecked" Value="true">
+                     <Setter Property="Data" TargetName="arrow" Value="M 1,4.5  L 4.5,1  L 8,4.5"/>
+                  </Trigger>
+                  <Trigger Property="IsMouseOver" Value="true">
+                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Stroke}"/>
+                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Fill}"/>
+                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.MouseOver.Arrow.Stroke}"/>
+                  </Trigger>
+                  <Trigger Property="IsPressed" Value="true">
+                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Stroke}"/>
+                     <Setter Property="StrokeThickness" TargetName="circle" Value="1.5"/>
+                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Fill}"/>
+                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Pressed.Arrow.Stroke}"/>
+                  </Trigger>
+                  <Trigger Property="IsEnabled" Value="false">
+                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Stroke}"/>
+                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Fill}"/>
+                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Disabled.Arrow.Stroke}"/>
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+   <Style x:Key="ExpanderHeaderFocusVisual">
+      <Setter Property="Control.Template">
+         <Setter.Value>
+            <ControlTemplate>
+               <Border>
+                  <Rectangle Margin="0" SnapsToDevicePixels="true" Stroke="Black" StrokeThickness="1" StrokeDashArray="1 2"/>
+               </Border>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+   <Style x:Key="ExpanderDownHeaderStyle" TargetType="{x:Type ToggleButton}">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type ToggleButton}">
+               <Border Padding="1" CornerRadius="3" Background="{Binding BorderBrush,RelativeSource={RelativeSource AncestorType={x:Type Expander}}}">
+                  <Grid Background="Transparent" SnapsToDevicePixels="False">
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="19"/>
+                        <ColumnDefinition Width="*"/>
+                     </Grid.ColumnDefinitions>
+                     <Ellipse x:Name="circle" Fill="{StaticResource Expander.Static.Circle.Fill}" HorizontalAlignment="Center" Height="19" Stroke="{StaticResource Expander.Static.Circle.Stroke}" VerticalAlignment="Center" Width="19"/>
+                     <Path x:Name="arrow" Data="M 1,1.5 L 4.5,5 L 8,1.5" HorizontalAlignment="Center" SnapsToDevicePixels="false" Stroke="{StaticResource Expander.Static.Arrow.Stroke}" StrokeThickness="2" VerticalAlignment="Center"/>
+                     <ContentPresenter Grid.Column="1" HorizontalAlignment="Stretch" Margin="4,0,0,0" RecognizesAccessKey="True" SnapsToDevicePixels="True" VerticalAlignment="Center"/>
+                  </Grid>
+               </Border>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsChecked" Value="true">
+                     <Setter Property="Data" TargetName="arrow" Value="M 1,4.5  L 4.5,1  L 8,4.5"/>
+                  </Trigger>
+                  <Trigger Property="IsMouseOver" Value="true">
+                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Stroke}"/>
+                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Fill}"/>
+                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.MouseOver.Arrow.Stroke}"/>
+                  </Trigger>
+                  <Trigger Property="IsPressed" Value="true">
+                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Stroke}"/>
+                     <Setter Property="StrokeThickness" TargetName="circle" Value="1.5"/>
+                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Fill}"/>
+                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Pressed.Arrow.Stroke}"/>
+                  </Trigger>
+                  <Trigger Property="IsEnabled" Value="false">
+                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Stroke}"/>
+                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Fill}"/>
+                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Disabled.Arrow.Stroke}"/>
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+   <Style TargetType="{x:Type Expander}">
+      <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
+      <Setter Property="Background" Value="Transparent"/>
+      <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+      <Setter Property="VerticalContentAlignment" Value="Stretch"/>
+      <Setter Property="BorderBrush" Value="Transparent"/>
+      <Setter Property="BorderThickness" Value="1"/>
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type Expander}">
+               <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" CornerRadius="3" SnapsToDevicePixels="true">
+                  <DockPanel>
+                     <ToggleButton x:Name="HeaderSite" ContentTemplate="{TemplateBinding HeaderTemplate}" ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}" Content="{TemplateBinding Header}" DockPanel.Dock="Top" Foreground="{TemplateBinding Foreground}" FontWeight="{TemplateBinding FontWeight}" FocusVisualStyle="{StaticResource ExpanderHeaderFocusVisual}" FontStyle="{TemplateBinding FontStyle}" FontStretch="{TemplateBinding FontStretch}" FontSize="{TemplateBinding FontSize}" FontFamily="{TemplateBinding FontFamily}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" MinWidth="0" MinHeight="0" Padding="{TemplateBinding Padding}" Style="{StaticResource ExpanderDownHeaderStyle}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                     <ContentPresenter x:Name="ExpandSite" DockPanel.Dock="Bottom" Focusable="false" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" Visibility="Collapsed" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                  </DockPanel>
+               </Border>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsExpanded" Value="true">
+                     <Setter Property="Visibility" TargetName="ExpandSite" Value="Visible"/>
+                  </Trigger>
+                  <Trigger Property="ExpandDirection" Value="Right">
+                     <Setter Property="DockPanel.Dock" TargetName="ExpandSite" Value="Right"/>
+                     <Setter Property="DockPanel.Dock" TargetName="HeaderSite" Value="Left"/>
+                     <Setter Property="Style" TargetName="HeaderSite" Value="{StaticResource ExpanderRightHeaderStyle}"/>
+                  </Trigger>
+                  <Trigger Property="ExpandDirection" Value="Up">
+                     <Setter Property="DockPanel.Dock" TargetName="ExpandSite" Value="Top"/>
+                     <Setter Property="DockPanel.Dock" TargetName="HeaderSite" Value="Bottom"/>
+                     <Setter Property="Style" TargetName="HeaderSite" Value="{StaticResource ExpanderUpHeaderStyle}"/>
+                  </Trigger>
+                  <Trigger Property="ExpandDirection" Value="Left">
+                     <Setter Property="DockPanel.Dock" TargetName="ExpandSite" Value="Left"/>
+                     <Setter Property="DockPanel.Dock" TargetName="HeaderSite" Value="Right"/>
+                     <Setter Property="Style" TargetName="HeaderSite" Value="{StaticResource ExpanderLeftHeaderStyle}"/>
+                  </Trigger>
+                  <Trigger Property="IsEnabled" Value="false">
+                     <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
    <!-- ToggleButton Style -->
 
    <Style TargetType="{x:Type ToggleButton}">
diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderView.xaml b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderView.xaml
index 03ee680..7f52dc9 100644
--- a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderView.xaml
+++ b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderView.xaml
@@ -189,12 +189,15 @@
                </StackPanel>
             </Expander>
             
-            <Expander HorizontalAlignment="Left"  Visibility="{Binding Path=SelectedItem.Type, ElementName=OperationList,
-                                                               Converter={StaticResource OperationParamVisibilityConverter},
-                                                               ConverterParameter={StaticResource LeadOutTypeParameters}}">
+            <Expander 
+               Visibility="{Binding Path=SelectedItem.Type, ElementName=OperationList,
+                                    Converter={StaticResource OperationParamVisibilityConverter},
+                                    ConverterParameter={StaticResource LeadOutTypeParameters}}">
+               <!-- Foreground="{StaticResource EgaltechWhite}" Background="{StaticResource EgaltechLightGray}" BorderBrush="{StaticResource EgaltechBlue3}"-->
                <Expander.Header>
                   <UniformGrid Columns="2">
-                     <TextBlock Text="{Binding LeadOutTypeTxBl}" Margin="0,0,5,0"/>
+                     <TextBlock Text="{Binding LeadOutTypeTxBl}" Margin="0,0,5,0"
+                        VerticalAlignment="Center"/>
                      <ComboBox ItemsSource="{Binding Path=SelectedItem.LeadOutTypeList,
                                             ElementName=OperationList, Mode=OneWay}"
                             SelectedIndex="{Binding Path=SelectedItem.SelectedLeadOutType,
@@ -203,7 +206,7 @@
                      </ComboBox>
                   </UniformGrid>
                </Expander.Header>
-               <StackPanel>
+               <StackPanel Margin="2">
                   <UniformGrid Columns="2">
                      <TextBlock Text="{Binding EndAddLenTxBl}"/>
                      <EgtWPFLib5:EgtTextBox Text="{Binding ElementName=OperationList, Path=SelectedItem.EndAddLen}"/>
diff --git a/ToolsDbWindow/ToolTreeView2.vb b/ToolsDbWindow/ToolTreeView2.vb
index bba3b59..bf39b8c 100644
--- a/ToolsDbWindow/ToolTreeView2.vb
+++ b/ToolsDbWindow/ToolTreeView2.vb
@@ -1203,11 +1203,21 @@ Public Class ToolTreeViewItem
          If dMaxMat < EPS_SMALL Then
             Return EgtMsg(MSG_TOOLSERRORS + 6)
          End If
-         If Not IsNothing(m_Len) Then
-            Dim dLen As Double = 0
-            StringToLen(m_Len, dLen)
-            If dMaxMat > dLen + EPS_SMALL Then
-               Return EgtMsg(MSG_TOOLSERRORS + 7)
+         If (Type And MCH_TF.SAWBLADE) = 0 Then
+            If Not IsNothing(m_Len) Then
+               Dim dLen As Double = 0
+               StringToLen(m_Len, dLen)
+               If dMaxMat > dLen + EPS_SMALL Then
+                  Return EgtMsg(MSG_TOOLSERRORS + 7)
+               End If
+            End If
+         Else
+            If Not IsNothing(m_Diam) Then
+               Dim dDiam As Double = 0
+               StringToLen(m_Diam, dDiam)
+               If dMaxMat > (dDiam / 3) + EPS_SMALL Then
+                  Return EgtMsg(MSG_TOOLSERRORS + 17)
+               End If
             End If
          End If
       End If
@@ -1236,10 +1246,18 @@ Public Class ToolTreeViewItem
             Dim dTotDiam As Double = 0
             StringToLen(m_TotDiam, dTotDiam)
             If dDiam > dTotDiam + EPS_SMALL Then
-               Return "Il diametro non può essere maggiore del diametro totale"
+               Return EgtMsg(MSG_TOOLSERRORS + 18)
+            End If
+         End If
+         If (Type And MCH_TF.SAWBLADE) <> 0 Then
+            If Not IsNothing(m_MaxMat) Then
+               Dim dMaxMat As Double = 0
+               StringToLen(m_MaxMat, dMaxMat)
+               If (dDiam / 3) < dMaxMat Then
+                  Return EgtMsg(MSG_TOOLSERRORS + 19)
+               End If
             End If
          End If
-
       End If
       Return Nothing
    End Function
@@ -1249,7 +1267,7 @@ Public Class ToolTreeViewItem
          Dim dTotDiam As Double = 0
          StringToLen(m_TotDiam, dTotDiam)
          If dTotDiam < EPS_SMALL Then
-            Return "Il diametro totale deve essere maggiore di zero"
+            Return EgtMsg(MSG_TOOLSERRORS + 20)
          End If
       End If
       Return Nothing
@@ -1266,14 +1284,16 @@ Public Class ToolTreeViewItem
             Dim dTotLen As Double = 0
             StringToLen(m_TotLen, dTotLen)
             If dLen > dTotLen + EPS_SMALL Then
-               Return "La lunghezza non può essere maggiore della lunghezza totale"
+               Return EgtMsg(MSG_TOOLSERRORS + 13)
             End If
          End If
-         If Not IsNothing(m_MaxMat) Then
-            Dim dMaxMat As Double = 0
-            StringToLen(m_MaxMat, dMaxMat)
-            If dLen < dMaxMat Then
-               Return "La lunghezza non può essere minore del massimo materiale"
+         If (Type And MCH_TF.SAWBLADE) = 0 Then
+            If Not IsNothing(m_MaxMat) Then
+               Dim dMaxMat As Double = 0
+               StringToLen(m_MaxMat, dMaxMat)
+               If dLen < dMaxMat Then
+                  Return EgtMsg(MSG_TOOLSERRORS + 14)
+               End If
             End If
          End If
       End If
@@ -1285,13 +1305,13 @@ Public Class ToolTreeViewItem
          Dim dTotLen As Double = 0
          StringToLen(m_TotLen, dTotLen)
          If dTotLen < EPS_SMALL Then
-            Return "La lunghezza totale deve essere maggiore di zero"
+            Return EgtMsg(MSG_TOOLSERRORS + 15)
          End If
          If Not IsNothing(m_Len) Then
             Dim dLen As Double = 0
             StringToLen(m_Len, dLen)
             If dTotLen < dLen - EPS_SMALL Then
-               Return "La lunghezza totale non può essere minore della lunghezza"
+               Return EgtMsg(MSG_TOOLSERRORS + 16)
             End If
          End If
       End If
diff --git a/ToolsDbWindow/ToolsDbViewModel.vb b/ToolsDbWindow/ToolsDbViewModel.vb
index d0bc052..75ff8c0 100644
--- a/ToolsDbWindow/ToolsDbViewModel.vb
+++ b/ToolsDbWindow/ToolsDbViewModel.vb
@@ -484,6 +484,7 @@ Namespace EgtCAM5
          Dim ToolType As Integer = ToolToRemove.Type
          ' Cancello l'utensile
          EgtTdbRemoveTool(ToolToRemove.Name)
+         EgtTdbSave()
          ' Rimuovo il nome dell'albero
          For Each ToolFamily In ToolsList
             If (ToolFamily.ToolType And ToolType) <> 0 Then