diff --git a/Icarus/Icarus.vbproj b/Icarus/Icarus.vbproj
index b0203e4..6fb16d6 100644
--- a/Icarus/Icarus.vbproj
+++ b/Icarus/Icarus.vbproj
@@ -46,6 +46,9 @@
     <PlatformTarget>x64</PlatformTarget>
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>Resources\Icarus.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="EgtUILib, Version=2.4.7.1, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -55,8 +58,8 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\ExtLibs\EgtWPFLib5.dll</HintPath>
     </Reference>
-    <Reference Include="Ionic.Zip, Version=1.9.1.8, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c, processorArchitecture=MSIL">
-      <HintPath>packages\Ionic.Zip.1.9.1.8\lib\Ionic.Zip.dll</HintPath>
+    <Reference Include="Ionic.Zip">
+      <HintPath>..\..\..\EgtProg\Icarus\Ionic.Zip.dll</HintPath>
     </Reference>
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
@@ -437,7 +440,7 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="Resources\EgtBEAMWALL.ico" />
+    <Resource Include="Resources\Icarus.ico" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\ProjectManager\ExportProject.png" />
diff --git a/Icarus/ImportPanel/ImportUtility.vb b/Icarus/ImportPanel/ImportUtility.vb
index 719b5e2..5ee400b 100644
--- a/Icarus/ImportPanel/ImportUtility.vb
+++ b/Icarus/ImportPanel/ImportUtility.vb
@@ -74,6 +74,8 @@ Public Class GeomEntity
                Return "┴"
             Case ChooseReferenceWndVM.References.MC
                Return "┼"
+            Case Else
+               Return "X"
          End Select
       End Get
    End Property
diff --git a/Icarus/MachSaveInDbWnd/MachSaveInDbWindowV.xaml b/Icarus/MachSaveInDbWnd/MachSaveInDbWindowV.xaml
index fec8a2f..5064e43 100644
--- a/Icarus/MachSaveInDbWnd/MachSaveInDbWindowV.xaml
+++ b/Icarus/MachSaveInDbWnd/MachSaveInDbWindowV.xaml
@@ -6,7 +6,7 @@
                             Title="Machining Param Name" 
                             Height="150" Width="300"
                             WindowStartupLocation="CenterOwner"
-                            Icon="/Resources/EgtBEAMWALL.ico"
+                            Icon="/Resources/Icarus.ico"
                             WindowStyle="None" ResizeMode="NoResize"
                             ShowInTaskbar="False"
                             IsMinimizable="False">
diff --git a/Icarus/MainWindow/MainWindowV.xaml b/Icarus/MainWindow/MainWindowV.xaml
index a1974cc..bbb5a95 100644
--- a/Icarus/MainWindow/MainWindowV.xaml
+++ b/Icarus/MainWindow/MainWindowV.xaml
@@ -4,7 +4,7 @@
                             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
                             xmlns:PrintApp="clr-namespace:Icarus"
                             Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
-                            Title="{Binding sTitle}" Icon="/Resources/EgtBEAMWALL.ico"
+                            Title="{Binding sTitle}" Icon="/Resources/Icarus.ico"
                             MinHeight="600" MinWidth="800"
                             AboutBoxCommand="{Binding AboutBoxCommand}" WindowStyle="None" ResizeMode="NoResize"
                             AllowDrop="True" Drop="MainWindowV_Drop"
diff --git a/Icarus/MainWindow/MainWindowVM.vb b/Icarus/MainWindow/MainWindowVM.vb
index b8356e9..de4b95e 100644
--- a/Icarus/MainWindow/MainWindowVM.vb
+++ b/Icarus/MainWindow/MainWindowVM.vb
@@ -42,6 +42,7 @@ Public Class MainWindowVM
    Public Property nSelTabPage As Integer
       Get
          ' Return If(IsNothing(Map.refMainMenuVM.SelPage) OrElse Map.refMainMenuVM.SelPage = -1 OrElse Map.refMainMenuVM.SelPage = Pages.VIEW OrElse Map.refMainMenuVM.SelPage = Pages.MACHINING, 0, 1)
+         Return -1
       End Get
       Set(value As Integer)
       End Set
