diff --git a/IniFile.vb b/IniFile.vb
index bd49b3d..ac8941d 100644
--- a/IniFile.vb
+++ b/IniFile.vb
@@ -80,6 +80,7 @@ Public Module IniFile
    Friend m_sMachineName As String
    Friend m_sCurrMachIniFilePath As String
    Friend m_sCurrMachToolsDirPath As String
+   Friend m_sCurrMachSetUpDirPath As String
    Friend m_sCurrMachScriptsDirPath As String
    ' Variabile che contiene la path della cartella che contiene i ToolMaker
    Friend m_sToolMakersDir As String = String.Empty
diff --git a/SetUpWindow/SetUpView.xaml b/SetUpWindow/SetUpView.xaml
index e96644b..fd1fb82 100644
--- a/SetUpWindow/SetUpView.xaml
+++ b/SetUpWindow/SetUpView.xaml
@@ -89,7 +89,7 @@
             <ColumnDefinition Width="1*"/>
          </Grid.ColumnDefinitions>
       
-         <Image Source="{Binding TcPosImage}" MaxWidth="300"/>
+         <Image Source="{Binding SetUpImage}" MaxWidth="300"/>
 
          <ItemsControl Grid.Column="1" ItemsSource="{Binding PositionGroupList}"
             Style="{StaticResource HorizontalScrollViewerItemsControlStyle}">
@@ -101,7 +101,7 @@
             <ItemsControl.ItemTemplate>
                <DataTemplate>
 
-                  <ItemsControl Grid.Column="1" ItemsSource="{Binding PositionList}" Margin="0,0,30,0">
+                  <ItemsControl Grid.Column="1" ItemsSource="{Binding PositionList}" Margin="0,0,20,0">
                      <ItemsControl.ItemsPanel>
                         <ItemsPanelTemplate>
                            <WrapPanel Orientation="Vertical"/>
@@ -121,7 +121,7 @@
                                  <ItemsControl.ItemsPanel>
                                     <ItemsPanelTemplate>
                                        <!--<WrapPanel Orientation="Horizontal" MaxWidth="200"/>-->
-                                       <UniformGrid Columns="2"/>
+                                       <UniformGrid Columns="1"/>
                                     </ItemsPanelTemplate>
                                  </ItemsControl.ItemsPanel>
                                  <ItemsControl.ItemTemplate>
diff --git a/SetUpWindow/SetUpViewModel.vb b/SetUpWindow/SetUpViewModel.vb
index e37134c..a9451a4 100644
--- a/SetUpWindow/SetUpViewModel.vb
+++ b/SetUpWindow/SetUpViewModel.vb
@@ -38,10 +38,19 @@ Namespace EgtCAM5
          End Set
       End Property
 
-      Public ReadOnly Property TcPosImage As String
+      Public ReadOnly Property SetUpImage As String
          Get
-            Dim sImagePath As String = IniFile.m_sMachinesRoot & "\" & IniFile.m_sMachineName & "\SetUp\TcPosImage.png"
-            Return If(File.Exists(sImagePath), sImagePath, String.Empty)
+            ' Cerco png
+            Dim sImagePath As String = IniFile.m_sCurrMachSetUpDirPath & "\SetupImage.png"
+            If File.Exists(sImagePath) Then Return sImagePath
+            ' Cerco jpeg
+            sImagePath = IniFile.m_sCurrMachSetUpDirPath & "\SetupImage.jpg"
+            If File.Exists(sImagePath) Then Return sImagePath
+            ' Cerco bmp
+            sImagePath = IniFile.m_sCurrMachSetUpDirPath & "\SetupImage.bmp"
+            If File.Exists(sImagePath) Then Return sImagePath
+            ' Non trovato alcunché
+            Return String.Empty
          End Get
       End Property
 
@@ -1314,7 +1323,9 @@ Public Class ToolItem
 
    Public ReadOnly Property ToolTipMsg As String
       Get
-         Return (EgtMsg(MSG_TOOLSDBPAGE + 75) & ": " & m_Name & Environment.NewLine & EgtMsg(MSG_TOOLSDBPAGE + 74) & ": " & m_Head & Environment.NewLine & EgtMsg(MSG_TOOLSDBPAGE + 52) & ": " & m_Exit)
+         Return (EgtMsg(MSG_TOOLSDBPAGE + 75) & ": " & m_Name & Environment.NewLine &
+                 EgtMsg(MSG_TOOLSDBPAGE + 78) & ": " & m_TcPos & Environment.NewLine &
+                 EgtMsg(MSG_TOOLSDBPAGE + 74) & ": " & m_Head & "." & m_Exit)
       End Get
    End Property
 
diff --git a/StatusBar/StatusBarViewModel.vb b/StatusBar/StatusBarViewModel.vb
index fb97db2..1b42a62 100644
--- a/StatusBar/StatusBarViewModel.vb
+++ b/StatusBar/StatusBarViewModel.vb
@@ -150,6 +150,7 @@ Namespace EgtCAM5
                   IniFile.m_sMachineName = m_SelectedMachine.Name
                   IniFile.m_sCurrMachIniFilePath = m_SelectedMachine.MachineDirPath & "\" & m_SelectedMachine.Name & ".ini"
                   IniFile.m_sCurrMachToolsDirPath = m_SelectedMachine.MachineDirPath & "\Tools"
+                  IniFile.m_sCurrMachSetUpDirPath = m_SelectedMachine.MachineDirPath & "\SetUp"
                   IniFile.m_sCurrMachScriptsDirPath = m_SelectedMachine.MachineDirPath & "\Scripts"
                   UpdateToolAndMachDbParamVisibility()
                   OnPropertyChanged("SelectedMachine")