diff --git a/Machine/CurrentMachine.vb b/Machine/CurrentMachine.vb
index 054a65e..94d234d 100644
--- a/Machine/CurrentMachine.vb
+++ b/Machine/CurrentMachine.vb
@@ -766,6 +766,10 @@ Public Class CurrentMachine
       Set(value As String)
          If WritePrivateProfileString(S_MACH_MACH, K_CURRWATERJETTING, value, sMachIniFile) Then
             m_sCurrWaterJetting = value
+            If m_MainWindow.m_CurrentMachine.bWaterJet And EgtGetHeadId("H1") = GDB_ID.NULL Then
+               m_MainWindow.m_CurrentProjectPageUC.MachiningTxBx.Text = value
+            End If
+
          End If
       End Set
    End Property
diff --git a/OmagCUTDictionary.xaml b/OmagCUTDictionary.xaml
index c9170da..4649333 100644
--- a/OmagCUTDictionary.xaml
+++ b/OmagCUTDictionary.xaml
@@ -794,7 +794,13 @@
       <Setter Property="Margin" Value="0,8,6,4"/>
    </Style>
 
-   <!-- ______________________________________________________________________________________________________________________ -->
+    <!--Style di un immagine in al posto di una text-->
+    <Style x:Key="OmagCut_TextIcon" TargetType="{x:Type Image}" >
+        <Setter Property="Width" Value="30"/>
+        <Setter Property="Height" Value="30"/>
+    </Style>
+
+    <!-- ______________________________________________________________________________________________________________________ -->
 
    <!-- ScrollBar & it's component (RepeatButton, Thumb) -->
 
@@ -1191,7 +1197,7 @@
       <Setter Property="HorizontalAlignment" Value="Center"/>
    </Style>
 
-   <!-- ______________________________________________________________________________________________________________________ -->
+    <!-- ______________________________________________________________________________________________________________________ -->
 
    <!--TextBox-->
 
@@ -1202,7 +1208,7 @@
       <Setter Property="BorderBrush" Value="Black"/>
       <Setter Property="BorderThickness" Value="1"/>
       <Setter Property="FontSize" Value="{DynamicResource FontSize_LowerCaseCharacter}"/>
-      <Setter Property="TextAlignment" Value="Center"/>
+      <Setter Property="TextAlignment" Value="Left"/>
       <Setter Property="VerticalContentAlignment" Value="Center"/>
       <Setter Property="Padding" Value="1"/>
    </Style>
@@ -1266,7 +1272,7 @@
 
     <Style x:Key="OmagCut_FixedTextBox" TargetType="{x:Type EgtWPFLib:EgtTextBox}" BasedOn="{StaticResource OmagCut_TextBox}">
       <Setter Property="BorderBrush" Value="{StaticResource OmagCut_Gray}"/>
-        <Setter Property="Background" Value="White"/>
+      <Setter Property="Background" Value="White"/>
       <Setter Property="IsReadOnly" Value="True"/>
       <Setter Property="IsEnabled" Value="False"/>
       <Setter Property="Template" Value="{StaticResource FixedTextBoxTemplate}" />
diff --git a/Project/CurrentProjectPageUC.xaml b/Project/CurrentProjectPageUC.xaml
index 4359c0c..c9d6d54 100644
--- a/Project/CurrentProjectPageUC.xaml
+++ b/Project/CurrentProjectPageUC.xaml
@@ -7,79 +7,82 @@
    mc:Ignorable="d" 
    d:DesignHeight="853.3" d:DesignWidth="1280"
    Initialized="CurrentProjectPage_Initialized" Loaded="CurrentProjectPage_Loaded">
- 
-   <!-- Definizione della CurrentProjectPage -->
-   <Grid Name="CurrentProjectPageGrid" >
-      <Grid.ColumnDefinitions>
-         <ColumnDefinition Width="3*"/>
-         <ColumnDefinition Width="12*"/>
-      </Grid.ColumnDefinitions>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="1*"/>
-         <RowDefinition Height="8*"/>
-         <RowDefinition Height="1*"/>
-      </Grid.RowDefinitions>
 