@@ -110,7 +111,7 @@ Public Class MainWindowVM
    Friend Sub ContentRendered()
       Map.refTopPanelVM.SelPage = Pages.NULL
       'DbControllers.Init()
-      ''' chiamata a caso su Db per inizializzarlo
+      '' chiamata a caso su Db per inizializzarlo
       'DbControllers.m_ProjController.FindByProjDbId(0)
       '' Verifico che l'inizializzazione di tutte le parti del programma sia andata a buon fine
       'If Map.EndInit() Then
diff --git a/Icarus/My Project/AssemblyInfo.vb b/Icarus/My Project/AssemblyInfo.vb
index 3cf0f28..2f8c643 100644
--- a/Icarus/My Project/AssemblyInfo.vb	
+++ b/Icarus/My Project/AssemblyInfo.vb	
@@ -13,7 +13,7 @@ Imports System.Windows
 
 <Assembly: AssemblyTitle("Icarus")>
 <Assembly: AssemblyDescription("")>
-<Assembly: AssemblyCompany("")>
+<Assembly: AssemblyCompany("Egalware s.r.l.")>
 <Assembly: AssemblyProduct("Icarus")>
 <Assembly: AssemblyCopyright("Copyright ©  2022")>
 <Assembly: AssemblyTrademark("")>
@@ -55,5 +55,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.0.0.0")>
-<Assembly: AssemblyFileVersion("1.0.0.0")>
+<Assembly: AssemblyVersion("2.4.9.2")>
+<Assembly: AssemblyFileVersion("2.4.9.2")>
diff --git a/Icarus/ReferencePanel/ReferencePanelVM.vb b/Icarus/ReferencePanel/ReferencePanelVM.vb
index bce1bfb..3f14924 100644
--- a/Icarus/ReferencePanel/ReferencePanelVM.vb
+++ b/Icarus/ReferencePanel/ReferencePanelVM.vb
@@ -129,6 +129,8 @@ Public Class ReferenceBtn
                Return "┴"
             Case References.MC
                Return "┼"
+            Case Else
+               Return "X"
          End Select
       End Get
    End Property
diff --git a/Icarus/Resources/EgtBEAMWALL.ico b/Icarus/Resources/Icarus.ico
similarity index 75%
rename from Icarus/Resources/EgtBEAMWALL.ico
rename to Icarus/Resources/Icarus.ico
index 90d6296..49429c5 100644
Binary files a/Icarus/Resources/EgtBEAMWALL.ico and b/Icarus/Resources/Icarus.ico differ
diff --git a/Icarus/RibPanel/RibPanelVM.vb b/Icarus/RibPanel/RibPanelVM.vb
index 19c9de2..b8d2eb4 100644
--- a/Icarus/RibPanel/RibPanelVM.vb
+++ b/Icarus/RibPanel/RibPanelVM.vb
@@ -478,6 +478,7 @@ Public Class RibPanelVM
             EgtSelectObj(m_SelRib.nExtrusionId)
       End Select
       EgtDraw()
+      Return True
    End Function
 
    Friend Sub UpdateUi()
diff --git a/Icarus/SceneHost/MySceneHostVM.vb b/Icarus/SceneHost/MySceneHostVM.vb
index 545b87a..bb95f93 100644
--- a/Icarus/SceneHost/MySceneHostVM.vb
+++ b/Icarus/SceneHost/MySceneHostVM.vb
@@ -202,7 +202,7 @@ Public Class MySceneHostVM
       MainScene.SetGridCursorPos(True)
       ' modo di visualizzazione
       Dim nShowMode As Integer = GetMainPrivateProfileInt(S_SCENE, K_SHOWMODE, SM.SHADING)
-      '''Map.refShowPanelVM.SetShowMode(DirectCast(nShowMode, SM))
+      'Map.refShowPanelVM.SetShowMode(DirectCast(nShowMode, SM))
       ' visualizzazione avanzata dei triangoli costituenti le superfici
       Dim bShowTriaAdv As Boolean = (GetMainPrivateProfileInt(S_SCENE, K_SHOWTRIAADV, 1) <> 0)
       EgtSetShowTriaAdv(bShowTriaAdv)
