diff --git a/EgtBEAMWALL.Core/BTLModel/BTLFeatureM.vb b/EgtBEAMWALL.Core/BTLModel/BTLFeatureM.vb
index 4122db7f..1a405f5e 100644
--- a/EgtBEAMWALL.Core/BTLModel/BTLFeatureM.vb
+++ b/EgtBEAMWALL.Core/BTLModel/BTLFeatureM.vb
@@ -544,7 +544,7 @@ Public Class BTLFeatureM
          bOk = True
       Else
          ' Impossibile creare una feature con questi valori - ERRORE
-         MessageBox.Show(EgtMsg(61852), EgtMsg(30007))
+         EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61852), EgtMsg(30007))
          nFeatureId = EgtBeamModifyProcess(Me.nFeatureId, Me.nSelGRP, Me.nPRC, Me.nSelSIDE, "", Me.nPRID,
                                            Me.frFRAME, vPar, sPar, vParQ, nCrvId, nCrv2Id)
          SetFeatureId(nFeatureId)
diff --git a/EgtBEAMWALL.Core/ConfigurationPage/Machine_ConfigurationPageV.xaml b/EgtBEAMWALL.Core/ConfigurationPage/Machine_ConfigurationPageV.xaml
index ec293fbb..614f541c 100644
--- a/EgtBEAMWALL.Core/ConfigurationPage/Machine_ConfigurationPageV.xaml
+++ b/EgtBEAMWALL.Core/ConfigurationPage/Machine_ConfigurationPageV.xaml
@@ -74,7 +74,7 @@
            ToolTip="{Binding SaveToolTip}"
            Visibility="{Binding Machine_Visibility}"
            Style="{StaticResource SaveMachinePanel_Button}">
-      <Image Source="/Resources/ProjectManager/Save.png"
+      <Image Source="{StaticResource Save_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
 
diff --git a/EgtBEAMWALL.Core/EgtDataGrid/EgtDataGrid.xaml.vb b/EgtBEAMWALL.Core/EgtDataGrid/EgtDataGrid.xaml.vb
index 549f52df..96361da2 100644
--- a/EgtBEAMWALL.Core/EgtDataGrid/EgtDataGrid.xaml.vb
+++ b/EgtBEAMWALL.Core/EgtDataGrid/EgtDataGrid.xaml.vb
@@ -64,7 +64,7 @@ Public Class EgtDataGrid
                newItems(index).InitColumn(col)
                context.Columns.Add(col)
             Catch ex As Exception
-               MessageBox.Show(String.Format(EgtMsg(61883), newItems(index).Name, newItems(index).ParentDataGridName), EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)
+               EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, String.Format(EgtMsg(61883), newItems(index).Name, newItems(index).ParentDataGridName), EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)
             End Try
          Next
 
@@ -159,7 +159,7 @@ Public Class EgtDataGrid
                         Me.Columns(e.NewStartingIndex).DisplayIndex = e.NewStartingIndex
                      End If
                   Catch ex As Exception
-                     MessageBox.Show(String.Format(EgtMsg(61883), one.Name, one.ParentDataGridName), EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)
+                     EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, String.Format(EgtMsg(61883), one.Name, one.ParentDataGridName), EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)
                   End Try
                Next
             End If
diff --git a/EgtBEAMWALL.Core/EgtManageFileDialog/EgtManageFileDialogV.xaml b/EgtBEAMWALL.Core/EgtManageFileDialog/EgtManageFileDialogV.xaml
index b5d0693e..5626a54f 100644
--- a/EgtBEAMWALL.Core/EgtManageFileDialog/EgtManageFileDialogV.xaml
+++ b/EgtBEAMWALL.Core/EgtManageFileDialog/EgtManageFileDialogV.xaml
@@ -6,7 +6,7 @@
                                  Title="{Binding sTitle}"
                                  WindowStartupLocation="CenterOwner"
                                  ShowInTaskbar="False"
-                                 Height="500" Width="800"
+                                 Height="650" Width="1000"
                                  Style="{StaticResource OptimizerWindow.Dialog}">
 
    <Grid Style="{StaticResource AddRawPartWnd_Grid}">
@@ -24,7 +24,7 @@
          </Grid.ColumnDefinitions>
          <Button Command="{Binding GoBack_Command}"
                  Style="{StaticResource RightPanel_Button}">
-            <Image Source="\Resources\EgtDialog\Restore.png"
+            <Image Source="{StaticResource Restore_Image}"
                    Style="{StaticResource Button_Image}"/>
          </Button>
          <TextBlock Grid.Column="1"
@@ -241,25 +241,13 @@
                          SelectedItem="{Binding ItemSelected}"
                          RowStyle="{StaticResource RowDataGrid_CustomHighLight}"
                          CellStyle="{StaticResource CellDataGrid_CustomHighLight}"
+                         ColumnHeaderStyle="{StaticResource Main_DataGridColumnHeader}"
                          Style="{StaticResource Optimizer_DataGrid}">
-                  <DataGrid.ColumnHeaderStyle>
-                     <Style TargetType="{x:Type DataGridColumnHeader}">
-                        <Setter Property="Background" Value="{StaticResource BeamWall_Teal}"/>
-                        <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
-                        <Setter Property="BorderBrush" Value="{StaticResource BeamWall_Gray}"/>
-                        <Setter Property="HorizontalContentAlignment" Value="Center"/>
-                        <Setter Property="FontWeight" Value="Bold"/>
-                        <Setter Property="FontSize" Value="15"/>
-                        <Setter Property="Padding" Value="1"/>
-                        <Setter Property="BorderThickness" Value="0,0,1,1"/>
-                     </Style>
-                  </DataGrid.ColumnHeaderStyle>
                   <DataGrid.Columns>
                      <DataGridTemplateColumn Width="5*">
                         <DataGridTemplateColumn.HeaderTemplate>
                            <DataTemplate>
-                              <TextBlock Text="{Binding DataContext.Name_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"
-                                         Style="{StaticResource Name_TextBlock}"/>
+                              <TextBlock Text="{Binding DataContext.Name_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"/>
                            </DataTemplate>
                         </DataGridTemplateColumn.HeaderTemplate>
                         <DataGridTemplateColumn.CellTemplate>
@@ -283,8 +271,7 @@
                                          ElementStyle="{StaticResource DataGrid_TextBlock}">
                         <DataGridTextColumn.HeaderTemplate>
                            <DataTemplate>
-                              <TextBlock Text="{Binding DataContext.LastModify_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"
-                                         Style="{StaticResource Name_TextBlock}"/>
+                              <TextBlock Text="{Binding DataContext.LastModify_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"/>
                            </DataTemplate>
                         </DataGridTextColumn.HeaderTemplate>
                      </DataGridTextColumn>
@@ -293,8 +280,7 @@
                                          ElementStyle="{StaticResource DataGrid_TextBlock}">
                         <DataGridTextColumn.HeaderTemplate>
                            <DataTemplate>
-                              <TextBlock Text="{Binding DataContext.Type_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"
-                                         Style="{StaticResource Name_TextBlock}"/>
+                              <TextBlock Text="{Binding DataContext.Type_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"/>
                            </DataTemplate>
                         </DataGridTextColumn.HeaderTemplate>
                      </DataGridTextColumn>
@@ -303,8 +289,7 @@
                                          ElementStyle="{StaticResource DataGridR_TextBlock}">
                         <DataGridTextColumn.HeaderTemplate>
                            <DataTemplate>
-                              <TextBlock Text="{Binding DataContext.Dimension_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"
-                                         Style="{StaticResource Name_TextBlock}"/>
+                              <TextBlock Text="{Binding DataContext.Dimension_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"/>
                            </DataTemplate>
                         </DataGridTextColumn.HeaderTemplate>
                      </DataGridTextColumn>
diff --git a/EgtBEAMWALL.Core/EgtManageFileDialog/EgtManageFileDialogV.xaml.vb b/EgtBEAMWALL.Core/EgtManageFileDialog/EgtManageFileDialogV.xaml.vb
index 5306d946..0752e741 100644
--- a/EgtBEAMWALL.Core/EgtManageFileDialog/EgtManageFileDialogV.xaml.vb
+++ b/EgtBEAMWALL.Core/EgtManageFileDialog/EgtManageFileDialogV.xaml.vb
@@ -1,6 +1,6 @@
-Imports EgtWPFLib5
-Imports System.Windows.Forms
-Imports System.Windows.Input
+Imports System.Windows.Input
+Imports EgtWPFLib5
+Imports System.Windows
 
 Public Class EgtManageFileDialogV
 
@@ -8,7 +8,7 @@ Public Class EgtManageFileDialogV
 
    Private WithEvents m_EgtManageFileDialogVM As EgtManageFileDialogVM
 
-   Private Shadows DialogResult As DialogResult
+   Private Shadows DialogResult As Boolean
 
    ''' <summary>
    ''' Stringa che specifica il titolo da mostrare
@@ -31,6 +31,15 @@ Public Class EgtManageFileDialogV
       End Set
    End Property
 
+   Public Property SelFilter As EgtExstension
+      Get
+         Return m_EgtManageFileDialogVM.SelFilter
+      End Get
+      Set(value As EgtExstension)
+         m_EgtManageFileDialogVM.SelFilter = value
+      End Set
+   End Property
+
    Public Property InitialDirectory As String
       Get
          Return m_EgtManageFileDialogVM.sInitialDirectory
@@ -103,31 +112,31 @@ Public Class EgtManageFileDialogV
       End Set
    End Property
 
-#End Region    ' FIELDS & PROPERTIES
+#End Region    ' Fields & Properties
 
 #Region "CONTRUCTORS"
 
-   Sub New(Owner As System.Windows.Window, EgtManageFileDialogVM As EgtManageFileDialogVM)
+   Sub New(Owner As Window, EgtManageFileDialogVM As EgtManageFileDialogVM)
       InitializeComponent()
       Me.DataContext = EgtManageFileDialogVM
       ' Assegno al riferimento locale al VM il VM preso dal DataContext
       m_EgtManageFileDialogVM = EgtManageFileDialogVM
    End Sub
 
-#End Region
+#End Region    ' Constructor
 
 #Region "EVENTS"
 
-   Private Sub CloseWindow(DialogResult As DialogResult) Handles m_EgtManageFileDialogVM.OnCloseWindow
+   Private Sub CloseWindow(DialogResult As Boolean) Handles m_EgtManageFileDialogVM.OnCloseWindow
       Me.DialogResult = DialogResult
       Me.Close()
    End Sub
 
-#End Region
+#End Region    ' Events
 
 #Region "METHODS"
 
-   Public Overloads Function ShowDialog() As DialogResult
+   Public Overloads Function ShowDialog() As Boolean
       MyBase.ShowDialog()
       Return Me.DialogResult
    End Function
@@ -136,6 +145,6 @@ Public Class EgtManageFileDialogV
       m_EgtManageFileDialogVM.MouseDoubleClick()
    End Sub
 
-#End Region    '  METHODS
+#End Region    '  Methods
 
 End Class
diff --git a/EgtBEAMWALL.Core/Lib/NewMachGroupPanelVM.vb b/EgtBEAMWALL.Core/Lib/NewMachGroupPanelVM.vb
index 0d2e5a59..78682b68 100644
--- a/EgtBEAMWALL.Core/Lib/NewMachGroupPanelVM.vb
+++ b/EgtBEAMWALL.Core/Lib/NewMachGroupPanelVM.vb
@@ -214,7 +214,7 @@ Public Class NewMachGroupPanelVM
       Dim m_MessageBoxResult As MessageBoxResult
       If MachGroupVMList.Count = 1 Then
          'chiedo conferma prima di resettare il gruppo di lavorazione
-         MessageBox.Show(Application.Current.MainWindow, EgtMsg(62539), "", MessageBoxButton.YesNo, MessageBoxImage.Question)
+         EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62539), "", MessageBoxButton.YesNo, MessageBoxImage.Question)
          Select Case m_MessageBoxResult
             Case MessageBoxResult.Yes
                ' cancello il gruppo corrente e ne creo uno nuovo con lo stesso nome
@@ -228,7 +228,7 @@ Public Class NewMachGroupPanelVM
          End Select
       Else
          'chiedo conferma prima di cancellare il gruppo di lavorazione
-         MessageBox.Show(Application.Current.MainWindow, EgtMsg(62539), "", MessageBoxButton.YesNo, MessageBoxImage.Question)
+         EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62539), "", MessageBoxButton.YesNo, MessageBoxImage.Question)
          Select Case m_MessageBoxResult
             Case MessageBoxResult.Yes
                ' cancello quello selezionato (ovvero il corrente)
diff --git a/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb
index c3bbec85..0dc530bc 100644
--- a/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb	
+++ b/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb	
@@ -38,5 +38,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("3.1.2.2")>
-<Assembly: AssemblyFileVersion("3.1.2.2")>
+<Assembly: AssemblyVersion("3.1.2.3")>
+<Assembly: AssemblyFileVersion("3.1.2.3")>
diff --git a/EgtBEAMWALL.Core/Themes/Generic.xaml b/EgtBEAMWALL.Core/Themes/Generic.xaml
index 79716ad7..ae6ca96a 100644
--- a/EgtBEAMWALL.Core/Themes/Generic.xaml
+++ b/EgtBEAMWALL.Core/Themes/Generic.xaml
@@ -410,6 +410,15 @@
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
+   <!--#region Image-->
+
+   <BitmapImage x:Key="Save_Image" UriSource="/Resources/ProjectManager/Save.png"/>
+   <BitmapImage x:Key="Restore_Image" UriSource="/Resources/EgtDialog/Restore.png"/>
+
+   <!--#endregion Image-->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
    <!--#region FocusVisual standard-->
 
    <Style x:Key="FocusVisual">
@@ -452,6 +461,7 @@
    <!--#region DialogWindow-->
 
    <Style x:Key="DialogWindow_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+      <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
       <Setter Property="HorizontalAlignment" Value="Center"/>
       <Setter Property="VerticalAlignment" Value="Center"/>
       <Setter Property="FontSize" Value="13"/>
@@ -1931,7 +1941,7 @@
    </Style>
 
    <Style x:Key="Command_UniformGrid" TargetType="{x:Type UniformGrid}">
-      <Setter Property="Margin" Value="2.5,0,2.5,0"/>
+      <Setter Property="Margin" Value="2.5,0,2.5,2.5"/>
    </Style>
 
    <!--#endregion UniformGrid-->
@@ -2543,6 +2553,7 @@
    <Style x:Key="CellDataGrid_CustomHighLight" TargetType="{x:Type DataGridCell}">
       <Setter Property="Height" Value="24"/>
       <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}" />
+      <Setter Property="SnapsToDevicePixels" Value="True"/>
       <Style.Resources>
          <SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" Color="Transparent" />
          <SolidColorBrush x:Key="{x:Static SystemColors.HighlightTextBrushKey}" Color="Black" />
diff --git a/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs b/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs
index 4b9420ea..c5d92483 100644
--- a/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs
+++ b/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.1.2.2")]
-[assembly: AssemblyFileVersion("3.1.2.2")]
+[assembly: AssemblyVersion("3.1.2.3")]
+[assembly: AssemblyFileVersion("3.1.2.3")]
diff --git a/EgtBEAMWALL.Optimizer/AddFeatureWnd/AddFeatureWndVM.vb b/EgtBEAMWALL.Optimizer/AddFeatureWnd/AddFeatureWndVM.vb
index aa8a5b3a..a1d9ad03 100644
--- a/EgtBEAMWALL.Optimizer/AddFeatureWnd/AddFeatureWndVM.vb
+++ b/EgtBEAMWALL.Optimizer/AddFeatureWnd/AddFeatureWndVM.vb
@@ -314,7 +314,7 @@ Public Class AddFeatureWndVM
       If Not IsNothing(m_nSelPRC) AndAlso m_nSelPRC.nPRC > 0 Then
          RaiseEvent m_CloseWindow(True)
       Else
-         MessageBox.Show(EgtMsg(61852), EgtMsg(30007))
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61852), EgtMsg(30007))
       End If
    End Sub
 
diff --git a/EgtBEAMWALL.Optimizer/AddPartWnd/AddPartWndVM.vb b/EgtBEAMWALL.Optimizer/AddPartWnd/AddPartWndVM.vb
index 18745851..c932b241 100644
--- a/EgtBEAMWALL.Optimizer/AddPartWnd/AddPartWndVM.vb
+++ b/EgtBEAMWALL.Optimizer/AddPartWnd/AddPartWndVM.vb
@@ -165,7 +165,7 @@ Public Class AddPartWndVM
          Not IsNothing(m_dH) AndAlso m_dH >= 0 Then
          RaiseEvent m_CloseWindow(True)
       Else
-         MessageBox.Show(EgtMsg(61853), EgtMsg(30007))
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61853), EgtMsg(30007))
       End If
    End Sub
 
diff --git a/EgtBEAMWALL.Optimizer/AddRawPartWnd/AddRawPartWndVM.vb b/EgtBEAMWALL.Optimizer/AddRawPartWnd/AddRawPartWndVM.vb
index 8fe040bf..bd71720c 100644
--- a/EgtBEAMWALL.Optimizer/AddRawPartWnd/AddRawPartWndVM.vb
+++ b/EgtBEAMWALL.Optimizer/AddRawPartWnd/AddRawPartWndVM.vb
@@ -159,7 +159,7 @@ Public Class AddRawPartWndVM
       For Each Variable In m_VariableList
          If (Variable.nType = Variable.VariableType.STRING_ AndAlso IsNothing(Variable.sValue)) OrElse
             ((Variable.nType = Variable.VariableType.DOUBLE_ OrElse Variable.nType = Variable.VariableType.LENGTH) AndAlso IsNothing(Variable.dValue)) Then
-            MessageBox.Show(If(m_nProjectType = MachineType.BEAM, EgtMsg(61854), EgtMsg(61855)), EgtMsg(30007))
+            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, If(m_nProjectType = MachineType.BEAM, EgtMsg(61854), EgtMsg(61855)), EgtMsg(30007))
             Return
          End If
       Next
diff --git a/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndV.xaml b/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndV.xaml
index ef8b4b69..d5bb8759 100644
--- a/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndV.xaml
+++ b/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndV.xaml
@@ -39,13 +39,13 @@
                   <Button Command="{Binding Ok_Command}"
                           ToolTip="{Binding SaveAsToolTip}"
                           Style="{StaticResource OKBTLDataWnd_Button}">
-                     <Image Source="/Resources/NewPage/Ok.png"
+                     <Image Source="{StaticResource Ok_Image}"
                             Style="{StaticResource BTLDataWnd_Image}"/>
                   </Button>
                   <Button Command="{Binding Cancel_Command}"
                           ToolTip="{Binding SaveAsToolTip}"
                           Style="{StaticResource BTLDataWnd_Button}">
-                     <Image Source="/Resources/PDFEditor/Delete.png"
+                     <Image Source="{StaticResource Delete_Image}"
                             Style="{StaticResource BTLDataWnd_Image}"/>
                   </Button>
                </UniformGrid>
diff --git a/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndVM.vb b/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndVM.vb
index c57a1b1b..1b80e3f0 100644
--- a/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndVM.vb
+++ b/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndVM.vb
@@ -807,7 +807,7 @@ Public Class BTLDataWndVM
    Public Sub Ok()
       ' Messaggio ripristino verifica se presente
       If Not IsNothing(m_OldSelStrategySetup) AndAlso m_SelStrategySetup <> m_OldSelStrategySetup Then
-         If MessageBox.Show(EgtMsg(62579), EgtMsg(15002), MessageBoxButton.OKCancel, MessageBoxImage.Exclamation) = MessageBoxResult.OK Then
+         If EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62579), EgtMsg(15002), MessageBoxButton.OKCancel, MessageBoxImage.Exclamation) = MessageBoxResult.OK Then
             Map.refProjectVM.ResetGeneralParameters()
          Else
             Return
diff --git a/EgtBEAMWALL.Optimizer/BTLPartManager/BTLPartManagerV.xaml b/EgtBEAMWALL.Optimizer/BTLPartManager/BTLPartManagerV.xaml
index f9c80cfa..e21bb7bd 100644
--- a/EgtBEAMWALL.Optimizer/BTLPartManager/BTLPartManagerV.xaml
+++ b/EgtBEAMWALL.Optimizer/BTLPartManager/BTLPartManagerV.xaml
@@ -10,7 +10,7 @@
               ToolTip="{Binding CopyPart_ToolTip}"
               IsEnabled="{Binding CopyPart_IsEnabled}"
               Style="{StaticResource LP_Button}">
-         <Image Source="/Resources/LeftPanel/CopyPart.png" 
+         <Image Source="{StaticResource CopyPart_Image}" 
                 Style="{StaticResource BTLDataWnd_Image}"/>
       </Button>
       <Button Command="{Binding RemovePart_Command}"
@@ -18,7 +18,7 @@
               ToolTip="{Binding RemovePart_ToolTip}"
               IsEnabled="{Binding RemovePart_IsEnabled}"
               Style="{StaticResource LP_Button}">
-         <Image Source="/Resources/NewPage/Remove.png"
+         <Image Source="{StaticResource Remove_Image}"
                 Style="{StaticResource BTLDataWnd_Image}"/>
       </Button>
       <Button ToolTip="{Binding Simulate_ToolTip}"
@@ -26,7 +26,7 @@
               Command="{Binding Simulate_Command}"
               IsEnabled="{Binding Simulate_IsEnabled}"
               Style="{StaticResource LP_Button}">
-         <Image Source="/Resources/CALCPanel/Simulate.png" 
+         <Image Source="{StaticResource Simulate_Image}" 
                 Style="{StaticResource BTLDataWnd_Image}"/>
       </Button>
       <Button ToolTip="{Binding Edit_ToolTip}"
@@ -34,7 +34,7 @@
               Command="{Binding Edit_Command}"
               IsEnabled="{Binding Edit_IsEnabled}"
               Style="{StaticResource LP_Button}">
-         <Image Source="/Resources/CALCPanel/Edit.png" 
+         <Image Source="{StaticResource Edit_Image}" 
                 Style="{StaticResource BTLDataWnd_Image}"/>
       </Button>
       <Button Command="{Binding ResetCalc_Command}"
@@ -42,7 +42,7 @@
               ToolTip="{Binding ResetCalc_ToolTip}"
               IsEnabled="{Binding CALCPanel_IsEnabled}"
               Style="{StaticResource LP_Button}">
-         <Image Source="/Resources/CALCPanel/ResetCalc.png" 
+         <Image Source="{StaticResource ResetCalc_Image}" 
                 Style="{StaticResource BTLDataWnd_Image}"/>
       </Button>
    </StackPanel>
diff --git a/EgtBEAMWALL.Optimizer/BTLPartManager/BTLPartManagerVM.vb b/EgtBEAMWALL.Optimizer/BTLPartManager/BTLPartManagerVM.vb
index 23b01f47..fd35489f 100644
--- a/EgtBEAMWALL.Optimizer/BTLPartManager/BTLPartManagerVM.vb
+++ b/EgtBEAMWALL.Optimizer/BTLPartManager/BTLPartManagerVM.vb
@@ -324,7 +324,7 @@ Public Class BTLPartManagerVM
 
    Public Sub RemovePartCmd()
       If IsNothing(ProjectManagerVM.CurrProd) Then Return
-      If MessageBox.Show(EgtMsg(62573), EgtMsg(30009), MessageBoxButton.OKCancel, MessageBoxImage.Exclamation) = MessageBoxResult.OK Then
+      If EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62573), EgtMsg(30009), MessageBoxButton.OKCancel, MessageBoxImage.Exclamation) = MessageBoxResult.OK Then
          If Map.refProjectVM.BTLStructureVM.SelBTLParts.Count > 0 Then
             Dim CurrSelBTLParts As List(Of BTLPartVM) = Map.refProjectVM.BTLStructureVM.SelBTLParts.ToList()
             For RemoveIndex = CurrSelBTLParts.Count - 1 To 0 Step -1
@@ -341,7 +341,7 @@ Public Class BTLPartManagerVM
       Dim nDuploCount As Integer = 0
       If EgtDuploCount(BTLPartToDelete.nPartId, nDuploCount) AndAlso nDuploCount > 0 Then
          ' avviso che il pezzo non è cancellabile perchè in produzione
-         MessageBox.Show(String.Format(EgtMsg(61929), nDuploCount), EgtMsg(15003), MessageBoxButton.OK, MessageBoxImage.Warning)
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, String.Format(EgtMsg(61929), nDuploCount), EgtMsg(15003), MessageBoxButton.OK, MessageBoxImage.Warning)
          Return
       End If
       ' verifico se rimuovere sezione dalla lista
diff --git a/EgtBEAMWALL.Optimizer/BTLViewModel/BTLParamVM.vb b/EgtBEAMWALL.Optimizer/BTLViewModel/BTLParamVM.vb
index 5af41839..b4b35e49 100644
--- a/EgtBEAMWALL.Optimizer/BTLViewModel/BTLParamVM.vb
+++ b/EgtBEAMWALL.Optimizer/BTLViewModel/BTLParamVM.vb
@@ -132,7 +132,7 @@ Public Class BTLParamVM
             Case BTLParamType.DOUBLE_, BTLParamType.LENGTH
                ' verifico che sia compreso tra minimo e massimo
                If dNewValue < m_BTLParamM.dMin OrElse dNewValue > m_BTLParamM.dMax Then
-                  MessageBox.Show(EgtMsg(61856), EgtMsg(30007))
+                  EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61856), EgtMsg(30007))
                   NotifyPropertyChanged(NameOf(sValue))
                   Return
                End If
@@ -147,9 +147,9 @@ Public Class BTLParamVM
                Dim nDoneCnt As Integer = DbControllers.m_ProjController.getCountItemState(ProjectManagerVM.CurrProd.nProdId, nPartId, ItemState.Assigned)
                ' controllo se i pezzi sono lavorati se si messaggio di warning altrimenti messaggio informativo
                If nDoneCnt > 0 Then
-                  MessageBox.Show("Pezzo " & nPartId & " non modificato in " & INPROD & " barra/e perche' settata/e come da produrre", EgtMsg(30009), MessageBoxButton.OK, MessageBoxImage.Warning)
+                  EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62555) & nPartId & EgtMsg(62556) & INPROD & EgtMsg(62557), EgtMsg(30009), MessageBoxButton.OK, MessageBoxImage.Warning)
                ElseIf INPROD > 0 Then
-                  MessageBox.Show("Pezzo " & nPartId & " modificato in " & INPROD & " barra/e grezza/e", EgtMsg(30009), MessageBoxButton.OK, MessageBoxImage.Information)
+                  EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62555) & nPartId & EgtMsg(62558) & INPROD & EgtMsg(62559), EgtMsg(30009), MessageBoxButton.OK, MessageBoxImage.Information)
                End If
                UpdateParamValue(dNewValue, "")
             Case Else
@@ -194,7 +194,7 @@ Public Class BTLParamVM
             Case BTLParamType.DOUBLE_, BTLParamType.LENGTH
                ' verifico che sia compreso tra minimo e massimo
                If dNewValue < m_BTLParamM.dMin OrElse dNewValue > m_BTLParamM.dMax Then
-                  MessageBox.Show(EgtMsg(61856), EgtMsg(30007))
+                  EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61856), EgtMsg(30007))
                   NotifyPropertyChanged(NameOf(sDefault))
                   Return
                End If
diff --git a/EgtBEAMWALL.Optimizer/BTLViewModel/BTLPartVM.vb b/EgtBEAMWALL.Optimizer/BTLViewModel/BTLPartVM.vb
index dee0c2ad..0d1bdfd0 100644
--- a/EgtBEAMWALL.Optimizer/BTLViewModel/BTLPartVM.vb
+++ b/EgtBEAMWALL.Optimizer/BTLViewModel/BTLPartVM.vb
@@ -100,12 +100,12 @@ Public Class BTLPartVM
                   End If
                Next
                If bDuploInProduction Then
-                  MessageBox.Show("Impossible change dimension because already in production!", "", MessageBoxButton.OK, MessageBoxImage.Exclamation)
+                  EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62586), "", MessageBoxButton.OK, MessageBoxImage.Exclamation)
                   Return False
                End If
                ' lo impedisco
                ' avviso che tutti i pezzi verranno tolti dai grezzi e chiedo di confermare
-               If MessageBox.Show(String.Format(EgtMsg(61851), nDuploCount), EgtMsg(15003), MessageBoxButton.YesNo, MessageBoxImage.Information) = MessageBoxResult.Yes Then
+               If EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, String.Format(EgtMsg(61851), nDuploCount), EgtMsg(15003), MessageBoxButton.YesNo, MessageBoxImage.Information) = MessageBoxResult.Yes Then
                   MyMachGroupPanelM.DuploSetToDelete(m_BTLPartM.nPartId)
                   DeleteDuplo_Otmizer(DuploList)
                Else
@@ -1174,7 +1174,7 @@ Public Class BTLPartVM
             If nTempADDED >= nINPROD Then
                m_BTLPartM.nADDED = nTempADDED
             Else
-               MessageBox.Show(EgtMsg(61857), "", MessageBoxButton.OK, MessageBoxImage.Warning)
+               EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61857), "", MessageBoxButton.OK, MessageBoxImage.Warning)
             End If
          End If
          NotifyPropertyChanged(NameOf(sADDED))
@@ -2164,7 +2164,7 @@ Public Class BTLPartVM
          For Each sPart In ToAddList
             sMessage &= " - " & sPart & Environment.NewLine
          Next
-         If MessageBox.Show(sMessage & EgtMsg(61893), "", MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then
+         If EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, sMessage & EgtMsg(61893), "", MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then
             For Each PartVM In ToAddVM
                PartVM.AddNewPartToAdded()
             Next
@@ -2412,7 +2412,7 @@ Public Class BTLPartVM
       If IsNothing(SelMachGroup) Then Return
       ' se pareti e piu' di uno selezionato, esco
       If Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.WALL And SelParts.Count > 1 Then
-         MessageBox.Show(EgtMsg(61971), EgtMsg(30007))
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61971), EgtMsg(30007))
          Return
       End If
       ' se MachGroup gia' mandato in produzione, esco
