diff --git a/EgtBEAMWALL.Core/BTLModel/BTLPartM.vb b/EgtBEAMWALL.Core/BTLModel/BTLPartM.vb
index 72ded551..919f817b 100644
--- a/EgtBEAMWALL.Core/BTLModel/BTLPartM.vb
+++ b/EgtBEAMWALL.Core/BTLModel/BTLPartM.vb
@@ -587,7 +587,7 @@ Public Class BTLPartM
    Public ReadOnly Property nINPROD As Integer
       Get
          Dim INPROD As Integer = 0
-         EgtDuploCount(m_nPartId, INPROD)
+         EgtDuploInRawCount(m_nPartId, INPROD)
          Return INPROD
       End Get
    End Property
diff --git a/EgtBEAMWALL.Core/Constants/ConstIni.vb b/EgtBEAMWALL.Core/Constants/ConstIni.vb
index 0586cd5f..0ad9a85d 100644
--- a/EgtBEAMWALL.Core/Constants/ConstIni.vb
+++ b/EgtBEAMWALL.Core/Constants/ConstIni.vb
@@ -168,8 +168,6 @@ Public Module ConstIni
    Public Const K_EXTERNALFILEPATH As String = "ExternalFilePath"
    Public Const K_REMINDERFREQUENCY As String = "ReminderFrequency"
 
-   Public Const K_SPECIALPANEL As String = "SpecialPanel"
-
    Public Const S_SPECIAL As String = "Special"
    Public Const K_SPECIALENABLE As String = "SpecialEnable"
 
diff --git a/EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowM.vb b/EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowM.vb
index 911d0a9e..8c1a3821 100644
--- a/EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowM.vb
@@ -286,7 +286,7 @@ Public Class MainWindowM
       ' Leggo e imposto livello utilizzatore
       m_nUserLevel = Math.Min(m_nKeyLevel, GetMainPrivateProfileInt(S_GENERAL, K_USERLEVEL, 1))
       ' Recupero flag SpecialPanel
-      m_bSpecialPanel = GetMainPrivateProfileInt(S_GENERAL, K_SPECIALPANEL, 0) = 1
+      m_bSpecialPanel = GetMainPrivateProfileInt(S_SPECIAL, K_SPECIALENABLE, 0) = 1
       ' Imposto dir font Nfe e font default
       Dim sNfeDir As String = String.Empty
       GetMainPrivateProfileString(S_GEOMDB, K_NFEFONTDIR, "", sNfeDir)
diff --git a/EgtBEAMWALL.ViewerOptimizer/Project/ProjectVM.vb b/EgtBEAMWALL.ViewerOptimizer/Project/ProjectVM.vb
index 2de7d4f3..35d848ef 100644
--- a/EgtBEAMWALL.ViewerOptimizer/Project/ProjectVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/Project/ProjectVM.vb
@@ -198,7 +198,7 @@ Public Class ProjectVM
 
    Public ReadOnly Property SpecialPanel_Visibility As Visibility
       Get
-         Return If(Map.refMainWindowVM.MainWindowM.bSpecialPanel AndAlso Map.refMainWindowVM.MainWindowM.nUserLevel = 5, Visibility.Visible, Visibility.Collapsed)
+         Return If(Map.refMainWindowVM.MainWindowM.bSpecialPanel AndAlso Map.refMainWindowVM.MainWindowM.nUserLevel > 5, Visibility.Visible, Visibility.Collapsed)
       End Get
    End Property
 
diff --git a/EgtBEAMWALL.ViewerOptimizer/SpecialPanel/SpecialPanelVM.vb b/EgtBEAMWALL.ViewerOptimizer/SpecialPanel/SpecialPanelVM.vb
index 77bc4bcc..052af28a 100644
--- a/EgtBEAMWALL.ViewerOptimizer/SpecialPanel/SpecialPanelVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/SpecialPanel/SpecialPanelVM.vb
@@ -16,7 +16,7 @@ Public Class SpecialPanelVM
       ' Creo riferimento a questa classe in Map
       Map.SetRefSpecialPanelVM(Me)
       ' se attivo, inizializzo i bottoni leggendoli da file ini
-      If IsActiveSpecialPanel() Then
+      If Map.refMainWindowVM.MainWindowM.bSpecialPanel Then
          Dim BtnIndex As Integer = 1
          Dim CurrBtn As ButtonItem = Nothing
          While GetPrivateProfileButton(S_SPECIAL, K_BUTTON & BtnIndex, "", CurrBtn)
@@ -58,11 +58,6 @@ Public Class SpecialPanelVM
       Next
    End Sub
 
-   Friend Function IsActiveSpecialPanel() As Boolean
-      Dim btDummy As ButtonItem = Nothing
-      Return GetMainPrivateProfileInt(S_SPECIAL, K_SPECIALENABLE, 0) <> 0 AndAlso GetPrivateProfileButton(S_SPECIAL, K_BUTTON & "1", "", btDummy)
-   End Function
-
    Public Function GetPrivateProfileButton(sSection As String, sKey As String, sBaseDir As String, ByRef ReadButtonItem As ButtonItem) As Boolean
       ReadButtonItem = Nothing
       Dim sVal As String = String.Empty
diff --git a/ExtLibs/EgtUILib.dll b/ExtLibs/EgtUILib.dll
index 5ba8f7f8..8363513a 100644
Binary files a/ExtLibs/EgtUILib.dll and b/ExtLibs/EgtUILib.dll differ
diff --git a/ExtLibs/EgtWPFLib5.dll b/ExtLibs/EgtWPFLib5.dll
index 786487a1..92edc77f 100644
Binary files a/ExtLibs/EgtWPFLib5.dll and b/ExtLibs/EgtWPFLib5.dll differ