@@ -216,9 +216,9 @@ Public Class MySceneHostVM
       MainScene.SetSnapPointType(SP.PT_SKETCH)
       ' visualizzazione assemblato
       Dim nShowBuilding As Boolean = GetMainPrivateProfileInt(S_SCENE, K_SHOWBUILDING, 0) <> 0
-      '''Map.refShowBeamPanelVM.SetShowBuilding(nShowBuilding)
+      'Map.refShowBeamPanelVM.SetShowBuilding(nShowBuilding)
       ' nascondo input box
-      '''Map.refFreeContourInputVM.ResetInputBox()
+      'Map.refFreeContourInputVM.ResetInputBox()
    End Sub
 
    Friend Sub EmitTitle()
@@ -393,7 +393,7 @@ Public Class MySceneHostVM
       MainScene.SetStatusNull()
    End Sub
 
-   Friend Sub ExecScript(sFilePath As String)
+   Friend Shadows Sub ExecScript(sFilePath As String)
       If String.IsNullOrEmpty(sFilePath) Then
          Dim sDir As String = String.Empty
          'GetMainPrivateProfileString(S_GENERAL, K_LASTLUADIR, "", sDir)
diff --git a/Icarus/SecondaryWindow/SecondaryWindowV.xaml b/Icarus/SecondaryWindow/SecondaryWindowV.xaml
index da13014..961c8a1 100644
--- a/Icarus/SecondaryWindow/SecondaryWindowV.xaml
+++ b/Icarus/SecondaryWindow/SecondaryWindowV.xaml
@@ -4,7 +4,7 @@
                             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
                             xmlns:PrintApp="clr-namespace:Icarus"
                             Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
-                            Title="{Binding sTitle}" Icon="/Resources/EgtBEAMWALL.ico"
+                            Title="{Binding sTitle}" Icon="/Resources/Icarus.ico"
                             WindowStyle="None" ResizeMode="NoResize"
                             ShowInTaskbar="False"
                             AllowsTransparency="True"
diff --git a/Icarus/SimulationPanel/SimulationPanelVM.vb b/Icarus/SimulationPanel/SimulationPanelVM.vb
index f806c4b..155cd04 100644
--- a/Icarus/SimulationPanel/SimulationPanelVM.vb
+++ b/Icarus/SimulationPanel/SimulationPanelVM.vb
@@ -219,7 +219,7 @@ Public Class SimulationPanelVM
       '      Return False
       '   End If
       'End If
-      'Return True
+      Return True
    End Function
 
    Friend Sub ExitSimulation()
diff --git a/Icarus/SliceManager/SliceManagerVM.vb b/Icarus/SliceManager/SliceManagerVM.vb
index 5a1a63b..51d8b63 100644
--- a/Icarus/SliceManager/SliceManagerVM.vb
+++ b/Icarus/SliceManager/SliceManagerVM.vb
@@ -118,6 +118,7 @@ Public Class SliceManagerVM
       'Else
       '   Return 0
       'End If
+      Return 0
    End Function
 
    Friend Function CalcSlice(bSlice As Boolean, bCalcTFS As Boolean, bGenerate As Boolean) As Boolean
diff --git a/Icarus/StartMachPanel/StartMachPanelVM.vb b/Icarus/StartMachPanel/StartMachPanelVM.vb
index bf97085..3d39072 100644
--- a/Icarus/StartMachPanel/StartMachPanelVM.vb
+++ b/Icarus/StartMachPanel/StartMachPanelVM.vb
@@ -348,6 +348,7 @@ Public Class StartMachPanelVM
       ' seleziono percorso corrente
       EgtDeselectAll()
       EgtSelectObj(m_SelStart.nId)
+      Return True
    End Function
 
    Friend Sub UpdateUi()
diff --git a/Icarus/Utility/CurrentMachine.vb b/Icarus/Utility/CurrentMachine.vb
index 2c0848e..43cae01 100644
--- a/Icarus/Utility/CurrentMachine.vb
+++ b/Icarus/Utility/CurrentMachine.vb
@@ -1,6 +1,5 @@
 Imports System.Collections.ObjectModel
 Imports System.IO
-Imports EgtBEAMWALL.Core
 Imports EgtUILib
 Imports EgtWPFLib5