@@ -2431,13 +2431,13 @@ Public Class BTLPartVM
          ' verifico sezione e materiale
          For Each Part In SelParts
             If Part.Section <> BeamMachGroup.Section Then
-               MessageBox.Show(EgtMsg(61866), EgtMsg(30007))
+               EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61866), EgtMsg(30007))
                Return
             End If
          Next
          ' verifico lunghezza totale
          If Not VerifyTotLength(BeamMachGroup, SelParts) Then
-            MessageBox.Show(EgtMsg(61867), EgtMsg(30007))
+            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61867), EgtMsg(30007))
             Return
          End If
          If AddPartToBeam(BeamMachGroup, SelParts) Then
@@ -2455,7 +2455,7 @@ Public Class BTLPartVM
          Dim WallMachGroup As MyMachGroupVM = SelMachGroup
          ' verifico spessore
          If SelPart.Section <> WallMachGroup.Section Then
-            MessageBox.Show(EgtMsg(61868), EgtMsg(30007))
+            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61868), EgtMsg(30007))
             Return
          End If
          If AddPartToWall(WallMachGroup, SelPart) Then
diff --git a/EgtBEAMWALL.Optimizer/BTLViewModel/BTLStructureVM.vb b/EgtBEAMWALL.Optimizer/BTLViewModel/BTLStructureVM.vb
index bb9a10f2..1ae69455 100644
--- a/EgtBEAMWALL.Optimizer/BTLViewModel/BTLStructureVM.vb
+++ b/EgtBEAMWALL.Optimizer/BTLViewModel/BTLStructureVM.vb
@@ -790,7 +790,7 @@ Public Class BTLStructureVM
 
    Public ReadOnly Property Data_ToolTip As String
       Get
-         Return EgtMsg(61897)
+         Return EgtMsg(61898)
       End Get
    End Property
 
@@ -1295,13 +1295,13 @@ Public Class BTLStructureVM
       If IsNothing(CurrProd) Then Return
       ' verifico se progetto modificato, e chiedo se salvare
       If CurrProd.bIsNew Or EgtGetModified() OrElse Map.refCALCPanelVM.IsMachineModified() Then
-         Select Case MessageBox.Show(EgtMsg(61877), "", MessageBoxButton.YesNoCancel, MessageBoxImage.Question)
+         Select Case EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61877), "", MessageBoxButton.YesNoCancel, MessageBoxImage.Question)
             Case MessageBoxResult.Yes
                Map.refProdManagerVM.Save()
             Case MessageBoxResult.Cancel
                Return
             Case Else   ' No
-               MessageBox.Show(EgtMsg(61892), "", MessageBoxButton.OK, MessageBoxImage.Exclamation)
+               EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61892), "", MessageBoxButton.OK, MessageBoxImage.Exclamation)
                Return
          End Select
       End If
@@ -1329,13 +1329,23 @@ Public Class BTLStructureVM
       GetMainPrivateProfileString(S_GENERAL, K_LASTUPDATEDIR, "", sDir)
       If bWithDlg Then
          ' apro finestra scelta file
-         Dim BTLDlg As New Microsoft.Win32.OpenFileDialog() With {
-               .DefaultExt = ".btl",
-               .Filter = "BTL (*.btl)|*.btl" &
-                         "|BTLX (*.btlx)|*.btlx",
-               .InitialDirectory = If(Directory.Exists(sDir), sDir, ""),
-               .CheckFileExists = True,
-               .ValidateNames = True}
+         'Dim BTLDlg As New Microsoft.Win32.OpenFileDialog() With {
+         '      .DefaultExt = ".btl",
+         '      .Filter = "BTL (*.btl)|*.btl" &
+         '                "|BTLX (*.btlx)|*.btlx",
+         '      .InitialDirectory = If(Directory.Exists(sDir), sDir, ""),
+         '      .CheckFileExists = True,
+         '      .ValidateNames = True}
+         Dim BTLDlg As New EgtBEAMWALL.Core.EgtManageFileDialogV(Application.Current.MainWindow, New EgtManageFileDialogVM()) With {
+            .Title = EgtMsg(61834),
+            .Filter = "BTL (*.btl)|*.btl" &
+                      "|BTLX (*.btlx)|*.btlx",
+            .FilterIndex = 1,
+            .InitialDirectory = If(Directory.Exists(sDir), sDir, ""),
+            .CheckFileExists = True,
+            .ValidateNames = True,
+            .Mode = 1}
+
          If BTLDlg.ShowDialog() Then
             sFile = BTLDlg.FileName
          Else
diff --git a/EgtBEAMWALL.Optimizer/CALCPanel/CALCPanelVM.vb b/EgtBEAMWALL.Optimizer/CALCPanel/CALCPanelVM.vb
index cdb80682..f70b0ed3 100644
--- a/EgtBEAMWALL.Optimizer/CALCPanel/CALCPanelVM.vb
+++ b/EgtBEAMWALL.Optimizer/CALCPanel/CALCPanelVM.vb
@@ -151,7 +151,7 @@ Public Class CALCPanelVM
 
    Private Sub Calc_Ended(sender As Object, e As CalcEndEventArgs)
       If e.End_ = CalcEndEventArgs.Results.ERROR_ OrElse e.End_ = CalcEndEventArgs.Results.NULL Then
-         MessageBox.Show("Execution error (all processes are disabled)")
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62540))
       End If
       If e.End_ = CalcEndEventArgs.Results.EDIT Then
          Map.refMyStatusBarVM.SetOutputMessage("Editor closed")
@@ -878,7 +878,7 @@ Public Class CALCPanelVM
    Friend Sub ChooseMachine()
       ' rendo visibile la CmBx per la scelta e il pulsante di conferma solo se il Proj corrente non ha associato alcun Prod
       If ProjectManagerVM.CurrProd.nProjId > 0 Then
-         MessageBox.Show(EgtMsg(61929), EgtMsg(30009), MessageBoxButton.OK, MessageBoxImage.Exclamation)
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61929), EgtMsg(30009), MessageBoxButton.OK, MessageBoxImage.Exclamation)
       Else
          SetChooseMachine_Visibility(True)
       End If
@@ -950,7 +950,7 @@ Public Class CALCPanelVM
          nPartId = EgtGetNextPart(nPartId)
       End While
       If Map.refProjectVM.MachGroupPanelVM.MachGroupVMList.Count > 0 Then
-         If MessageBox.Show(EgtMsg(61779), EgtMsg(30009), MessageBoxButton.OKCancel, MessageBoxImage.Exclamation) = MessageBoxResult.OK Then
+         If EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61779), EgtMsg(30009), MessageBoxButton.OKCancel, MessageBoxImage.Exclamation) = MessageBoxResult.OK Then
             For Index As Integer = Map.refMachGroupPanelVM.MachGroupVMList.Count - 1 To 0 Step -1
                Dim CurrMachGroup As MyMachGroupVM = Map.refMachGroupPanelVM.MachGroupVMList(Index)
                CurrMachGroup.DeleteMachGroup()
diff --git a/EgtBEAMWALL.Optimizer/CALCPanel/CalcPanelV.xaml b/EgtBEAMWALL.Optimizer/CALCPanel/CalcPanelV.xaml
index 720c1ddb..9aaed7f5 100644
--- a/EgtBEAMWALL.Optimizer/CALCPanel/CalcPanelV.xaml
+++ b/EgtBEAMWALL.Optimizer/CALCPanel/CalcPanelV.xaml
@@ -8,7 +8,7 @@
            IsEnabled="{Binding CALCPanel_IsEnabled}"
            Visibility="{Binding ChooseMachineBtn_Visibility}"
            Style="{StaticResource ToolBarViewPanel_Button}">
-      <Image Source="/Resources/CALCPanel/ChooseMachine.png"
+      <Image Source="{StaticResource ChooseMachine_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
 
diff --git a/EgtBEAMWALL.Optimizer/ChangeMaterialWnd/ChangeMaterialWndVM.vb b/EgtBEAMWALL.Optimizer/ChangeMaterialWnd/ChangeMaterialWndVM.vb
index c7d3d71d..c22253ba 100644
--- a/EgtBEAMWALL.Optimizer/ChangeMaterialWnd/ChangeMaterialWndVM.vb
+++ b/EgtBEAMWALL.Optimizer/ChangeMaterialWnd/ChangeMaterialWndVM.vb
@@ -129,7 +129,7 @@ Public Class ChangeMaterialWndVM
          Not IsNothing(m_SelWhMaterial) AndAlso m_SelWhMaterial <> "" Then
          RaiseEvent m_CloseWindow(True)
       Else
-         MessageBox.Show(EgtMsg(61858), EgtMsg(30007))
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61858), EgtMsg(30007))
       End If
    End Sub
 
diff --git a/EgtBEAMWALL.Optimizer/ChangeParameterWnd/ChangeParameterWndVM.vb b/EgtBEAMWALL.Optimizer/ChangeParameterWnd/ChangeParameterWndVM.vb
index 1caa33e4..c25611e0 100644
--- a/EgtBEAMWALL.Optimizer/ChangeParameterWnd/ChangeParameterWndVM.vb
+++ b/EgtBEAMWALL.Optimizer/ChangeParameterWnd/ChangeParameterWndVM.vb
@@ -108,7 +108,7 @@ Public Class ChangeParameterWndVM
          Not IsNothing(m_SelParam) AndAlso m_SelParam.sName <> "" Then
          RaiseEvent m_CloseWindow(True)
       Else
-         MessageBox.Show(EgtMsg(61858), EgtMsg(30007))
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61858), EgtMsg(30007))
       End If
    End Sub
 
diff --git a/EgtBEAMWALL.Optimizer/ConfigurationPage/ConfigurationPageVM.vb b/EgtBEAMWALL.Optimizer/ConfigurationPage/ConfigurationPageVM.vb
index 00b4cea7..30a92425 100644
--- a/EgtBEAMWALL.Optimizer/ConfigurationPage/ConfigurationPageVM.vb
+++ b/EgtBEAMWALL.Optimizer/ConfigurationPage/ConfigurationPageVM.vb
@@ -602,13 +602,17 @@ Public Class ConfigurationPageVM
    End Property
 
    Public Sub ChooseExternalBackupFolderPath()
-      Dim FileDialog As New Microsoft.Win32.SaveFileDialog() With {.InitialDirectory = m_ExternalBackupFolderPath,
-                                                                   .CheckFileExists = False,
-                                                                   .CheckPathExists = False,
-                                                                   .DefaultExt = ".folder",
-                                                                   .OverwritePrompt = False,
-                                                                   .FileName = "Select this ",
-                                                                   .Title = "Backup & Restore File Path"}
+      Dim FileDialog As New EgtBEAMWALL.Core.EgtManageFileDialogV(Application.Current.MainWindow, New EgtManageFileDialogVM()) With {
+            .Title = EgtMsg(63039),
+            .Filter = "BTL (*.btl)|*.btl" &
+                      "|BTLX (*.btlx)|*.btlx",
+            .InitialDirectory = m_ExternalBackupFolderPath,
+            .FileName = "Select this ",
+            .FilterIndex = 1,
+            .CheckFileExists = False,
+            .OverwritePrompt = False,
+            .Mode = 1}
+
       If FileDialog.ShowDialog() Then
          m_ExternalBackupFolderPath = Path.GetDirectoryName(FileDialog.FileName)
          WriteMainPrivateProfileString(S_BACKUPANDRESTORE, K_EXTERNALFILEPATH, m_ExternalBackupFolderPath)
@@ -692,7 +696,7 @@ Public Class ConfigurationPageVM
       Try
          DataLayer.DbConfig.DataBaseDumpToFile(sBackupZipPath)
       Catch ex As Exception
-         MessageBox.Show(EgtMsg(62103), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62103), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)
          bOk = False
       End Try
       If bOk AndAlso File.Exists(sBackupZipPath) Then
@@ -725,7 +729,7 @@ Public Class ConfigurationPageVM
                End Using
             End Using
          Catch ex As Exception
-            MessageBox.Show(EgtMsg(62103), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)
+            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62103), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)
             bOk = False
          End Try
       End If
@@ -738,7 +742,7 @@ Public Class ConfigurationPageVM
          If Directory.Exists(m_ExternalBackupFolderPath) Then
             CopyForExternalBackup(sBackupFolder, m_ExternalBackupFolderPath)
          Else
-            MessageBox.Show(EgtMsg(62104), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)                      ' External folder does not exist or is not reachable! Copy to external folder impossible!
+            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62104), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)                      ' External folder does not exist or is not reachable! Copy to external folder impossible!
          End If
       End If
       'chiudo finestra di caricamento
@@ -789,7 +793,7 @@ Public Class ConfigurationPageVM
       Dim localProc As Process() = Process.GetProcessesByName(sSupervisorName)
       ' verifico che sia chiuso
       If localProc.Length > 0 Then
-         MessageBox.Show(EgtMsg(62105), EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)          ' Please verify the machine is stoped and close the supervisor before proceding with the restore operation!
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62105), EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)          ' Please verify the machine is stoped and close the supervisor before proceding with the restore operation!
          Return
       End If
       m_bRestoreRunning = True
@@ -835,22 +839,22 @@ Public Class ConfigurationPageVM
          Next
       End If
       If String.IsNullOrEmpty(sRestorePath) Then
-         MessageBox.Show(EgtMsg(62106), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)            ' Restore impossible! Last backup not found!
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62106), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)            ' Restore impossible! Last backup not found!
          m_bRestoreRunning = False
          Return
       End If
-      If MessageBox.Show(String.Format(EgtMsg(62107), nYear, nMonth, nDay), EgtMsg(15002), MessageBoxButton.OKCancel, MessageBoxImage.Warning) <> MessageBoxResult.OK Then               'Are you sure you want to restore the last backup from {0}\{1}\{2}? If you proceed you will lose actual data!
+      If EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, String.Format(EgtMsg(62107), nYear, nMonth, nDay), EgtMsg(15002), MessageBoxButton.OKCancel, MessageBoxImage.Warning) <> MessageBoxResult.OK Then               'Are you sure you want to restore the last backup from {0}\{1}\{2}? If you proceed you will lose actual data!
          m_bRestoreRunning = False
          Return
       End If
       Dim bDoBackup = False
-      Select Case MessageBox.Show(EgtMsg(62108), EgtMsg(15003), MessageBoxButton.YesNoCancel, MessageBoxImage.Information)                  ' Do you want to do a backup of the current project before proceding with the restore?
+      Select Case EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62108), EgtMsg(15003), MessageBoxButton.YesNoCancel, MessageBoxImage.Information)                  ' Do you want to do a backup of the current project before proceding with the restore?
          Case MessageBoxResult.Yes
             bDoBackup = True
          Case MessageBoxResult.No
             bDoBackup = False
          Case MessageBoxResult.Cancel
-            MessageBox.Show(EgtMsg(62109), EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)
+            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62109), EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)
             m_bRestoreRunning = False
             Return
       End Select
@@ -887,7 +891,7 @@ Public Class ConfigurationPageVM
       Catch ex1 As Exception
          EgtOutLog("Error! Impossible importing Recovery file " & sRestorePath & "!")
          EgtOutLog("Exception in zip: " & ex1.ToString())
-         MessageBox.Show(EgtMsg(62110), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)             ' Impossible importing Recovery file!
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62110), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)             ' Impossible importing Recovery file!
          bOk = False
       End Try
       Dim sBackupTempPath As String = Map.refMainWindowVM.MainWindowM.sTempDir & "\DbRestore"
@@ -897,7 +901,7 @@ Public Class ConfigurationPageVM
          Try
             DataLayer.DbConfig.DataBaseRestoreFromFile(sRestoreDir & "\DbBackup.zip", "", sBackupTempPath)
          Catch ex As Exception
-            MessageBox.Show(EgtMsg(62111), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)                 ' Restore failed! Impossible to restore the backup Database
+            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62111), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)                 ' Restore failed! Impossible to restore the backup Database
             bOk = False
          End Try
       End If
diff --git a/EgtBEAMWALL.Optimizer/ConfigurationPage/ConfigurationProgramV.xaml b/EgtBEAMWALL.Optimizer/ConfigurationPage/ConfigurationProgramV.xaml
index 5aced70a..89642a99 100644
--- a/EgtBEAMWALL.Optimizer/ConfigurationPage/ConfigurationProgramV.xaml
+++ b/EgtBEAMWALL.Optimizer/ConfigurationPage/ConfigurationProgramV.xaml
@@ -26,7 +26,7 @@
                           ToolTip="{Binding SaveToolTip}"
                           Visibility="{Binding General_Visibility}"
                           Style="{StaticResource SaveOptionPanel_Button}">
-                     <Image Source="/Resources/ProjectManager/Save.png"
+                     <Image Source="{StaticResource Save_Image}"
                             Style="{StaticResource BTLDataWnd_Image}"/>
                   </Button>
                </StackPanel>
@@ -44,7 +44,7 @@
                           ToolTip="{Binding SaveToolTip}"
                           Visibility="{Binding PDFEditor_Visibility}"
                           Style="{StaticResource SaveOptionPanel_Button}">
-                     <Image Source="/Resources/ProjectManager/Save.png"
+                     <Image Source="{StaticResource Save_Image}"
                             Style="{StaticResource BTLDataWnd_Image}"/>
                   </Button>
                </StackPanel>
diff --git a/EgtBEAMWALL.Optimizer/FeatureListManager/FeatureListManagerV.xaml b/EgtBEAMWALL.Optimizer/FeatureListManager/FeatureListManagerV.xaml
index 4bf1c21a..d1354403 100644
--- a/EgtBEAMWALL.Optimizer/FeatureListManager/FeatureListManagerV.xaml
+++ b/EgtBEAMWALL.Optimizer/FeatureListManager/FeatureListManagerV.xaml
@@ -8,21 +8,21 @@
            ToolTip="{Binding CopyFeature_ToolTip}"
            IsEnabled="{Binding CopyFeature_IsEnabled}"
            Style="{StaticResource LP_Button}">
-      <Image Source="/Resources/LeftPanel/CopyFeature.png"
+      <Image Source="{StaticResource CopyFeature_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
    <Button Command="{Binding AddFeature_Command}"
            ToolTip="{Binding AddFeature_ToolTip}"
            IsEnabled="{Binding AddFeature_IsEnabled}"
            Style="{StaticResource LP_Button}">
-      <Image Source="/Resources/LeftPanel/AddFeature.png"
+      <Image Source="{StaticResource AddFeature_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
    <Button Command="{Binding RemoveFeature_Command}"
            ToolTip="{Binding RemoveFeature_ToolTip}"
            IsEnabled="{Binding RemoveFeature_IsEnabled}"
            Style="{StaticResource LP_Button}">
-      <Image Source="/Resources/NewPage/Remove.png"
+      <Image Source="{StaticResource Remove_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
 
diff --git a/EgtBEAMWALL.Optimizer/FeatureListManager/FeatureListManagerVM.vb b/EgtBEAMWALL.Optimizer/FeatureListManager/FeatureListManagerVM.vb
index eede239e..fd3f0b9c 100644
--- a/EgtBEAMWALL.Optimizer/FeatureListManager/FeatureListManagerVM.vb
+++ b/EgtBEAMWALL.Optimizer/FeatureListManager/FeatureListManagerVM.vb
@@ -117,7 +117,7 @@ Public Class FeatureListManagerVM
          ' Reset lua
          EgtLuaResetGlobVar("MACRO")
          If Not bOk Then
-            MessageBox.Show(EgtMsg(61869), EgtMsg(30007))
+            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61869), EgtMsg(30007))
             Return
          End If
          bMacroFlag = True
diff --git a/EgtBEAMWALL.Optimizer/FeatureManager/FeatureManagerV.xaml b/EgtBEAMWALL.Optimizer/FeatureManager/FeatureManagerV.xaml
index b1d2f70e..03ff2f7e 100644
--- a/EgtBEAMWALL.Optimizer/FeatureManager/FeatureManagerV.xaml
+++ b/EgtBEAMWALL.Optimizer/FeatureManager/FeatureManagerV.xaml
@@ -79,7 +79,7 @@
            ToolTip="{Binding MacroFeature_ToolTip}"
            IsEnabled="{Binding MacroFeature_IsEnabled}"
            Style="{StaticResource MacroFeaturen_Button}">
-      <Image Source="/Resources/LeftPanel/MacroFeature.png"
+      <Image Source="{StaticResource MacroFeature_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
 
diff --git a/EgtBEAMWALL.Optimizer/ForcedStrategyPanel/ForcedStrategyPanelV.xaml b/EgtBEAMWALL.Optimizer/ForcedStrategyPanel/ForcedStrategyPanelV.xaml
index 3b002469..6c6a3bc7 100644
--- a/EgtBEAMWALL.Optimizer/ForcedStrategyPanel/ForcedStrategyPanelV.xaml
+++ b/EgtBEAMWALL.Optimizer/ForcedStrategyPanel/ForcedStrategyPanelV.xaml
@@ -46,13 +46,13 @@
          <Button Command="{Binding Ok_Command}"
                  ToolTip="{Binding Ok_Msg}"
                  Style="{StaticResource ToolBarViewPanel_Button}">
-            <Image Source="/Resources/NewPage/Ok.png"
+            <Image Source="{StaticResource Ok_Image}"
                    Style="{StaticResource BTLDataWnd_Image}"/>
          </Button>
          <Button Command="{Binding Cancel_Command}"
                  ToolTip="{Binding Cancel_Msg}"
                  Style="{StaticResource ToolBarViewPanel_Button}">
-            <Image Source="/Resources/PDFEditor/Delete.png"
+            <Image Source="{StaticResource Delete_Image}"
                    Style="{StaticResource BTLDataWnd_Image}"/>
          </Button>
       </StackPanel>
diff --git a/EgtBEAMWALL.Optimizer/FreeContourManager/FreeContourManagerV.xaml b/EgtBEAMWALL.Optimizer/FreeContourManager/FreeContourManagerV.xaml
index 33a05fa5..3dc190f2 100644
--- a/EgtBEAMWALL.Optimizer/FreeContourManager/FreeContourManagerV.xaml
+++ b/EgtBEAMWALL.Optimizer/FreeContourManager/FreeContourManagerV.xaml
@@ -14,62 +14,62 @@
            ToolTip="{Binding Line2P_ToolTip}"
            IsEnabled="{Binding Line2P_IsEnabled}"
            Style="{StaticResource ToolBarViewPanel_Button}">
-      <Image Source="/Resources/DrawPanel/Line2P.png" 
+      <Image Source="{StaticResource Line2P_Image}" 
              Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
    <Button Command="{Binding Delete_Command}"
            ToolTip="{Binding Delete_ToolTip}"
            Style="{StaticResource ToolBarViewPanel_Button}">
-      <Image Source="/Resources/DrawPanel/Delete.png"
+      <Image Source="{StaticResource DeleteD_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
    <Button Command="{Binding ModifyCurve_Command}"
            ToolTip="{Binding ModifyCurve_ToolTip}"
            Style="{StaticResource ToolBarViewPanel_Button}">
-      <Image Source="/Resources/DrawPanel/ModifyCurve.png"
+      <Image Source="{StaticResource ModifyCurve_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
    <Button Command="{Binding AddPointCurve_Command}"
            ToolTip="{Binding AddPointCurve_ToolTip}"
            Style="{StaticResource ToolBarViewPanel_Button}">
-      <Image Source="/Resources/DrawPanel/AddPointCurve.png"
+      <Image Source="{StaticResource AddPointCurve_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
    <Button Command="{Binding RemovePointCurve_Command}"
            ToolTip="{Binding RemovePointCurve_ToolTip}"
            Style="{StaticResource ToolBarViewPanel_Button}">
-      <Image Source="/Resources/DrawPanel/RemovePointCurve.png"
+      <Image Source="{StaticResource RemovePointCurve_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
    <Button Command="{Binding ChangeStart_Command}"
            ToolTip="{Binding ChangeStart_ToolTip}"
            Style="{StaticResource ToolBarViewPanel_Button}">
-      <Image Source="/Resources/DrawPanel/ChangeStart.png"
+      <Image Source="{StaticResource ChangeStart_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
    <Button Command="{Binding InvertCurve_Command}"
            ToolTip="{Binding InvertCurve_ToolTip}"
            Style="{StaticResource ToolBarViewPanel_Button}">
-      <Image Source="/Resources/DrawPanel/InvertCurve.png"
+      <Image Source="{StaticResource InvertCurve_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
    <Button Command="{Binding Move_Command}"
            ToolTip="{Binding Move_ToolTip}"
            Style="{StaticResource ToolBarViewPanel_Button}">
-      <Image Source="/Resources/DrawPanel/Move.png"
+      <Image Source="{StaticResource Move_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
    <Button Command="{Binding Rotate_Command}"
            ToolTip="{Binding Rotate_ToolTip}"
            Style="{StaticResource ToolBarViewPanel_Button}">
-      <Image Source="/Resources/DrawPanel/Rotate.png"
+      <Image Source="{StaticResource RotateD_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
    <Button Command="{Binding TextAngle_Command}"
            ToolTip="{Binding TextAngle_ToolTip}" 
            Visibility="{Binding TextAngle_Visibility}"
            Style="{StaticResource ToolBarViewPanel_Button}">
-      <Image Source="/Resources/DrawPanel/Text.png"
+      <Image Source="{StaticResource Text_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
 
diff --git a/EgtBEAMWALL.Optimizer/FreeContourManager/FreeContourManagerVM.vb b/EgtBEAMWALL.Optimizer/FreeContourManager/FreeContourManagerVM.vb
index 98f7c960..2d0c8503 100644
--- a/EgtBEAMWALL.Optimizer/FreeContourManager/FreeContourManagerVM.vb
+++ b/EgtBEAMWALL.Optimizer/FreeContourManager/FreeContourManagerVM.vb
@@ -83,7 +83,7 @@ Public Class FreeContourManagerVM
                NotifyPropertyChanged(NameOf(TextAngle_Visibility))
             Case FreeContourTypes.TWO
                ' chiedo conferma
-               If MessageBox.Show(EgtMsg(61862), "", MessageBoxButton.YesNo, MessageBoxImage.Warning) <> MessageBoxResult.Yes Then
+               If EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61862), "", MessageBoxButton.YesNo, MessageBoxImage.Warning) <> MessageBoxResult.Yes Then
                   m_SelType = FreeContourTypes.TWO
                   NotifyPropertyChanged(NameOf(SelType))
                   Return
@@ -423,7 +423,7 @@ Public Class FreeContourManagerVM
       Dim frFace As New Frame3d
       EgtBeamGetSideData(SelFeature.nSelSIDE, frFace)
       Dim frFrame As New Frame3d(SelFeature.BTLFeatureM.frFRAME)
-      frFrame.ToGlob( frFace)
+      frFrame.ToGlob(frFace)
       EgtSetGridFrame(frFrame)
       EgtSetGridShow(True, True)
       Map.refSceneHostVM.MainScene.CPlaneView()
diff --git a/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersStrategyV.xaml b/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersStrategyV.xaml
index ae5df6c7..13207ec7 100644
--- a/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersStrategyV.xaml
+++ b/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersStrategyV.xaml
@@ -25,7 +25,7 @@
          <Button Command="{Binding Ok_Command}"
                  ToolTip="{Binding SaveAsToolTip}"
                  Style="{StaticResource SaveStrategy_Button}">
-            <Image Source="/Resources/NewPage/Ok.png"
+            <Image Source="{StaticResource Ok_Image}"
                    Style="{StaticResource BTLDataWnd_Image}"/>
          </Button>
       </StackPanel>
diff --git a/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersWnd.xaml b/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersWnd.xaml
index 52cc71bd..f4e30f60 100644
--- a/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersWnd.xaml
+++ b/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersWnd.xaml
@@ -35,7 +35,7 @@
          <Button Command="{Binding Ok_Command}"
                  ToolTip="{Binding SaveAsToolTip}"
                  Style="{StaticResource GeneralParametersWnd_Button}">
-            <Image Source="/Resources/NewPage/Ok.png"
+            <Image Source="{StaticResource Ok_Image}"
                    Style="{StaticResource BTLDataWnd_Image}"/>
          </Button>
       </UniformGrid>
diff --git a/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/ProjectParametersV.xaml b/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/ProjectParametersV.xaml
index dfdd75b0..f31ba8b8 100644
--- a/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/ProjectParametersV.xaml
+++ b/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/ProjectParametersV.xaml
@@ -113,14 +113,14 @@
                                 IsEnabled="{Binding OpenToolListIsEnable}"
                                 Command="{Binding OpenToolListCommand}"
                                 Style="{StaticResource ProjectParameters_Button}">
-                           <Image Source="/Resources/NewPage/+.png"
+                           <Image Source="{StaticResource Plus_Image}"
                                   Style="{StaticResource BTLDataWnd_Image}"/>
                         </Button>
                         <Button ToolTip="{Binding DeselectAllToolTip}"
                                 IsEnabled="{Binding ActiveToolListIsEnable}"
                                 Command="{Binding DeselectAllCommand}"
                                 Style="{StaticResource CloseProjectParameters_Button}">
-                           <Image Source="/Resources/NewPage/deselectall.png"
+                           <Image Source="{StaticResource DeselectAll_Image}"
                                   Style="{StaticResource BTLDataWnd_Image}"/>
                         </Button>
                      </StackPanel>
@@ -148,14 +148,14 @@
                         <Button ToolTip="{Binding CloseToolListToolTip}"
                                 Command="{Binding CloseToolListCommand}"
                                 Style="{StaticResource ProjectParameters_Button}">
-                           <Image Source="/Resources/PDFEditor/Delete.png"
+                           <Image Source="{StaticResource Delete_Image}"
                                   Style="{StaticResource BTLDataWnd_Image}"/>
                         </Button>
                         <Button ToolTip="{Binding SelectAllToolTip}"
                                 IsEnabled="{Binding AvailableToolListIsEnable}"
                                 Command="{Binding SelectAllCommand}"
                                 Style="{StaticResource ProjectParameters_Button}">
-                           <Image Source="/Resources/NewPage/selectall.png"
+                           <Image Source="{StaticResource SelectAll_Image}"
                                   Style="{StaticResource BTLDataWnd_Image}"/>
                         </Button>
                      </StackPanel>
