diff --git a/EgtBEAMWALL.Core/ConfigurationPage/OnlyProdQParameter_ConfigurationPageV.xaml b/EgtBEAMWALL.Core/ConfigurationPage/OnlyProdQParameter_ConfigurationPageV.xaml
index bc23f1fd..9fb0d98a 100644
--- a/EgtBEAMWALL.Core/ConfigurationPage/OnlyProdQParameter_ConfigurationPageV.xaml
+++ b/EgtBEAMWALL.Core/ConfigurationPage/OnlyProdQParameter_ConfigurationPageV.xaml
@@ -10,6 +10,9 @@
    <Grid.RowDefinitions>
       <RowDefinition Height="1*"/>
    </Grid.RowDefinitions>
+
+   <Border Style="{StaticResource OnlyProdPage_Border}"/>
+
    <EgtBEAMWALL:OnlyProd_QParamListV DataContext="{Binding}" 
                                      ItemsSource="{Binding QBTLParamVMList}"
                                      SelectedItem="{Binding SelQParam}"
diff --git a/EgtBEAMWALL.Core/ItemParamList/OnlyProd_QParamListV.xaml b/EgtBEAMWALL.Core/ItemParamList/OnlyProd_QParamListV.xaml
index 37b52d0d..f7e23c52 100644
--- a/EgtBEAMWALL.Core/ItemParamList/OnlyProd_QParamListV.xaml
+++ b/EgtBEAMWALL.Core/ItemParamList/OnlyProd_QParamListV.xaml
@@ -11,12 +11,14 @@
           ScrollViewer.VerticalScrollBarVisibility="Auto"
           ScrollViewer.HorizontalScrollBarVisibility="Hidden"
           Margin="0,0,0,5"
+          AlternatingRowBackground="{StaticResource BeamWall_LinkWater}"
+          AlternationCount="2"
           Style="{StaticResource DataGrid_OnlyProd}"
           RowStyle="{StaticResource RowDataGrid_CustomHighLight}"
           CellStyle="{StaticResource CellDataGrid_CustomHighLight}">
    <DataGrid.ColumnHeaderStyle>
       <Style TargetType="{x:Type DataGridColumnHeader}">
-         <Setter Property="Background" Value="{StaticResource BeamWall_Glacier}"/>
+         <Setter Property="Background" Value="{StaticResource BeamWall_Downy}"/>
          <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
          <Setter Property="HorizontalContentAlignment" Value="Center"/>
          <Setter Property="FontWeight" Value="Bold"/>
diff --git a/EgtBEAMWALL.Core/OpenProjectFileDialog/OnlyProdOpenProjectFileDialogV.xaml b/EgtBEAMWALL.Core/OpenProjectFileDialog/OnlyProdOpenProjectFileDialogV.xaml
index 595258d3..e51e57eb 100644
--- a/EgtBEAMWALL.Core/OpenProjectFileDialog/OnlyProdOpenProjectFileDialogV.xaml
+++ b/EgtBEAMWALL.Core/OpenProjectFileDialog/OnlyProdOpenProjectFileDialogV.xaml
@@ -91,7 +91,7 @@
          </Grid>
       </GroupBox>
 
-      <Border Grid.Row="1"  Style="{StaticResource OnlyProdPage_Border}" Margin="1"/>
+      <Border Grid.Row="1" Style="{StaticResource OnlyProdPage_Border}" Margin="1"/>
       
       <EgtBEAMWALL:EgtDataGrid Grid.Row="1"
                                ItemsSource="{Binding ProjectList}" 
diff --git a/EgtBEAMWALL.Supervisor/SupervisorManager/SupervisorManagerVM.vb b/EgtBEAMWALL.Supervisor/SupervisorManager/SupervisorManagerVM.vb
index c474f73c..564589a9 100644
--- a/EgtBEAMWALL.Supervisor/SupervisorManager/SupervisorManagerVM.vb
+++ b/EgtBEAMWALL.Supervisor/SupervisorManager/SupervisorManagerVM.vb
@@ -189,12 +189,17 @@ Public Class SupervisorManagerVM
          Return
       End If
       Dim sFilePath As String = ""
+      Dim OpenFile As Object
       ' se la string è vuota
       Dim OpenProjectFileDialogVM As OpenProjectFileDialogVM = Nothing
       If IsNothing(TempCurrProd) Then
          ' apro dialogo di scelta file
          OpenProjectFileDialogVM = New OpenProjectFileDialogVM
-         Dim OpenFile As New OpenProjectFileDialogV(Application.Current.MainWindow, OpenProjectFileDialogVM)
+         If bOnlyProd Then
+            OpenFile = New OnlyProdOpenProjectFileDialogV(Application.Current.MainWindow, OpenProjectFileDialogVM)
+         Else
+            OpenFile = New OpenProjectFileDialogV(Application.Current.MainWindow, OpenProjectFileDialogVM)
+         End If
          Dim DialogResult As Boolean? = OpenFile.EgtShowDialog(ProjectType.PROD)
          If IsNothing(DialogResult) OrElse Not DialogResult Then Return
          sFilePath = OpenProjectFileDialogVM.SelProject.sProdPath
diff --git a/EgtBEAMWALL.Supervisor/Utility/Dictionary.xaml b/EgtBEAMWALL.Supervisor/Utility/Dictionary.xaml
index 49a2fada..378cc765 100644
--- a/EgtBEAMWALL.Supervisor/Utility/Dictionary.xaml
+++ b/EgtBEAMWALL.Supervisor/Utility/Dictionary.xaml
@@ -1678,18 +1678,12 @@
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-
    <!-- DatePicker -->
 
    <Style x:Key="Log_DatePicker" TargetType="{x:Type DatePicker}">
       <Setter Property="Height" Value="22" />
    </Style>
 
-   <Style x:Key="Filter_DatePicker" TargetType="{x:Type DatePicker}">
-      <Setter Property="Height" Value="22" />
-      <Setter Property="Width" Value="100" />
-   </Style>
-
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
    <!-- TabControl that have only Headers and no Pages -->
@@ -2266,6 +2260,66 @@
 
    <!--#endregion TabControl-->
 
+   <!--#region EgtCustomWindow-->
+
+   <Style x:Key="OnlyProd_EgtCustomWindow" TargetType="{x:Type EgtWPFLib5:EgtCustomWindow}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtCustomWindow}}">
+      <Setter Property="TitleBarHeight" Value="32"/>
+      <Setter Property="TitleBarBrush" Value="{StaticResource BeamWall_Glacier}"/>
+      <Setter Property="BorderBrush" Value="{StaticResource BeamWall_Kashmir}"/>
+      <Setter Property="TitleBarForeground" Value="{StaticResource BeamWall_White}"/>
+      <Setter Property="ShowInTaskbar" Value="False"/>
+      <Setter Property="Background">
+         <Setter.Value>
+            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.35,0">
+               <GradientStop Color="{StaticResource BeamWall_Mercury_Color}" Offset="0"/>
+               <GradientStop Color="{StaticResource BeamWall_Concrete_Color}" Offset="0.45"/>
+               <GradientStop Color="{StaticResource BeamWall_White_Color}" Offset="1"/>
+            </LinearGradientBrush>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <!--#endregion EgtCustomWindow-->
+
+   <!--#region DatePicker-->
+
+   <Style x:Key="Filter_DatePicker" TargetType="{x:Type DatePicker}">
+      <Setter Property="Height" Value="25" />
+      <Setter Property="Width" Value="100" />
+      <Setter Property="BorderBrush" Value="Transparent"/>
+      <Setter Property="Background" Value="Transparent"/>
+      <Style.Resources>
+         <Style TargetType="{x:Type DatePickerTextBox}">
+            <Setter Property="Background" Value="Transparent"/>
+         </Style>
+      </Style.Resources>
+   </Style>
+
+   <Style x:Key="Filter_Calendar" TargetType="{x:Type Calendar}">
+      <Setter Property="Background">
+         <Setter.Value>
+            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.35,0">
+               <GradientStop Color="{StaticResource BeamWall_Glacier_Color}" Offset="0"/>
+               <GradientStop Color="{StaticResource BeamWall_LinkWater_Color}" Offset="0.16"/>
+               <GradientStop Color="{StaticResource BeamWall_White_Color}" Offset="1"/>
+            </LinearGradientBrush>
+         </Setter.Value>
+      </Setter>
+      <Setter Property="BorderBrush">
+         <Setter.Value>
+            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.35,0">
+               <GradientStop Color="{StaticResource BeamWall_LinkWater_Color}" Offset="0"/>
+               <GradientStop Color="{StaticResource BeamWall_RegentStBlue_Color}" Offset="0.45"/>
+               <GradientStop Color="{StaticResource BeamWall_Glacier_Color}" Offset="0.75"/>
+               <GradientStop Color="{StaticResource BeamWall_Kashmir_Color}" Offset="1"/>
+            </LinearGradientBrush>
+         </Setter.Value>
+      </Setter>
+      <Setter Property="BorderThickness" Value="1"/>
+   </Style>
+
+   <!--#endregion DatePicker-->
+
    <!--#endregion GRAFICA NUOVA PAGINA-->
 
 </ResourceDictionary>