-      <!-- Definizione della Grid superiore -->
-      <Grid Name="UpperButtonGrid" Grid.Column="1" Grid.Row="0" >
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="5*"/>
-            <ColumnDefinition Width="7*"/>
-         </Grid.ColumnDefinitions>
-
-      </Grid>
-
-      <!-- Definizione della Grid laterale -->
-        <Grid Grid.RowSpan="3">
-         <Grid.RowDefinitions>
-            <RowDefinition Height="2*"/>
-            <RowDefinition Height="7*"/>
+    <!-- Definizione della CurrentProjectPage -->
+    <Grid Name="CurrentProjectPageGrid" >
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="3*"/>
+            <ColumnDefinition Width="12*"/>
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
             <RowDefinition Height="1*"/>
-         </Grid.RowDefinitions>
+            <RowDefinition Height="8*"/>
+            <RowDefinition Height="1*"/>
+        </Grid.RowDefinitions>
 
-         <!-- Definizione della Grid con le caratteristiche del progetto -->
+        <!-- Definizione della Grid superiore -->
+        <Grid Name="UpperButtonGrid" Grid.Column="1" Grid.Row="0" >
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="5*"/>
+                <ColumnDefinition Width="7*"/>
+            </Grid.ColumnDefinitions>
+
+        </Grid>
+
+        <!-- Definizione della Grid laterale -->
+        <Grid Grid.RowSpan="3">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="2*"/>
+                <RowDefinition Height="7*"/>
+                <RowDefinition Height="1*"/>
+            </Grid.RowDefinitions>
+
+            <!-- Definizione della Grid con le caratteristiche del progetto -->
             <Border Name="CurrProjGrid" Style="{DynamicResource OmagCut_MachiningBorder}" Grid.Row="0" >
                 <Grid >
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="1*"/>
-                  <ColumnDefinition Width="1*"/>
-               </Grid.ColumnDefinitions>
-               <Grid.RowDefinitions>
-                  <RowDefinition Height="0.5*"/>
-                  <RowDefinition Height="0.5*"/>
-                  <RowDefinition Height="0.5*"/>
-                  <RowDefinition Height="0.5*"/>
-               </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="0.2*"/>
+                        <ColumnDefinition Width="1*"/>
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="0.5*"/>
+                        <RowDefinition Height="0.5*"/>
+                        <RowDefinition Height="0.5*"/>
+                        <RowDefinition Height="0.5*"/>
+                    </Grid.RowDefinitions>
 
-               <TextBlock Name="MaterialTxBl" Grid.Row="0"
-                  Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
-               <EgtWPFLib:EgtTextBox Name="MaterialTxBx" Grid.Column="1" Grid.Row="0" Width="100"
-                  Style="{DynamicResource OmagCut_FixedTextBox}"/>
-               <TextBlock Name="HeightTxBl" Grid.Row="1"
-                  Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
-               <EgtWPFLib:EgtTextBox Name="HeightTxBx" Grid.Column="1" Grid.Row="1" Width="100"
+                    <Image Name="MaterialTxBl" 
+                           Source="{DynamicResource RawPartImg}" Style="{StaticResource OmagCut_TextIcon}"/>
+                    <EgtWPFLib:EgtTextBox Name="MaterialTxBx" Grid.Column="1" Grid.Row="0" Margin="0,0,10,0"
+                   TextAlignment="Right" Style="{DynamicResource OmagCut_FixedTextBox}"
+                                          ToolTip="{Binding RelativeSource={RelativeSource Self}, Path=Text}"/>
+                    <Image Name="HeightTxBl" Grid.Row="1"
+                       Source="{DynamicResource RawProbeImg}" Style="{StaticResource OmagCut_TextIcon}"/>
+                    <EgtWPFLib:EgtTextBox Name="HeightTxBx" Grid.Column="1" Grid.Row="1" Margin="0,0,10,0"
+                  Style="{DynamicResource OmagCut_FixedTextBox}" TextAlignment="Right"
+                                          ToolTip="PROVA PROVA CIAONE PROVA PROVA CIAONE"/>
+                   <Image Name="ToolTxBl" Grid.Row="2"
+                       Source="{DynamicResource DB-utensiliImg}" Style="{StaticResource OmagCut_TextIcon}"/>
+                    <EgtWPFLib:EgtTextBox Name="ToolTxBx" Grid.Column="1" Grid.Row="2" Margin="0,0,10,0"
+                  Style="{DynamicResource OmagCut_FixedTextBox}" TextAlignment="Right"/>
+                    <Image Name="MachiningTxBl" Grid.Row="3"
+                       Source="{DynamicResource DB-lavorazioniImg}" Style="{StaticResource OmagCut_TextIcon}"/>
+                    <EgtWPFLib:EgtTextBox Name="MachiningTxBx" Grid.Column="1" Grid.Row="3" Margin="0,0,10,0"
                   Style="{DynamicResource OmagCut_FixedTextBox}" TextAlignment="Right"/>