diff --git a/EgtBEAMWALL.Optimizer/InstrumentPanel/InstrumentPanelV.xaml b/EgtBEAMWALL.Optimizer/InstrumentPanel/InstrumentPanelV.xaml
index 43c4888a..26a957b1 100644
--- a/EgtBEAMWALL.Optimizer/InstrumentPanel/InstrumentPanelV.xaml
+++ b/EgtBEAMWALL.Optimizer/InstrumentPanel/InstrumentPanelV.xaml
@@ -6,7 +6,7 @@
    <ToggleButton ToolTip="{Binding GetDistToolTip}"
                  IsChecked="{Binding GetDistIsChecked}"
                  Style="{StaticResource ToolBar_ToggleButton}">
-      <Image Source="/Resources/InstrumentPanel/GetDist+.png"
+      <Image Source="{StaticResource GetDist_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </ToggleButton>
 
@@ -15,7 +15,7 @@
            Visibility="{Binding ChangeParam_Visibility}"
            IsEnabled="{Binding InstrumentPanel_IsEnabled}"
            Style="{StaticResource ToolBarViewPanel_Button}">
-      <Image Source="/Resources/InstrumentPanel/ChangeParam.png"
+      <Image Source="{StaticResource ChangeParam_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
 
diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml b/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml
index 85b38748..0c37e8ed 100644
--- a/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml
+++ b/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml
@@ -24,15 +24,11 @@
                               AlternatingRowBackground="{StaticResource BeamWall_LinkWater}"
                               AlternationCount="2"
                               AreRowDetailsFrozen="True"
-                              EnableRowVirtualization="True" 
-                              EnableColumnVirtualization="True"
-                              VirtualizingStackPanel.VirtualizationMode="Recycling"
-                              VirtualizingStackPanel.IsVirtualizing="True"
                               VirtualizingPanel.IsVirtualizingWhenGrouping="True"
                               VirtualizingPanel.ScrollUnit="Pixel"
                               RenderOptions.CachingHint="Cache"
-                              VirtualizingPanel.CacheLength="10"
-                              VirtualizingPanel.CacheLengthUnit="Pixel"
+                              VirtualizingPanel.CacheLength="2"
+                              VirtualizingPanel.CacheLengthUnit="Page"
                               RowBackground="{StaticResource BeamWall_BLackSqueeze}"
                               ColumnHeaderStyle="{StaticResource Main_DataGridColumnHeader}"
                               Style="{StaticResource Optimizer_DataGrid}">
@@ -58,21 +54,21 @@
                                             CommandParameter="{Binding Path=Name}"
                                             ToolTip="{Binding Tag.Data_ToolTip, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
                                             Style="{StaticResource BTLPartList_Button}">
-                                       <Image Source="/Resources/NewPage/adjustment.png"
+                                       <Image Source="{StaticResource Adjustment_Image}"
                                               Style="{StaticResource BTLDataWnd_Image}"/>
                                     </Button>
                                     <Button Command="{Binding Tag.AddPart_Command, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
                                             CommandParameter="{Binding Path=Name}"
                                             ToolTip="{Binding Tag.AddPart_ToolTip, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
                                             Style="{StaticResource BTLPartList_Button}">
-                                       <Image Source="/Resources/LeftPanel/AddPart.png"
+                                       <Image Source="{StaticResource AddPart_Image}"
                                               Style="{StaticResource BTLDataWnd_Image}"/>
                                     </Button>
                                     <Button Command="{Binding Tag.UpdateBTL_Command, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
                                             CommandParameter="{Binding Path=Name}"
                                             ToolTip="{Binding Tag.UpdateBTL_ToolTip, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
                                             Style="{StaticResource BTLPartList_Button}">
-                                       <Image Source="/Resources/ProjectManager/UpdateBTL.png"
+                                       <Image Source="{StaticResource UpdateBTL_Image}"
                                               Style="{StaticResource BTLDataWnd_Image}"/>
                                     </Button>
                                  </StackPanel>
@@ -277,7 +273,7 @@
          <DataGridTemplateColumn x:Key="colROT" SortMemberPath="dROT">
             <DataGridTemplateColumn.HeaderTemplate>
                <DataTemplate>
-                  <Image Source="/Resources/NewPage/RotateIntestazione.png"
+                  <Image Source="{StaticResource HeaderRotate_Image}"
                          Style="{StaticResource BTLPartList_Image}"/>
                </DataTemplate>
             </DataGridTemplateColumn.HeaderTemplate>
@@ -295,7 +291,7 @@
                              ToolTip="{Binding ForwardRotation_ToolTip}"
                              IsEnabled="{Binding RotatePart_IsEnabled}"
                              Style="{StaticResource BTLPanel_Button}">
-                        <Image Source="/Resources/NewPage/Rotate.png"
+                        <Image Source="{StaticResource Rotate_Image}"
                                Style="{StaticResource BTLDataWnd_Image}"/>
                      </Button>
                   </Grid>
@@ -306,7 +302,7 @@
          <DataGridTemplateColumn x:Key="colFLIP">
             <DataGridTemplateColumn.HeaderTemplate>
                <DataTemplate>
-                  <Image Source="/Resources/NewPage/InversionIntestazione.png"
+                  <Image Source="{StaticResource HeaderInversion_Image}"
                          Style="{StaticResource BTLPartList_Image}"/>
                </DataTemplate>
             </DataGridTemplateColumn.HeaderTemplate>
@@ -321,7 +317,7 @@
          <DataGridTemplateColumn x:Key="colVERIFY">
             <DataGridTemplateColumn.HeaderTemplate>
                <DataTemplate>
-                  <Image Source="/Resources/NewPage/VerifyIntestazione.png"
+                  <Image Source="{StaticResource HeaderVerify_Image}"
                          Style="{StaticResource BTLPartList_Image}"/>
                </DataTemplate>
             </DataGridTemplateColumn.HeaderTemplate>
@@ -331,7 +327,7 @@
                           Command="{Binding Verify_Command}"
                           IsEnabled="{Binding Verify_IsEnabled}"
                           Style="{StaticResource BTLPanel_Button}">
-                     <Image Source="/Resources/CALCPanel/Verify.png"
+                     <Image Source="{StaticResource Verify_Image}"
                             Style="{StaticResource BTLDataWnd_Image}"/>
                   </Button>
                </DataTemplate>
@@ -341,7 +337,7 @@
          <DataGridTemplateColumn x:Key="colADD">
             <DataGridTemplateColumn.HeaderTemplate>
                <DataTemplate>
-                  <Image Source="/Resources/NewPage/AddToRawPartIntestazione.png"
+                  <Image Source="{StaticResource HeaderAddToRawPart_Image}"
                          Style="{StaticResource BTLPartList_Image}"/>
                </DataTemplate>
             </DataGridTemplateColumn.HeaderTemplate>
@@ -352,7 +348,7 @@
                           ToolTip="{Binding AddToRawPart_ToolTip}"
                           IsEnabled="{Binding BTLPartManager_IsEnabled}"
                           Style="{StaticResource BTLPanel_Button}">
-                     <Image Source="/Resources/LeftPanel/AddToRawPart.png"
+                     <Image Source="{StaticResource AddToRawPart_Image}"
                             Style="{StaticResource BTLDataWnd_Image}"/>
                   </Button>
                </DataTemplate>
@@ -362,7 +358,7 @@
          <DataGridTemplateColumn x:Key="colSETTING">
             <DataGridTemplateColumn.HeaderTemplate>
                <DataTemplate>
-                  <Image Source="/Resources/NewPage/SettingIntestazione.png"
+                  <Image Source="{StaticResource HeaderSetting_Image}"
                          Style="{StaticResource BTLPartList_Image}"/>
                </DataTemplate>
             </DataGridTemplateColumn.HeaderTemplate>
@@ -373,7 +369,7 @@
                              ToolTip="{Binding Settings_Command_ToolTip}"
                              Style="{StaticResource BTLPanel_Button}"                             
                              Click="OpenPopUp_Click">
-                        <Image Source="/Resources/NewPage/Setting.png"
+                        <Image Source="{StaticResource Setting_Image}"
                                Style="{StaticResource BTLDataWnd_Image}"/>
                      </Button>
                      <Popup Style="{StaticResource BTLPartList_PopUp}">
@@ -406,6 +402,9 @@
                         ItemsSource="{Binding BTLFeatureVMList}"
                         SelectedItem="{Binding SelBTLFeatureVM, UpdateSourceTrigger=PropertyChanged}"
                         PreviewMouseWheel="ListBox_PreviewMouseWheel"
+                        VirtualizingPanel.IsVirtualizing="True"
+                        VirtualizingPanel.VirtualizationMode="Recycling"
+                        ScrollViewer.CanContentScroll="True"
                         Style="{StaticResource BTLPartList_ListBox}">
                   <ListBox.ItemsPanel>
                      <ItemsPanelTemplate>
@@ -508,7 +507,7 @@
                                    Command="{Binding EditFeature_Command}"
                                    Click="SelectButton_Click"
                                    Style="{StaticResource EditFeature_Button}">
-                              <Image Source="/Resources/CALCPanel/Edit.png"
+                              <Image Source="{StaticResource Edit_Image}"
                                      Style="{StaticResource BTLDataWnd_Image}"/>
                            </Button>
                         </Grid>
diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/FeatureInPartInRawPartListV.xaml b/EgtBEAMWALL.Optimizer/ItemParamList/FeatureInPartInRawPartListV.xaml
index 05536a30..63899856 100644
--- a/EgtBEAMWALL.Optimizer/ItemParamList/FeatureInPartInRawPartListV.xaml
+++ b/EgtBEAMWALL.Optimizer/ItemParamList/FeatureInPartInRawPartListV.xaml
@@ -93,7 +93,7 @@
                   <Button ToolTip="{Binding Strategy_ToolTip}"
                           Command="{Binding Strategy_Command}"
                           Style="{StaticResource FeatureInPartInRawPartList_Button}">
-                     <Image Source="/Resources/CALCPanel/Verify.png"
+                     <Image Source="{StaticResource Verify_Image}"
                             Style="{StaticResource BTLDataWnd_Image}"/>
                   </Button>
                </DataTemplate>
diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/PParameterListV.xaml b/EgtBEAMWALL.Optimizer/ItemParamList/PParameterListV.xaml
index 6dc5162c..5302a5dc 100644
--- a/EgtBEAMWALL.Optimizer/ItemParamList/PParameterListV.xaml
+++ b/EgtBEAMWALL.Optimizer/ItemParamList/PParameterListV.xaml
@@ -136,13 +136,13 @@
          <Button Command="{Binding Ok_Command}"
                  ToolTip="{Binding Ok_Msg}"
                  Style="{StaticResource ToolBarViewPanel_Button}">
-            <Image Source="/Resources/NewPage/Ok.png"
+            <Image Source="{StaticResource Ok_Image}"
                    Style="{StaticResource BTLDataWnd_Image}"/>
          </Button>
          <Button Command="{Binding Cancel_Command}"
                  ToolTip="{Binding Cancel_Msg}"
                  Style="{StaticResource ToolBarViewPanel_Button}">
-            <Image Source="/Resources/PDFEditor/Delete.png"
+            <Image Source="{StaticResource Delete_Image}"
                    Style="{StaticResource BTLDataWnd_Image}"/>
          </Button>
       </StackPanel>
diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListV.xaml b/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListV.xaml
index 36cb50be..82fcae73 100644
--- a/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListV.xaml
+++ b/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListV.xaml
@@ -188,7 +188,7 @@
          <DataGridTemplateColumn x:Key="colVERIFY">
             <DataGridTemplateColumn.HeaderTemplate>
                <DataTemplate>
-                  <Image Source="/Resources/NewPage/VerifyIntestazione.png"
+                  <Image Source="{StaticResource HeaderVerify_Image}"
                          Style="{StaticResource BTLPartList_Image}"/>
                </DataTemplate>
             </DataGridTemplateColumn.HeaderTemplate>
@@ -198,7 +198,7 @@
                           Command="{Binding Verify_Command}"
                           IsEnabled="{Binding Verify_IsEnabled}"
                           Style="{StaticResource BTLPanel_Button}">
-                     <Image Source="/Resources/CALCPanel/Verify.png"
+                     <Image Source="{StaticResource Verify_Image}"
                             Style="{StaticResource BTLDataWnd_Image}"/>
                   </Button>
                </DataTemplate>
@@ -217,7 +217,7 @@
                           Command="{Binding Simulate_Command}"
                           IsEnabled="{Binding Simulate_IsEnabled}"
                           Style="{StaticResource BTLPanel_Button}">
-                     <Image Source="/Resources/CALCPanel/Simulate.png"
+                     <Image Source="{StaticResource Simulate_Image}"
                             Style="{StaticResource BTLDataWnd_Image}"/>
                   </Button>
                </DataTemplate>
@@ -227,7 +227,7 @@
          <DataGridTemplateColumn x:Key="colPROD">
             <DataGridTemplateColumn.HeaderTemplate>
                <DataTemplate>
-                  <Image Source="/Resources/NewPage/ProduceRawPartIntestazione.png"
+                  <Image Source="{StaticResource HeaderProduceRawPart_Image}"
                          Style="{StaticResource BTLPartList_Image}"/>
                </DataTemplate>
             </DataGridTemplateColumn.HeaderTemplate>
@@ -237,7 +237,7 @@
                           ToolTip="{Binding ProduceRawPart_ToolTip}"
                           IsEnabled="{Binding RawPartManagerIsEnabled}"
                           Style="{StaticResource BTLPanel_Button}">
-                     <Image Source="/Resources/TopPanel/ProduceRawPart.png"
+                     <Image Source="{StaticResource ProduceRawPart_Image}"
                             Style="{StaticResource BTLDataWnd_Image}"/>
                   </Button>
                </DataTemplate>
@@ -247,7 +247,7 @@
          <DataGridTemplateColumn x:Key="colSETTING">
             <DataGridTemplateColumn.HeaderTemplate>
                <DataTemplate>
-                  <Image Source="/Resources/NewPage/SettingIntestazione.png"
+                  <Image Source="{StaticResource HeaderSetting_Image}"
                          Style="{StaticResource BTLPartList_Image}"/>
                </DataTemplate>
             </DataGridTemplateColumn.HeaderTemplate>
@@ -258,7 +258,7 @@
                              ToolTip="{Binding Settings_Command_ToolTip}"
                              Style="{StaticResource BTLPanel_Button}"
                              Click="Button_Click">
-                        <Image Source="/Resources/NewPage/Setting.png"
+                        <Image Source="{StaticResource Setting_Image}"
                                Style="{StaticResource BTLDataWnd_Image}"/>
                      </Button>
                      <Popup AllowsTransparency="True" 
@@ -270,7 +270,7 @@
                                    ToolTip="{Binding CopyRawPart_ToolTip}"
                                    Click="ClosePopUp_Click"
                                    Style="{StaticResource LP_Button}">
-                              <Image Source="/Resources/TopPanel/CopyRawPart.png"
+                              <Image Source="{StaticResource CopyRawPart_Image}"
                                      Style="{StaticResource BTLDataWnd_Image}"/>
                            </Button>
                            <!--DELETE - Elimina-->
@@ -278,14 +278,14 @@
                                    ToolTip="{Binding RemoveRawPart_ToolTip}"
                                    Click="ClosePopUp_Click"
                                    Style="{StaticResource LP_Button}">
-                              <Image Source="/Resources/NewPage/Remove.png"
+                              <Image Source="{StaticResource Remove_Image}"
                                      Style="{StaticResource BTLDataWnd_Image}"/>
                            </Button>
                            <!--CAM - CAM-->
                            <Button ToolTip="{Binding Simulate_ToolTip}"
                                    Command="{Binding Simulate_Command}"
                                    Style="{StaticResource ToolBarViewPanel_Button}">
-                              <Image Source="/Resources/CALCPanel/Simulate.png"
+                              <Image Source="{StaticResource Simulate_Image}"
                                      Style="{StaticResource BTLDataWnd_Image}"/>
                            </Button>
                            <!--REORDER - Riordina-->
@@ -293,7 +293,7 @@
                                    ToolTip="{Binding ReOrderPart_ToolTip}"
                                    Click="ClosePopUp_Click"
                                    Style="{StaticResource LP_Button}">
-                              <Image Source="/Resources/TopPanel/ReOrderPart.png"
+                              <Image Source="{StaticResource ReOrderPart_Image}"
                                      Style="{StaticResource BTLDataWnd_Image}"/>
                            </Button>
                            <!--RESET - Reset-->
@@ -301,7 +301,7 @@
                                    ToolTip="{Binding ResetCalc_ToolTip}"
                                    Click="ClosePopUp_Click"
                                    Style="{StaticResource LP_Button}">
-                              <Image Source="/Resources/CALCPanel/ResetCalc.png"
+                              <Image Source="{StaticResource ResetCalc_Image}"
                                      Style="{StaticResource BTLDataWnd_Image}"/>
                            </Button>
                         </StackPanel>
@@ -424,7 +424,7 @@
                      <DataGridTemplateColumn x:Key="colROT" SortMemberPath="dROT">
                         <DataGridTemplateColumn.HeaderTemplate>
                            <DataTemplate>
-                              <Image Source="/Resources/NewPage/RotateIntestazioneRawPart.png"
+                              <Image Source="{StaticResource HeaderRotateRawPart_Image}"
                                      Style="{StaticResource BTLPartList_Image}"/>
                            </DataTemplate>
                         </DataGridTemplateColumn.HeaderTemplate>
@@ -440,7 +440,7 @@
                                  <Button Grid.Column="1"
                                          Command="{Binding ForwardRotation_Command}"
                                          Style="{StaticResource Rotation_Button}">
-                                    <Image Source="/Resources/NewPage/Rotate.png"
+                                    <Image Source="{StaticResource Rotate_Image}"
                                            Style="{StaticResource BTLDataWnd_Image}"/>
                                  </Button>
                               </Grid>
@@ -451,7 +451,7 @@
                      <DataGridTemplateColumn x:Key="colFLIP">
                         <DataGridTemplateColumn.HeaderTemplate>
                            <DataTemplate>
-                              <Image Source="/Resources/NewPage/InversionIntestazioneRawPart.png"
+                              <Image Source="{StaticResource HeaderInversionRawPart_Image}"
                                      Style="{StaticResource BTLPartList_Image}"/>
                            </DataTemplate>
                         </DataGridTemplateColumn.HeaderTemplate>
@@ -561,7 +561,7 @@
                               <Button Command="{Binding MoveUpPart_Command}"
                                       ToolTip="{Binding MoveUpPart_ToolTip}"
                                       Style="{StaticResource Move_Button}">
-                                 <Image Source="/Resources/NewPage/MoveUp.png"
+                                 <Image Source="{StaticResource MoveUp_Image}"
                                         Style="{StaticResource BTLDataWnd_Image}"/>
                               </Button>
                            </DataTemplate>
@@ -579,7 +579,7 @@
                               <Button Command="{Binding MoveDownPart_Command}"
                                       ToolTip="{Binding MoveDownPart_ToolTip}"
                                       Style="{StaticResource Move_Button}">
-                                 <Image Source="/Resources/NewPage/MoveDown.png"
+                                 <Image Source="{StaticResource MoveDown_Image}"
                                         Style="{StaticResource BTLDataWnd_Image}"/>
                               </Button>
                            </DataTemplate>
@@ -597,7 +597,7 @@
                               <Button Command="{Binding RemovePart_Command}"
                                       ToolTip="{Binding RemovePart_ToolTip}"
                                       Style="{StaticResource Move_Button}">
-                                 <Image Source="/Resources/NewPage/Remove.png"
+                                 <Image Source="{StaticResource Remove_Image}"
                                         Style="{StaticResource BTLDataWnd_Image}"/>
                               </Button>
                            </DataTemplate>
diff --git a/EgtBEAMWALL.Optimizer/LeftPanel/LeftPanelV.xaml b/EgtBEAMWALL.Optimizer/LeftPanel/LeftPanelV.xaml
index b08f07b9..19f608b2 100644
--- a/EgtBEAMWALL.Optimizer/LeftPanel/LeftPanelV.xaml
+++ b/EgtBEAMWALL.Optimizer/LeftPanel/LeftPanelV.xaml
@@ -32,7 +32,7 @@
               Command="{Binding VerifyAll_Command}"
               IsEnabled="{Binding VerifyAll_IsEnabled}"
               Style="{StaticResource Verify_Button}">
-         <Image Source="/Resources/CALCPanel/VerifyAll.png"
+         <Image Source="{StaticResource VerifyAll_Image}"
                 Style="{StaticResource BTLDataWnd_Image}"/>
       </Button>
       <Button Grid.Column="1"
@@ -40,7 +40,7 @@
               ToolTip="{Binding ResetCalc_ToolTip}"
               IsEnabled="{Binding CALCPanel_IsEnabled}"
               Style="{StaticResource Verify_Button}">
-         <Image Source="/Resources/CALCPanel/ResetCalc.png"
+         <Image Source="{StaticResource ResetCalc_Image}"
                 Style="{StaticResource BTLDataWnd_Image}"/>
       </Button>
       <Button Grid.Column="2"
@@ -48,7 +48,7 @@
               ToolTip="{Binding FilterAll_ToolTip}"
               Command="{Binding ShowPopUpFilterBtnCommand}"
               Style="{StaticResource Verify_Button}">
-         <Image Source="/Resources/LeftPanel/All_Filter.png"
+         <Image Source="{StaticResource AllFilter_Image}"
                 Style="{StaticResource BTLDataWnd_Image}"/>
       </Button>
       <Popup IsOpen="{Binding IsFilterBtnOpen}"
@@ -112,7 +112,7 @@
               ToolTip="{Binding RotateAll_ToolTip}"
               IsEnabled="{Binding RotateAll_IsEnabled}"
               Style="{StaticResource LP_Button}">
-         <Image Source="/Resources/NewPage/Rotate.png"
+         <Image Source="{StaticResource Rotate_Image}"
                 Style="{StaticResource BTLDataWnd_Image}"/>
       </Button>
       <Button Grid.Column="6" Visibility="Collapsed"
@@ -120,7 +120,7 @@
               ToolTip="{Binding InvertAll_ToolTip}"
               IsEnabled="{Binding RotateAll_IsEnabled}"
               Style="{StaticResource LP_Button}">
-         <Image Source="/Resources/NewPage/Inversion.png" 
+         <Image Source="{StaticResource Inversion_Image}" 
                 Style="{StaticResource BTLDataWnd_Image}"/>
       </Button>
       <Button Grid.Column="7" Visibility="Collapsed"
@@ -128,7 +128,7 @@
               ToolTip="{Binding MultipleModify_ToolTip}"
               IsEnabled="{Binding RotateAll_IsEnabled}"
               Style="{StaticResource MacroFeaturen_Button}">
-         <Image Source="/Resources/CALCPanel/Edit.png"
+         <Image Source="{StaticResource Edit_Image}"
                 Style="{StaticResource BTLDataWnd_Image}"/>
       </Button>
    </Grid>
diff --git a/EgtBEAMWALL.Optimizer/MachGroupPanel/MyMachGroupVM.vb b/EgtBEAMWALL.Optimizer/MachGroupPanel/MyMachGroupVM.vb
index 273d2165..89f17916 100644
--- a/EgtBEAMWALL.Optimizer/MachGroupPanel/MyMachGroupVM.vb
+++ b/EgtBEAMWALL.Optimizer/MachGroupPanel/MyMachGroupVM.vb
@@ -535,7 +535,7 @@ Public Class MyMachGroupVM
                BeamWallMachGroup.DeleteMachGroup()
                Dim LogFile As String() = File.ReadAllLines(sLogPath)
                If LogFile.Count >= 2 AndAlso Not IsNothing(LogFile(1)) Then
-                  MessageBox.Show(LogFile(1), EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error)
+                  EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, LogFile(1), EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error)
                End If
                Return Nothing
             End If
@@ -612,7 +612,7 @@ Public Class MyMachGroupVM
                BeamWallMachGroup.DeleteMachGroup()
                Dim LogFile As String() = File.ReadAllLines(sLogPath)
                If LogFile.Count >= 2 AndAlso Not IsNothing(LogFile(1)) Then
-                  MessageBox.Show(LogFile(1), EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error)
+                  EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, LogFile(1), EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error)
                End If
                Return Nothing
             End If
@@ -715,7 +715,7 @@ Public Class MyMachGroupVM
       Next
       sPartToAdd &= Environment.NewLine & "Aggiungerli?"
       If bPartToAdd Then
-         If MessageBox.Show(sPartToAdd, "", MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then
+         If EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, sPartToAdd, "", MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then
             For Each Part In SelParts
                If Not Part.CanAddPartToCount() Then Part.AddNewPartToAdded()
             Next
@@ -1069,7 +1069,7 @@ Public Class MyMachGroupVM
       ' verifico se modalita' supervisore attiva
       If GetPrivateProfileInt(S_GENERAL, K_SUPERVISOR, 1, CurrentMachine.sMachIniFile) = 1 Then
          If Not Produce(Map.refMachGroupPanelVM.SelectedMachGroup, ErrorMsg) AndAlso Not String.IsNullOrWhiteSpace(ErrorMsg) Then
-            MessageBox.Show(ErrorMsg)
+            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, ErrorMsg)
          End If
       Else
          ' altrimenti lo copio se path disponibile
@@ -1087,9 +1087,9 @@ Public Class MyMachGroupVM
                Dim sMachGroupFilePath As String = Map.refProdManagerVM.CurrProd.sProdDirPath & "\" & Map.refMachGroupPanelVM.SelectedMachGroup.Name.ToString() & ".cnc"
                Dim sNewPath As String = sSaveCncPath & "\" & Map.refProdManagerVM.CurrProd.sProdId & "-" & Map.refMachGroupPanelVM.SelectedMachGroup.Name.ToString() & sSaveExt
                File.Copy(sMachGroupFilePath, sNewPath, True)
-               MessageBox.Show(String.Format("File copied! You can find it at {0}", {sNewPath}), "Info", MessageBoxButton.OK, MessageBoxImage.Information)
+               EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, String.Format(EgtMsg(62584), {sNewPath}), EgtMsg(15003), MessageBoxButton.OK, MessageBoxImage.Information)
             Catch ex As Exception
-               MessageBox.Show(String.Format("Copy to {0} folder failed!", {sSaveCncPath}), "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+               EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, String.Format(EgtMsg(62585), {sSaveCncPath}), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)
             End Try
          End If
       End If
@@ -1173,7 +1173,7 @@ Public Class MyMachGroupVM
    End Property
 
    Public Sub RemoveRawPartCmd()
-      If MessageBox.Show(EgtMsg(62574) & Map.refProjectVM.MachGroupPanelVM.SelectedMachGroup.Name & " ?", EgtMsg(30009), MessageBoxButton.OKCancel, MessageBoxImage.Exclamation) = MessageBoxResult.OK Then
+      If EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62574) & Map.refProjectVM.MachGroupPanelVM.SelectedMachGroup.Name & " ?", EgtMsg(30009), MessageBoxButton.OKCancel, MessageBoxImage.Exclamation) = MessageBoxResult.OK Then
          RemoveRawPart()
       Else
          Return
diff --git a/EgtBEAMWALL.Optimizer/MachGroupPanel/PartVM.vb b/EgtBEAMWALL.Optimizer/MachGroupPanel/PartVM.vb
index 74e72f7d..df9286f4 100644
--- a/EgtBEAMWALL.Optimizer/MachGroupPanel/PartVM.vb
+++ b/EgtBEAMWALL.Optimizer/MachGroupPanel/PartVM.vb
@@ -762,7 +762,7 @@ Public Class PartVM
 
    Public Sub RemovePart()
       If IsNothing(ProjectManagerVM.CurrProd) Then Return
-      If MessageBox.Show(EgtMsg(62575), EgtMsg(30009), MessageBoxButton.OKCancel, MessageBoxImage.Exclamation) = MessageBoxResult.OK Then
+      If EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62575), EgtMsg(30009), MessageBoxButton.OKCancel, MessageBoxImage.Exclamation) = MessageBoxResult.OK Then
          Dim SelMachGroup As MyMachGroupVM = Map.refMachGroupPanelVM.SelectedMachGroup
          ' Recupero indice elemento selezionato in lista
          Dim Index As Integer = ParentMachGroupVM.PartVMList.IndexOf(SelMachGroup.PartVMList.FirstOrDefault(Function(x) x.nPartId = nPartId))
diff --git a/EgtBEAMWALL.Optimizer/MachinePanel/MachinePanelV.xaml b/EgtBEAMWALL.Optimizer/MachinePanel/MachinePanelV.xaml
index 2feb76bb..087f2828 100644
--- a/EgtBEAMWALL.Optimizer/MachinePanel/MachinePanelV.xaml
+++ b/EgtBEAMWALL.Optimizer/MachinePanel/MachinePanelV.xaml
@@ -33,7 +33,7 @@
                  ToolTip="{Binding ChooseMachine_ToolTip}"
                  Command="{Binding ChooseMachine_Command}"
                  Style="{StaticResource ToolBarViewPanel_Button}">
-            <Image Source="/Resources/CALCPanel/ChooseMachine.png"
+            <Image Source="{StaticResource ChooseMachine_Image}"
                    Style="{StaticResource BTLDataWnd_Image}"/>
          </Button>
          <Grid Grid.Column="3"
diff --git a/EgtBEAMWALL.Optimizer/MachinePanel/MachinePanelVM.vb b/EgtBEAMWALL.Optimizer/MachinePanel/MachinePanelVM.vb
index 59775522..a4ff1c20 100644
--- a/EgtBEAMWALL.Optimizer/MachinePanel/MachinePanelVM.vb
+++ b/EgtBEAMWALL.Optimizer/MachinePanel/MachinePanelVM.vb
@@ -270,7 +270,7 @@ Public Class MachinePanelVM
       ' ricarico il database per intercettare eventuali aggiornamenti fatti da altre istanze del programma (se la cartella Machines è condivisa)
       If Not EgtTdbReload() Then
          EgtOutLog("Impossible reloading tool Db")
-         MessageBox.Show(EgtMsg(31130), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(31130), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)
          Return
       End If
 