diff --git a/EgtBEAMWALL.ViewerOptimizer/AddFeatureWnd/AddFeatureWndVM.vb b/EgtBEAMWALL.ViewerOptimizer/AddFeatureWnd/AddFeatureWndVM.vb
index ff981be2..6a818d66 100644
--- a/EgtBEAMWALL.ViewerOptimizer/AddFeatureWnd/AddFeatureWndVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/AddFeatureWnd/AddFeatureWndVM.vb
@@ -192,6 +192,18 @@ Public Class AddFeatureWndVM
       End Get
    End Property
 
+   Public ReadOnly Property OK_Msg As String
+      Get
+         Return EgtMsg(91651)
+      End Get
+   End Property
+
+   Public ReadOnly Property Cancel_Msg As String
+      Get
+         Return EgtMsg(91652)
+      End Get
+   End Property
+
 #End Region
 
 #End Region    ' FIELDS & PROPERTIES
diff --git a/EgtBEAMWALL.ViewerOptimizer/AddFeatureWnd/NewAddFeatureWndV.xaml b/EgtBEAMWALL.ViewerOptimizer/AddFeatureWnd/NewAddFeatureWndV.xaml
index 4e8062b6..d1246f13 100644
--- a/EgtBEAMWALL.ViewerOptimizer/AddFeatureWnd/NewAddFeatureWndV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/AddFeatureWnd/NewAddFeatureWndV.xaml
@@ -22,76 +22,97 @@
          <RowDefinition Height="1*"/>
          <RowDefinition Height="Auto"/>
       </Grid.RowDefinitions>
+      <Border Background="{StaticResource BeamWall_Kashmir}" Margin="0,2,0,2" CornerRadius="4,0,0,4">
       <TextBlock Text="{Binding Process_Msg}"
                  Style="{StaticResource ListTextBlock}"/>
-      <ListBox Grid.Row="1"
-               ItemsSource="{Binding PRCListView}"
-               SelectedItem="{Binding nSelPRC}"
-               Style="{StaticResource NewAddFeature_ListBox}">
-         <ListBox.ItemTemplate>
-            <DataTemplate>
-               <TextBlock Text="{Binding ghDesc}"
-                          ToolTip="{Binding ghDesc}"
-                          HorizontalAlignment="Left"
-                          Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType={x:Type ListBox}}}"
-                          Style="{StaticResource OptionTextBlock}"/>
-            </DataTemplate>
-         </ListBox.ItemTemplate>
-      </ListBox>
-      <TextBlock Grid.Column="1"
+      </Border>
+      <Border Grid.Row="1" 
+              Style="{StaticResource OnlyProdPage_Border}"
+              CornerRadius="4,0,0,4"
+              BorderThickness="2,2,0,2">
+         <ListBox Grid.Row="1"
+                  ItemsSource="{Binding PRCListView}"
+                  SelectedItem="{Binding nSelPRC}"
+                  Style="{StaticResource NewAddFeature_ListBox}"
+                  ItemContainerStyle="{StaticResource AlternationIndex_ListBoxItem}">
+            <ListBox.ItemTemplate>
+               <DataTemplate>
+                  <TextBlock Text="{Binding ghDesc}"
+                             ToolTip="{Binding ghDesc}"
+                             TextAlignment="Justify"
+                             Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType={x:Type ListBox}}}"
+                             Style="{StaticResource OptionTextBlock}"/>
+               </DataTemplate>
+            </ListBox.ItemTemplate>
+         </ListBox>
+      </Border>
+      <Border Grid.Column="1" Background="{StaticResource BeamWall_Kashmir}" Margin="0,2,0,2">
+         <TextBlock Grid.Column="1"
                  Text="{Binding Custom_Msg}"
                  Style="{StaticResource ListTextBlock}"/>
-      <ListBox Grid.Row="1"
-               Grid.Column="1"
-               ItemsSource="{Binding MacroCustomList}"
-               SelectedIndex="{Binding nSelMacroCustom}"
-               Style="{StaticResource MacroCustom_ListBox}">
-         <ListBox.ItemsPanel>
-            <ItemsPanelTemplate>
-               <WrapPanel Style="{StaticResource MacroCustom_WrapPanel}"/>
-            </ItemsPanelTemplate>
-         </ListBox.ItemsPanel>
-         <ListBox.ItemTemplate>
-            <DataTemplate>
-               <Grid>
-                  <Grid.RowDefinitions>
-                     <RowDefinition Height="Auto"/>
-                     <RowDefinition Height="1*"/>
-                  </Grid.RowDefinitions>
-                  <TextBlock Text="{Binding sMacroName}"
-                             Style="{StaticResource Macro_TextBlock}"/>
-                  <Image Grid.Row="1" 
-                         Source="{Binding sMacroDrawPath}"
-                         Style="{StaticResource Macro_Image}"/>
-               </Grid>
-            </DataTemplate>
-         </ListBox.ItemTemplate>
-      </ListBox>
-      <TextBlock Grid.Column="2"
+      </Border>
+      <Border Grid.Row="1" 
+              Grid.Column="1" 
+              Style="{StaticResource OnlyProdPage_Border}"
+              CornerRadius="0"
+              BorderThickness="0,2,0,2">
+         <ListBox ItemsSource="{Binding MacroCustomList}"
+                  SelectedIndex="{Binding nSelMacroCustom}"
+                  Style="{StaticResource MacroCustom_ListBox}">
+            <ListBox.ItemsPanel>
+               <ItemsPanelTemplate>
+                  <WrapPanel Style="{StaticResource MacroCustom_WrapPanel}"/>
+               </ItemsPanelTemplate>
+            </ListBox.ItemsPanel>
+            <ListBox.ItemTemplate>
+               <DataTemplate>
+                  <Grid>
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="1*"/>
+                     </Grid.RowDefinitions>
+                     <TextBlock Text="{Binding sMacroName}"
+                                Style="{StaticResource Macro_TextBlock}"/>
+                     <Image Grid.Row="1" 
+                            Source="{Binding sMacroDrawPath}"
+                            Style="{StaticResource Macro_Image}"/>
+                  </Grid>
+               </DataTemplate>
+            </ListBox.ItemTemplate>
+         </ListBox>
+      </Border>
+      <Border Grid.Column="2" Background="{StaticResource BeamWall_Kashmir}" Margin="0,2,0,2" Padding="0,10,0,10" CornerRadius="0,4,4,0">
+         <TextBlock 
                  Text="{Binding Default_Msg}"
                  Style="{StaticResource ListTextBlock}"/>