-               <TextBlock Name="ToolTxBl" Grid.Row="2" Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
-               <EgtWPFLib:EgtTextBox Name="ToolTxBx" Grid.Column="1" Grid.Row="2" Width="100"
-                  Style="{DynamicResource OmagCut_FixedTextBox}"/>
-               <TextBlock Name="MachiningTxBl" Grid.Row="3"
-                  Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
-               <EgtWPFLib:EgtTextBox Name="MachiningTxBx" Grid.Column="1" Grid.Row="3" Width="100"
-                  Style="{DynamicResource OmagCut_FixedTextBox}"/>
 
-            </Grid>
+                </Grid>
 
-         </Border>
+            </Border>
 
-         <ProgressBar Name="PhotoProgress" Grid.Row="2" Height="50" Margin="10,0,10,0" Minimum="0" Maximum="100"/>
+            <ProgressBar Name="PhotoProgress" Grid.Row="2" Height="50" Margin="10,0,10,0" Minimum="0" Maximum="100"/>
 
-         <Border Name="OutMessageBrd" Grid.Row="2" >
-            <TextBlock Name="OutMessageTxBl" TextAlignment="Center"
+            <Border Name="OutMessageBrd" Grid.Row="2" >
+                <TextBlock Name="OutMessageTxBl" TextAlignment="Center"
                Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-         </Border>
+            </Border>
 
-      </Grid>
+        </Grid>
 
-   </Grid>
+    </Grid>
 
 </UserControl>
diff --git a/Project/CurrentProjectPageUC.xaml.vb b/Project/CurrentProjectPageUC.xaml.vb
index a864b3a..5b98887 100644
--- a/Project/CurrentProjectPageUC.xaml.vb
+++ b/Project/CurrentProjectPageUC.xaml.vb
@@ -57,11 +57,11 @@ Public Class CurrentProjectPageUC
       CurrentProjectSceneHost.SetValue(Grid.RowProperty, 1)
       Me.CurrentProjectPageGrid.Children.Add(CurrentProjectSceneHost)
 
-      'Imposto i messaggi letti dal file dei messaggi
-      MaterialTxBl.Text = EgtMsg(MSG_RAWPARTPAGEUC + 9)       'Material - Materiale
-      HeightTxBl.Text = EgtMsg(MSG_RAWPARTPAGEUC + 5)         'Height - Spessore
-      ToolTxBl.Text = EgtMsg(MSG_CADCUTPAGEUC + 11)           'Tool - Utensile
-      MachiningTxBl.Text = EgtMsg(MSG_CADCUTPAGEUC + 12)      'Machining - Lavorazione
+      'Imposto i messaggi letti dal file dei messaggi      
+      MaterialTxBl.ToolTip = EgtMsg(MSG_RAWPARTPAGEUC + 9)     'Material - Materiale
+      HeightTxBl.ToolTip = EgtMsg(MSG_RAWPARTPAGEUC + 5)       'Height - Spessore
+      ToolTxBl.ToolTip = EgtMsg(MSG_CADCUTPAGEUC + 11)           'Tool - Utensile
+      MachiningTxBl.ToolTip = EgtMsg(MSG_CADCUTPAGEUC + 12)      'Machining - Lavorazione
 
    End Sub
 
@@ -210,9 +210,17 @@ Public Class CurrentProjectPageUC
       Else
          MaterialTxBx.Text = "-----"
       End If