@@ -292,7 +292,7 @@ Public Class MachinePanelVM
       ' ricarico il database per intercettare eventuali aggiornamenti fatti da altre istanze del programma (se la cartella Machines è condivisa)
       If Not EgtMdbReload() Then
          EgtOutLog("Impossible reloading machining Db")
-         MessageBox.Show(EgtMsg(31408), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(31408), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)
          Return
       End If
       Dim MachDbWindowVM As New EgtWPFLib5.MachiningDbWindowVM(CurrentMachine.sMachIniFile, Map.refSceneHostVM.MainScene.GetCtx(), "Stone")
@@ -312,7 +312,7 @@ Public Class MachinePanelVM
       ' verifico che il file di configurazione attrezzaggio (lua) della macchina esista
       If Not File.Exists(CurrentMachine.sMachDir & "\Scripts\" & SETUP_LUA) Then
          EgtOutLog("SetUp error: SetUp configuration file doesn't exist ")
-         MessageBox.Show(EgtMsg(6477), EgtMsg(6471), MessageBoxButton.OK, MessageBoxImage.Error)
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(6477), EgtMsg(6471), MessageBoxButton.OK, MessageBoxImage.Error)
          Return
       End If
       ' carico Lua che contiene le funzioni per ottenere le posizioni valide dell'utensile selezionato,
@@ -331,7 +331,7 @@ Public Class MachinePanelVM
          EgtLuaGetGlobIntVar("STU.ERR", nErr)
          If nErr = 0 Then
             If EgtGetHeadExitCount(sHead) = 0 Then
-               MessageBox.Show(EgtMsg(6478), EgtMsg(6471), MessageBoxButton.OK, MessageBoxImage.Error)
+               EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(6478), EgtMsg(6471), MessageBoxButton.OK, MessageBoxImage.Error)
                Return
             End If
          End If
diff --git a/EgtBEAMWALL.Optimizer/MacroFeatureWnd/MacroFeatureWndVM.vb b/EgtBEAMWALL.Optimizer/MacroFeatureWnd/MacroFeatureWndVM.vb
index 225b5057..b1e7de0f 100644
--- a/EgtBEAMWALL.Optimizer/MacroFeatureWnd/MacroFeatureWndVM.vb
+++ b/EgtBEAMWALL.Optimizer/MacroFeatureWnd/MacroFeatureWndVM.vb
@@ -130,7 +130,7 @@ Public Class MacroFeatureWndVM
          WriteMacro(sFeatureName)
          RaiseEvent m_CloseWindow(True)
       Else
-         MessageBox.Show(EgtMsg(61870), EgtMsg(30007))
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61870), EgtMsg(30007))
       End If
    End Sub
 
diff --git a/EgtBEAMWALL.Optimizer/MainMenu/MainMenuV.xaml b/EgtBEAMWALL.Optimizer/MainMenu/MainMenuV.xaml
index 052fc39d..b022d07e 100644
--- a/EgtBEAMWALL.Optimizer/MainMenu/MainMenuV.xaml
+++ b/EgtBEAMWALL.Optimizer/MainMenu/MainMenuV.xaml
@@ -36,7 +36,7 @@
            Command="{Binding SendFeedbackCommand}"
            ToolTip="{Binding SendFeedbackToolTip}"
            Style="{StaticResource SendFeedback_Button}">
-      <Image Source="/Resources/MainMenu/Send.png"
+      <Image Source="{StaticResource Send_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
 
diff --git a/EgtBEAMWALL.Optimizer/MainMenu/MainMenuVM.vb b/EgtBEAMWALL.Optimizer/MainMenu/MainMenuVM.vb
index 9ae94e59..06a0603c 100644
--- a/EgtBEAMWALL.Optimizer/MainMenu/MainMenuVM.vb
+++ b/EgtBEAMWALL.Optimizer/MainMenu/MainMenuVM.vb
@@ -439,7 +439,7 @@ Public Class MainMenuVM
       If InputPwdWnd.ShowDialog() Then
          If GetMainPrivateProfileString(S_STRATEGY, K_PARAMPASSWORD, "", sPwdIni) <> 0 Then
             If sPwdIni <> InputPwdWndVM.sPassword Then
-               MessageBox.Show("Password Errata", EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Error)
+               EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(63040), EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Error)
                Return False
             End If
          End If
@@ -549,7 +549,7 @@ Public Class MainMenuVM
 
    Public Sub SendFeedback(ByVal param As Object)
       If SelPage = Pages.OPTIMIZERPAGE AndAlso IsNothing(ProjectManagerVM.CurrProd) Then
-         MessageBox.Show(EgtMsg(61891), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61891), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)
          Return
       End If
       ' Recupero indirizzo a cui spedire la mail
@@ -557,7 +557,7 @@ Public Class MainMenuVM
       GetMainPrivateProfileString(S_GENERAL, K_SUPPORT, "support@egaltech.com", sSupportAddress)
       ' se vuoto do messaggio di errore ed esco
       If String.IsNullOrWhiteSpace(sSupportAddress) Then
-         MessageBox.Show(EgtMsg(30510), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(30510), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)
          Return
       End If
       ' Recupero numero chiave
@@ -661,7 +661,7 @@ Public Class MainMenuVM
          bEx = True
       End Try
       If bEx OrElse EgtWPFLib5.MapiMailMessage.m_ErrorCode <> 0 Then
-         MessageBox.Show(String.Format(EgtMsg(30512), sSupportAddress, sZipToCreate), EgtMsg(15003), MessageBoxButton.OK, MessageBoxImage.Information)
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, String.Format(EgtMsg(30512), sSupportAddress, sZipToCreate), EgtMsg(15003), MessageBoxButton.OK, MessageBoxImage.Information)
       Else
          Map.refMyStatusBarVM.SetOutputMessage(EgtMsg(30514))
       End If
diff --git a/EgtBEAMWALL.Optimizer/MainWindow/MainWindowV.xaml.vb b/EgtBEAMWALL.Optimizer/MainWindow/MainWindowV.xaml.vb
index 8f86fb64..f1dcb384 100644
--- a/EgtBEAMWALL.Optimizer/MainWindow/MainWindowV.xaml.vb
+++ b/EgtBEAMWALL.Optimizer/MainWindow/MainWindowV.xaml.vb
@@ -39,7 +39,7 @@ Public Class MainWindowV
 
    Private Sub MainWindowV_Closing(sender As Object, e As System.ComponentModel.CancelEventArgs)
       If Map.refCALCPanelVM.bCalculating Then
-         MessageBox.Show(Application.Current.MainWindow, "Impossible closing software! Wait end of calculation!", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(63041), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)
          e.Cancel = True
          Return
       End If
diff --git a/EgtBEAMWALL.Optimizer/MainWindow/MainWindowVM.vb b/EgtBEAMWALL.Optimizer/MainWindow/MainWindowVM.vb
index b5eb6f13..eed33779 100644
--- a/EgtBEAMWALL.Optimizer/MainWindow/MainWindowVM.vb
+++ b/EgtBEAMWALL.Optimizer/MainWindow/MainWindowVM.vb
@@ -239,7 +239,7 @@ Public Class MainWindowVM
          End If
          Dim TimeFromLastBackup As TimeSpan = DateTime.Now - LastBackupDate
          If TimeFromLastBackup > TimeSpan.FromDays(Map.refConfigurationPageVM.SelReminder.Id) Then
-            If MessageBox.Show(Application.Current.MainWindow, String.Format(EgtMsg(61987), Map.refConfigurationPageVM.SelReminder.Name), EgtMsg(15002), MessageBoxButton.YesNo, MessageBoxImage.Warning) = MessageBoxResult.Yes Then
+            If EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, String.Format(EgtMsg(61987), Map.refConfigurationPageVM.SelReminder.Name), EgtMsg(15002), MessageBoxButton.YesNo, MessageBoxImage.Warning) = MessageBoxResult.Yes Then
                Map.refConfigurationPageVM.Backup(True)
             End If
          End If
@@ -369,16 +369,16 @@ Public Class MainWindowVM
       End If
       ' verifico se sono in modifica percorso libero
       If Map.refFreeContourManagerVM.bIsActive Then
-         MessageBox.Show(EgtMsg(61994))
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61994))
          Return
       End If
       ' verifico se sto facendo backup
       If Map.refConfigurationPageVM.bBackupRunning Then
-         MessageBox.Show(Application.Current.MainWindow, EgtMsg(62101), EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)              'Backup running! Impossible closing the software until finish the backup process!
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62101), EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)              'Backup running! Impossible closing the software until finish the backup process!
          Return
       End If
       If Map.refConfigurationPageVM.bRestoreRunning Then
-         MessageBox.Show(Application.Current.MainWindow, EgtMsg(62102), EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)                 'Restore running! Impossible closing the software until finish the restore process!
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62102), EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)                 'Restore running! Impossible closing the software until finish the restore process!
          Return
       End If
       ' Gestisco eventuale file corrente modificato
diff --git a/EgtBEAMWALL.Optimizer/MovePartInRawPartWnd/MovePartInRawPartWndV.xaml b/EgtBEAMWALL.Optimizer/MovePartInRawPartWnd/MovePartInRawPartWndV.xaml
index 8341a63d..3856f18f 100644
--- a/EgtBEAMWALL.Optimizer/MovePartInRawPartWnd/MovePartInRawPartWndV.xaml
+++ b/EgtBEAMWALL.Optimizer/MovePartInRawPartWnd/MovePartInRawPartWndV.xaml
@@ -33,14 +33,14 @@
          <RadioButton Grid.Row="1"
                       IsChecked="{Binding LeftIsChecked}"
                       Style="{StaticResource ToolBar_ToggleButton}">
-            <Image Source="/Resources/MovePartInRawPart/MoveLeftParts.png" 
+            <Image Source="{StaticResource MoveLeftParts_Image}" 
                    Style="{StaticResource BTLDataWnd_Image}"/>
          </RadioButton>
          <RadioButton Grid.Row="1" 
                       Grid.Column="1"
                       IsChecked="{Binding RightIsChecked}" 
                       Style="{StaticResource ToolBar_ToggleButton}">
-            <Image Source="/Resources/MovePartInRawPart/MoveRightParts.png" 
+            <Image Source="{StaticResource MoveRightParts_Image}" 
                    Style="{StaticResource BTLDataWnd_Image}"/>
          </RadioButton>
       </Grid>
diff --git a/EgtBEAMWALL.Optimizer/MovePartInRawPartWnd/MovePartInRawPartWndVM.vb b/EgtBEAMWALL.Optimizer/MovePartInRawPartWnd/MovePartInRawPartWndVM.vb
index 07f3117b..0b2a23dc 100644
--- a/EgtBEAMWALL.Optimizer/MovePartInRawPartWnd/MovePartInRawPartWndVM.vb
+++ b/EgtBEAMWALL.Optimizer/MovePartInRawPartWnd/MovePartInRawPartWndVM.vb
@@ -145,10 +145,10 @@ Public Class MovePartInRawPartWndVM
             End If
             RaiseEvent m_CloseWindow(True)
          Else
-            MessageBox.Show(EgtMsg(61947), EgtMsg(30007))
+            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61947), EgtMsg(30007))
          End If
       Else
-         MessageBox.Show(EgtMsg(61948), EgtMsg(30007))
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61948), EgtMsg(30007))
       End If
    End Sub
 
diff --git a/EgtBEAMWALL.Optimizer/MultiCopyRawPartWnd/MultiCopyRawPartWndVM.vb b/EgtBEAMWALL.Optimizer/MultiCopyRawPartWnd/MultiCopyRawPartWndVM.vb
index c4bb9fd6..c74bbf96 100644
--- a/EgtBEAMWALL.Optimizer/MultiCopyRawPartWnd/MultiCopyRawPartWndVM.vb
+++ b/EgtBEAMWALL.Optimizer/MultiCopyRawPartWnd/MultiCopyRawPartWndVM.vb
@@ -71,7 +71,7 @@ Public Class MultiCopyRawPartWndVM
       If Not IsNothing(m_nQuantity) AndAlso m_nQuantity > 0 AndAlso m_nQuantity < 99 Then
          RaiseEvent m_CloseWindow(True)
       Else
-         MessageBox.Show(EgtMsg(61887), EgtMsg(30007))
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61887), EgtMsg(30007))
       End If
    End Sub
 
diff --git a/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb
index afdbb324..b32301ff 100644
--- a/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb	
+++ b/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb	
@@ -67,5 +67,5 @@ Imports System.Windows
 '      Revision
 '
 
-<Assembly: AssemblyVersion("3.1.2.2")>
-<Assembly: AssemblyFileVersion("3.1.2.2")>
+<Assembly: AssemblyVersion("3.1.2.3")>
+<Assembly: AssemblyFileVersion("3.1.2.3")>
diff --git a/EgtBEAMWALL.Optimizer/NestingRunningWnd/NestingRunningWndVM.vb b/EgtBEAMWALL.Optimizer/NestingRunningWnd/NestingRunningWndVM.vb
index 64c897c6..db2a8db3 100644
--- a/EgtBEAMWALL.Optimizer/NestingRunningWnd/NestingRunningWndVM.vb
+++ b/EgtBEAMWALL.Optimizer/NestingRunningWnd/NestingRunningWndVM.vb
@@ -612,10 +612,10 @@ Public Class NestingRunningWndVM
             If File.Exists(sLogPath) Then
                Dim LogFile As String() = File.ReadAllLines(sLogPath)
                If LogFile.Count >= 2 AndAlso Not IsNothing(LogFile(1)) Then
-                  MessageBox.Show(LogFile(1), EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error)
+                  EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, LogFile(1), EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error)
                End If
             Else
-               MessageBox.Show("Impossible creating rawpart", EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error)
+               EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61973), EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error)
             End If
             ' se nessun grezzo, rimetto tutti i pezzi invisibili
             If Map.refProjectVM.MachGroupPanelVM.MachGroupVMList.Count = 0 Then
@@ -746,7 +746,7 @@ Public Class NestingRunningWndVM
 
    Friend Sub Cancel()
       ' chiedo conferma
-      If MessageBox.Show("Are you sure you want to stop the nesting?", "Warning", MessageBoxButton.YesNo, MessageBoxImage.Warning) = MessageBoxResult.No Then Return
+      If EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62560), EgtMsg(15002), MessageBoxButton.YesNo, MessageBoxImage.Warning) = MessageBoxResult.No Then Return
       ' fermo il nesting
       Map.refOptimizePanelVM.m_StopNesting = True
    End Sub
diff --git a/EgtBEAMWALL.Optimizer/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb b/EgtBEAMWALL.Optimizer/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb
index 1057aa4f..306a2f4a 100644
--- a/EgtBEAMWALL.Optimizer/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb
+++ b/EgtBEAMWALL.Optimizer/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb
@@ -144,7 +144,7 @@ Public Class NewOpenProjectFileDialogVM
       Dim ProjListIndex As Integer = m_ProjectList.IndexOf(SelProject)
       ' verifico se proj selezionato e' il corrente
       If Not IsNothing(ProjectManagerVM.CurrProj) AndAlso SelProject.ProjFileList.Any(Function(x) x.nProjId = ProjectManagerVM.CurrProj.nProjId) Then
-         Dim m_MessageBoxResult As MessageBoxResult = MessageBox.Show(Application.Current.MainWindow, EgtMsg(61872), EgtMsg(30009), MessageBoxButton.OKCancel, MessageBoxImage.Warning)
+         Dim m_MessageBoxResult As MessageBoxResult = EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61872), EgtMsg(30009), MessageBoxButton.OKCancel, MessageBoxImage.Warning)
          If m_ProjectType = ProjectType.PROJ AndAlso m_MessageBoxResult = MessageBoxResult.Cancel Then
             Return
          Else
@@ -153,7 +153,7 @@ Public Class NewOpenProjectFileDialogVM
       End If
       ' verifico se prod selezionato e' il corrente
       If Not IsNothing(ProjectManagerVM.CurrProd) AndAlso SelProject.ProdFileVM.nProdId = ProjectManagerVM.CurrProd.nProdId Then
-         Dim m_MessageBoxResult As MessageBoxResult = MessageBox.Show(Application.Current.MainWindow, EgtMsg(61872), EgtMsg(30009), MessageBoxButton.OKCancel, MessageBoxImage.Warning)
+         Dim m_MessageBoxResult As MessageBoxResult = EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61872), EgtMsg(30009), MessageBoxButton.OKCancel, MessageBoxImage.Warning)
          If m_ProjectType = ProjectType.PROD AndAlso m_MessageBoxResult = MessageBoxResult.Cancel Then
             Return
          Else
diff --git a/EgtBEAMWALL.Optimizer/OpenProjectFileDialog/OpenProjectFileDialogVM.vb b/EgtBEAMWALL.Optimizer/OpenProjectFileDialog/OpenProjectFileDialogVM.vb
index 04a820a4..ff0d5896 100644
--- a/EgtBEAMWALL.Optimizer/OpenProjectFileDialog/OpenProjectFileDialogVM.vb
+++ b/EgtBEAMWALL.Optimizer/OpenProjectFileDialog/OpenProjectFileDialogVM.vb
@@ -117,12 +117,12 @@ Public Class OpenProjectFileDialogVM
       If m_ProjectType = ProjectType.PROD Then
          ' verifico se prod selezionato e' il corrente
          If Not IsNothing(ProjectManagerVM.CurrProd) AndAlso SelProject.nProdId = ProjectManagerVM.CurrProd.nProdId Then
-            MessageBox.Show(EgtMsg(61872), EgtMsg(30009), MessageBoxButton.OK, MessageBoxImage.Warning)
+            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61872), EgtMsg(30009), MessageBoxButton.OK, MessageBoxImage.Warning)
             Return
          End If
          ' verifico se ci sono grezzi mandati al supervisore
          If DbControllers.m_ProdController.IsAnyInSupervisor(SelProject.nProdId) Then
-            MessageBox.Show(EgtMsg(61874), EgtMsg(30009), MessageBoxButton.OK, MessageBoxImage.Warning)
+            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61874), EgtMsg(30009), MessageBoxButton.OK, MessageBoxImage.Warning)
             Return
          End If
          Map.refProdManagerVM.m_MruFiles.Remove(SelProject.sProdPath)
diff --git a/EgtBEAMWALL.Optimizer/OptimizePanel/OptimizePanelV.xaml b/EgtBEAMWALL.Optimizer/OptimizePanel/OptimizePanelV.xaml
index ac100997..34071f8d 100644
--- a/EgtBEAMWALL.Optimizer/OptimizePanel/OptimizePanelV.xaml
+++ b/EgtBEAMWALL.Optimizer/OptimizePanel/OptimizePanelV.xaml
@@ -11,7 +11,7 @@
    <Button ToolTip="{Binding Warehouse_ToolTip}"
            Command="{Binding Warehouse_Command}"
            Style="{StaticResource Warehouse_Button}">
-      <Image Source="/Resources/OptimizePanel/Warehouse.png" 
+      <Image Source="{StaticResource Warehouse_Image}" 
              Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
    
diff --git a/EgtBEAMWALL.Optimizer/OptimizePanel/OptimizePanelVM.vb b/EgtBEAMWALL.Optimizer/OptimizePanel/OptimizePanelVM.vb
index ea6bf110..47575962 100644
--- a/EgtBEAMWALL.Optimizer/OptimizePanel/OptimizePanelVM.vb
+++ b/EgtBEAMWALL.Optimizer/OptimizePanel/OptimizePanelVM.vb
@@ -425,7 +425,7 @@ Public Class OptimizePanelVM
          Next
       Next
       If Not String.IsNullOrWhiteSpace(sResult) Then
-         MessageBox.Show(Application.Current.MainWindow, sResult, "", MessageBoxButton.OK, MessageBoxImage.Warning)
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, sResult, "", MessageBoxButton.OK, MessageBoxImage.Warning)
       End If
    End Sub
 
diff --git a/EgtBEAMWALL.Optimizer/Panel/RightPanelTopV.xaml b/EgtBEAMWALL.Optimizer/Panel/RightPanelTopV.xaml
index f183a08e..9e2d085c 100644
--- a/EgtBEAMWALL.Optimizer/Panel/RightPanelTopV.xaml
+++ b/EgtBEAMWALL.Optimizer/Panel/RightPanelTopV.xaml
@@ -83,13 +83,13 @@
                     Command="{Binding Parameter_Command}"
                     ToolTip="{Binding Parameters_ToolTip}"
                     Style="{StaticResource Parameter_Button}">
-               <Image Source="/Resources/InstrumentPanel/Analyze.png"
+               <Image Source="{StaticResource Analyze_Image}"
                       Style="{StaticResource BTLDataWnd_Image}"/>
             </Button>
 
             <Image Grid.RowSpan="3"
                    Grid.Column="1" 
-                   Source="/Resources/NewPage/pezzo.png" 
+                   Source="{StaticResource Part_Image}" 
                    Style="{StaticResource Piece_Image}"/>
 
             <UniformGrid Grid.Row="2"
@@ -98,14 +98,14 @@
                <Button Command="{Binding Ok_Command}"
                        ToolTip="{Binding SaveAsToolTip}"
                        Style="{StaticResource Back_Button}">
-                  <Image Source="/Resources/NewPage/Ok.png" 
+                  <Image Source="{StaticResource Ok_Image}" 
                          Style="{StaticResource BTLDataWnd_Image}"/>
                </Button>
 
                <Button Command="{Binding Back_Command}"
                        ToolTip="{Binding Back_Msg}"
                        Style="{StaticResource Back_Button}">
-                  <Image Source="/Resources/PDFEditor/Delete.png"
+                  <Image Source="{StaticResource Delete_Image}"
                          Style="{StaticResource BTLDataWnd_Image}"/>
                </Button>               
             </UniformGrid>
diff --git a/EgtBEAMWALL.Optimizer/Panel/TopPanelV.xaml b/EgtBEAMWALL.Optimizer/Panel/TopPanelV.xaml
index c825a7e0..d193a368 100644
--- a/EgtBEAMWALL.Optimizer/Panel/TopPanelV.xaml
+++ b/EgtBEAMWALL.Optimizer/Panel/TopPanelV.xaml
@@ -31,7 +31,7 @@
            Command="{Binding Optimizer_Command}"
            ToolTip="{Binding Statistics_Msg}"
            Style="{StaticResource Optmizer_Button}">
-      <Image Source="/Resources/InstrumentPanel/Statistics.png"
+      <Image Source="{StaticResource Statistics_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
 </Grid>
diff --git a/EgtBEAMWALL.Optimizer/ProdManager/ProdManagerV.xaml b/EgtBEAMWALL.Optimizer/ProdManager/ProdManagerV.xaml
index 420cfe4b..8c7834cc 100644
--- a/EgtBEAMWALL.Optimizer/ProdManager/ProdManagerV.xaml
+++ b/EgtBEAMWALL.Optimizer/ProdManager/ProdManagerV.xaml
@@ -8,7 +8,7 @@
       <Button Command="{Binding ImportBTL_Command}"
               ToolTip="{Binding ImportBTL_ToolTip}"
               Style="{StaticResource BTLProd_Button}">
-         <Image Source="/Resources/NewPage/fileimport.png"
+         <Image Source="{StaticResource FileImport_Image}"
                 Style="{StaticResource BTL_Image}"/>
       </Button>
       <Button Name="ImportBtn"
@@ -29,14 +29,14 @@
             <Button Command="{Binding New_Command}"
                     ToolTip="{Binding NewToolTip}"
                     Style="{StaticResource LeftPanel_Button}">
-               <Image Source="/Resources/NewPage/newdocument.png"
+               <Image Source="{StaticResource NewDocument_Image}"
                       Style="{StaticResource BTLDataWnd_Image}"/>
             </Button>
             <Button Command="{Binding AddProj_Command}"
                     ToolTip="{Binding AddProj_ToolTip}"
                     Visibility="{Binding AddProj_Visibility}"
                     Style="{StaticResource LeftPanel_Button}">
-               <Image Source="/Resources/ProjectManager/AddProj.png"
+               <Image Source="{StaticResource AddProj_Image}"
                       Style="{StaticResource BTLDataWnd_Image}"/>
             </Button>
          </StackPanel>
@@ -60,7 +60,7 @@
                </ContextMenu.Resources>
             </ContextMenu>
          </Button.ContextMenu>
-         <Image Source="/Resources/NewPage/openfolder.png"
+         <Image Source="{StaticResource OpenFolder_Image}"
                 Style="{StaticResource BTLDataWnd_Image}"/>
       </Button>
       <Button Name="OpenBtn"
@@ -80,7 +80,7 @@
          <Button Command="{Binding ImportProject_Command}"
                  ToolTip="{Binding ImportProject_ToolTip}"
                  Style="{StaticResource LeftPanel_Button}">
-            <Image Source="/Resources/NewPage/import.png"
+            <Image Source="{StaticResource Import_Image}"
                    Style="{StaticResource BTLDataWnd_Image}"/>
          </Button>
       </Border>
@@ -90,7 +90,7 @@
       <Button Command="{Binding SaveCommand}" 
               ToolTip="{Binding SaveToolTip}"
               Style="{StaticResource PrManagerNew_Button}">
-         <Image Source="/Resources/NewPage/diskette.png"
+         <Image Source="{StaticResource Diskette_Image}"
                 Style="{StaticResource BTLDataWnd_Image}"/>
       </Button>
       <Button Name="SaveBtn"
@@ -110,7 +110,7 @@
          <Button Command="{Binding ExportProject_Command}"
                  ToolTip="{Binding ExportProject_ToolTip}"
                  Style="{StaticResource LeftPanel_Button}">
-            <Image Source="/Resources/NewPage/export.png"
+            <Image Source="{StaticResource Export_Image}"
                    Style="{StaticResource BTLDataWnd_Image}"/>
          </Button>
       </Border>
diff --git a/EgtBEAMWALL.Optimizer/ProdManager/ProdManagerVM.vb b/EgtBEAMWALL.Optimizer/ProdManager/ProdManagerVM.vb
index c6b9fd79..f8ce96ba 100644
--- a/EgtBEAMWALL.Optimizer/ProdManager/ProdManagerVM.vb
+++ b/EgtBEAMWALL.Optimizer/ProdManager/ProdManagerVM.vb
@@ -434,7 +434,7 @@ Public Class ProdManagerVM
          Else
             NewProject()
          End If
-         MessageBox.Show(Application.Current.MainWindow, "Error! Failed loading MachGroups!", EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)        'Error opening file
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62581), EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)        'Error opening file
          EgtOutLog("Errore! Caricamento dei gruppi di lavorazione fallito!")
          Return False
       End If
@@ -496,13 +496,16 @@ Public Class ProdManagerVM
       GetMainPrivateProfileString(S_GENERAL, K_LASTIMPDIR, "", sDir)
       ' apro finestra scelta file
       Dim sImportFilePath As String = ""
-      Dim BTLDlg As New Microsoft.Win32.OpenFileDialog() With {
-               .DefaultExt = ".btl",
-               .Filter = "BTL (*.btl)|*.btl" &
-                         "|BTLX (*.btlx)|*.btlx",
-               .InitialDirectory = If(Directory.Exists(sDir), sDir, ""),
-               .CheckFileExists = True,
-               .ValidateNames = True}
+      Dim BTLDlg As New EgtBEAMWALL.Core.EgtManageFileDialogV(Application.Current.MainWindow, New EgtManageFileDialogVM()) With {
+         .Title = EgtMsg(61840),
+         .Filter = "BTL (*.btl)|*.btl" &
+                   "|BTLX (*.btlx)|*.btlx",
+         .FilterIndex = 1,
+         .InitialDirectory = If(Directory.Exists(sDir), sDir, ""),
+         .CheckFileExists = True,
+         .ValidateNames = True,
+         .Mode = 1}
+
       If BTLDlg.ShowDialog() Then
          sImportFilePath = BTLDlg.FileName
       Else
@@ -517,7 +520,7 @@ Public Class ProdManagerVM
          Dim ToDeleteProj As ProjFileM = DbControllers.m_ProjController.FindByProjIdConv(nAlreadyImported)
          ' se esiste gia' un'ottimizzazione
          If ToDeleteProj.nProdId > 0 Then
-            Select Case MessageBox.Show(EgtMsg(61942), "Information", MessageBoxButton.YesNo, MessageBoxImage.Information)       ' BTL file already imported and optimized. Do you want to import it again?
+            Select Case EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61942), EgtMsg(15003), MessageBoxButton.YesNo, MessageBoxImage.Information)       ' BTL file already imported and optimized. Do you want to import it again?
                Case MessageBoxResult.Yes
                   ' lo importo, quindi non devo fare nulla
                Case MessageBoxResult.No
@@ -586,7 +589,7 @@ Public Class ProdManagerVM
       ' verifico tipo di file e recupero flag di importazione
       Dim nFileType As Integer = EgtGetFileType(sBtlCopyPath)
       If nFileType <> FT.BTL AndAlso nFileType <> FT.BTLX Then
-         MessageBox.Show(Application.Current.MainWindow, EgtMsg(10005), EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)   ' File type unknown  - Error
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(10005), EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)   ' File type unknown  - Error
          EgtOutLog("Errore! Estensione progetto sconosciuta!")
          Return False
       End If
@@ -633,7 +636,7 @@ Public Class ProdManagerVM
             End If
       End Select
       If EgtGetFirstPart() = GDB_ID.NULL Then
-         MessageBox.Show("Imported file is Empty!", "Warning!", MessageBoxButton.OK, MessageBoxImage.Warning)
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62582), EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)
          Return False
       End If
 
@@ -742,7 +745,7 @@ Public Class ProdManagerVM
       ' verifico tipo di file e recupero flag di importazione
       Dim nFileType As Integer = EgtGetFileType(sBtlCopyPath)
       If nFileType <> FT.BTL AndAlso nFileType <> FT.BTLX Then
-         MessageBox.Show(Application.Current.MainWindow, EgtMsg(10005), EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)   ' File type unknown  - Error
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(10005), EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)   ' File type unknown  - Error
          EgtOutLog("Errore! Estensione progetto sconosciuta!")
          Return False
       End If