-      <ListBox Grid.Row="1"
-               Grid.Column="2"
-               ItemsSource="{Binding MacroDefaultList}"
-               SelectedIndex="{Binding nSelMacroDefault}"
-               Style="{StaticResource MacroDefault_ListBox}">
-         <ListBox.ItemTemplate>
-            <DataTemplate>
-               <TextBlock Text="{Binding sMacroName}"
-                          Style="{StaticResource MacroDefault_TextBlock}"/>
-            </DataTemplate>
-         </ListBox.ItemTemplate>
-      </ListBox>
-
+      </Border>
+      <Border Grid.Row="1" 
+              Grid.Column="2" 
+              Style="{StaticResource OnlyProdPage_Border}"
+              CornerRadius="0,4,4,0"
+              BorderThickness="0,2,2,2">
+         <ListBox ItemsSource="{Binding MacroDefaultList}"
+                  SelectedIndex="{Binding nSelMacroDefault}"
+                  Style="{StaticResource MacroDefault_ListBox}"
+                  ItemContainerStyle="{StaticResource AlternationIndex_ListBoxItem}">
+            <ListBox.ItemTemplate>
+               <DataTemplate>
+                  <TextBlock Text="{Binding sMacroName}"
+                             TextAlignment="Justify"
+                             Style="{StaticResource MacroDefault_TextBlock}"/>
+               </DataTemplate>
+            </ListBox.ItemTemplate>
+         </ListBox>
+      </Border>
       <UniformGrid Columns="2"
                    Grid.Row="2"
                    Grid.ColumnSpan="3"
                    Margin="5">
-         <Button Content="Ok"
+         <Button Content="{Binding OK_Msg}"
                  Command="{Binding Ok_Command}"
                  IsDefault="True"
                  Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
-         <Button Content="Cancel"
+         <Button Content="{Binding Cancel_Msg}"
                  IsCancel="True"
                  Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
       </UniformGrid>
diff --git a/EgtBEAMWALL.ViewerOptimizer/AddRawPartWnd/OnlyProdAddRawPartWndV.xaml b/EgtBEAMWALL.ViewerOptimizer/AddRawPartWnd/OnlyProdAddRawPartWndV.xaml
index e32d38ed..d193ef83 100644
--- a/EgtBEAMWALL.ViewerOptimizer/AddRawPartWnd/OnlyProdAddRawPartWndV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/AddRawPartWnd/OnlyProdAddRawPartWndV.xaml
@@ -20,7 +20,8 @@
                 SelectedItem="{Binding SelDimension}"
                 DisplayMemberPath="sDimension"
                 Visibility="{Binding DimensionsList_Visibility}"
-                Margin="0,0,0,5"/>
+                Margin="0,0,0,5"
+                Style="{StaticResource OnlyProd_ComboBox}"/>
       <ItemsControl Grid.Row="1"
                     ItemsSource="{Binding VariableList}">
          <ItemsControl.ItemTemplate>
@@ -40,25 +41,20 @@
             </DataTemplate>
          </ItemsControl.ItemTemplate>
       </ItemsControl>
-      <Grid Grid.Row="2"
-            Margin="0,0,0,5">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="1*"/>
-         </Grid.ColumnDefinitions>
+      <UniformGrid Grid.Row="2"
+                   Columns="2"
+                   Margin="0,0,0,5">
          <Button Grid.Column="1"
                  Content="Ok"
                  Command="{Binding Ok_Command}"
                  IsDefault="True"
-                 Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
+                 Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"
+                 Margin="0,0,5,0"/>
          <Button Grid.Column="3"
                  Content="Cancel"
                  IsCancel="True"
                  Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
-      </Grid>
+      </UniformGrid>
    </Grid>
 
 </EgtWPFLib5:EgtCustomWindow>
diff --git a/EgtBEAMWALL.ViewerOptimizer/BTLPartManager/BTLPartManagerVM.vb b/EgtBEAMWALL.ViewerOptimizer/BTLPartManager/BTLPartManagerVM.vb
index 3b4829de..1ff21d72 100644
--- a/EgtBEAMWALL.ViewerOptimizer/BTLPartManager/BTLPartManagerVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/BTLPartManager/BTLPartManagerVM.vb
@@ -45,7 +45,6 @@ Public Class BTLPartManagerVM
       End Get
    End Property
 
-
    ' Definizione comandi
    Private m_cmdNewRawPart As ICommand
    Private m_cmdNewRawPartLast As ICommand
diff --git a/EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLPartVM.vb b/EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLPartVM.vb
index 3888ebaf..009a6444 100644
--- a/EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLPartVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLPartVM.vb
@@ -1580,8 +1580,8 @@ Public Class BTLPartVM
          If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
             EgtResetCurrMachGroup()
             ResetSearchFound()
-            Map.refStatisticsTimePanelVM.ViewPage_Visibility = Visibility.Visible
-            Map.refStatisticsTimePanelVM.MachiningPage_Visibility = Visibility.Collapsed
+            Map.refStatisticsTimePanelVM.SetViewPage_Visibility(Visibility.Visible)
+            Map.refStatisticsTimePanelVM.SetMachiningPage_Visibility(Visibility.Collapsed)
          End If
          EgtDraw()
          NotifyPropertyChanged(NameOf(SelBTLFeatureVM))
diff --git a/EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj b/EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj
index cf7c67c6..b3ad512d 100644
--- a/EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj
+++ b/EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj
@@ -1382,6 +1382,9 @@
   <ItemGroup>
     <Resource Include="Resources\InstrumentPanel\Vis.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\PDFEditor\PDFPreview.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\EgtBEAMWALL\EgtBEAMWALL.ViewerOptimizerR32.exe
diff --git a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdQParameterListV.xaml b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdQParameterListV.xaml
index b4d89051..5532d80c 100644
--- a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdQParameterListV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/OnlyProdQParameterListV.xaml
@@ -96,7 +96,7 @@
             </DataGridTextColumn.HeaderTemplate>
             <DataGridTextColumn.EditingElementStyle>
                <Style TargetType="{x:Type TextBox}">
-                  <Setter Property="Foreground" Value="{StaticResource BeamWall_White}" />
+                  <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
                </Style>
             </DataGridTextColumn.EditingElementStyle>
          </DataGridTextColumn>
diff --git a/EgtBEAMWALL.ViewerOptimizer/LeftPanel/OnlyProdLeftPanelV.xaml b/EgtBEAMWALL.ViewerOptimizer/LeftPanel/OnlyProdLeftPanelV.xaml
index ccaa2bb6..df7eb27c 100644
--- a/EgtBEAMWALL.ViewerOptimizer/LeftPanel/OnlyProdLeftPanelV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/LeftPanel/OnlyProdLeftPanelV.xaml
@@ -3,6 +3,13 @@
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
       xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.ViewerOptimizer">
+   <Grid.Background>
+      <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.35,0">
+         <GradientStop Color="{StaticResource BeamWall_Mercury_Color}" Offset="0"/>
+         <GradientStop Color="{StaticResource BeamWall_Concrete_Color}" Offset="0.65"/>
+         <GradientStop Color="{StaticResource BeamWall_White_Color}" Offset="1"/>
+      </LinearGradientBrush>
+   </Grid.Background>
 
    <Grid.RowDefinitions>
       <RowDefinition Height="Auto"/>