-      ' Visualizzo lama e lavorazione correnti
-      ToolTxBx.Text = m_MainWindow.m_CurrentMachine.sCurrSaw
-      MachiningTxBx.Text = m_MainWindow.m_CurrentMachine.sCurrSawing
+
+      ' se macchina waterjet e senza una lama corrente impostata allora visualizzo info WJ
+      If m_MainWindow.m_CurrentMachine.bWaterJet And String.IsNullOrEmpty(m_MainWindow.m_CurrentMachine.sCurrSaw) Then
+         ToolTxBx.Text = m_MainWindow.m_CurrentMachine.sCurrWaterJet
+         MachiningTxBx.Text = m_MainWindow.m_CurrentMachine.sCurrWaterJetting
+         '& "-" & m_MainWindow.m_CurrentMachine.sCurrWaterJettingQuality
+      Else
+         ToolTxBx.Text = m_MainWindow.m_CurrentMachine.sCurrSaw
+         MachiningTxBx.Text = m_MainWindow.m_CurrentMachine.sCurrSawing
+      End If
+
    End Sub
 
    Public Sub StartProgram()
@@ -1014,10 +1022,16 @@ Public Class CurrentProjectPageUC
    End Sub
 
    Friend Sub UpdateMachiningTxBx()
-      MachiningTxBx.Text = m_MainWindow.m_CurrentMachine.sCurrSawing
+      ' se macchina waterjet e senza uscita lama allora visualizzo info WJ
+      If m_MainWindow.m_CurrentMachine.bWaterJet And EgtGetHeadId("H1") = GDB_ID.NULL Then
+         MachiningTxBx.Text = m_MainWindow.m_CurrentMachine.sCurrWaterJetting
+         '& "-" & m_MainWindow.m_CurrentMachine.sCurrWaterJettingQuality
+      Else
+         MachiningTxBx.Text = m_MainWindow.m_CurrentMachine.sCurrSawing
+      End If
    End Sub
 
-  ' Gestione fotografia della lastra (compreso riconoscimento contorno)
+   ' Gestione fotografia della lastra (compreso riconoscimento contorno)
 
    Friend Function LoadPhoto(sPath As String) As Boolean
       ' Verifico esistenza file immagine
diff --git a/RawPhoto/ChooseMachining.xaml.vb b/RawPhoto/ChooseMachining.xaml.vb
index a823d48..453a482 100644
--- a/RawPhoto/ChooseMachining.xaml.vb
+++ b/RawPhoto/ChooseMachining.xaml.vb
@@ -175,20 +175,24 @@ Public Class ChooseMachining
 
       End Select
 
-      ' verifico che lista delle lavorazioni di lama non sia vuoto
-      If m_SawingList.Count > 0 Then
-         ' provo ad assegnare la lama corrente (se l'associazione fallisce corrispoende ad impostare un campo vuoto)
-         CurrSawingCmBx.SelectedItem = m_MainWindow.m_CurrentMachine.sCurrSawing
+      If m_CurrentMachine.bWaterJet And EgtGetHeadId("H1") = GDB_ID.NULL Then
+
       Else
-         m_MainWindow.m_CurrentMachine.sCurrSawing = String.Empty
-      End If
-      ' se non riesco a fare l'assegnazione della lama allora elimino il nome della lama salvata
-      If String.IsNullOrEmpty(CurrSawingCmBx.SelectedItem) Then
-         ' verifico che il nome della lama esista
-         If CurrSawingCmBx.SelectedItem <> m_MainWindow.m_CurrentMachine.sCurrSawing Then
-            m_MachIsModified = True
+         ' verifico che lista delle lavorazioni di lama non sia vuoto
+         If m_SawingList.Count > 0 Then
+            ' provo ad assegnare la lama corrente (se l'associazione fallisce corrispoende ad impostare un campo vuoto)
+            CurrSawingCmBx.SelectedItem = m_MainWindow.m_CurrentMachine.sCurrSawing
+         Else
+            m_MainWindow.m_CurrentMachine.sCurrSawing = String.Empty
+         End If
+         ' se non riesco a fare l'assegnazione della lama allora elimino il nome della lama salvata
+         If String.IsNullOrEmpty(CurrSawingCmBx.SelectedItem) Then
+            ' verifico che il nome della lama esista
+            If CurrSawingCmBx.SelectedItem <> m_MainWindow.m_CurrentMachine.sCurrSawing Then
+               m_MachIsModified = True
+            End If
+            m_MainWindow.m_CurrentMachine.sCurrSawing = String.Empty
          End If
-         m_MainWindow.m_CurrentMachine.sCurrSawing = String.Empty
       End If
 
       ' definizione della lista delle lavorazioni secondarie -- DA RIMUOVERE COMPLETAMENTE --