@@ -788,7 +791,7 @@ Public Class ProdManagerVM
       End Select
       ' verifico che abbia importato qualcosa
       If EgtGetGroupObjs(GDB_ID.ROOT) <= nGroupQty Then
-         MessageBox.Show("Imported file is Empty!", "Warning!", MessageBoxButton.OK, MessageBoxImage.Warning)
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62582), EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)
          Return False
       End If
       'LoadingWndHelper.UpdateLoadingWnd(ActiveIds.IMPORTBTL, 2, EgtMsg(63005), 50, 70)          ' Loading parts
@@ -1045,7 +1048,7 @@ Public Class ProdManagerVM
       End If
       LoadingWndHelper.OpenLoadingWnd(ActiveIds.OPENPROD, 3, EgtMsg(63004), EgtMsg(63001), 50)          ' Optimization opening     ' Loading project geometries
       If Not File.Exists(sFilePath) Then
-         MessageBox.Show(EgtMsg(61871))
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61871))
          EgtOutLog("Errore! File da aprire non trovato!")
          Return False
       End If
@@ -1054,7 +1057,7 @@ Public Class ProdManagerVM
       If IsNothing(OpenProjectMachine) Then
          ' rimuovo il file in apertura dalla lista degli MRU
          m_MruFiles.Remove(sFilePath)
-         MessageBox.Show(EgtMsg(61885), EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)        'Error
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61885), EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)        'Error
          EgtOutLog("Errore! Macchina del progetto da aprire non trovata!")
          Return False
       End If
@@ -1066,7 +1069,7 @@ Public Class ProdManagerVM
          Else
             NewProject()
          End If
-         MessageBox.Show(Application.Current.MainWindow, EgtMsg(10003) & " '" & sFilePath & "'", EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)        'Error opening file
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(10003) & " '" & sFilePath & "'", EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)        'Error opening file
          EgtOutLog("Errore! Caricamento del progetto fallito!")
          Return False
       End If
@@ -1090,7 +1093,7 @@ Public Class ProdManagerVM
          Else
             NewProject()
          End If
-         MessageBox.Show(Application.Current.MainWindow, EgtMsg(10003) & " '" & sFilePath & "'", EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)        'Error opening file
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(10003) & " '" & sFilePath & "'", EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)        'Error opening file
          EgtOutLog("Errore! Caricamento dei pezzi btl fallito!")
          Return False
       End If
@@ -1118,7 +1121,7 @@ Public Class ProdManagerVM
          Else
             NewProject()
          End If
-         MessageBox.Show(Application.Current.MainWindow, EgtMsg(10003) & " '" & sFilePath & "'", EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)        'Error opening file
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(10003) & " '" & sFilePath & "'", EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)        'Error opening file
          EgtOutLog("Errore! Caricamento dei gruppi di lavorazione fallito!")
          Return False
       End If
@@ -1194,7 +1197,7 @@ Public Class ProdManagerVM
       If Not Map.refSceneHostVM.SaveProject() Then
          m_MruFiles.Remove(CurrProd.sProdPath)
          Dim sMsg As String = EgtMsg(10004) & " '" & CurrProd.sProdPath & "'"            'Error saving file
-         MessageBox.Show(Application.Current.MainWindow, sMsg, EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)     ' Error
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, sMsg, EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)     ' Error
          EgtOutLog("Salvataggio progetto non riuscito")
          Return False
       End If
@@ -1291,7 +1294,7 @@ Public Class ProdManagerVM
             End Try
             ' se almeno un errore, mostro log
             If bGlobalError Then
-               MessageBox.Show(Application.Current.MainWindow, sImportMessage, EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)   ' Error
+               EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, sImportMessage, EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)   ' Error
             End If
          End If
       End If
@@ -1543,9 +1546,13 @@ Public Class ProdManagerVM
       If IsNothing(CurrProd) Then Return Nothing
 
       ' apro finestra di salvataggio progetto
-      Dim ExportDlg As New Microsoft.Win32.SaveFileDialog() With {.DefaultExt = ".ngexp",
-                                                                  .Filter = "ProjectExport (*.ngexp)|*.ngexp",
-                                                                  .FileName = CurrProd.nProdId.ToString("0000") & " - " & CurrProd.sBTLFileName & " - ProjectExport"}
+      Dim ExportDlg As New EgtBEAMWALL.Core.EgtManageFileDialogV(Application.Current.MainWindow, New EgtManageFileDialogVM()) With {
+         .Title = EgtMsg(61838),
+         .Filter = "ProjectExport (*.ngexp)|*.ngexp",
+         .FilterIndex = 1,
+         .FileName = CurrProd.nProdId.ToString("0000") & " - " & CurrProd.sName & " - ProjectExport.ngexp",
+         .Mode = 1}
+
       If IsNothing(sExportFileName) Then
          If ExportDlg.ShowDialog() <> True Then Return Nothing
       End If
@@ -1608,7 +1615,7 @@ Public Class ProdManagerVM
          End Using
       Catch ex1 As Exception
          EgtOutLog("Exception in zip: " & ex1.ToString())
-         MessageBox.Show("Error in export file creation!")
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62561))
       End Try
       ' elimino layer di esportazione
       EgtErase(nImpExpPartId)
@@ -1643,11 +1650,15 @@ Public Class ProdManagerVM
       Dim sDir As String = String.Empty
       GetMainPrivateProfileString(S_GENERAL, K_LASTNGEXPDIR, "", sDir)
       ' apro finestra scelta file
-      Dim ImportDlg As New Microsoft.Win32.OpenFileDialog() With {.DefaultExt = ".ngexp",
-                                                                  .Filter = "ProjectExport (*.ngexp)|*.ngexp",
-                                                                  .InitialDirectory = If(Directory.Exists(sDir), sDir, ""),
-                                                                  .CheckFileExists = True,
-                                                                  .ValidateNames = True}
+      Dim ImportDlg As New EgtBEAMWALL.Core.EgtManageFileDialogV(Application.Current.MainWindow, New EgtManageFileDialogVM()) With {
+         .Title = EgtMsg(61839),
+         .Filter = "ProjectExport (*.ngexp)|*.ngexp",
+         .FilterIndex = 1,
+         .InitialDirectory = If(Directory.Exists(sDir), sDir, ""),
+         .CheckFileExists = True,
+         .ValidateNames = True,
+         .Mode = 1}
+
       If ImportDlg.ShowDialog() <> True Then Return
 
       ' creo cartella temporanea di estrazione in Temp
@@ -1660,7 +1671,7 @@ Public Class ProdManagerVM
          ZipFile.ExtractToDirectory(ImportDlg.FileName, sProjectimportDir)
       Catch ex1 As Exception
          EgtOutLog("Exception in zip: " & ex1.ToString())
-         MessageBox.Show("Impossibile importare file", "Errore")
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62562), EgtMsg(15001))
          Return
       End Try
 
@@ -1671,7 +1682,7 @@ Public Class ProdManagerVM
       Dim bOk = EgtOpenFile(sProjFromPath(0))
       If Not bOk Then
          LoadingWndHelper.CloseLoadingWnd(ActiveIds.IMPORTPROJECT)
-         MessageBox.Show("Impossibile aprire il file", "Errore")
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62552), EgtMsg(15001))
          Return
       End If
 
@@ -1686,7 +1697,7 @@ Public Class ProdManagerVM
       EgtGetInfo(nImpExpPartId, BTL_GEN_PROJTYPE, nType)
       If IsNothing(Machine) OrElse nType = BWType.NULL Then
          LoadingWndHelper.CloseLoadingWnd(ActiveIds.IMPORTPROJECT)
-         MessageBox.Show(EgtMsg(61885), EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)        'Error
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61885), EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)        'Error
          Return
       End If
 
@@ -1716,7 +1727,7 @@ Public Class ProdManagerVM
          End If
          nBTLInfoLayerId = EgtGetNextName(nBTLInfoLayerId, BTLINFO)
       End While
-      If Not ImportProjIdList.Count > 0 Then MessageBox.Show("Nessun progetto trovato all'interno del file importato", "Errore")
+      If Not ImportProjIdList.Count > 0 Then EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62563), EgtMsg(15001))
 
       ' carico i proj
       For nProjIndex = 0 To ImportProjIdList.Count - 1
@@ -1820,8 +1831,6 @@ Public Class ProdManagerVM
          End If
 
          If Map.refMainWindowVM.MainWindowM.nUserLevel >= 5 AndAlso GetMainPrivateProfileInt(S_MACH, K_EXPORTBWE, 0) = 1 Then
-            Map.refMyStatusBarVM.SetLoadingProgress(0)
-            Map.refMyStatusBarVM.SetOutputMessage("")
             ' lancio verifica perche' importato
             Map.refCALCPanelVM.VerifyAll(ProjectType.PROJ)
          End If
@@ -1898,7 +1907,7 @@ Public Class ProdManagerVM
    Public Sub AddProj()
       SetBtlImage("pack://application:,,,/Resources/NewPage/down.png")
       If Not CreateNewProj(CurrProd, 0) Then
-         MessageBox.Show("Errore! Aggiunta file fallita!")
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62583))
       End If
       Return
    End Sub
@@ -1923,13 +1932,16 @@ Public Class ProdManagerVM
       Dim sDir As String = String.Empty
       GetMainPrivateProfileString(S_GENERAL, K_LASTIMPDIR, "", sDir)
       Dim sFile As String = ""
-      Dim BTLDlg As New Microsoft.Win32.OpenFileDialog() With {
-               .DefaultExt = ".btl",
-               .Filter = "BTL (*.btl)|*.btl" &
-                         "|BTLX (*.btlx)|*.btlx",
-               .InitialDirectory = If(Directory.Exists(sDir), sDir, ""),
-               .CheckFileExists = True,
-               .ValidateNames = True}
+      Dim BTLDlg As New EgtBEAMWALL.Core.EgtManageFileDialogV(Application.Current.MainWindow, New EgtManageFileDialogVM()) With {
+         .Title = EgtMsg(63038),
+         .Filter = "BTL (*.btl)|*.btl" &
+                   "|BTLX (*.btlx)|*.btlx",
+         .FilterIndex = 1,
+         .InitialDirectory = If(Directory.Exists(sDir), sDir, ""),
+         .CheckFileExists = True,
+         .ValidateNames = True,
+         .Mode = 1}
+
       If BTLDlg.ShowDialog() Then
          sFile = BTLDlg.FileName
       Else
@@ -1941,7 +1953,7 @@ Public Class ProdManagerVM
       Dim sBTLFileName As String = Path.GetFileNameWithoutExtension(sFile)
       Dim nAlreadyImported As Integer = DbControllers.m_ProjController.AlreadyImported(sBTLFileName)
       If nAlreadyImported > 0 Then
-         Select Case MessageBox.Show(EgtMsg(61942), "Information", MessageBoxButton.YesNo, MessageBoxImage.Information)       ' BTL file already imported and optimized. Do you want to import it again?
+         Select Case EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61942), EgtMsg(15003), MessageBoxButton.YesNo, MessageBoxImage.Information)       ' BTL file already imported and optimized. Do you want to import it again?
             Case MessageBoxResult.Yes
                   ' lo importo, quindi non devo fare nulla
             Case MessageBoxResult.No
diff --git a/EgtBEAMWALL.Optimizer/Project/ProjectV.xaml b/EgtBEAMWALL.Optimizer/Project/ProjectV.xaml
index d6bcfdbc..c8bb442f 100644
--- a/EgtBEAMWALL.Optimizer/Project/ProjectV.xaml
+++ b/EgtBEAMWALL.Optimizer/Project/ProjectV.xaml
@@ -1,8 +1,8 @@
 <UserControl x:Class="ProjectV"
-            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer"
-            DataContext="{StaticResource ProjectVM}">
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer"
+             DataContext="{StaticResource ProjectVM}">
    <Grid>
       <Grid.ColumnDefinitions>
          <ColumnDefinition Width="{Binding GridDims[3].GridLen, Mode=TwoWay}"/>
@@ -15,7 +15,7 @@
          <RowDefinition Height="Auto"/>
          <RowDefinition Height="{Binding GridDims[2].GridLen, Mode=TwoWay}"/>
       </Grid.RowDefinitions>
-      
+
       <OPTIMIZER:TopPanelV Grid.ColumnSpan="3"/>
 
       <OPTIMIZER:LeftPanelTopV Grid.Row="1"/>
@@ -26,7 +26,7 @@
 
       <OPTIMIZER:RightPanelTopV Grid.Row="1"
                                 Grid.Column="2"/>
-      
+
       <OPTIMIZER:SceneBuildingV Grid.Row="1"
                                 Grid.Column="2"
                                 Grid.RowSpan="4"
diff --git a/EgtBEAMWALL.Optimizer/ProjectFileVM/ProdFileVM.vb b/EgtBEAMWALL.Optimizer/ProjectFileVM/ProdFileVM.vb
index 61dff61d..745b56e6 100644
--- a/EgtBEAMWALL.Optimizer/ProjectFileVM/ProdFileVM.vb
+++ b/EgtBEAMWALL.Optimizer/ProjectFileVM/ProdFileVM.vb
@@ -46,7 +46,7 @@ Public Class ProdFileVM
       Dim VerifyResult As MessageBoxResult = MessageBoxResult.None
       ' verifico se progetto modificato, e chiedo se salvare
       If EgtGetModified() OrElse CurrProject.bIsNew OrElse Map.refCALCPanelVM.IsMachineModified() Then
-         VerifyResult = MessageBox.Show(EgtMsg(61875), "", MessageBoxButton.YesNoCancel, MessageBoxImage.Question)
+         VerifyResult = EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61875), "", MessageBoxButton.YesNoCancel, MessageBoxImage.Question)
          Select Case VerifyResult
             Case MessageBoxResult.Yes
                ' salvo proj
diff --git a/EgtBEAMWALL.Optimizer/ProjectFileVM/ProjFileVM.vb b/EgtBEAMWALL.Optimizer/ProjectFileVM/ProjFileVM.vb
index dcfd2b06..b1d7a654 100644
--- a/EgtBEAMWALL.Optimizer/ProjectFileVM/ProjFileVM.vb
+++ b/EgtBEAMWALL.Optimizer/ProjectFileVM/ProjFileVM.vb
@@ -36,7 +36,7 @@ Public Class ProjFileVM
       sProjectDirPath = CurrProject.sProjDirPath
       ' verifico se progetto modificato, e chiedo se salvare
       If EgtGetModified() OrElse CurrProject.bIsNew OrElse Map.refCALCPanelVM.IsMachineModified() Then
-         Select Case MessageBox.Show(EgtMsg(61875), "", MessageBoxButton.YesNoCancel, MessageBoxImage.Question)
+         Select Case EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61875), "", MessageBoxButton.YesNoCancel, MessageBoxImage.Question)
             Case MessageBoxResult.Yes
                ' salvo proj
                If Not IsNothing(Map.refProdManagerVM) Then
diff --git a/EgtBEAMWALL.Optimizer/ProjectTypeWnd/ProjectTypeWndVM.vb b/EgtBEAMWALL.Optimizer/ProjectTypeWnd/ProjectTypeWndVM.vb
index 5d3ea66c..6993f729 100644
--- a/EgtBEAMWALL.Optimizer/ProjectTypeWnd/ProjectTypeWndVM.vb
+++ b/EgtBEAMWALL.Optimizer/ProjectTypeWnd/ProjectTypeWndVM.vb
@@ -136,7 +136,7 @@ Public Class ProjectTypeWndVM
          RaiseEvent m_CloseWindow(True)
       Else
          ' se non seleziono nessuna macchina lo segnalo con un MessageBox
-         MessageBox.Show(EgtMsg(61880), EgtMsg(30009))
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61880), EgtMsg(30009))
       End If
    End Sub
 
diff --git a/EgtBEAMWALL.Optimizer/RawPartManager/RawPartManagerV.xaml b/EgtBEAMWALL.Optimizer/RawPartManager/RawPartManagerV.xaml
index 14d2b348..41275c54 100644
--- a/EgtBEAMWALL.Optimizer/RawPartManager/RawPartManagerV.xaml
+++ b/EgtBEAMWALL.Optimizer/RawPartManager/RawPartManagerV.xaml
@@ -11,7 +11,7 @@
            ToolTip="{Binding NewRawPart_ToolTip}"
            IsEnabled="{Binding BTLPartManager_IsEnabled}"
            Style="{StaticResource RawPartManager_Button}">
-      <Image Source="/Resources/LeftPanel/NewRawPart.png"
+      <Image Source="{StaticResource NewRawPart_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
    <StackPanel Grid.Column="1" 
@@ -21,28 +21,28 @@
               IsEnabled="{Binding RawPartManagerIsEnabled}"
               Visibility="{Binding ProduceRawPart_Visibility}"
               Style="{StaticResource LP_Button}">
-         <Image Source="/Resources/TopPanel/ProduceAllRawPart.png"
+         <Image Source="{StaticResource ProduceAllRawPart_Image}"
                 Style="{StaticResource BTLDataWnd_Image}"/>
       </Button>
       <Button ToolTip="{Binding VerifyAll_ToolTip}"
               Command="{Binding VerifyAll_Command}"
               IsEnabled="{Binding VerifyAll_IsEnabled}"
               Style="{StaticResource LP_Button}">
-         <Image Source="/Resources/CALCPanel/VerifyAll.png"
+         <Image Source="{StaticResource VerifyAll_Image}"
                 Style="{StaticResource BTLDataWnd_Image}"/>
       </Button>
       <Button Command="{Binding ResetCalc_Command}"
               ToolTip="{Binding ResetCalc_ToolTip}"
               IsEnabled="{Binding CALCPanel_IsEnabled}"
               Style="{StaticResource LP_Button}">
-         <Image Source="/Resources/CALCPanel/ResetCalc.png"
+         <Image Source="{StaticResource ResetCalc_Image}"
                 Style="{StaticResource BTLDataWnd_Image}"/>
       </Button>
       <Button Command="{Binding RemoveAllRawPart_Command}"
               ToolTip="{Binding RemoveAllRawPart_ToolTip}"
               IsEnabled="{Binding RawPartManagerIsEnabled}"
               Style="{StaticResource LP_Button}">
-         <Image Source="/Resources/NewPage/Remove.png"
+         <Image Source="{StaticResource Remove_Image}"
                 Style="{StaticResource BTLDataWnd_Image}"/>
       </Button>
       <Button Command="{Binding MovePartInRawPart_Command}"
@@ -50,7 +50,7 @@
               IsEnabled="{Binding RawPartManagerIsEnabled}"
               Visibility="{Binding MovePartInRawPart_Visibility}"
               Style="{StaticResource LP_Button}">
-         <Image Source="/Resources/TopPanel/MovePartInRawPart.png"
+         <Image Source="{StaticResource MovePartInRawPart_Image}"
                 Style="{StaticResource BTLDataWnd_Image}"/>
       </Button>
    </StackPanel>
diff --git a/EgtBEAMWALL.Optimizer/RawPartManager/RawPartManagerVM.vb b/EgtBEAMWALL.Optimizer/RawPartManager/RawPartManagerVM.vb
index 04146ca1..4b68ecea 100644
--- a/EgtBEAMWALL.Optimizer/RawPartManager/RawPartManagerVM.vb
+++ b/EgtBEAMWALL.Optimizer/RawPartManager/RawPartManagerVM.vb
@@ -175,7 +175,7 @@ Public Class RawPartManagerVM
       ' verifico se modalita' supervisore attiva
       If GetPrivateProfileInt(S_GENERAL, K_SUPERVISOR, 1, CurrentMachine.sMachIniFile) = 1 Then
          If Not Produce(Map.refMachGroupPanelVM.SelectedMachGroup, ErrorMsg) AndAlso Not String.IsNullOrWhiteSpace(ErrorMsg) Then
-            MessageBox.Show(ErrorMsg)
+            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, ErrorMsg)
          End If
       Else
          ' altrimenti lo copio se path disponibile
@@ -193,9 +193,9 @@ Public Class RawPartManagerVM
                Dim sMachGroupFilePath As String = Map.refProdManagerVM.CurrProd.sProdDirPath & "\" & Map.refMachGroupPanelVM.SelectedMachGroup.Name.ToString() & ".cnc"
                Dim sNewPath As String = sSaveCncPath & "\" & Map.refProdManagerVM.CurrProd.sProdId & "-" & Map.refMachGroupPanelVM.SelectedMachGroup.Name.ToString() & sSaveExt
                File.Copy(sMachGroupFilePath, sNewPath, True)
-               MessageBox.Show(String.Format("File copied! You can find it at {0}", {sNewPath}), "Info", MessageBoxButton.OK, MessageBoxImage.Information)
+               EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, String.Format(EgtMsg(62584), {sNewPath}), EgtMsg(15003), MessageBoxButton.OK, MessageBoxImage.Information)
             Catch ex As Exception
-               MessageBox.Show(String.Format("Copy to {0} folder failed!", {sSaveCncPath}), "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+               EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, String.Format(EgtMsg(62585), {sSaveCncPath}), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)
             End Try
          End If
       End If
@@ -309,16 +309,16 @@ Public Class RawPartManagerVM
                      Dim sMachGroupFilePath As String = Map.refProdManagerVM.CurrProd.sProdDirPath & "\" & Machgroup.Name.ToString() & ".cnc"
                      Dim sNewPath As String = sSaveCncPath & "\" & Map.refProdManagerVM.CurrProd.sProdId & "-" & Machgroup.Name.ToString() & sSaveExt
                      File.Copy(sMachGroupFilePath, sNewPath, True)
-                     sErrorMessage &= String.Format("File copied! You can find it at {0}", {sNewPath}) & Environment.NewLine
+                     sErrorMessage &= String.Format(EgtMsg(62584), {sNewPath}) & Environment.NewLine
                   Catch ex As Exception
-                     sErrorMessage &= String.Format("Copy to {0} folder failed!", {sSaveCncPath}) & Environment.NewLine
+                     sErrorMessage &= String.Format(EgtMsg(62585), {sSaveCncPath}) & Environment.NewLine
                   End Try
                End If
             End If
          Next
          If Not String.IsNullOrWhiteSpace(sErrorMessage) Then
-            sErrorMessage = "Results for all the parts generated:" & Environment.NewLine & sErrorMessage
-            MessageBox.Show(sErrorMessage, If(bErrorMessage, "Error", "Info"), MessageBoxButton.OK, MessageBoxImage.Information)
+            sErrorMessage = EgtMsg(62587) & Environment.NewLine & sErrorMessage
+            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, sErrorMessage, If(bErrorMessage, EgtMsg(15001), EgtMsg(15003)), MessageBoxButton.OK, MessageBoxImage.Information)
          End If
          If MachgroupErrorList.Count > 0 Then
             Dim sMachGroups As String = ""
@@ -326,7 +326,7 @@ Public Class RawPartManagerVM
                sMachGroups &= " " & MachGroup.Name & ","
             Next
             sMachGroups = sMachGroups.Trim({" "c, ","c})
-            MessageBox.Show(String.Format("Impossible sending {0} to supervisor because not machinable!", sMachGroups))
+            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, String.Format(EgtMsg(62568), sMachGroups))
          End If
       End If
    End Sub
@@ -397,12 +397,12 @@ Public Class RawPartManagerVM
          If Not IsNothing(Part) Then
             If Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.BEAM Then
                If Part.dH <> dHSection OrElse Part.dW <> dWSection Then
-                  MessageBox.Show(EgtMsg(61970), EgtMsg(30007))
+                  EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61970), EgtMsg(30007))
                   Return
                End If
             ElseIf Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.WALL Then
                If Part.dH <> dHSection Then
-                  MessageBox.Show(EgtMsg(61970), EgtMsg(30007))
+                  EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61970), EgtMsg(30007))
                   Return
                End If
             End If
@@ -412,7 +412,7 @@ Public Class RawPartManagerVM
       Next
       ' se pareti e piu' di uno selezionato, esco
       If Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.WALL And SelParts.Count > 1 Then
-         MessageBox.Show(EgtMsg(61971), EgtMsg(30007))
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61971), EgtMsg(30007))
          Return
       End If
       ' se nessun grezzo, rendo tutti i pezzi visibili
@@ -467,7 +467,7 @@ Public Class RawPartManagerVM
                      dRawL = SParamlist(0).dL
                      dRawW = SParamlist(0).dW
                   Else
-                     MessageBox.Show(EgtMsg(61975), EgtMsg(30007))
+                     EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61975), EgtMsg(30007))
                      Return
                   End If
                Else
@@ -514,7 +514,7 @@ Public Class RawPartManagerVM
             dTotLen += SelParts(PartIndex).dL
          Next
          If dTotLen > dRawL Then
-            MessageBox.Show(EgtMsg(61972), EgtMsg(30007))
+            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61972), EgtMsg(30007))
             Return
          End If
       End If
@@ -567,10 +567,10 @@ Public Class RawPartManagerVM
             If File.Exists(sLogPath) Then
                Dim LogFile As String() = File.ReadAllLines(sLogPath)
                If LogFile.Count >= 2 AndAlso Not IsNothing(LogFile(1)) Then
-                  MessageBox.Show(LogFile(1), EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error)
+                  EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, LogFile(1), EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error)
                End If
             Else
-               MessageBox.Show(EgtMsg(61973), EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error)
+               EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61973), EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error)
             End If
             ' se nessun grezzo, rimetto tutti i pezzi invisibili
             If Map.refProjectVM.MachGroupPanelVM.MachGroupVMList.Count = 0 Then
@@ -611,10 +611,10 @@ Public Class RawPartManagerVM
             If File.Exists(sLogPath) Then
                Dim LogFile As String() = File.ReadAllLines(sLogPath)
                If LogFile.Count >= 2 AndAlso Not IsNothing(LogFile(1)) Then
-                  MessageBox.Show(LogFile(1), EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error)
+                  EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, LogFile(1), EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error)
                End If
             Else
-               MessageBox.Show(EgtMsg(61973), EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error)
+               EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61973), EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error)
             End If
             ' se nessun grezzo, rimetto tutti i pezzi invisibili
             If Map.refProjectVM.MachGroupPanelVM.MachGroupVMList.Count = 0 Then
@@ -749,7 +749,7 @@ Public Class RawPartManagerVM
          For Each sPart In ToAddList
             sMessage &= " - " & sPart & Environment.NewLine
          Next
-         If MessageBox.Show(sMessage & EgtMsg(61893), "", MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then
+         If EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, sMessage & EgtMsg(61893), "", MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then
             For Each PartVM In ToAddVM
                PartVM.AddNewPartToAdded()
             Next
diff --git a/EgtBEAMWALL.Optimizer/SaveAsStrategyWnd/SaveAsStrategyV.xaml b/EgtBEAMWALL.Optimizer/SaveAsStrategyWnd/SaveAsStrategyV.xaml
index 04644829..1ad4bd6d 100644
--- a/EgtBEAMWALL.Optimizer/SaveAsStrategyWnd/SaveAsStrategyV.xaml
+++ b/EgtBEAMWALL.Optimizer/SaveAsStrategyWnd/SaveAsStrategyV.xaml
@@ -48,7 +48,7 @@
                     IsEnabled="{Binding bSaveAsIsEnable}"
                     Visibility="{Binding bOpen_Visibility}"
                     Style="{StaticResource SaveStrategy_Button}">
-               <Image Source="/Resources/newPage/Ok.png"
+               <Image Source="{StaticResource Ok_Image}"
                       Style="{StaticResource BTLDataWnd_Image}"/>
             </Button>
             <Button Command="{Binding SaveAsCommand}"
@@ -56,13 +56,13 @@
                     IsEnabled="{Binding bSaveAsIsEnable}"
                     Visibility="{Binding bSave_Visibility}"
                     Style="{StaticResource SaveStrategy_Button}">
-               <Image Source="/Resources/newPage/Ok.png"
+               <Image Source="{StaticResource Ok_Image}"
                       Style="{StaticResource BTLDataWnd_Image}"/>
             </Button>
             <Button Command="{Binding CloseCommand}"
                     ToolTip="{Binding SaveAsToolTip}"
                     Style="{StaticResource SaveStrategy_Button}">
-               <Image Source="/Resources/PDFEditor/Delete.png"
+               <Image Source="{StaticResource Delete_Image}"
                       Style="{StaticResource BTLDataWnd_Image}"/>
             </Button>
          </UniformGrid>
diff --git a/EgtBEAMWALL.Optimizer/SaveAsStrategyWnd/SaveAsStrategyVM.vb b/EgtBEAMWALL.Optimizer/SaveAsStrategyWnd/SaveAsStrategyVM.vb
index c7777ba1..89f74d6c 100644
--- a/EgtBEAMWALL.Optimizer/SaveAsStrategyWnd/SaveAsStrategyVM.vb
+++ b/EgtBEAMWALL.Optimizer/SaveAsStrategyWnd/SaveAsStrategyVM.vb
@@ -166,7 +166,7 @@ Public Class SaveAsStrategyVM
       Dim sAISetupDirPath As String = Map.refMainWindowVM.MainWindowM.GetAISetupDirPath(ProjectManagerVM.CurrProd.nType, False)
       Dim sStrategyConfigurationFilePath As String = sAISetupDirPath & "\" & sFileNameCustomConfig & ".json"
       If String.IsNullOrWhiteSpace(Path.GetFileNameWithoutExtension(sFileNameCustomConfig)) Then
-         MessageBox.Show(EgtMsg(62578), EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62578), EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)
          Return
       End If
       Dim Strategy As New StrategySetup(sFileNameCustomConfig)
diff --git a/EgtBEAMWALL.Optimizer/SceneHost/MySceneHostVM.vb b/EgtBEAMWALL.Optimizer/SceneHost/MySceneHostVM.vb
index c5b88ba1..21a2ea7c 100644
--- a/EgtBEAMWALL.Optimizer/SceneHost/MySceneHostVM.vb
+++ b/EgtBEAMWALL.Optimizer/SceneHost/MySceneHostVM.vb
@@ -78,21 +78,24 @@ Public Class MySceneHostVM
          ' Box di avviso chiave mancante : "Chiave non presente. \n Inserirla e riavviare il programma."  "Errore"
          Dim sText As String = EgtMsg(10102) & vbCrLf & EgtMsg(10103)
          Dim sTitle As String = EgtMsg(10101)