@@ -11,13 +18,6 @@
    </Grid.RowDefinitions>
    <UniformGrid Columns="5" 
                 Margin="0,10,0,10">
-      <UniformGrid.Background>
-         <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.35,0">
-            <GradientStop Color="{StaticResource BeamWall_Mercury_Color}" Offset="0"/>
-            <GradientStop Color="{StaticResource BeamWall_Concrete_Color}" Offset="0.65"/>
-            <GradientStop Color="{StaticResource BeamWall_White_Color}" Offset="1"/>
-         </LinearGradientBrush>
-      </UniformGrid.Background>
       <Expander  Header="{Binding Section_Msg}">
          <ListBox ItemsSource="{Binding Tag.SectionList, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdLeftPanelV}}}"
                   SelectedItem="{Binding Tag.SelSection, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdLeftPanelV}}}"
diff --git a/EgtBEAMWALL.ViewerOptimizer/MachGroupPanel/MyMachGroupPanelVM.vb b/EgtBEAMWALL.ViewerOptimizer/MachGroupPanel/MyMachGroupPanelVM.vb
index a4a585f4..e2d7f0d8 100644
--- a/EgtBEAMWALL.ViewerOptimizer/MachGroupPanel/MyMachGroupPanelVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/MachGroupPanel/MyMachGroupPanelVM.vb
@@ -65,8 +65,8 @@ Public Class MyMachGroupPanelVM
          ' imposto tipo di grid selezionata
          If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE AndAlso Not IsNothing(value) Then
             Map.refProjectVM.SetLastSelGridType(ProjectVM.GridSelTypes.MACHGROUP)
-            Map.refStatisticsTimePanelVM.MachiningPage_Visibility = Visibility.Visible
-            Map.refStatisticsTimePanelVM.ViewPage_Visibility = Visibility.Collapsed
+            Map.refStatisticsTimePanelVM.SetMachiningPage_Visibility(Visibility.Visible)
+            Map.refStatisticsTimePanelVM.SetViewPage_Visibility(Visibility.Collapsed)
          End If
          ' se MachGroup gia' mandato in produzione,disabilito pulsanti verify e reset
          If Not IsNothing(SelectedMachGroup) AndAlso SelectedMachGroup.nProduction_State >= ItemState.Assigned Then
diff --git a/EgtBEAMWALL.ViewerOptimizer/MovePartInRawPartWnd/OnlyProdMovePartInRawPartWndV.xaml b/EgtBEAMWALL.ViewerOptimizer/MovePartInRawPartWnd/OnlyProdMovePartInRawPartWndV.xaml
index 8dc5f27f..363ef402 100644
--- a/EgtBEAMWALL.ViewerOptimizer/MovePartInRawPartWnd/OnlyProdMovePartInRawPartWndV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/MovePartInRawPartWnd/OnlyProdMovePartInRawPartWndV.xaml
@@ -59,25 +59,20 @@
                                 Style="{StaticResource NAM_TextBox}"/>
       </Grid>
 
-      <Grid Grid.Row="3"
-            Margin="5,5,5,0">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="1*"/>
-         </Grid.ColumnDefinitions>
+      <UniformGrid Grid.Row="3"
+                   Columns="2"
+                   Margin="5,5,5,0">
 
          <Button Grid.Column="1"
                  Content="Ok"
                  Command="{Binding Ok_Command}"
                  IsDefault="True"
+                 Margin="0,0,5,0"
                  Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
          <Button Grid.Column="3"
                  Content="Cancel"
                  IsCancel="True"
                  Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
-      </Grid>
+      </UniformGrid>
    </Grid>
 </EgtWPFLib5:EgtCustomWindow>
\ No newline at end of file
diff --git a/EgtBEAMWALL.ViewerOptimizer/OnlyProdProject/OnlyProdProjectV.xaml b/EgtBEAMWALL.ViewerOptimizer/OnlyProdProject/OnlyProdProjectV.xaml
index 4999d393..58590498 100644
--- a/EgtBEAMWALL.ViewerOptimizer/OnlyProdProject/OnlyProdProjectV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/OnlyProdProject/OnlyProdProjectV.xaml
@@ -102,7 +102,8 @@
                           Grid.ColumnSpan="2"
                           Style="{StaticResource Height_GridSplitter}"/>
 
-            <EgtBEAMWALL:PartInRawPartManagerWndV Grid.Row="2" Tag="{Binding DataContext, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"/>
+            <EgtBEAMWALL:PartInRawPartManagerWndV Grid.Row="2" 
+                                                  Tag="{Binding DataContext, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"/>
 
          </Grid>
       </Grid>
diff --git a/EgtBEAMWALL.ViewerOptimizer/PartInRawPartManager/PartInRawPartManagerWndV.xaml b/EgtBEAMWALL.ViewerOptimizer/PartInRawPartManager/PartInRawPartManagerWndV.xaml
index 06abbbfe..dd43ea93 100644
--- a/EgtBEAMWALL.ViewerOptimizer/PartInRawPartManager/PartInRawPartManagerWndV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/PartInRawPartManager/PartInRawPartManagerWndV.xaml
@@ -2,6 +2,13 @@
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.ViewerOptimizer">
+   <Grid.Background>
+      <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.35,0">
+         <GradientStop Color="{StaticResource BeamWall_Mercury_Color}" Offset="0"/>
+         <GradientStop Color="{StaticResource BeamWall_Concrete_Color}" Offset="0.65"/>
+         <GradientStop Color="{StaticResource BeamWall_White_Color}" Offset="1"/>
+      </LinearGradientBrush>
+   </Grid.Background>
 
    <Grid.RowDefinitions>
       <RowDefinition Height="Auto"/>
diff --git a/EgtBEAMWALL.ViewerOptimizer/RawPartManager/RawPartManagerWndV.xaml b/EgtBEAMWALL.ViewerOptimizer/RawPartManager/RawPartManagerWndV.xaml
index e5841e45..edf79b7b 100644
--- a/EgtBEAMWALL.ViewerOptimizer/RawPartManager/RawPartManagerWndV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/RawPartManager/RawPartManagerWndV.xaml
@@ -2,6 +2,13 @@
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.ViewerOptimizer">
+   <Grid.Background>
+      <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.35,0">
+         <GradientStop Color="{StaticResource BeamWall_Mercury_Color}" Offset="0"/>
+         <GradientStop Color="{StaticResource BeamWall_Concrete_Color}" Offset="0.65"/>
+         <GradientStop Color="{StaticResource BeamWall_White_Color}" Offset="1"/>
+      </LinearGradientBrush>
+   </Grid.Background>
 
    <Grid.RowDefinitions>
       <RowDefinition Height="Auto"/>
diff --git a/EgtBEAMWALL.ViewerOptimizer/Resources/PDFEditor/PDFPreview.png b/EgtBEAMWALL.ViewerOptimizer/Resources/PDFEditor/PDFPreview.png
new file mode 100644
index 00000000..8fda14bc
Binary files /dev/null and b/EgtBEAMWALL.ViewerOptimizer/Resources/PDFEditor/PDFPreview.png differ
diff --git a/EgtBEAMWALL.ViewerOptimizer/Statistics/OnlyProdOptimizerStatisticsV.xaml b/EgtBEAMWALL.ViewerOptimizer/Statistics/OnlyProdOptimizerStatisticsV.xaml
index 7040c94b..f81bc7d7 100644
--- a/EgtBEAMWALL.ViewerOptimizer/Statistics/OnlyProdOptimizerStatisticsV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/Statistics/OnlyProdOptimizerStatisticsV.xaml
@@ -28,7 +28,18 @@
                                             ScrollViewer.VerticalScrollBarVisibility="Auto"
                                             ScrollViewer.HorizontalScrollBarVisibility="Auto"
                                             Margin="0,0,0,5"
-                                            BindingColumns="{Binding OptimizerStatisticsColumns}">
+                                            BindingColumns="{Binding OptimizerStatisticsColumns}"
+                                            AlternatingRowBackground="{StaticResource BeamWall_LinkWater}"
+                                            AlternationCount="2"
+                                            ColumnHeaderBackground="{StaticResource BeamWall_Teal}"
+                                            ColumnHeaderForeground="{StaticResource BeamWall_White}"
+                                            ColumnHeaderHorizontalContentAlignment="Center"
+                                            ColumnHeaderFontWeight="Bold"
+                                            ColumnHeaderFontSize="15"
+                                            ColumnHeaderPadding="0,2,0,2"
+                                            CellStyle="{StaticResource CellDataGrid_CustomHighLight}"
+                                            RowStyle="{StaticResource RowDataGrid_CustomHighLight}"
+                                            Style="{StaticResource DataGrid_OnlyProd}">
                   <DataGrid.Resources>
                      <!--Id - Nome-->
                      <DataGridTextColumn x:Key="colNAME" Binding="{Binding Name}" SortMemberPath="nName">
@@ -115,7 +126,18 @@
                                             ScrollViewer.VerticalScrollBarVisibility="Auto"
                                             ScrollViewer.HorizontalScrollBarVisibility="Auto"
                                             Margin="0,0,0,5"
-                                            BindingColumns="{Binding RawPartStatisticsColumns}">
+                                            BindingColumns="{Binding RawPartStatisticsColumns}"
+                                            AlternatingRowBackground="{StaticResource BeamWall_LinkWater}"
+                                            AlternationCount="2"
+                                            ColumnHeaderBackground="{StaticResource BeamWall_Teal}"
+                                            ColumnHeaderForeground="{StaticResource BeamWall_White}"
+                                            ColumnHeaderHorizontalContentAlignment="Center"
+                                            ColumnHeaderFontWeight="Bold"
+                                            ColumnHeaderFontSize="15"
+                                            ColumnHeaderPadding="0,2,0,2"
+                                            CellStyle="{StaticResource CellDataGrid_CustomHighLight}"
+                                            RowStyle="{StaticResource RowDataGrid_CustomHighLight}"
+                                            Style="{StaticResource DataGrid_OnlyProd}">
                   <DataGrid.Resources>
                      <!--W - Larghezza-->
                      <DataGridTextColumn x:Key="colW" Binding="{Binding sW}">
@@ -157,91 +179,100 @@
                            </DataTemplate>
                         </DataGridTextColumn.HeaderTemplate>
                      </DataGridTextColumn>
-
                   </DataGrid.Resources>
-
                </EgtBEAMWALLCORE:EgtDataGrid>
             </TabItem.Content>
          </TabItem>
 
       </TabControl>
 
-      <Grid Grid.Row="1" Margin="5">
+      <Grid Grid.Row="1" Background="{StaticResource BeamWall_Glacier}">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="Auto"/>
          </Grid.ColumnDefinitions>
-         <StackPanel>
+         <StackPanel Margin="10" Background="{StaticResource BeamWall_White}">
             <StackPanel Orientation="Horizontal">
-               <TextBlock Text="{Binding TotMachGroups_Msg}"/>
+               <TextBlock Text="{Binding TotMachGroups_Msg}" Margin="10,5,5,5"/>
                <TextBlock Text="{Binding Tag.MachGroupPanelVM.sTotMachGroups,
-                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdOptimizerStatisticsV}}}"/>
+                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdOptimizerStatisticsV}}}"
+                          Margin="10,5,5,5"/>
             </StackPanel>
             <StackPanel Orientation="Horizontal">
-               <TextBlock Text="{Binding BTLTotVolume_Msg}"/>
+               <TextBlock Text="{Binding BTLTotVolume_Msg}" Margin="10,5,5,5"/>
                <TextBlock Text="{Binding Tag.MachGroupPanelVM.sTotVolume,
-                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdOptimizerStatisticsV}}}"/>
+                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdOptimizerStatisticsV}}}"
+                          Margin="10,5,5,5"/>
             </StackPanel>
             <StackPanel Orientation="Horizontal">
-               <TextBlock Text="{Binding BTLTotEstimatedTime_Msg}"/>
+               <TextBlock Text="{Binding BTLTotEstimatedTime_Msg}" Margin="10,5,5,5"/>
                <TextBlock Text="{Binding Tag.MachGroupPanelVM.sTotEstimatedTime,
-                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdOptimizerStatisticsV}}}"/>
+                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdOptimizerStatisticsV}}}"
+                          Margin="10,5,5,5"/>
             </StackPanel>
             <StackPanel Orientation="Horizontal">
-               <TextBlock Text="{Binding BTLTotTime_Msg}"/>
+               <TextBlock Text="{Binding BTLTotTime_Msg}" Margin="10,5,5,5"/>
                <TextBlock Text="{Binding Tag.MachGroupPanelVM.sTotTime,
-                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdOptimizerStatisticsV}}}"/>
+                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdOptimizerStatisticsV}}}"
+                          Margin="10,5,5,5"/>
             </StackPanel>
             <StackPanel Orientation="Horizontal">
-               <TextBlock Text="{Binding BTLRemainingTime_Msg}"/>
+               <TextBlock Text="{Binding BTLRemainingTime_Msg}" Margin="10,5,5,5"/>
                <TextBlock Text="{Binding Tag.MachGroupPanelVM.sRemainingTime,
-                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdOptimizerStatisticsV}}}"/>
+                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdOptimizerStatisticsV}}}"
+                          Margin="10,5,5,5"/>
             </StackPanel>
          </StackPanel>
-         <StackPanel Grid.Column="1">
+         <StackPanel Grid.Column="1" Margin="-10,10,10,10" Background="{StaticResource BeamWall_White}">
             <StackPanel Orientation="Horizontal">
-               <TextBlock Text="{Binding TotCNTParts_Msg}"/>
+               <TextBlock Text="{Binding TotCNTParts_Msg}" Margin="10,5,5,5"/>
                <TextBlock Text="{Binding Tag.BTLStructureVM.sTotCNTParts,
-                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdOptimizerStatisticsV}}}"/>
+                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdOptimizerStatisticsV}}}"
+                          Margin="10,5,5,5"/>
             </StackPanel>
             <StackPanel Orientation="Horizontal">
-               <TextBlock Text="{Binding TotADDEDParts_Msg}"/>
+               <TextBlock Text="{Binding TotADDEDParts_Msg}" Margin="10,5,5,5"/>
                <TextBlock Text="{Binding Tag.BTLStructureVM.sTotADDEDParts,
-                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdOptimizerStatisticsV}}}"/>
+                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdOptimizerStatisticsV}}}"
+                          Margin="10,5,5,5"/>
             </StackPanel>
             <StackPanel Orientation="Horizontal">
-               <TextBlock Text="{Binding TotINPRODParts_Msg}"/>
+               <TextBlock Text="{Binding TotINPRODParts_Msg}" Margin="10,5,5,5"/>
                <TextBlock Text="{Binding Tag.BTLStructureVM.sTotINPRODParts,
-                                 RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdOptimizerStatisticsV}}}"/>
+                                 RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdOptimizerStatisticsV}}}"
+                          Margin="10,5,5,5"/>
             </StackPanel>
             <StackPanel Orientation="Horizontal">
-               <TextBlock Text="{Binding TotDONEParts_Msg}"/>
+               <TextBlock Text="{Binding TotDONEParts_Msg}" Margin="10,5,5,5"/>
                <TextBlock Text="{Binding Tag.BTLStructureVM.sTotDONEParts,