-         MessageBox.Show(Application.Current.MainWindow, sText, sTitle, MessageBoxButton.OK, MessageBoxImage.Error)
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, sText, sTitle, MessageBoxButton.OK, MessageBoxImage.Error)
          ' Altrimenti manca la licenza
       Else
          EgtOutLog("Problems with Licence")
          ' Box di avviso licenza con problemi : "Programma senza licenza. \n Caricala e riavvia il programma."  "Errore"
          Dim sText As String = EgtMsg(10105) & vbCrLf & EgtMsg(10106)
          Dim sTitle As String = EgtMsg(10101)
-         If MessageBox.Show(Application.Current.MainWindow, sText, sTitle, MessageBoxButton.OKCancel, MessageBoxImage.Error) = MessageBoxResult.OK Then
+         If EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, sText, sTitle, MessageBoxButton.OKCancel, MessageBoxImage.Error) = MessageBoxResult.OK Then
             ' Apro dialogo per richiesta file licenza
-            Dim LicDlg As New Microsoft.Win32.OpenFileDialog() With {
-               .DefaultExt = ".lic",
+            Dim LicDlg As New EgtBEAMWALL.Core.EgtManageFileDialogV(Application.Current.MainWindow, New EgtManageFileDialogVM()) With {
+               .Title = EgtMsg(110026),
                .Filter = "Licences (.lic)|*.lic",
+               .FilterIndex = 1,
+               .InitialDirectory = Map.refMainWindowVM.MainWindowM.sConfigDir,
                .CheckFileExists = True,
-               .ValidateNames = True
-            }
+               .ValidateNames = True,
+               .Mode = 1}
+
             If LicDlg.ShowDialog() = True Then
                ' Recupero il direttorio del file
                Dim sDir As String = Path.GetDirectoryName(LicDlg.FileName)
diff --git a/EgtBEAMWALL.Optimizer/SetUp/SetUpVM.vb b/EgtBEAMWALL.Optimizer/SetUp/SetUpVM.vb
index 225292ce..69b4a83f 100644
--- a/EgtBEAMWALL.Optimizer/SetUp/SetUpVM.vb
+++ b/EgtBEAMWALL.Optimizer/SetUp/SetUpVM.vb
@@ -445,10 +445,10 @@ Public Class SetUpVM
                         If String.IsNullOrWhiteSpace(sSearchedTool) Then sSearchedTool = sToolNameList(ToolIndex)
                         If Not String.IsNullOrWhiteSpace(sSearchedTool) Then
                            ' Impossibile trovare l'utensile xxx nel DB utensili
-                           MessageBox.Show(EgtMsg(6473) & " " & sSearchedTool & " " & EgtMsg(6474), EgtMsg(6472), MessageBoxButton.OK, MessageBoxImage.Error)
+                           EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(6473) & " " & sSearchedTool & " " & EgtMsg(6474), EgtMsg(6472), MessageBoxButton.OK, MessageBoxImage.Error)
                         Else
                            ' Impossibile trovare l'utensile nel DB utensili
-                           MessageBox.Show(EgtMsg(6473) & " " & EgtMsg(6474), EgtMsg(6472), MessageBoxButton.OK, MessageBoxImage.Error)
+                           EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(6473) & " " & EgtMsg(6474), EgtMsg(6472), MessageBoxButton.OK, MessageBoxImage.Error)
                         End If
                      End If
                   End If
@@ -564,7 +564,7 @@ Public Class SetUpVM
             For ErrorIndex = 0 To ErrorList.Count - 1
                sError &= "- " & ErrorList(ErrorIndex) & Environment.NewLine
             Next
-            MessageBox.Show(sError, EgtMsg(6472), MessageBoxButton.OK, MessageBoxImage.Exclamation)
+            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, sError, EgtMsg(6472), MessageBoxButton.OK, MessageBoxImage.Exclamation)
          End If
       End If
    End Sub
@@ -611,7 +611,7 @@ Public Class SetUpVM
       ' se la posizione non è valida, restituisco errore
       If sHead = INVALIDPOS Then
          EgtOutLog("SetUp warning: try to set " & SelTool.Name & " on " & Position.TcPos)
-         MessageBox.Show(EgtMsg(6475), EgtMsg(6471), MessageBoxButton.OK, MessageBoxImage.Error)
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(6475), EgtMsg(6471), MessageBoxButton.OK, MessageBoxImage.Error)
          Return False
          ' altrimenti, se la posizione nell'attrezzaggio è vuota
       ElseIf Not PosIsOccupied Then
@@ -789,7 +789,7 @@ Public Class SetUpVM
          For ErrorIndex = 0 To ErrorList.Count - 1
             sError &= "- " & ErrorList(ErrorIndex) & Environment.NewLine
          Next
-         MessageBox.Show(sError, EgtMsg(6472), MessageBoxButton.OK, MessageBoxImage.Exclamation)
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, sError, EgtMsg(6472), MessageBoxButton.OK, MessageBoxImage.Exclamation)
       End If
 
       ' abilito e disabilito tutte le uscite in base all'utensile selezionato 
diff --git a/EgtBEAMWALL.Optimizer/ShowBeamPanel/ShowBeamPanelV.xaml b/EgtBEAMWALL.Optimizer/ShowBeamPanel/ShowBeamPanelV.xaml
index 0843c823..1e6ebeec 100644
--- a/EgtBEAMWALL.Optimizer/ShowBeamPanel/ShowBeamPanelV.xaml
+++ b/EgtBEAMWALL.Optimizer/ShowBeamPanel/ShowBeamPanelV.xaml
@@ -8,21 +8,21 @@
            ToolTip="{Binding ShowAll_ToolTip}"
            Visibility="{Binding ShowAll_Visibility}"
            Style="{StaticResource ToolBarViewPanel_Button}">
-      <Image Source="/Resources/ShowBeamPanel/ShowAll.png"
+      <Image Source="{StaticResource ShowAll_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
    <ToggleButton IsChecked="{Binding ShowSolid_IsChecked}"
                  IsEnabled="{Binding ShowSolid_IsEnabled}"
                  ToolTip="{Binding ShowSolid_ToolTip}"
                  Style="{StaticResource ToolBar_ToggleButton}">
-      <Image Source="/Resources/ShowBeamPanel/ShowSolid.png"
+      <Image Source="{StaticResource ShowSolid_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </ToggleButton>
    <ToggleButton IsChecked="{Binding ShowBuilding_IsChecked}"
                  IsEnabled="{Binding ShowBuilding_IsEnabled}"
                  ToolTip="{Binding ShowBuilding_ToolTip}"
                  Style="{StaticResource ToolBar_ToggleButton}">
-      <Image Source="/Resources/ShowBeamPanel/ShowBuilding.png"
+      <Image Source="{StaticResource ShowBuilding_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </ToggleButton>
 
diff --git a/EgtBEAMWALL.Optimizer/ShowPanel/ShowPanelV.xaml b/EgtBEAMWALL.Optimizer/ShowPanel/ShowPanelV.xaml
index dcc7ad4b..eaeba28e 100644
--- a/EgtBEAMWALL.Optimizer/ShowPanel/ShowPanelV.xaml
+++ b/EgtBEAMWALL.Optimizer/ShowPanel/ShowPanelV.xaml
@@ -6,19 +6,19 @@
    <RadioButton ToolTip="{Binding RenderingWFToolTip}"
                 IsChecked="{Binding WireframeIsChecked}"
                 Style="{StaticResource ToolBar_ToggleButton}">
-      <Image Source="/Resources/ShowPanel/RenderingWF.png"
+      <Image Source="{StaticResource RenderingWF_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </RadioButton>
    <RadioButton ToolTip="{Binding RenderingHLToolTip}"
                 IsChecked="{Binding HiddenLineIsChecked}"
                 Style="{StaticResource ToolBar_ToggleButton}">
-      <Image Source="/Resources/ShowPanel/RenderingHL.png"
+      <Image Source="{StaticResource RenderingHL_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </RadioButton>
    <RadioButton ToolTip="{Binding RenderingSHToolTip}"
                 IsChecked="{Binding ShadingIsChecked}"
                 Style="{StaticResource ToolBar_ToggleButton}">
-      <Image Source="/Resources/ShowPanel/RenderingSH.png"
+      <Image Source="{StaticResource RenderingSH_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </RadioButton>
 
diff --git a/EgtBEAMWALL.Optimizer/SplashScreen/SplashScreenV.xaml b/EgtBEAMWALL.Optimizer/SplashScreen/SplashScreenV.xaml
index dedef854..e846f223 100644
--- a/EgtBEAMWALL.Optimizer/SplashScreen/SplashScreenV.xaml
+++ b/EgtBEAMWALL.Optimizer/SplashScreen/SplashScreenV.xaml
@@ -11,7 +11,7 @@
         Width="1000">
    
     <Grid>
-      <Image Source="/Resources/NewPage/LogoProvaStrategy.png" 
+      <Image Source="{StaticResource SplashScreen_Image}" 
              Style="{StaticResource BTLDataWnd_Image}"/>
       <TextBlock x:Name="VersionTxBl"
                  Style="{StaticResource SplashScreenV_TextBlock}"/>
diff --git a/EgtBEAMWALL.Optimizer/Statistics/OptimizerStatisticsV.xaml b/EgtBEAMWALL.Optimizer/Statistics/OptimizerStatisticsV.xaml
index 8bd18609..d92e1062 100644
--- a/EgtBEAMWALL.Optimizer/Statistics/OptimizerStatisticsV.xaml
+++ b/EgtBEAMWALL.Optimizer/Statistics/OptimizerStatisticsV.xaml
@@ -263,13 +263,13 @@
             <Button ToolTip="{Binding CopyToClipboard_Msg}"
                     x:Name="CopyToClipboardBtn"
                     Style="{StaticResource Statistics_Button}">
-               <Image Source="/Resources/Statistics/CopyToClipboard.png"
+               <Image Source="{StaticResource CopyToClipboard_Image}"
                       Style="{StaticResource BTLDataWnd_Image}"/>
             </Button>
             <Button ToolTip="{Binding PrintPDF_Msg}"
                     Command="{Binding PrintOptPDF_Command}"
                     Style="{StaticResource Statistics_Button}">
-               <Image Source="/Resources/Statistics/PrintPDF.png"
+               <Image Source="{StaticResource PrintPDF_Image}"
                       Style="{StaticResource BTLDataWnd_Image}"/>
             </Button>
          </StackPanel>
diff --git a/EgtBEAMWALL.Optimizer/Statistics/PDFEditorV.xaml b/EgtBEAMWALL.Optimizer/Statistics/PDFEditorV.xaml
index 4bb4893c..816c652e 100644
--- a/EgtBEAMWALL.Optimizer/Statistics/PDFEditorV.xaml
+++ b/EgtBEAMWALL.Optimizer/Statistics/PDFEditorV.xaml
@@ -21,19 +21,19 @@
             <Button ToolTip="PDF Viewer - Preview"
                     Command="{Binding CreatePreviewVis_Command}"
                     Style="{StaticResource PDFPanel_Button}">
-               <Image Source="/Resources/PDFEditor/PrintPDF.png"
+               <Image Source="{StaticResource PDFEditor_Image}"
                       Style="{StaticResource BTLDataWnd_Image}"/>
             </Button>
             <Button ToolTip="PDF Viewer - Optimizer"
                     Command="{Binding CreatePreviewOtt_Command}"
                     Style="{StaticResource PDFPanel_Button}">
-               <Image Source="/Resources/PDFEditor/PrintPDF.png"
+               <Image Source="{StaticResource PDFEditor_Image}"
                       Style="{StaticResource BTLDataWnd_Image}"/>
             </Button>
             <Button ToolTip="Close PDF Viewer"
                     Command="{Binding ClosePreview_Command}"
                     Style="{StaticResource Close_Button}">
-               <Image Source="/Resources/PDFEditor/Delete.png"
+               <Image Source="{StaticResource Delete_Image}"
                       Style="{StaticResource BTLDataWnd_Image}"/>
             </Button>
          </StackPanel>
@@ -115,12 +115,12 @@
                                              Style="{StaticResource Button_StackPanel}">
                                     <Button Command="{Binding MoveUpOrder_Command}"
                                             Style="{StaticResource LeftPanel_Button}">
-                                       <Image Source="/Resources/PDFEditor/MoveUp.png"
+                                       <Image Source="{StaticResource MoveUpPDF_Image}"
                                               Style="{StaticResource BTLDataWnd_Image}"/>
                                     </Button>
                                     <Button Command="{Binding MoveDownOrder_Command}"
                                             Style="{StaticResource LeftPanel_Button}">
-                                       <Image Source="/Resources/PDFEditor/MoveDown.png"
+                                       <Image Source="{StaticResource MoveDownPDF_Image}"
                                               Style="{StaticResource BTLDataWnd_Image}"/>
                                     </Button>
                                  </StackPanel>
@@ -138,7 +138,7 @@
                 Style="{StaticResource PDFPreview_GroupBox}">
          <GroupBox.Header>
             <StackPanel Style="{StaticResource PartManager_StackPanel}">
-               <Image Source="/Resources/PDFEditor/PDFPreview.png" 
+               <Image Source="{StaticResource PDFPreview_Image}" 
                       Style="{StaticResource PDF_Image}"/>
                <TextBlock Text="PDF" 
                           Style="{StaticResource PDF_TextBlock}"/>
diff --git a/EgtBEAMWALL.Optimizer/Statistics/StatisticsV.xaml b/EgtBEAMWALL.Optimizer/Statistics/StatisticsV.xaml
index 95c9c37f..85e97c42 100644
--- a/EgtBEAMWALL.Optimizer/Statistics/StatisticsV.xaml
+++ b/EgtBEAMWALL.Optimizer/Statistics/StatisticsV.xaml
@@ -185,13 +185,13 @@
          <Button ToolTip="{Binding CopyToClipboard_Msg}"
                  x:Name="CopyToClipboardBtn"
                  Style="{StaticResource CopyToClipboard_Button}">
-            <Image Source="/Resources/Statistics/CopyToClipboard.png"
+            <Image Source="{StaticResource CopyToClipboard_Image}"
                    Style="{StaticResource BTLDataWnd_Image}"/>
          </Button>
          <Button ToolTip="{Binding PrintPDF_Msg}"
                  Command="{Binding PrintPDF_Command}"
                  Style="{StaticResource CopyToClipboard_Button}">
-            <Image Source="/Resources/Statistics/PrintPDF.png"
+            <Image Source="{StaticResource PrintPDF_Image}"
                    Style="{StaticResource BTLDataWnd_Image}"/>
          </Button>
          </StackPanel>
diff --git a/EgtBEAMWALL.Optimizer/StrategyManager/ParameterStrategyV.xaml b/EgtBEAMWALL.Optimizer/StrategyManager/ParameterStrategyV.xaml
index 9ae52481..1102d80d 100644
--- a/EgtBEAMWALL.Optimizer/StrategyManager/ParameterStrategyV.xaml
+++ b/EgtBEAMWALL.Optimizer/StrategyManager/ParameterStrategyV.xaml
@@ -71,14 +71,14 @@
                              IsEnabled="{Binding OpenToolListIsEnable}"
                              Command="{Binding OpenToolListCommand}"
                              Style="{StaticResource ProjectParameters_Button}">
-                        <Image Source="/Resources/NewPage/+.png"
+                        <Image Source="{StaticResource Plus_Image}"
                                Style="{StaticResource BTLDataWnd_Image}"/>
                      </Button>
                      <Button ToolTip="{Binding DeselectAllToolTip}"
                              IsEnabled="{Binding ActiveToolListIsEnable}"
                              Command="{Binding DeselectAllCommand}"
                              Style="{StaticResource CloseProjectParameters_Button}">
-                        <Image Source="/Resources/NewPage/deselectall.png" 
+                        <Image Source="{StaticResource DeselectAll_Image}" 
                                Style="{StaticResource BTLDataWnd_Image}"/>
                      </Button>
                   </StackPanel>
@@ -106,14 +106,14 @@
                      <Button ToolTip="{Binding CloseToolListToolTip}"
                              Command="{Binding CloseToolListCommand}"
                              Style="{StaticResource ProjectParameters_Button}">
-                        <Image Source="/Resources/PDFEditor/Delete.png" 
+                        <Image Source="{StaticResource Delete_Image}" 
                                Style="{StaticResource BTLDataWnd_Image}"/>
                      </Button>
                      <Button ToolTip="{Binding SelectAllToolTip}"
                              IsEnabled="{Binding AvailableToolListIsEnable}"
                              Command="{Binding SelectAllCommand}"
                              Style="{StaticResource ProjectParameters_Button}">
-                        <Image Source="/Resources/NewPage/selectall.png" 
+                        <Image Source="{StaticResource SelectAll_Image}" 
                                Style="{StaticResource BTLDataWnd_Image}"/>
                      </Button>
                   </StackPanel>
diff --git a/EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerV.xaml b/EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerV.xaml
index 4bcaf88b..0aa30e52 100644
--- a/EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerV.xaml
+++ b/EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerV.xaml
@@ -18,7 +18,7 @@
       <Button Command="{Binding ConfigurationParametersCommand}"
               ToolTip="Parametri Configurazione"
               Style="{StaticResource ConfigurationParameters_Button}">
-         <Image Source="/Resources/NewPage/adjustment.png" 
+         <Image Source="{StaticResource Adjustment_Image}" 
                 Style="{StaticResource BTLDataWnd_Image}"/>
       </Button>
       <StackPanel Grid.Column="1" 
@@ -36,13 +36,13 @@
          <Button Command="{Binding New_Command}"
                  ToolTip="{Binding NewToolTip}"
                  Style="{StaticResource ConfigurationParameters_Button}">
-            <Image Source="/Resources/NewPage/newdocument.png"
+            <Image Source="{StaticResource NewDocument_Image}"
                    Style="{StaticResource BTLDataWnd_Image}"/>
          </Button>
          <Button Command="{Binding OpenFileNameCustomConfigCommand}"
                  ToolTip="{Binding SaveAsToolTip}"
                  Style="{StaticResource ConfigurationParameters_Button}">
-            <Image Source="/Resources/NewPage/+.png"
+            <Image Source="{StaticResource Plus_Image}"
                    Style="{StaticResource BTLDataWnd_Image}"/>
          </Button>
          <Button Command="{Binding SaveCommand}"
diff --git a/EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerVM.vb b/EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerVM.vb
index 4eb220c0..5a3dfae4 100644
--- a/EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerVM.vb
+++ b/EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerVM.vb
@@ -274,7 +274,7 @@ Public Class StrategyManagerVM
       ' Controlla se il file JSON è stato modificato
       If Not m_bIsModifyStrategy Then Return
       ' Chiede conferma per il salvataggio
-      If MessageBox.Show(EgtMsg(62580), EgtMsg(15003), MessageBoxButton.YesNo, MessageBoxImage.Information) = MessageBoxResult.Yes Then
+      If EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62580), EgtMsg(15003), MessageBoxButton.YesNo, MessageBoxImage.Information) = MessageBoxResult.Yes Then
          m_SelStrategySetup.Write(Map.refGeneralParametersStrategyVM.GeneralParametersList)
       End If
    End Sub
@@ -1792,7 +1792,7 @@ Public Class ListStrategyParameter
             Map.refProjectVM.MachGroupPanelVM.SelectedMachGroup.SelPart.SelFeatureVM.SetbStrategy_Visibility(Visibility.Visible)
          End If
       End If
-         NotifyPropertyChanged(NameOf(bIsListModify))
+      NotifyPropertyChanged(NameOf(bIsListModify))
    End Sub
 
 #Region "Messages"
diff --git a/EgtBEAMWALL.Optimizer/StrategyManager/StrategyProductionV.xaml b/EgtBEAMWALL.Optimizer/StrategyManager/StrategyProductionV.xaml
index 8a54f4d6..cb2aefd1 100644
--- a/EgtBEAMWALL.Optimizer/StrategyManager/StrategyProductionV.xaml
+++ b/EgtBEAMWALL.Optimizer/StrategyManager/StrategyProductionV.xaml
@@ -49,13 +49,13 @@
          <Button Command="{Binding Ok_Command}"
                  ToolTip="{Binding Ok_Msg}"
                  Style="{StaticResource ToolBarViewPanel_Button}">
-            <Image Source="/Resources/NewPage/Ok.png"
+            <Image Source="{StaticResource Ok_Image}"
                    Style="{StaticResource BTLDataWnd_Image}"/>
          </Button>
          <Button Command="{Binding Cancel_Command}"
                  ToolTip="{Binding Cancel_Msg}"
                  Style="{StaticResource ToolBarViewPanel_Button}">
-            <Image Source="/Resources/PDFEditor/Delete.png"
+            <Image Source="{StaticResource Delete_Image}"
                    Style="{StaticResource BTLDataWnd_Image}"/>
          </Button>
       </StackPanel>
diff --git a/EgtBEAMWALL.Optimizer/StrategyManager/StrategyV.xaml b/EgtBEAMWALL.Optimizer/StrategyManager/StrategyV.xaml
index e1e2719c..618c8023 100644
--- a/EgtBEAMWALL.Optimizer/StrategyManager/StrategyV.xaml
+++ b/EgtBEAMWALL.Optimizer/StrategyManager/StrategyV.xaml
@@ -38,12 +38,12 @@
                Style="{StaticResource Strategy_StackPanel}">
       <Button Command="{Binding AddSelectedStrategyCommand}"
               Style="{StaticResource Strategy_Button}">
-         <Image Source="/Resources/NewPage/MoveRight.png"
+         <Image Source="{StaticResource MoveRight_Image}"
                 Style="{StaticResource BTLDataWnd_Image}"/>
       </Button>
       <Button Command="{Binding RemoveSelectedStrategyCommand}"
               Style="{StaticResource Strategy_Button}">
-         <Image Source="/Resources/NewPage/MoveLeft.png" 
+         <Image Source="{StaticResource MoveLeft_Image}" 
                 Style="{StaticResource BTLDataWnd_Image}"/>
       </Button>
    </StackPanel>
@@ -75,12 +75,12 @@
                Style="{StaticResource Strategy_StackPanel}">
       <Button Command="{Binding MoveUpSelectedStrategyCommand}"
               Style="{StaticResource Strategy_Button}">
-         <Image Source="/Resources/NewPage/MoveUp.png"
+         <Image Source="{StaticResource MoveUp_Image}"
                 Style="{StaticResource BTLDataWnd_Image}"/>
       </Button>
       <Button Command="{Binding MoveDownSelectedStrategyCommand}"
               Style="{StaticResource Strategy_Button}">
-         <Image Source="/Resources/NewPage/MoveDown.png"
+         <Image Source="{StaticResource MoveDown_Image}"
                 Style="{StaticResource BTLDataWnd_Image}"/>
       </Button>
    </StackPanel>
diff --git a/EgtBEAMWALL.Optimizer/ToolsDbWindow/MyToolDbWindowVM.vb b/EgtBEAMWALL.Optimizer/ToolsDbWindow/MyToolDbWindowVM.vb
index bd4328b4..c909a1f2 100644
--- a/EgtBEAMWALL.Optimizer/ToolsDbWindow/MyToolDbWindowVM.vb
+++ b/EgtBEAMWALL.Optimizer/ToolsDbWindow/MyToolDbWindowVM.vb
@@ -59,7 +59,7 @@ Public Class MyToolDbWindowVM
       ' verifico che il file di configurazione attrezzaggio (lua) della macchina esista
       If Not File.Exists(CurrentMachine.sMachScriptDir & "\" & SETUP_LUA) Then
          EgtOutLog("SetUp error: SetUp configuration file doesn't exist ")
-         MessageBox.Show(EgtMsg(6477), EgtMsg(6471), MessageBoxButton.OK, MessageBoxImage.Error)
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(6477), EgtMsg(6471), MessageBoxButton.OK, MessageBoxImage.Error)
          Return
       End If
       ' carico Lua che contiene le funzioni per ottenere le posizioni valide dell'utensile selezionato,
@@ -78,7 +78,7 @@ Public Class MyToolDbWindowVM
          EgtLuaGetGlobIntVar("STU.ERR", nErr)
          If nErr = 0 Then
             If EgtGetHeadExitCount(sHead) = 0 Then
-               MessageBox.Show(EgtMsg(6478), EgtMsg(6471), MessageBoxButton.OK, MessageBoxImage.Error)
+               EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(6478), EgtMsg(6471), MessageBoxButton.OK, MessageBoxImage.Error)
                Return
             End If
          End If
diff --git a/EgtBEAMWALL.Optimizer/Utility/DbControllers.vb b/EgtBEAMWALL.Optimizer/Utility/DbControllers.vb
index 01cbbc7e..66c08f8f 100644
--- a/EgtBEAMWALL.Optimizer/Utility/DbControllers.vb
+++ b/EgtBEAMWALL.Optimizer/Utility/DbControllers.vb
@@ -83,7 +83,7 @@ Public Module DbControllers
          End If
       Catch ex As Exception
          EgtOutLog("InitDb error: " & ex.ToString())
-         MessageBox.Show(Application.Current.MainWindow, "Db connection error!!", "Error")
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62554), EgtMsg(15001))
          End
       End Try
 