-                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdOptimizerStatisticsV}}}"/>
+                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdOptimizerStatisticsV}}}"
+                          Margin="10,5,5,5"/>
             </StackPanel>
          </StackPanel>
-         <ToggleButton Content="R"
-                       Grid.Column="2"
-                       IsChecked="{Binding bRawPart_IsChecked}"
-                       ToolTip="Materials"
-                       Style="{StaticResource OnlyProdToolBar_ToggleButton}">
-            <!--<Image Source="/Resources/Statistics/CopyToClipboard.png" Stretch="Uniform"/>-->
-         </ToggleButton>
-         <Button Grid.Column="3"
-                 ToolTip="{Binding CopyToClipboard_Msg}"
-                 x:Name="CopyToClipboardBtn"
-                 Style="{StaticResource CopyToClipboard_ToolBar_Button}">
-            <Image Source="/Resources/Statistics/CopyToClipboard.png" Stretch="Uniform"/>
-         </Button>
-         <Button Grid.Column="4"
-                 ToolTip="{Binding PrintPDF_Msg}"
-                 Command="{Binding PrintPDF_Command}"
-                 Style="{StaticResource CopyToClipboard_ToolBar_Button}">
-            <Image Source="/Resources/Statistics/PrintPDF.png" Stretch="Uniform"/>
-         </Button>
+         <StackPanel Grid.Column="2" Orientation="Vertical" Margin="-10,10,10,10" Background="{StaticResource BeamWall_White}">
+            <ToggleButton Content="R"
+                          Grid.Column="2"
+                          Foreground="{StaticResource BeamWall_White}"
+                          IsChecked="{Binding bRawPart_IsChecked}"
+                          ToolTip="Materials"
+                          Style="{StaticResource OnlyProdToolBar_ToggleButton}"
+                          Margin="0,10,10,5">
+               <!--<Image Source="/Resources/Statistics/CopyToClipboard.png" Stretch="Uniform"/>-->
+            </ToggleButton>
+            <Button ToolTip="{Binding CopyToClipboard_Msg}"
+                    x:Name="CopyToClipboardBtn"
+                    Style="{StaticResource CopyToClipboard_ToolBar_Button}"
+                    Margin="0,5,10,5">
+               <Image Source="/Resources/Statistics/CopyToClipboard.png" Stretch="Uniform"/>
+            </Button>
+            <Button ToolTip="{Binding PrintPDF_Msg}"
+                    Command="{Binding PrintPDF_Command}"
+                    Style="{StaticResource CopyToClipboard_ToolBar_Button}"
+                    Margin="0,5,10,5">
+               <Image Source="/Resources/Statistics/PrintPDF.png" Stretch="Uniform"/>
+            </Button>
+         </StackPanel>
       </Grid>
    </Grid>
 
diff --git a/EgtBEAMWALL.ViewerOptimizer/Statistics/OnlyProdPDFEditorV.xaml b/EgtBEAMWALL.ViewerOptimizer/Statistics/OnlyProdPDFEditorV.xaml
index 12a89163..f6c8517e 100644
--- a/EgtBEAMWALL.ViewerOptimizer/Statistics/OnlyProdPDFEditorV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/Statistics/OnlyProdPDFEditorV.xaml
@@ -132,10 +132,15 @@
             </ItemsControl.ItemTemplate>
          </ItemsControl>
       </ScrollViewer>
-      <GroupBox Header="PDF"
-                Grid.Column="1"
+      <GroupBox Grid.Column="1"
                 Grid.RowSpan="2"
                 Style="{StaticResource GroupBox_PDFPreview}">
+         <GroupBox.Header>
+            <StackPanel Orientation="Horizontal">
+               <Image Source="/Resources/PDFEditor/PDFPreview.png" Height="20" Width="20" Stretch="Uniform"/>
+               <TextBlock Text="PDF" Margin="5,2,0,0"/>
+            </StackPanel>
+         </GroupBox.Header>
          <!--<WebBrowser EgtBEAMWALL:WebBrowserUtility.BindableSource="{Binding WebAddress}"/>-->
          <EgtBEAMWALL:PdfViewer PdfPath="{Binding WebAddress, Mode=TwoWay}" Visibility="{Binding PdfViewer_Visibility}"/>
       </GroupBox>
diff --git a/EgtBEAMWALL.ViewerOptimizer/Statistics/OnlyProdStatisticsV.xaml b/EgtBEAMWALL.ViewerOptimizer/Statistics/OnlyProdStatisticsV.xaml
index 7f42f7c5..cf36a8fb 100644
--- a/EgtBEAMWALL.ViewerOptimizer/Statistics/OnlyProdStatisticsV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/Statistics/OnlyProdStatisticsV.xaml
@@ -19,7 +19,18 @@
                                    ScrollViewer.VerticalScrollBarVisibility="Auto"
                                    ScrollViewer.HorizontalScrollBarVisibility="Auto"
                                    Margin="0,0,0,5"
-                                   BindingColumns="{Binding StatisticsColumns}">
+                                   BindingColumns="{Binding StatisticsColumns}"
+                                   AlternatingRowBackground="{StaticResource BeamWall_LinkWater}"
+                                   AlternationCount="2"
+                                   ColumnHeaderBackground="{StaticResource BeamWall_Teal}"
+                                   ColumnHeaderForeground="{StaticResource BeamWall_White}"
+                                   ColumnHeaderHorizontalContentAlignment="Center"
+                                   ColumnHeaderFontWeight="Bold"
+                                   ColumnHeaderFontSize="15"
+                                   ColumnHeaderPadding="0,2,0,2"
+                                   CellStyle="{StaticResource CellDataGrid_CustomHighLight}"
+                                   RowStyle="{StaticResource RowDataGrid_CustomHighLight}"
+                                   Style="{StaticResource DataGrid_OnlyProd}">
          <DataGrid.Resources>
             <!--PDN - Nome-->
             <DataGridTextColumn x:Key="colPDN" Binding="{Binding nPDN}">
@@ -138,46 +149,51 @@
 
       </EgtBEAMWALLCORE:EgtDataGrid>
 
-      <Grid Grid.Row="1" Margin="5">
+      <Grid Grid.Row="1" Background="{StaticResource BeamWall_Glacier}">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="Auto"/>
          </Grid.ColumnDefinitions>
-         <StackPanel Grid.Row="1">
-            <StackPanel Orientation="Horizontal">
-               <TextBlock Text="{Binding BTLTotParts_Msg}"/>
+         <StackPanel>
+            <StackPanel Orientation="Horizontal" Margin="10,10,0,0" Background="{StaticResource BeamWall_White}">
+               <TextBlock Text="{Binding BTLTotParts_Msg}" Margin="10,5,5,5"/>
                <TextBlock Text="{Binding Tag.sBTLTotParts,
-                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdStatisticsV}}}"/>
+                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdStatisticsV}}}"
+                          Margin="10,5,5,5"/>
             </StackPanel>
-            <StackPanel Orientation="Horizontal">
-               <TextBlock Text="{Binding BTLTotVolume_Msg}"/>
+            <StackPanel Orientation="Horizontal" Margin="10,-1,0,0" Background="{StaticResource BeamWall_White}">
+               <TextBlock Text="{Binding BTLTotVolume_Msg}" Margin="10,5,5,5"/>
                <TextBlock Text="{Binding Tag.sBTLTotVolume,
-                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdStatisticsV}}}"/>
+                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdStatisticsV}}}"
+                          Margin="10,5,5,5"/>
             </StackPanel>
-            <StackPanel Orientation="Horizontal">
-               <TextBlock Text="{Binding BTLTotTime_Msg}"/>
+            <StackPanel Orientation="Horizontal" Margin="10,-1,0,0" Background="{StaticResource BeamWall_White}">
+               <TextBlock Text="{Binding BTLTotTime_Msg}" Margin="10,5,5,5"/>
                <TextBlock Text="{Binding Tag.sBTLTotTime,
-                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdStatisticsV}}}"/>
+                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdStatisticsV}}}"
+                          Margin="10,5,5,5"/>
             </StackPanel>
-            <StackPanel Orientation="Horizontal">
-               <TextBlock Text="{Binding BTLRemainingTime_Msg}"/>
+            <StackPanel Orientation="Horizontal" Margin="10,-1,0,10" Background="{StaticResource BeamWall_White}">
+               <TextBlock Text="{Binding BTLRemainingTime_Msg}" Margin="10,5,5,5"/>
                <TextBlock Text="{Binding Tag.sBTLRemainingTime,
-                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdStatisticsV}}}"/>
+                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdStatisticsV}}}"
+                          Margin="10,5,5,5"/>
             </StackPanel>
          </StackPanel>
-         <Button Grid.Column="1"
-                 ToolTip="{Binding CopyToClipboard_Msg}"
+         <StackPanel Grid.Column="1" Orientation="Vertical" Margin="0,10,10,10" Background="{StaticResource BeamWall_White}">
+         <Button ToolTip="{Binding CopyToClipboard_Msg}"
                  x:Name="CopyToClipboardBtn"
-                 Style="{StaticResource CopyToClipboard_ToolBar_Button}">
+                 Style="{StaticResource CopyToClipboard_ToolBar_Button}"
+                 Margin="0,10,10,10">
             <Image Source="/Resources/Statistics/CopyToClipboard.png" Stretch="Uniform"/>
          </Button>
-         <Button Grid.Column="2"
-                 ToolTip="{Binding PrintPDF_Msg}"
-                 Command="{Binding PrintPDF_Command}"
-                 Style="{StaticResource CopyToClipboard_ToolBar_Button}">
-            <Image Source="/Resources/Statistics/PrintPDF.png" Stretch="Uniform"/>
-         </Button>
+            <Button ToolTip="{Binding PrintPDF_Msg}"
+                    Command="{Binding PrintPDF_Command}"
+                    Style="{StaticResource CopyToClipboard_ToolBar_Button}"
+                    Margin="0,10,10,10">
+               <Image Source="/Resources/Statistics/PrintPDF.png" Stretch="Uniform"/>
+            </Button>
+         </StackPanel>
       </Grid>
    </Grid>
 
diff --git a/EgtBEAMWALL.ViewerOptimizer/StatisticsTimePanel/StatisticsTimePanelVM.vb b/EgtBEAMWALL.ViewerOptimizer/StatisticsTimePanel/StatisticsTimePanelVM.vb
index be6b03b0..eb9af7ab 100644
--- a/EgtBEAMWALL.ViewerOptimizer/StatisticsTimePanel/StatisticsTimePanelVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/StatisticsTimePanel/StatisticsTimePanelVM.vb
@@ -10,20 +10,8 @@ Public Class StatisticsTimePanelVM
 
 #Region "FIELDS & PROPERTIES"
 
-   'Public ReadOnly Property ViewPage_Visibility As Visibility
-   '   Get
-   '      Return If(Map.refMainMenuVM.SelPage = Pages.VIEW OrElse Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE, Visibility.Visible, Visibility.Collapsed)
-   '   End Get
-   'End Property
-
-   'Public ReadOnly Property MachiningPage_Visibility As Visibility
-   '   Get
-   '      Return If(Map.refMainMenuVM.SelPage = Pages.MACHINING OrElse Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE, Visibility.Visible, Visibility.Collapsed)
-   '   End Get
-   'End Property
-
    Private m_ViewPage_Visibility As Visibility = Visibility.Collapsed
-   Public Property ViewPage_Visibility As Visibility
+   Public ReadOnly Property ViewPage_Visibility As Visibility
       Get
          If Map.refMainMenuVM.SelPage = Pages.VIEW Then
             Return Visibility.Visible
@@ -31,14 +19,14 @@ Public Class StatisticsTimePanelVM
             Return m_ViewPage_Visibility
          End If
       End Get
-      Set(value As Visibility)
-         m_ViewPage_Visibility = value
-         NotifyPropertyChanged(NameOf(ViewPage_Visibility))
-      End Set
    End Property
+   Friend Sub SetViewPage_Visibility(value As Visibility)
+      m_ViewPage_Visibility = value
+      NotifyPropertyChanged(NameOf(ViewPage_Visibility))
+   End Sub
 
    Private m_MachiningPage_Visibility As Visibility = Visibility.Collapsed
-   Public Property MachiningPage_Visibility As Visibility
+   Public ReadOnly Property MachiningPage_Visibility As Visibility
       Get
          If Map.refMainMenuVM.SelPage = Pages.MACHINING Then
             Return Visibility.Visible
@@ -46,11 +34,11 @@ Public Class StatisticsTimePanelVM
             Return m_MachiningPage_Visibility
          End If
       End Get
-      Set(value As Visibility)
-         m_MachiningPage_Visibility = value
-         NotifyPropertyChanged(NameOf(MachiningPage_Visibility))
-      End Set
    End Property
+   Friend Sub SetMachiningPage_Visibility(value As Visibility)
+      m_MachiningPage_Visibility = value
+      NotifyPropertyChanged(NameOf(MachiningPage_Visibility))
+   End Sub
 
 #Region "ToolTip"
 
diff --git a/EgtBEAMWALL.ViewerOptimizer/StatisticsWnd/OptimizerStatisticsWndV.xaml b/EgtBEAMWALL.ViewerOptimizer/StatisticsWnd/OptimizerStatisticsWndV.xaml
index dc6a6d6b..46e6c783 100644
--- a/EgtBEAMWALL.ViewerOptimizer/StatisticsWnd/OptimizerStatisticsWndV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/StatisticsWnd/OptimizerStatisticsWndV.xaml
@@ -4,7 +4,7 @@
                             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
                             xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.ViewerOptimizer"
                             xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"
-                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
+                            Style="{StaticResource OnlyProd_EgtCustomWindow}"
                             WindowStyle="None" ResizeMode="NoResize"
                             SizeToContent="Height"
                             WindowStartupLocation="CenterOwner"
diff --git a/EgtBEAMWALL.ViewerOptimizer/StatisticsWnd/StatisticsWndV.xaml b/EgtBEAMWALL.ViewerOptimizer/StatisticsWnd/StatisticsWndV.xaml
index 1f07a1aa..f4f4ef79 100644
--- a/EgtBEAMWALL.ViewerOptimizer/StatisticsWnd/StatisticsWndV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/StatisticsWnd/StatisticsWndV.xaml
@@ -4,7 +4,7 @@
                             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
                             xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.ViewerOptimizer"
                             xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"
-                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
+                            Style="{StaticResource OnlyProd_EgtCustomWindow}"
                             WindowStyle="None" ResizeMode="NoResize"
                             SizeToContent="Height"
                             WindowStartupLocation="CenterOwner"
diff --git a/EgtBEAMWALL.ViewerOptimizer/Utility/Dictionary.xaml b/EgtBEAMWALL.ViewerOptimizer/Utility/Dictionary.xaml
index e9a42197..18def84b 100644
--- a/EgtBEAMWALL.ViewerOptimizer/Utility/Dictionary.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/Utility/Dictionary.xaml
@@ -172,8 +172,6 @@
       <GradientStop Color="#F0F0F0" Offset="0.0"/>
       <GradientStop Color="#E5E5E5" Offset="1.0"/>
    </LinearGradientBrush>-->