diff --git a/EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml b/EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml
index 02f99619..e41a77cf 100644
--- a/EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml
+++ b/EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml
@@ -50,6 +50,102 @@
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
+   <!--#region Image-->
+
+   <BitmapImage x:Key="Adjustment_Image" UriSource="/Resources/NewPage/adjustment.png"/>
+   <BitmapImage x:Key="AddPart_Image" UriSource="/Resources/LeftPanel/AddPart.png"/>
+   <BitmapImage x:Key="UpdateBTL_Image" UriSource="/Resources/ProjectManager/UpdateBTL.png"/>
+   <BitmapImage x:Key="HeaderRotate_Image" UriSource="/Resources/NewPage/RotateIntestazione.png"/>
+   <BitmapImage x:Key="Rotate_Image" UriSource="/Resources/NewPage/Rotate.png"/>
+   <BitmapImage x:Key="HeaderInversion_Image" UriSource="/Resources/NewPage/InversionIntestazione.png"/>
+   <BitmapImage x:Key="HeaderVerify_Image" UriSource="/Resources/NewPage/VerifyIntestazione.png"/>
+   <BitmapImage x:Key="Verify_Image" UriSource="/Resources/CALCPanel/Verify.png"/>
+   <BitmapImage x:Key="HeaderAddToRawPart_Image" UriSource="/Resources/NewPage/AddToRawPartIntestazione.png"/>
+   <BitmapImage x:Key="AddToRawPart_Image" UriSource="/Resources/LeftPanel/AddToRawPart.png"/>
+   <BitmapImage x:Key="HeaderSetting_Image" UriSource="/Resources/NewPage/SettingIntestazione.png"/>
+   <BitmapImage x:Key="Setting_Image" UriSource="/Resources/NewPage/Setting.png"/>
+   <BitmapImage x:Key="Edit_Image" UriSource="/Resources/CALCPanel/Edit.png"/>
+   <BitmapImage x:Key="Ok_Image" UriSource="/Resources/NewPage/Ok.png"/>
+   <BitmapImage x:Key="Delete_Image" UriSource="/Resources/PDFEditor/Delete.png"/>
+   <BitmapImage x:Key="CopyPart_Image" UriSource="/Resources/LeftPanel/CopyPart.png"/>
+   <BitmapImage x:Key="Remove_Image" UriSource="/Resources/NewPage/Remove.png"/>
+   <BitmapImage x:Key="Simulate_Image" UriSource="/Resources/CALCPanel/Simulate.png"/>
+   <BitmapImage x:Key="ResetCalc_Image" UriSource="/Resources/CALCPanel/ResetCalc.png"/>
+   <BitmapImage x:Key="ChooseMachine_Image" UriSource="/Resources/CALCPanel/ChooseMachine.png"/>
+   <BitmapImage x:Key="Save_Image" UriSource="/Resources/ProjectManager/Save.png"/>
+   <BitmapImage x:Key="CopyFeature_Image" UriSource="/Resources/LeftPanel/CopyFeature.png"/>
+   <BitmapImage x:Key="AddFeature_Image" UriSource="/Resources/LeftPanel/AddFeature.png"/>
+   <BitmapImage x:Key="MacroFeature_Image" UriSource="/Resources/LeftPanel/MacroFeature.png"/>
+   <BitmapImage x:Key="Line2P_Image" UriSource="/Resources/DrawPanel/Line2P.png"/>
+   <BitmapImage x:Key="DeleteD_Image" UriSource="/Resources/DrawPanel/Delete.png"/>
+   <BitmapImage x:Key="ModifyCurve_Image" UriSource="/Resources/DrawPanel/ModifyCurve.png"/>
+   <BitmapImage x:Key="AddPointCurve_Image" UriSource="/Resources/DrawPanel/AddPointCurve.png"/>
+   <BitmapImage x:Key="RemovePointCurve_Image" UriSource="/Resources/DrawPanel/RemovePointCurve.png"/>
+   <BitmapImage x:Key="ChangeStart_Image" UriSource="/Resources/DrawPanel/ChangeStart.png"/>
+   <BitmapImage x:Key="InvertCurve_Image" UriSource="/Resources/DrawPanel/InvertCurve.png"/>
+   <BitmapImage x:Key="Move_Image" UriSource="/Resources/DrawPanel/Move.png"/>
+   <BitmapImage x:Key="RotateD_Image" UriSource="/Resources/DrawPanel/Rotate.png"/>
+   <BitmapImage x:Key="Text_Image" UriSource="/Resources/DrawPanel/Text.png"/>
+   <BitmapImage x:Key="Plus_Image" UriSource="/Resources/NewPage/+.png"/>
+   <BitmapImage x:Key="DeselectAll_Image" UriSource="/Resources/NewPage/deselectall.png"/>
+   <BitmapImage x:Key="SelectAll_Image" UriSource="/Resources/NewPage/selectall.png"/>
+   <BitmapImage x:Key="GetDist_Image" UriSource="/Resources/InstrumentPanel/GetDist+.png"/>
+   <BitmapImage x:Key="ChangeParam_Image" UriSource="/Resources/InstrumentPanel/ChangeParam.png"/>
+   <BitmapImage x:Key="HeaderProduceRawPart_Image" UriSource="/Resources/NewPage/ProduceRawPartIntestazione.png"/>
+   <BitmapImage x:Key="ProduceRawPart_Image" UriSource="/Resources/TopPanel/ProduceRawPart.png"/>
+   <BitmapImage x:Key="CopyRawPart_Image" UriSource="/Resources/TopPanel/CopyRawPart.png"/>
+   <BitmapImage x:Key="ReOrderPart_Image" UriSource="/Resources/TopPanel/ReOrderPart.png"/>
+   <BitmapImage x:Key="HeaderRotateRawPart_Image" UriSource="/Resources/NewPage/RotateIntestazioneRawPart.png"/>
+   <BitmapImage x:Key="HeaderInversionRawPart_Image" UriSource="/Resources/NewPage/InversionIntestazioneRawPart.png"/>
+   <BitmapImage x:Key="MoveUp_Image" UriSource="/Resources/NewPage/MoveUp.png"/>
+   <BitmapImage x:Key="MoveDown_Image" UriSource="/Resources/NewPage/MoveDown.png"/>
+   <BitmapImage x:Key="VerifyAll_Image" UriSource="/Resources/CALCPanel/VerifyAll.png"/>
+   <BitmapImage x:Key="AllFilter_Image" UriSource="/Resources/LeftPanel/All_Filter.png"/>
+   <BitmapImage x:Key="Inversion_Image" UriSource="/Resources/NewPage/Inversion.png"/>
+   <BitmapImage x:Key="Send_Image" UriSource="/Resources/MainMenu/Send.png"/>
+   <BitmapImage x:Key="MoveLeftParts_Image" UriSource="/Resources/MovePartInRawPart/MoveLeftParts.png"/>
+   <BitmapImage x:Key="MoveRightParts_Image" UriSource="/Resources/MovePartInRawPart/MoveRightParts.png"/>
+   <BitmapImage x:Key="Warehouse_Image" UriSource="/Resources/OptimizePanel/Warehouse.png"/>
+   <BitmapImage x:Key="Analyze_Image" UriSource="/Resources/InstrumentPanel/Analyze.png"/>
+   <BitmapImage x:Key="Part_Image" UriSource="/Resources/NewPage/pezzo.png"/>
+   <BitmapImage x:Key="Statistics_Image" UriSource="/Resources/InstrumentPanel/Statistics.png"/>
+   <BitmapImage x:Key="FileImport_Image" UriSource="/Resources/NewPage/fileimport.png"/>
+   <BitmapImage x:Key="NewDocument_Image" UriSource="/Resources/NewPage/newdocument.png"/>
+   <BitmapImage x:Key="AddProj_Image" UriSource="/Resources/ProjectManager/AddProj.png"/>
+   <BitmapImage x:Key="OpenFolder_Image" UriSource="/Resources/NewPage/openfolder.png"/>
+   <BitmapImage x:Key="Import_Image" UriSource="/Resources/NewPage/import.png"/>
+   <BitmapImage x:Key="Diskette_Image" UriSource="/Resources/NewPage/diskette.png"/>
+   <BitmapImage x:Key="Export_Image" UriSource="/Resources/NewPage/export.png"/>
+   <BitmapImage x:Key="NewRawPart_Image" UriSource="/Resources/LeftPanel/NewRawPart.png"/>
+   <BitmapImage x:Key="ProduceAllRawPart_Image" UriSource="/Resources/TopPanel/ProduceAllRawPart.png"/>
+   <BitmapImage x:Key="MovePartInRawPart_Image" UriSource="/Resources/TopPanel/MovePartInRawPart.png"/>
+   <BitmapImage x:Key="ShowAll_Image" UriSource="/Resources/ShowBeamPanel/ShowAll.png"/>
+   <BitmapImage x:Key="ShowSolid_Image" UriSource="/Resources/ShowBeamPanel/ShowSolid.png"/>
+   <BitmapImage x:Key="ShowBuilding_Image" UriSource="/Resources/ShowBeamPanel/ShowBuilding.png"/>
+   <BitmapImage x:Key="RenderingWF_Image" UriSource="/Resources/ShowPanel/RenderingWF.png"/>
+   <BitmapImage x:Key="RenderingHL_Image" UriSource="/Resources/ShowPanel/RenderingHL.png"/>
+   <BitmapImage x:Key="RenderingSH_Image" UriSource="/Resources/ShowPanel/RenderingSH.png"/>
+   <BitmapImage x:Key="SplashScreen_Image" UriSource="/Resources/NewPage/LogoProvaStrategy.png"/>
+   <BitmapImage x:Key="CopyToClipboard_Image" UriSource="/Resources/Statistics/CopyToClipboard.png"/>
+   <BitmapImage x:Key="PrintPDF_Image" UriSource="/Resources/Statistics/PrintPDF.png"/>
+   <BitmapImage x:Key="PDFEditor_Image" UriSource="/Resources/PDFEditor/PrintPDF.png"/>
+   <BitmapImage x:Key="MoveUpPDF_Image" UriSource="/Resources/PDFEditor/MoveUp.png"/>
+   <BitmapImage x:Key="MoveDownPDF_Image" UriSource="/Resources/PDFEditor/MoveDown.png"/>
+   <BitmapImage x:Key="PDFPreview_Image" UriSource="/Resources/PDFEditor/PDFPreview.png"/>
+   <BitmapImage x:Key="MoveRight_Image" UriSource="/Resources/NewPage/MoveRight.png"/>
+   <BitmapImage x:Key="MoveLeft_Image" UriSource="/Resources/NewPage/MoveLeft.png"/>
+   <BitmapImage x:Key="ZoomAll_Image" UriSource="/Resources/ViewPanel/ZoomAll+.png"/>
+   <BitmapImage x:Key="LookFromTOP_Image" UriSource="/Resources/ViewPanel/LookFromTOP.png"/>
+   <BitmapImage x:Key="LookFromFRONT_Image" UriSource="/Resources/ViewPanel/LookFromFRONT.png"/>
+   <BitmapImage x:Key="LookFromRIGHT_Image" UriSource="/Resources/ViewPanel/LookFromRIGHT.png"/>
+   <BitmapImage x:Key="LookFromBACK_Image" UriSource="/Resources/ViewPanel/LookFromBACK.png"/>
+   <BitmapImage x:Key="LookFromLEFT_Image" UriSource="/Resources/ViewPanel/LookFromLEFT.png"/>
+   <BitmapImage x:Key="LookFromISO_SW_Image" UriSource="/Resources/ViewPanel/LookFromISO_SW.png"/>
+
+   <!--#endregion Image-->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
    <!--#region TextBlock-->
 
    <!--#region ForegroundWhite-->
@@ -157,7 +253,7 @@
    </Style>
 
    <!--#region FeatureInPartInRawPartList-->
-   
+
    <Style x:Key="FeatureInPartInRawPartList_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource ForegroundCorduroy_TextBlock}">
       <Setter Property="TextAlignment" Value="Center"/>
       <Setter Property="FontWeight" Value="Bold"/>
@@ -348,7 +444,7 @@
    <!--#endregion StrategyModify-->
 
    <!--#region CALC_ROT-->
-   
+
    <Style x:Key="CALC_ROT_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
       <Setter Property="Text" Value="&#11119;"/>
       <Setter Property="Foreground" Value="{StaticResource BeamWall_Blue}"/>
@@ -364,7 +460,7 @@
    </Style>
 
    <!--#region CALC_ROTFeature-->
-   
+
    <Style x:Key="CALC_ROTFeature_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource CALC_ROT_TextBlock}">
       <Setter Property="FontSize" Value="10.5"/>
       <Setter Property="Margin" Value="-12,-2,1,0"/>
@@ -375,7 +471,7 @@
    </Style>
 
    <!--#endregion CALC_ROTFeature-->
-   
+
    <!--#endregion CALC_ROT-->
 
    <Style x:Key="Prod_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
@@ -456,7 +552,7 @@
    <!--#region EgtOptimizer-->
 
    <!--#region Dimension_TextBox-->
-   
+
    <Style x:Key="Dimension_TextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource EgtOptmizer_TextBox}">
       <Setter Property="VerticalAlignment" Value="Center"/>
       <Setter Property="Width" Value="55"/>
@@ -467,7 +563,7 @@
    </Style>
 
    <!--#endregion Dimension_TextBox-->
-   
+
    <Style x:Key="Qty_TextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource EgtOptmizer_TextBox}">
       <Setter Property="VerticalAlignment" Value="Center"/>
       <Setter Property="Width" Value="40"/>
@@ -2452,6 +2548,8 @@
    <Style x:Key="BTLPartList_Image" TargetType="{x:Type Image}">
       <Setter Property="Height" Value="20"/>
       <Setter Property="Stretch" Value="Uniform"/>
+      <Setter Property="RenderOptions.BitmapScalingMode" Value="NearestNeighbor"/>
+      <Setter Property="SnapsToDevicePixels" Value="True"/>
    </Style>
 
    <Style x:Key="CurrDraw_Image" TargetType="{x:Type Image}">
diff --git a/EgtBEAMWALL.Optimizer/Utility/MyMachine.vb b/EgtBEAMWALL.Optimizer/Utility/MyMachine.vb
index da79ff97..a01fe560 100644
--- a/EgtBEAMWALL.Optimizer/Utility/MyMachine.vb
+++ b/EgtBEAMWALL.Optimizer/Utility/MyMachine.vb
@@ -71,7 +71,7 @@ Public Class MyMachine
                Dim MachParamString As String = sMachParamType & "," & MachParamItem.sName & "," & MachParamItem.sValue & "," & MachParamItem.sDescription
                Dim bOk = WriteMachPrivateProfileString(MachParamItem.nParentTable, MachParamItem.nParamIndex, MachParamString)
                If Not bOk Then
-                  MessageBox.Show(EgtMsg(61859), EgtMsg(30007))
+                  EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61859), EgtMsg(30007))
                   Return
                End If
                MachParamItem.IsModifiedReset()
@@ -142,7 +142,7 @@ Public Class MyMachine
       For Each MachTableItem In MachTableList
          For Each MachParamItem In MachTableItem.MachParamList
             If MachParamItem.IsModified Then
-               If MessageBox.Show(EgtMsg(61860), "", MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then
+               If EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61860), "", MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then
                   ' scrivo i parametri Macchina
                   WriteMachParams()
                   WriteMachParamsLua()
diff --git a/EgtBEAMWALL.Optimizer/ViewPanel/ViewPanelV.xaml b/EgtBEAMWALL.Optimizer/ViewPanel/ViewPanelV.xaml
index aca9c8f4..cf028cc2 100644
--- a/EgtBEAMWALL.Optimizer/ViewPanel/ViewPanelV.xaml
+++ b/EgtBEAMWALL.Optimizer/ViewPanel/ViewPanelV.xaml
@@ -6,44 +6,44 @@
    <Button ToolTip="{Binding ZoomAllToolTip}"
            Command="{Binding ZoomAllCommand}"
            Style="{StaticResource ToolBarViewPanel_Button}">
-      <Image Source="/Resources/ViewPanel/ZoomAll+.png"
+      <Image Source="{StaticResource ZoomAll_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
    
    <Button ToolTip="{Binding LookFromTopToolTip}"
            Command="{Binding TopViewCommand}"
            Style="{StaticResource ToolBarViewPanel_Button}">
-      <Image Source="/Resources/ViewPanel/LookFromTOP.png"
+      <Image Source="{StaticResource LookFromTOP_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
    <Button ToolTip="{Binding LookFromFrontToolTip}"
            Command="{Binding FrontViewCommand}"
            Style="{StaticResource ToolBarViewPanel_Button}">
-      <Image Source="/Resources/ViewPanel/LookFromFRONT.png"
+      <Image Source="{StaticResource LookFromFRONT_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
    <Button ToolTip="{Binding LookFromRightToolTip}"
            Command="{Binding RightViewCommand}"
            Style="{StaticResource ToolBarViewPanel_Button}">
-      <Image Source="/Resources/ViewPanel/LookFromRIGHT.png"
+      <Image Source="{StaticResource LookFromRIGHT_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
    <Button ToolTip="{Binding LookFromBackToolTip}"
            Command="{Binding BackViewCommand}"
            Style="{StaticResource ToolBarViewPanel_Button}">
-      <Image Source="/Resources/ViewPanel/LookFromBACK.png"
+      <Image Source="{StaticResource LookFromBACK_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
    <Button ToolTip="{Binding LookFromLeftToolTip}"
            Command="{Binding LeftViewCommand}"
            Style="{StaticResource ToolBarViewPanel_Button}">
-      <Image Source="/Resources/ViewPanel/LookFromLEFT.png"
+      <Image Source="{StaticResource LookFromLEFT_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
    <Button ToolTip="{Binding LookFromIso_SWToolTip}"
            Command="{Binding IsoViewSWCommand}"
            Style="{StaticResource ToolBarViewPanel_Button}">
-      <Image Source="/Resources/ViewPanel/LookFromISO_SW.png"
+      <Image Source="{StaticResource LookFromISO_SW_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
 
diff --git a/EgtBEAMWALL.Optimizer/WarehouseWnd/WarehouseWndVM.vb b/EgtBEAMWALL.Optimizer/WarehouseWnd/WarehouseWndVM.vb
index fd26c525..da94d673 100644
--- a/EgtBEAMWALL.Optimizer/WarehouseWnd/WarehouseWndVM.vb
+++ b/EgtBEAMWALL.Optimizer/WarehouseWnd/WarehouseWndVM.vb
@@ -625,7 +625,7 @@ Public Class WarehouseWndVM
             If Map.refProjectVM.BTLStructureVM.nPROJTYPE = MachineType.BEAM Then
                ' Verifico che i valori siano tutti > 0
                If dStartOffset <= 0 OrElse dOffset <= 0 Then
-                  MessageBox.Show(IncorrectValues_Msg, Error_Msg)
+                  EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, IncorrectValues_Msg, Error_Msg)
                   Return
                End If
                ' Se i valori sono tutti > 0 li scrivo nel file INI
@@ -644,7 +644,7 @@ Public Class WarehouseWndVM
             ElseIf Map.refProjectVM.BTLStructureVM.nPROJTYPE = MachineType.WALL Then
                ' Verifico che i valori siano tutti > 0
                If dKerf <= 0 OrElse dOffset <= 0 Then
-                  MessageBox.Show(IncorrectValues_Msg, Error_Msg)
+                  EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, IncorrectValues_Msg, Error_Msg)
                   Return
                End If
                ' Se i valori sono tutti > 0 li scrivo nel file INI
@@ -667,13 +667,13 @@ Public Class WarehouseWndVM
             If Map.refProjectVM.BTLStructureVM.nPROJTYPE = MachineType.BEAM Then
                ' Verifico che i valori siano tutti > 0
                If dStartOffset < 0 OrElse dOffset < 0 Then
-                  MessageBox.Show(IncorrectValues_Msg, Error_Msg)
+                  EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, IncorrectValues_Msg, Error_Msg)
                   Return
                End If
 
                For Each SPItem In SParamList
                   If IsNothing(SParamList(ParamIndex - 1).SectXMat) OrElse SParamList(ParamIndex - 1).dL <= 0 Then
-                     MessageBox.Show(IncorrectValues_Msg, Error_Msg)
+                     EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, IncorrectValues_Msg, Error_Msg)
                      Return
                   End If
                   ParamIndex += 1
@@ -704,12 +704,12 @@ Public Class WarehouseWndVM
             ElseIf Map.refProjectVM.BTLStructureVM.nPROJTYPE = MachineType.WALL Then
                ' Verifico che i valori siano tutti > 0
                If dKerf < 0 OrElse dOffset < 0 Then
-                  MessageBox.Show(IncorrectValues_Msg, Error_Msg)
+                  EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, IncorrectValues_Msg, Error_Msg)
                   Return
                End If
                For Each SPItem In SParamList
                   If IsNothing(SParamList(ParamIndex - 1).SectXMat) OrElse SParamList(ParamIndex - 1).dW <= 0 OrElse SParamList(ParamIndex - 1).dL <= 0 Then
-                     MessageBox.Show(IncorrectValues_Msg, Error_Msg)
+                     EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, IncorrectValues_Msg, Error_Msg)
                      Return
                   End If
                   ParamIndex += 1
@@ -838,14 +838,14 @@ Public Class WarehouseWndVM
                   End If
                Next
                If bExist Then
-                  MessageBox.Show(ValueExists_Msg, Error_Msg)
+                  EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, ValueExists_Msg, Error_Msg)
                Else
                   SParamList.Add(New SParam(dLValue))
                   sNewL = Nothing
                   NewBeamParam_Visibility = Visibility.Collapsed
                End If
             Else
-               MessageBox.Show(IncorrectValue_Msg, Error_Msg)
+               EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, IncorrectValue_Msg, Error_Msg)
             End If
          Case MachineType.WALL
             If Not IsNothing(sNewW) Then StringToLenAdv(sNewW, dWValue, True)
@@ -860,7 +860,7 @@ Public Class WarehouseWndVM
                   End If
                Next
                If bExist Then
-                  MessageBox.Show(ValuesExist_Msg, Error_Msg)
+                  EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, ValuesExist_Msg, Error_Msg)
                Else
                   SParamList.Add(New SParam(dWValue, dLValue))
                   sNewW = Nothing
@@ -868,7 +868,7 @@ Public Class WarehouseWndVM
                   NewWallParam_Visibility = Visibility.Collapsed
                End If
             Else
-               MessageBox.Show(IncorrectValues_Msg, Error_Msg)
+               EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, IncorrectValues_Msg, Error_Msg)
             End If
       End Select
    End Sub
@@ -909,7 +909,7 @@ Public Class WarehouseWndVM
    Public Sub RemoveParam()
       If Not IsNothing(SelSParam) Then
          If SelSParam.Equals(SelCurrentS) Then
-            If MessageBox.Show(Application.Current.MainWindow, RemoveCurrent_Msg, Attention_Msg, MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then
+            If EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, RemoveCurrent_Msg, Attention_Msg, MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then
                SParamList.Remove(SelSParam)
                m_RemovedParamsCount += 1
                If SParamList.Count > 0 Then
@@ -1023,7 +1023,7 @@ Public Class WarehouseWndVM
          If WhWallParamList.Last().dMaxThickness > WhWallParamList.Last().dMinThickness Then
             WhWallParamList.Add(New WhWallParam(0, CurrentMachine.dMaxRawH))
          Else
-            System.Windows.MessageBox.Show(EgtMsg(61777), "", MessageBoxButton.OK, MessageBoxImage.Warning)
+            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61777), "", MessageBoxButton.OK, MessageBoxImage.Warning)
          End If
       Else
          WhWallParamList.Add(New WhWallParam(0, CurrentMachine.dMaxRawH))
diff --git a/EgtBEAMWALL.Supervisor/CALCPanel/CALCPanelVM.vb b/EgtBEAMWALL.Supervisor/CALCPanel/CALCPanelVM.vb
index e6e38112..3b760195 100644
--- a/EgtBEAMWALL.Supervisor/CALCPanel/CALCPanelVM.vb
+++ b/EgtBEAMWALL.Supervisor/CALCPanel/CALCPanelVM.vb
@@ -91,7 +91,7 @@ Public Class CALCPanelVM
 
    Private Sub Calc_Ended(sender As Object, e As CalcEndEventArgs)
       If e.End_ <> CalcEndEventArgs.Results.OK Then
-         MessageBox.Show("Execution error (all processes are disabled)")
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62540))
       End If
       ' ciclo sui pezzi
       Dim bNotOkFound As Boolean = False
diff --git a/EgtBEAMWALL.Supervisor/CALCPanel/CalcPanelV.xaml b/EgtBEAMWALL.Supervisor/CALCPanel/CalcPanelV.xaml
index 55dc4973..bb2f8899 100644
--- a/EgtBEAMWALL.Supervisor/CALCPanel/CalcPanelV.xaml
+++ b/EgtBEAMWALL.Supervisor/CALCPanel/CalcPanelV.xaml
@@ -7,7 +7,7 @@
            Command="{Binding Simulate_Command}"
            IsEnabled="{Binding CALCPanel_IsEnabled}"
            Style="{StaticResource ToolBarViewPanel_Button}">
-      <Image Source="/Resources/CALCPanel/Simulate.png"
+      <Image Source="{StaticResource Simulate_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
    <ToggleButton Content="Log"
diff --git a/EgtBEAMWALL.Supervisor/Comms/NUMAxiumComm.vb b/EgtBEAMWALL.Supervisor/Comms/NUMAxiumComm.vb
index 6b70f440..0bd582c1 100644
--- a/EgtBEAMWALL.Supervisor/Comms/NUMAxiumComm.vb
+++ b/EgtBEAMWALL.Supervisor/Comms/NUMAxiumComm.vb
@@ -474,9 +474,9 @@ Public Class NUMAxiumComm
 
    Private Sub objDGeneralFunction_VariableWritten(ByVal errorCode As Short)
       If errorCode <> 0 Then
-         MessageBox.Show("Error from VariableWritten:" & " " & errorCode.ToString())
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62541) & " " & errorCode.ToString())
       Else
-         MessageBox.Show("VariableWritten successfully")
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62542))
       End If
    End Sub
 
diff --git a/EgtBEAMWALL.Supervisor/Comms/NUMAxiumPcToolkitComm.vb b/EgtBEAMWALL.Supervisor/Comms/NUMAxiumPcToolkitComm.vb
index 1d8a8ae6..bfdc2328 100644
--- a/EgtBEAMWALL.Supervisor/Comms/NUMAxiumPcToolkitComm.vb
+++ b/EgtBEAMWALL.Supervisor/Comms/NUMAxiumPcToolkitComm.vb
@@ -741,9 +741,9 @@ Public Class NUMAxiumPcToolkitComm
 
    Private Sub objDGeneralFunction_VariableWritten(ByVal errorCode As Short)
       If errorCode <> 0 Then
-         MessageBox.Show("Error from VariableWritten:" & " " & errorCode.ToString())
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62541) & " " & errorCode.ToString())
       Else
-         MessageBox.Show("VariableWritten successfully")
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62542))
       End If
    End Sub
 
diff --git a/EgtBEAMWALL.Supervisor/Comms/NUMFlexiumComm.vb b/EgtBEAMWALL.Supervisor/Comms/NUMFlexiumComm.vb
index 9b975aa4..56826d00 100644
--- a/EgtBEAMWALL.Supervisor/Comms/NUMFlexiumComm.vb
+++ b/EgtBEAMWALL.Supervisor/Comms/NUMFlexiumComm.vb
@@ -446,9 +446,9 @@ Public Class NUMFlexiumComm
 
    Private Sub objDGeneralFunction_VariableWritten(ByVal errorCode As Short)
       If errorCode <> 0 Then
-         MessageBox.Show("Error from VariableWritten:" & " " & errorCode.ToString())
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62541) & " " & errorCode.ToString())
       Else
-         MessageBox.Show("VariableWritten successfully")
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62542))
       End If
    End Sub
 
diff --git a/EgtBEAMWALL.Supervisor/Comms/TPAComm.vb b/EgtBEAMWALL.Supervisor/Comms/TPAComm.vb
index ac7fc5f5..06b34a3c 100644
--- a/EgtBEAMWALL.Supervisor/Comms/TPAComm.vb
+++ b/EgtBEAMWALL.Supervisor/Comms/TPAComm.vb
@@ -122,7 +122,7 @@ Public Class TPAComm
          AddHandler _remObject.RPCUpdate, m_Rem_RPCUpdateEventHandler
          AddHandler _remObject.VariableCommandExecuted, m_Rem_VariableCommandExecutedEventHandler
       Catch ex As System.Runtime.Remoting.RemotingException
-         MessageBox.Show(Application.Current.MainWindow, ex.Message)
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, ex.Message)
       End Try
       ' creo classe che gestisce variabili
       m_RWVariableManager = RWVariableManager.CreateRWVariableManager(Me)
@@ -184,7 +184,7 @@ Public Class TPAComm
 
    Private Sub RemoteObject_ServerError(ByVal sender As Object, ByVal seEA As ISOCNC.Remoting.ServerErrorEventArgs)
       m_ResultCallbackDlg(CommandTypes.ERROR_, CommandStates.ERROR_, ResultTypes.RESULT, EgtUILib.EgtMsg(62543) & seEA.[Error])
-      MessageBox.Show(Application.Current.MainWindow, EgtUILib.EgtMsg(62543) & seEA.[Error])
+      EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtUILib.EgtMsg(62543) & seEA.[Error])
    End Sub
 
    Private Sub RemoteObject_AxisCoordinatesUpdate(ByVal axisValue As Double, ByVal axisIndex As Integer)
diff --git a/EgtBEAMWALL.Supervisor/ConfigurationPage/ConfigurationPageV.xaml b/EgtBEAMWALL.Supervisor/ConfigurationPage/ConfigurationPageV.xaml
index 7de062fb..207b4c81 100644
--- a/EgtBEAMWALL.Supervisor/ConfigurationPage/ConfigurationPageV.xaml
+++ b/EgtBEAMWALL.Supervisor/ConfigurationPage/ConfigurationPageV.xaml
@@ -26,7 +26,7 @@
                           ToolTip="{Binding SaveToolTip}"
                           Visibility="{Binding General_Visibility}"
                           Style="{StaticResource SaveOptionPanel_Button}">
-                     <Image Source="/Resources/ProjectManager/Save.png"
+                     <Image Source="{StaticResource Save_Image}"
                             Style="{StaticResource BTLDataWnd_Image}"/>
                   </Button>
                </StackPanel>
diff --git a/EgtBEAMWALL.Supervisor/ItemParamList/RawPartListV.xaml b/EgtBEAMWALL.Supervisor/ItemParamList/RawPartListV.xaml
index 8c4aec5b..2cfd3615 100644
--- a/EgtBEAMWALL.Supervisor/ItemParamList/RawPartListV.xaml
+++ b/EgtBEAMWALL.Supervisor/ItemParamList/RawPartListV.xaml
@@ -47,7 +47,8 @@
                           Command="{Binding ProduceMachGroup_Command}"
                           IsEnabled="{Binding Produce_IsEnabled}"
                           Style="{StaticResource ToolBar_Button}">
-                     <Image Source="/Resources/RawPartList/Produce.png" Stretch="Uniform"/>
+                     <Image Source="{StaticResource Produce_Image}"
+                            Style="{StaticResource BTLDataWnd_Image}"/>
                   </Button>
                </DataTemplate>
             </DataGridTemplateColumn.CellTemplate>
diff --git a/EgtBEAMWALL.Supervisor/LeftPanel/LeftPanelV.xaml b/EgtBEAMWALL.Supervisor/LeftPanel/LeftPanelV.xaml
index 3b0aea1e..9a183691 100644
--- a/EgtBEAMWALL.Supervisor/LeftPanel/LeftPanelV.xaml
+++ b/EgtBEAMWALL.Supervisor/LeftPanel/LeftPanelV.xaml
@@ -70,41 +70,41 @@
          <Button Command="{Binding MoveUpRawPart_Command}"
                  IsEnabled="{Binding MoveRawPart_IsEnabled}"
                  Style="{StaticResource LeftPanel_Button}">
-            <Image Source="/Resources/LeftPanel/MoveUp.png"
+            <Image Source="{StaticResource MoveUp_Image}"
                    Style="{StaticResource BTLDataWnd_Image}"/>
          </Button>
          <Button Command="{Binding MoveDownRawPart_Command}"
                  IsEnabled="{Binding MoveRawPart_IsEnabled}"
                  Style="{StaticResource LeftPanel_Button}">
-            <Image Source="/Resources/LeftPanel/MoveDown.png"
+            <Image Source="{StaticResource MoveDown_Image}"
                    Style="{StaticResource BTLDataWnd_Image}"/>
          </Button>
          <Button ToolTip="{Binding ProduceAll_ToolTip}"
                  Command="{Binding ProduceAll_Command}"
                  IsEnabled="{Binding LeftPanel_IsEnabled}"
                  Style="{StaticResource LeftPanel_Button}">
-            <Image Source="/Resources/LeftPanel/ProduceAll.png"
+            <Image Source="{StaticResource ProduceAll_Image}"
                    Style="{StaticResource BTLDataWnd_Image}"/>
          </Button>
          <Button ToolTip="{Binding DoneRawPart_ToolTip}"
                  Command="{Binding DoneRawPart_Command}"
                  IsEnabled="{Binding DoneRawPart_IsEnabled}"
                  Style="{StaticResource LeftPanel_Button}">
-            <Image Source="/Resources/LeftPanel/DoneRawPart.png"
+            <Image Source="{StaticResource DoneRawPart_Image}"
                    Style="{StaticResource BTLDataWnd_Image}"/>
          </Button>
          <Button ToolTip="{Binding ResetRawPart_ToolTip}"
                  Command="{Binding ResetRawPart_Command}"
                  IsEnabled="{Binding ResetRawPart_IsEnabled}"
                  Style="{StaticResource LeftPanel_Button}">
-            <Image Source="/Resources/LeftPanel/ResetRawPart.png"
+            <Image Source="{StaticResource ResetRawPart_Image}"
                    Style="{StaticResource BTLDataWnd_Image}"/>
          </Button>
          <Button ToolTip="{Binding DeleteRawPart_ToolTip}"
                  Command="{Binding DeleteRawPart_Command}"
                  IsEnabled="{Binding DeleteRawPart_IsEnabled}"
                  Style="{StaticResource LeftPanel_Button}">
-            <Image Source="/Resources/LeftPanel/DeleteRawPart.png"
+            <Image Source="{StaticResource DeleteRawPart_Image}"
                    Style="{StaticResource BTLDataWnd_Image}"/>
          </Button>
       </StackPanel>
@@ -133,7 +133,7 @@
                  IsEnabled="{Binding LeftPanel_IsEnabled}"
                  Visibility="{Binding PrintLabel_Visibility}"
                  Style="{StaticResource LeftPanel_Button}">
-            <Image Source="/Resources/LeftPanel/PrintLabel.png"
+            <Image Source="{StaticResource PrintLabel_Image}"
                    Style="{StaticResource BTLDataWnd_Image}"/>
          </Button>
          <Button ToolTip="{Binding DonePart_ToolTip}"