-
-   <!--#endregion Colori per TabHeader-->
    
    <!--Risorsa che toglie le animazioni dai menù popup per evitare che i menù mru di scelta dei file rimangano aperti se il file è grosso -->
    <!--o viene eseguito un lua che non aggiorna l'interfaccia-->
@@ -324,6 +322,7 @@
       <Setter Property="VerticalAlignment" Value="Center"/>
       <Setter Property="Margin" Value="10,0,10,0"/>
       <Setter Property="FontSize" Value="20"/>
+      <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
    </Style>
 
    <Style x:Key="MachParamTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
@@ -1974,8 +1973,6 @@
       <Setter Property="Height" Value="30"/>
       <Setter Property="Width" Value="30"/>
       <Setter Property="Margin" Value="2.5,2.5,2.5,2.5"/>
-      <Setter Property="Background" Value="Transparent"/>
-      <Setter Property="BorderBrush" Value="Transparent"/>
    </Style>
 
    <Style x:Key="Close_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
@@ -2333,7 +2330,6 @@
       <Setter Property="BorderThickness" Value="0"/>
       <Setter Property="Margin" Value="0"/>
       <Setter Property="Padding" Value="0"/>
-      <Setter Property="AlternationCount" Value="2"/>
    </Style>
 
    <Style x:Key="ItemsControl_ExpanderElementList" TargetType="{x:Type ItemsControl}" BasedOn="{StaticResource {x:Type ItemsControl}}">
@@ -2988,31 +2984,14 @@
 
    <Style x:Key="NewAddFeature_ListBox" TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">
       <Setter Property="BorderThickness" Value="0"/>
-      <Setter Property="HorizontalAlignment" Value="Left"/>
       <Setter Property="Height" Value="585"/>
       <Setter Property="Width" Value="260"/>
       <Setter Property="Margin" Value="5"/>
+      <Setter Property="Background" Value="Transparent"/>
+      <Setter Property="AlternationCount" Value="2"/>
       <Style.Resources>
-         <Style TargetType="{x:Type ListBoxItem}">
-            <Setter Property="Template">
-               <Setter.Value>
-                  <ControlTemplate TargetType="ListBoxItem">
-                     <Border Name="Border" Padding="2" SnapsToDevicePixels="True">
-                        <ContentPresenter/>
-                     </Border>
-                     <ControlTemplate.Triggers>
-                        <Trigger Property="IsSelected" Value="True">
-                           <Setter TargetName="Border" Property="Background" Value="{DynamicResource {x:Static SystemColors.HotTrackBrushKey}}"/>
-                           <Setter Property="FontWeight" Value="Bold"/>
-                           <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
-                           <Setter Property="FontSize" Value="15"/>
-                        </Trigger>
-                     </ControlTemplate.Triggers>
-                  </ControlTemplate>
-               </Setter.Value>
-            </Setter>
-         </Style>
-      </Style.Resources>
+         <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource OnlyProd_ScrollBar}"/>
+      </Style.Resources> 
    </Style>
 
    <Style x:Key="MacroCustom_ListBox" TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">
@@ -3021,6 +3000,7 @@
       <Setter Property="Height" Value="610"/>
       <Setter Property="Width" Value="980"/>
       <Setter Property="Margin" Value="5"/>
+      <Setter Property="Background" Value="Transparent"/>
    </Style>
 
    <Style x:Key="MacroDefault_ListBox" TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">
@@ -3029,27 +3009,10 @@
       <Setter Property="Height" Value="585"/>
       <Setter Property="Width" Value="250"/>
       <Setter Property="Margin" Value="5"/>
+      <Setter Property="Background" Value="Transparent"/>
+      <Setter Property="AlternationCount" Value="2"/>
       <Style.Resources>
-         <Style TargetType="{x:Type ListBoxItem}">
-            <Setter Property="Template">
-               <Setter.Value>
-                  <ControlTemplate TargetType="ListBoxItem">
-                     <Border Name="Border" Padding="2" SnapsToDevicePixels="True">
-                        <ContentPresenter/>
-                     </Border>
-                     <ControlTemplate.Triggers>
-                        <Trigger Property="IsSelected" Value="True">
-                           <Setter TargetName="Border" Property="Background" Value="{DynamicResource {x:Static SystemColors.HotTrackBrushKey}}"/>
-                           <Setter Property="FontWeight" Value="Bold"/>
-                           <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
-                           <Setter Property="FontSize" Value="14"/>
-                           <Setter Property="HorizontalAlignment" Value="Left"/>
-                        </Trigger>
-                     </ControlTemplate.Triggers>
-                  </ControlTemplate>
-               </Setter.Value>
-            </Setter>
-         </Style>
+         <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource OnlyProd_ScrollBar}"/>
       </Style.Resources>
    </Style>
 
@@ -3066,7 +3029,7 @@
       <Setter Property="Background" Value="Transparent"/>
       <Setter Property="BorderThickness" Value="0"/>
       <Setter Property="HorizontalContentAlignment" Value="Center"/>
-      <Setter Property="Height" Value="200"/>
+      <Setter Property="Height" Value="150"/>
       <Setter Property="Width" Value="130"/>
       <Setter Property="AlternationCount" Value="2"/>
       <Style.Resources>
diff --git a/EgtBEAMWALL.ViewerOptimizer/WarehouseWnd/OnlyProdWarehouseWndV.xaml b/EgtBEAMWALL.ViewerOptimizer/WarehouseWnd/OnlyProdWarehouseWndV.xaml
index e305f896..c5fe1609 100644
--- a/EgtBEAMWALL.ViewerOptimizer/WarehouseWnd/OnlyProdWarehouseWndV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/WarehouseWnd/OnlyProdWarehouseWndV.xaml
@@ -5,7 +5,7 @@
                             Width="{Binding WarehouseWnd_Width, Mode=TwoWay}"
                             xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.ViewerOptimizer"
                             xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"
-                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
+                            Style="{StaticResource OnlyProd_EgtCustomWindow}"
                             WindowStyle="None" ResizeMode="NoResize"
                             SizeToContent="Height"
                             MinHeight="300"
@@ -247,7 +247,7 @@
                         </DataTemplate>
                      </DataGridComboBoxColumn.HeaderTemplate>
                      <DataGridComboBoxColumn.ElementStyle>
-                        <Style TargetType="ComboBox" BasedOn="{StaticResource {x:Type ComboBox}}">
+                        <Style TargetType="ComboBox" BasedOn="{StaticResource OnlyProd_ComboBox}">
                            <Setter Property="ItemsSource" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type EgtBEAMWALL:OnlyProdWarehouseWndV}}, Path=DataContext.SectionXMaterialList}"/>
                            <Setter Property="SelectedItem" Value="{Binding SectXMat, UpdateSourceTrigger=PropertyChanged}" />
                            <Setter Property="Height" Value="{Binding ActualHeight, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}"/>
@@ -255,7 +255,7 @@
                         </Style>
                      </DataGridComboBoxColumn.ElementStyle>
                      <DataGridComboBoxColumn.EditingElementStyle>
-                        <Style TargetType="ComboBox" BasedOn="{StaticResource {x:Type ComboBox}}">
+                        <Style TargetType="ComboBox" BasedOn="{StaticResource OnlyProd_ComboBox}">
                            <Setter Property="ItemsSource" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type EgtBEAMWALL:OnlyProdWarehouseWndV}}, Path=DataContext.SectionXMaterialList}"/>
                            <Setter Property="SelectedItem" Value="{Binding SectXMat, UpdateSourceTrigger=PropertyChanged}" />
                            <Setter Property="Height" Value="{Binding ActualHeight, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}"/>