@@ -141,7 +141,7 @@
                  IsEnabled="{Binding LeftPanel_IsEnabled}"
                  Visibility="{Binding DonePart_Visibility}"
                  Style="{StaticResource LeftPanel_Button}">
-            <Image Source="/Resources/LeftPanel/DonePart.png"
+            <Image Source="{StaticResource DonePart_Image}"
                    Style="{StaticResource BTLDataWnd_Image}"/>
          </Button>
       </StackPanel>
diff --git a/EgtBEAMWALL.Supervisor/LeftPanel/LeftPanelVM.vb b/EgtBEAMWALL.Supervisor/LeftPanel/LeftPanelVM.vb
index 17003b45..6a87f28f 100644
--- a/EgtBEAMWALL.Supervisor/LeftPanel/LeftPanelVM.vb
+++ b/EgtBEAMWALL.Supervisor/LeftPanel/LeftPanelVM.vb
@@ -717,9 +717,6 @@ Public Class LeftPanelVM
 
 #Region "DeleteRawPart"
 
-   ''' <summary>
-   ''' Returns a command that do Exec.
-   ''' </summary>
    Public ReadOnly Property DeleteRawPart_Command As ICommand
       Get
          If m_cmdDeleteRawPart Is Nothing Then
@@ -729,16 +726,13 @@ Public Class LeftPanelVM
       End Get
    End Property
 
-   ''' <summary>
-   ''' Execute the Exec.  This method is invoked by the ExecCommand.
-   ''' </summary>
    Public Sub DeleteRawPart()
       If IsNothing(Map.refSupervisorManagerVM.CurrProd) Then Return
       If IsNothing(Map.refProjectVM.SupervisorMachGroupPanelVM.SelectedMachGroup) Then Return
       Dim SelMachGroup As MyMachGroupVM = Map.refProjectVM.SupervisorMachGroupPanelVM.SelectedMachGroup
       ' se gia' prodotto, o in produzione non lo posso eliminare
       If SelMachGroup.dtStartTime <> Date.MinValue OrElse SelMachGroup.dtEndTime <> Date.MinValue OrElse SelMachGroup.bReadyForMachining OrElse SelMachGroup.bSentToMachine OrElse SelMachGroup.bResetWhileCutting Then
-         MessageBox.Show("Impossibile cancellare il grezzo")
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62544))
          Return
       End If
       ' rimuovo da Db il MachGroup
@@ -764,9 +758,6 @@ Public Class LeftPanelVM
 
 #Region "DonePart"
 
-   ''' <summary>
-   ''' Returns a command that do Exec.
-   ''' </summary>
    Public ReadOnly Property DonePart_Command As ICommand
       Get
          If m_cmdDonePart Is Nothing Then
@@ -776,9 +767,6 @@ Public Class LeftPanelVM
       End Get
    End Property
 
-   ''' <summary>
-   ''' Execute the Exec.  This method is invoked by the ExecCommand.
-   ''' </summary>
    Public Sub DonePart()
       If IsNothing(Map.refSupervisorManagerVM.CurrProd) Then Return
       If IsNothing(Map.refProjectVM.SupervisorMachGroupPanelVM.SelectedMachGroup) Then Return
@@ -792,7 +780,7 @@ Public Class LeftPanelVM
          If CurrPart Is SelMachGroup.SelPart Then
             Exit For
          ElseIf CurrPart.nProduction_State < ItemState.Produced Then
-            MessageBox.Show("It is not possible to set as done a part that has before not already produced parts.", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62545), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)
             Return
          End If
       Next
diff --git a/EgtBEAMWALL.Supervisor/MDIPage/MDIPageV.xaml b/EgtBEAMWALL.Supervisor/MDIPage/MDIPageV.xaml
index d44c17a8..0a60e354 100644
--- a/EgtBEAMWALL.Supervisor/MDIPage/MDIPageV.xaml
+++ b/EgtBEAMWALL.Supervisor/MDIPage/MDIPageV.xaml
@@ -62,7 +62,7 @@
          <Button Grid.Column="1"
                  Command="{Binding SendMDI_Command}"
                  Style="{StaticResource MDIPage_Button}">
-            <Image Source="/Resources/MDIPage/Send.png"
+            <Image Source="{StaticResource Send_Image}"
                    Style="{StaticResource BTLDataWnd_Image}"/>
          </Button>
       </Grid>
diff --git a/EgtBEAMWALL.Supervisor/MachGroupPanel/MyMachGroupVM.vb b/EgtBEAMWALL.Supervisor/MachGroupPanel/MyMachGroupVM.vb
index 42ef1caf..1582e63f 100644
--- a/EgtBEAMWALL.Supervisor/MachGroupPanel/MyMachGroupVM.vb
+++ b/EgtBEAMWALL.Supervisor/MachGroupPanel/MyMachGroupVM.vb
@@ -189,7 +189,7 @@ Public Class MyMachGroupVM
          ' creo nuova barra
          Dim RedoMachGroupVM As MyMachGroupVM = RedoRawPart()
          If IsNothing(RedoMachGroupVM) Then
-            MessageBox.Show("New RawPart creation failed!")
+            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62546))
             Return
          End If
          ' salvo progetto con nuova barra
@@ -222,7 +222,7 @@ Public Class MyMachGroupVM
       ' se progetto travi e lavorazione interrotta da reset
       If Map.refSupervisorManagerVM.CurrProd.nType = BWType.BEAM AndAlso (bResetWhileCutting OrElse dtStartTime <> DateTime.MinValue) And Not Map.refLeftPanelVM.bRestart Then
          ' chiedo se riprendere o rifare la barra da zero
-         Select Case MessageBox.Show(Application.Current.MainWindow, EgtMsg(62509), "", MessageBoxButton.YesNo, MessageBoxImage.Information)
+         Select Case EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62509), "", MessageBoxButton.YesNo, MessageBoxImage.Information)
             Case MessageBoxResult.Yes
                ' segno da rifare pezzi non completamente lavorati 
                For Each Part As PartVM In PartVMList
@@ -274,7 +274,7 @@ Public Class MyMachGroupVM
          If False Then
             ' chiedo se riprendere o rifare il pannello da zero
             Dim MachIndexVariable As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = MACHINDEX)
-            Select Case MessageBox.Show(Application.Current.MainWindow, EgtMsg(62547), "", MessageBoxButton.YesNo, MessageBoxImage.Information)
+            Select Case EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62547), "", MessageBoxButton.YesNo, MessageBoxImage.Information)
                ' se ripresa
                Case MessageBoxResult.Yes
                   ' ripristino indice di lavorazione precedente a reset
@@ -402,7 +402,7 @@ Public Class MyMachGroupVM
             If File.Exists(sLogPath) Then
                Dim LogFile As String() = File.ReadAllLines(sLogPath)
                If LogFile.Count >= 2 AndAlso Not IsNothing(LogFile(1)) Then
-                  MessageBox.Show(Application.Current.MainWindow, LogFile(1), EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error)
+                  EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, LogFile(1), EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error)
                End If
             End If
             Return Nothing
diff --git a/EgtBEAMWALL.Supervisor/MachManagingThread/MachManaging.vb b/EgtBEAMWALL.Supervisor/MachManagingThread/MachManaging.vb
index f7827dfa..db69e9a3 100644
--- a/EgtBEAMWALL.Supervisor/MachManagingThread/MachManaging.vb
+++ b/EgtBEAMWALL.Supervisor/MachManagingThread/MachManaging.vb
@@ -810,7 +810,7 @@ Public Class MachManaging
                      bFileOk = True
                   Catch ex As Exception
                      m_ResultCallbackDlg(CommandTypes.START, CommandStates.ERROR_, ResultTypes.NULL, "Error in copying DEFAULT.ISO file")
-                     MessageBox.Show("Impossibile copiare il file DEFAULT.ISO!", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+                     EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62548), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)
                      Return
                   End Try
                End If
diff --git a/EgtBEAMWALL.Supervisor/MachineLogPage/MachineLogPageV.xaml b/EgtBEAMWALL.Supervisor/MachineLogPage/MachineLogPageV.xaml
index d0261cab..6fc1ee48 100644
--- a/EgtBEAMWALL.Supervisor/MachineLogPage/MachineLogPageV.xaml
+++ b/EgtBEAMWALL.Supervisor/MachineLogPage/MachineLogPageV.xaml
@@ -19,7 +19,7 @@
          <Button Grid.Column="1"
                  Command="{Binding Refresh_Command}"
                  Style="{StaticResource MachineLog_Button}">
-            <Image Source="/Resources/MDIPage/Send.png"
+            <Image Source="{StaticResource Send_Image}"
                    Style="{StaticResource BTLDataWnd_Image}"/>
          </Button>
       </Grid>
@@ -54,7 +54,7 @@
          <Button Grid.Column="1"
                  Command="{Binding Refresh_Command}"
                  Style="{StaticResource MachineLog_Button}">
-            <Image Source="/Resources/MDIPage/Send.png"
+            <Image Source="{StaticResource Send_Image}"
                    Style="{StaticResource BTLDataWnd_Image}"/>
          </Button>
       </StackPanel>
diff --git a/EgtBEAMWALL.Supervisor/MachinePanel/MachinePanelVM.vb b/EgtBEAMWALL.Supervisor/MachinePanel/MachinePanelVM.vb
index b6acf9d8..4b6d94a1 100644
--- a/EgtBEAMWALL.Supervisor/MachinePanel/MachinePanelVM.vb
+++ b/EgtBEAMWALL.Supervisor/MachinePanel/MachinePanelVM.vb
@@ -191,7 +191,7 @@ Public Class MachinePanelVM
       ' ricarico il database per intercettare eventuali aggiornamenti fatti da altre istanze del programma (se la cartella Machines è condivisa)
       If Not EgtTdbReload() Then
          EgtOutLog("Impossible reloading tool Db")
-         MessageBox.Show(EgtMsg(MSG_TOOLDBERRORS + 30), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error)
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(31130), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)
          Return
       End If
 
@@ -218,7 +218,7 @@ Public Class MachinePanelVM
       ' ricarico il database per intercettare eventuali aggiornamenti fatti da altre istanze del programma (se la cartella Machines è condivisa)
       If Not EgtMdbReload() Then
          EgtOutLog("Impossible reloading machining Db")
-         MessageBox.Show(EgtMsg(MSG_MACHININGDBERRORS + 8), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error)
+         MessageBox.Show(EgtMsg(31408), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)
          Return
       End If
 
@@ -239,7 +239,7 @@ Public Class MachinePanelVM
       ' verifico che il file di configurazione attrezzaggio (lua) della macchina esista
       If Not File.Exists(CurrentMachine.sMachDir & "\Scripts\" & SETUP_LUA) Then
          EgtOutLog("SetUp error: SetUp configuration file doesn't exist ")
-         MessageBox.Show(EgtMsg(MSG_SETUPERRORS + 7), EgtMsg(MSG_SETUPERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error)
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(6477), EgtMsg(6471), MessageBoxButton.OK, MessageBoxImage.Error)
          Return
       End If
       ' carico Lua che contiene le funzioni per ottenere le posizioni valide dell'utensile selezionato,
@@ -258,7 +258,7 @@ Public Class MachinePanelVM
          EgtLuaGetGlobIntVar("STU.ERR", nErr)
          If nErr = 0 Then
             If EgtGetHeadExitCount(sHead) = 0 Then
-               MessageBox.Show(EgtMsg(MSG_SETUPERRORS + 8), EgtMsg(MSG_SETUPERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error)
+               EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(6478), EgtMsg(6471), MessageBoxButton.OK, MessageBoxImage.Error)
                Return
             End If
          End If
diff --git a/EgtBEAMWALL.Supervisor/MainWindow/MainWindowVM.vb b/EgtBEAMWALL.Supervisor/MainWindow/MainWindowVM.vb
index dc60bf07..3c62b33c 100644
--- a/EgtBEAMWALL.Supervisor/MainWindow/MainWindowVM.vb
+++ b/EgtBEAMWALL.Supervisor/MainWindow/MainWindowVM.vb
@@ -3,6 +3,7 @@ Imports System.IO
 Imports System.Threading
 Imports EgtBEAMWALL.Core
 Imports EgtWPFLib5
+Imports EgtUILib
 
 Public Class MainWindowVM
    Inherits VMBase
@@ -199,7 +200,7 @@ Public Class MainWindowVM
       ' se macchina sta funzionando
       If Not IsNothing(Map.refMachManaging) AndAlso Map.refMachManaging.bConnected AndAlso
          (Map.refLeftPanelVM.SelOPState.Id <> OPStates.End AndAlso Map.refLeftPanelVM.SelOPState.Id <> OPStates.Unspecified) Then
-         MessageBox.Show("Impossible closing software while machine is working. If you want to close, first press reset and stop the machine!", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62549), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)
          Return
       End If
       ' disconnetto comunicazione con macchina
diff --git a/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb
index bf20ec91..fcf8f8bc 100644
--- a/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb	
+++ b/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb	
@@ -70,5 +70,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("3.1.2.2")>
-<Assembly: AssemblyFileVersion("3.1.2.2")>
+<Assembly: AssemblyVersion("3.1.2.3")>
+<Assembly: AssemblyFileVersion("3.1.2.3")>
diff --git a/EgtBEAMWALL.Supervisor/SceneHost/MySceneHostVM.vb b/EgtBEAMWALL.Supervisor/SceneHost/MySceneHostVM.vb
index fb9af39d..e5b5ed25 100644
--- a/EgtBEAMWALL.Supervisor/SceneHost/MySceneHostVM.vb
+++ b/EgtBEAMWALL.Supervisor/SceneHost/MySceneHostVM.vb
@@ -76,21 +76,24 @@ Public Class MySceneHostVM
          ' Box di avviso chiave mancante : "Chiave non presente. \n Inserirla e riavviare il programma."  "Errore"
          Dim sText As String = EgtMsg(10102) & vbCrLf & EgtMsg(10103)
          Dim sTitle As String = EgtMsg(10101)
-         MessageBox.Show(Application.Current.MainWindow, sText, sTitle, MessageBoxButton.OK, MessageBoxImage.Error)
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, sText, sTitle, MessageBoxButton.OK, MessageBoxImage.Error)
          ' Altrimenti manca la licenza
       Else
          EgtOutLog("Problems with Licence")
          ' Box di avviso licenza con problemi : "Programma senza licenza. \n Caricala e riavvia il programma."  "Errore"
          Dim sText As String = EgtMsg(10105) & vbCrLf & EgtMsg(10106)
          Dim sTitle As String = EgtMsg(10101)
-         If MessageBox.Show(Application.Current.MainWindow, sText, sTitle, MessageBoxButton.OKCancel, MessageBoxImage.Error) = MessageBoxResult.OK Then
+         If EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, sText, sTitle, MessageBoxButton.OKCancel, MessageBoxImage.Error) = MessageBoxResult.OK Then
             ' Apro dialogo per richiesta file licenza
-            Dim LicDlg As New Microsoft.Win32.OpenFileDialog() With {
-               .DefaultExt = ".lic",
+            Dim LicDlg As New EgtBEAMWALL.Core.EgtManageFileDialogV(Application.Current.MainWindow, New EgtManageFileDialogVM()) With {
+               .Title = EgtMsg(110026),
                .Filter = "Licences (.lic)|*.lic",
+               .FilterIndex = 1,
+               .InitialDirectory = Map.refMainWindowVM.MainWindowM.sConfigDir,
                .CheckFileExists = True,
-               .ValidateNames = True
-            }
+               .ValidateNames = True,
+               .Mode = 1}
+
             If LicDlg.ShowDialog() = True Then
                ' Recupero il direttorio del file
                Dim sDir As String = Path.GetDirectoryName(LicDlg.FileName)
@@ -259,7 +262,7 @@ Public Class MySceneHostVM
          EgtNewFile()
          Map.refMainWindowVM.SetTitle(" New - EgtBEAMWALL")
          Dim sMsg As String = EgtMsg(10003) & " '" & sFile & "'"            'Error opening file
-         MessageBox.Show(Application.Current.MainWindow, sMsg, EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)        'Error
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, sMsg, EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)        'Error
       End If
       MainScene.SetStatusNull()
    End Sub
@@ -271,7 +274,7 @@ Public Class MySceneHostVM
       ' Se salvataggio non riuscito, esco subito
       If Not bOk Then
          Dim sMsg As String = EgtMsg(10004) & " '" & sFile & "'"            'Error saving file
-         MessageBox.Show(Application.Current.MainWindow, sMsg, EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)     ' Error
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, sMsg, EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)     ' Error
          Return
       End If
       ' Salvo nome ultimo file
@@ -282,7 +285,7 @@ Public Class MySceneHostVM
       If nType = FT.BTL Or nType = FT.BTLX Then
          nFlag = GetMainPrivateProfileInt(S_IMPORT, K_BTLFLAG, EIB_FL.TS3_POS + EIB_FL.SORT + EIB_FL.USEUATTR)
       Else
-         MessageBox.Show(Application.Current.MainWindow, EgtMsg(10005), EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)   ' File type unknown  - Error
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(10005), EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)   ' File type unknown  - Error
       End If
    End Sub
 
diff --git a/EgtBEAMWALL.Supervisor/ShowPanel/ShowPanelV.xaml b/EgtBEAMWALL.Supervisor/ShowPanel/ShowPanelV.xaml
index a5705a8b..c22e48a9 100644
--- a/EgtBEAMWALL.Supervisor/ShowPanel/ShowPanelV.xaml
+++ b/EgtBEAMWALL.Supervisor/ShowPanel/ShowPanelV.xaml
@@ -6,19 +6,19 @@
    <RadioButton ToolTip="{Binding RenderingWFToolTip}"
                 IsChecked="{Binding WireframeIsChecked}"
                 Style="{StaticResource ToolBar_ToggleButton}">
-      <Image Source="/Resources/ShowPanel/RenderingWF.png"
+      <Image Source="{StaticResource RenderingWF_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </RadioButton>
    <RadioButton ToolTip="{Binding RenderingHLToolTip}"
                 IsChecked="{Binding HiddenLineIsChecked}"
                 Style="{StaticResource ToolBar_ToggleButton}">
-      <Image Source="/Resources/ShowPanel/RenderingHL.png"
+      <Image Source="{StaticResource RenderingHL_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </RadioButton>
    <RadioButton ToolTip="{Binding RenderingSHToolTip}"
                 IsChecked="{Binding ShadingIsChecked}"
                 Style="{StaticResource ToolBar_ToggleButton}">
-      <Image Source="/Resources/ShowPanel/RenderingSH.png"
+      <Image Source="{StaticResource RenderingSH_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </RadioButton>
    
diff --git a/EgtBEAMWALL.Supervisor/SupervisorManager/SupervisorManagerV.xaml b/EgtBEAMWALL.Supervisor/SupervisorManager/SupervisorManagerV.xaml
index e3996d1a..d665492f 100644
--- a/EgtBEAMWALL.Supervisor/SupervisorManager/SupervisorManagerV.xaml
+++ b/EgtBEAMWALL.Supervisor/SupervisorManager/SupervisorManagerV.xaml
@@ -20,13 +20,13 @@
             </ContextMenu.Resources>
          </ContextMenu>
       </Button.ContextMenu>
-      <Image Source="/Resources/ProjectManager/Open.png"
+      <Image Source="{StaticResource Open_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
    <Button Command="{Binding GoToProd_Command}"
            ToolTip="{Binding GoToProd_ToolTip}"
            Style="{StaticResource ToolBarViewPanel_Button}">
-      <Image Source="/Resources/ProjectManager/GoToProd.png"
+      <Image Source="{StaticResource GoToProd_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
 
diff --git a/EgtBEAMWALL.Supervisor/SupervisorManager/SupervisorManagerVM.vb b/EgtBEAMWALL.Supervisor/SupervisorManager/SupervisorManagerVM.vb
index f03be4f9..a7f83283 100644
--- a/EgtBEAMWALL.Supervisor/SupervisorManager/SupervisorManagerVM.vb
+++ b/EgtBEAMWALL.Supervisor/SupervisorManager/SupervisorManagerVM.vb
@@ -162,9 +162,6 @@ Public Class SupervisorManagerVM
 
 #Region "OpenCommand"
 
-   ''' <summary>
-   ''' Returns a command that do Open.
-   ''' </summary>
    Public ReadOnly Property OpenCommand As ICommand
       Get
          If m_cmdOpen Is Nothing Then
@@ -174,9 +171,6 @@ Public Class SupervisorManagerVM
       End Get
    End Property
 
-   ''' <summary>
-   ''' Execute the Open.  This method is invoked by the OpenCommand.
-   ''' </summary>
    Friend Sub Open()
       OpenProject(Nothing)
    End Sub
@@ -185,7 +179,7 @@ Public Class SupervisorManagerVM
       ' se macchina connessa e non in reset  
       If Not IsNothing(Map.refMachManaging) AndAlso Map.refLeftPanelVM.SelOPState.Id <> OPStates.End Then
          ' impedisco cambio progetto
-         MessageBox.Show("Press reset before changing program!!")
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62550))
          Return
       End If
       Dim sFilePath As String = ""
@@ -212,7 +206,7 @@ Public Class SupervisorManagerVM
          If CurrentMachine.sMachineName <> TempCurrProd.sMachine Then
             ' rimuovo il file in apertura dalla lista degli MRU
             m_MruFiles.Remove(sFilePath)
-            MessageBox.Show(String.Format("Impossible opening a project done with {0} in a supervisor on a {1}!", {TempCurrProd.sMachine, CurrentMachine.sMachineName}), EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)        'Error
+            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, String.Format(EgtMsg(62551), {TempCurrProd.sMachine, CurrentMachine.sMachineName}), EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)        'Error
             EgtNewFile()
             EgtDraw()
             Map.refProjectVM.ProdMachGroupPanelVM = New MyMachGroupPanelVM(MyMachGroupPanelM.CreateMyMachGroupPanel(Map.refMachinePanelVM.MachineList.ToList()))
@@ -231,7 +225,7 @@ Public Class SupervisorManagerVM
             ' inizializzo visibilita' bottone done per i Part
             Map.refLeftPanelVM.NotifyPropertyChanged(NameOf(Map.refLeftPanelVM.DonePart_Visibility))
          Else
-            MessageBox.Show("Impossibile aprire il file!!")
+            EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62552))
             Map.refSceneHostVM.MainController.NewProject()
             Map.refMainWindowVM.SetTitle("New - EgtBEAMWALL")
             m_bLoadingProd = False
@@ -240,7 +234,7 @@ Public Class SupervisorManagerVM
             Return
          End If
       Else
-         MessageBox.Show("File non trovato!!")
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62553))
          Map.refSceneHostVM.MainController.NewProject()
          Map.refMainWindowVM.SetTitle("New - EgtBEAMWALL")
          m_bLoadingProd = False
diff --git a/EgtBEAMWALL.Supervisor/Utility/DbControllers.vb b/EgtBEAMWALL.Supervisor/Utility/DbControllers.vb
index 3e8b77a2..c1625bbb 100644
--- a/EgtBEAMWALL.Supervisor/Utility/DbControllers.vb
+++ b/EgtBEAMWALL.Supervisor/Utility/DbControllers.vb
@@ -87,7 +87,7 @@ Module DbControllers
          End If
       Catch ex As Exception
          EgtOutLog("InitDb error: " & ex.ToString())
-         MessageBox.Show(Application.Current.MainWindow, "Db connection error!!", "Error")
+         EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62554), EgtMsg(15001))
          End
       End Try
 
diff --git a/EgtBEAMWALL.Supervisor/Utility/Dictionary.xaml b/EgtBEAMWALL.Supervisor/Utility/Dictionary.xaml
index 82c861a5..9afab781 100644
--- a/EgtBEAMWALL.Supervisor/Utility/Dictionary.xaml
+++ b/EgtBEAMWALL.Supervisor/Utility/Dictionary.xaml
@@ -45,6 +45,37 @@
    </DataTemplate>
 
    <!--#endregion Template che permette di andare a capo-->
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!--#region Image-->
+
+   <BitmapImage x:Key="Simulate_Image" UriSource="/Resources/CALCPanel/Simulate.png"/>
+   <BitmapImage x:Key="Save_Image" UriSource="/Resources/ProjectManager/Save.png"/>
+   <BitmapImage x:Key="Produce_Image" UriSource="/Resources/RawPartList/Produce.png"/>
+   <BitmapImage x:Key="MoveUp_Image" UriSource="/Resources/LeftPanel/MoveUp.png"/>
+   <BitmapImage x:Key="MoveDown_Image" UriSource="/Resources/LeftPanel/MoveDown.png"/>
+   <BitmapImage x:Key="ProduceAll_Image" UriSource="/Resources/LeftPanel/ProduceAll.png"/>
+   <BitmapImage x:Key="DoneRawPart_Image" UriSource="/Resources/LeftPanel/DoneRawPart.png"/>
+   <BitmapImage x:Key="ResetRawPart_Image" UriSource="/Resources/LeftPanel/ResetRawPart.png"/>
+   <BitmapImage x:Key="DeleteRawPart_Image" UriSource="/Resources/LeftPanel/DeleteRawPart.png"/>
+   <BitmapImage x:Key="PrintLabel_Image" UriSource="/Resources/LeftPanel/PrintLabel.png"/>
+   <BitmapImage x:Key="DonePart_Image" UriSource="/Resources/LeftPanel/DonePart.png"/>
+   <BitmapImage x:Key="Send_Image" UriSource="/Resources/MDIPage/Send.png"/>
+   <BitmapImage x:Key="RenderingWF_Image" UriSource="/Resources/ShowPanel/RenderingWF.png"/>
+   <BitmapImage x:Key="RenderingHL_Image" UriSource="/Resources/ShowPanel/RenderingHL.png"/>
+   <BitmapImage x:Key="RenderingSH_Image" UriSource="/Resources/ShowPanel/RenderingSH.png"/>
+   <BitmapImage x:Key="Open_Image" UriSource="/Resources/ProjectManager/Open.png"/>
+   <BitmapImage x:Key="GoToProd_Image" UriSource="/Resources/ProjectManager/GoToProd.png"/>
+   <BitmapImage x:Key="ZoomAll_Image" UriSource="/Resources/ViewPanel/ZoomAll.png"/>
+   <BitmapImage x:Key="LookFromTOP_Image" UriSource="/Resources/ViewPanel/LookFromTOP.png"/>
+   <BitmapImage x:Key="LookFromFRONT_Image" UriSource="/Resources/ViewPanel/LookFromFRONT.png"/>
+   <BitmapImage x:Key="LookFromRIGHT_Image" UriSource="/Resources/ViewPanel/LookFromRIGHT.png"/>
+   <BitmapImage x:Key="LookFromBACK_Image" UriSource="/Resources/ViewPanel/LookFromBACK.png"/>
+   <BitmapImage x:Key="LookFromLEFT_Image" UriSource="/Resources/ViewPanel/LookFromLEFT.png"/>
+   <BitmapImage x:Key="LookFromISO_SW_Image" UriSource="/Resources/ViewPanel/LookFromISO_SW.png"/>
+
+   <!--#endregion Image-->
    
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
diff --git a/EgtBEAMWALL.Supervisor/ViewPanel/ViewPanelV.xaml b/EgtBEAMWALL.Supervisor/ViewPanel/ViewPanelV.xaml
index 56c68480..1dd37382 100644
--- a/EgtBEAMWALL.Supervisor/ViewPanel/ViewPanelV.xaml
+++ b/EgtBEAMWALL.Supervisor/ViewPanel/ViewPanelV.xaml
@@ -6,43 +6,43 @@
    <Button ToolTip="{Binding ZoomAllToolTip}"
            Command="{Binding ZoomAllCommand}"
            Style="{StaticResource ToolBarViewPanel_Button}">
-      <Image Source="/Resources/ViewPanel/ZoomAll.png"
+      <Image Source="{StaticResource ZoomAll_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
    <Button ToolTip="{Binding LookFromTopToolTip}"
            Command="{Binding TopViewCommand}"
            Style="{StaticResource ToolBarViewPanel_Button}">
-      <Image Source="/Resources/ViewPanel/LookFromTOP.png"
+      <Image Source="{StaticResource LookFromTOP_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
    <Button ToolTip="{Binding LookFromFrontToolTip}"
            Command="{Binding FrontViewCommand}"
            Style="{StaticResource ToolBarViewPanel_Button}">
-      <Image Source="/Resources/ViewPanel/LookFromFRONT.png"
+      <Image Source="{StaticResource LookFromFRONT_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
    <Button ToolTip="{Binding LookFromRightToolTip}"
            Command="{Binding RightViewCommand}"
            Style="{StaticResource ToolBarViewPanel_Button}">
-      <Image Source="/Resources/ViewPanel/LookFromRIGHT.png"
+      <Image Source="{StaticResource LookFromRIGHT_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
    <Button ToolTip="{Binding LookFromBackToolTip}"
            Command="{Binding BackViewCommand}"
            Style="{StaticResource ToolBarViewPanel_Button}">
-      <Image Source="/Resources/ViewPanel/LookFromBACK.png"
+      <Image Source="{StaticResource LookFromBACK_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
    <Button ToolTip="{Binding LookFromLeftToolTip}"
            Command="{Binding LeftViewCommand}"
            Style="{StaticResource ToolBarViewPanel_Button}">
-      <Image Source="/Resources/ViewPanel/LookFromLEFT.png"
+      <Image Source="{StaticResource LookFromLEFT_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
    <Button ToolTip="{Binding LookFromIso_SWToolTip}"
            Command="{Binding IsoViewSWCommand}"
            Style="{StaticResource ToolBarViewPanel_Button}">
-      <Image Source="/Resources/ViewPanel/LookFromISO_SW.png"
+      <Image Source="{StaticResource LookFromISO_SW_Image}"
              Style="{StaticResource BTLDataWnd_Image}"/>
    </Button>
    
diff --git a/ExtLibs/EgtWPFLib5.dll b/ExtLibs/EgtWPFLib5.dll
index c2afd426..787bf622 100644
Binary files a/ExtLibs/EgtWPFLib5.dll and b/ExtLibs/EgtWPFLib5.dll differ