diff --git a/Icarus/MachiningDb/Machining.vb b/Icarus/MachiningDb/Machining.vb
index ffd83bf..c6fbd99 100644
--- a/Icarus/MachiningDb/Machining.vb
+++ b/Icarus/MachiningDb/Machining.vb
@@ -565,10 +565,18 @@ Public Class ToolTipDataMsg
       End Get
    End Property
 
+   Protected m_bVisibilityToolTip As Visibility
+   Public ReadOnly Property bVisibilityToolTip As Visibility
+      Get
+         Return m_bVisibilityToolTip
+      End Get
+   End Property
+
    Sub New(Type As MachiningParam.Params, bIsBeta As Boolean)
       Dim sTitle As String = ""
       Dim sDescription As String = ""
       If GetPrivateProfileString(Type, K_TITLE, "", sTitle, CurrentMachine.sToolTipFilePath) > 0 Then
+         m_bVisibilityToolTip = Visibility.Visible
          GetPrivateProfileString(Type, K_DESCRIPTION, "", sDescription, CurrentMachine.sToolTipFilePath)
          If bIsBeta Then
             m_sNameTitleToolTip = ReadToolTipMsg(sTitle) & " (BETA)"
@@ -576,14 +584,18 @@ Public Class ToolTipDataMsg
             m_sNameTitleToolTip = ReadToolTipMsg(sTitle)
          End If
          m_sNameDescriptionToolTip = ReadToolTipMsg(sDescription)
+      Else
+         m_bVisibilityToolTip = Visibility.Collapsed
       End If
-      If GetPrivateProfileString(Type, K_FIRST_ICON, "", m_sIconToolTip_First, CurrentMachine.sToolTipFilePath) > 0 Then
-         GetPrivateProfileString(Type, K_ORIENTATION_ICON, "", m_sIconOrientation, CurrentMachine.sToolTipFilePath)
-         m_nDimension_First = 200
-      End If
-      If GetPrivateProfileString(Type, K_SECOND_ICON, "", m_sIconToolTip_Second, CurrentMachine.sToolTipFilePath) > 0 Then
-         GetPrivateProfileString(Type, K_ORIENTATION_ICON, "", m_sIconOrientation, CurrentMachine.sToolTipFilePath)
-         m_nDimension_Second = 200
+      If m_bVisibilityToolTip = Visibility.Visible Then
+         If GetPrivateProfileString(Type, K_FIRST_ICON, "", m_sIconToolTip_First, CurrentMachine.sToolTipFilePath) > 0 Then
+            GetPrivateProfileString(Type, K_ORIENTATION_ICON, "", m_sIconOrientation, CurrentMachine.sToolTipFilePath)
+            m_nDimension_First = 200
+         End If
+         If GetPrivateProfileString(Type, K_SECOND_ICON, "", m_sIconToolTip_Second, CurrentMachine.sToolTipFilePath) > 0 Then
+            GetPrivateProfileString(Type, K_ORIENTATION_ICON, "", m_sIconOrientation, CurrentMachine.sToolTipFilePath)
+            m_nDimension_Second = 200
+         End If
       End If
    End Sub
 
diff --git a/Icarus/Utility/Dictionary.xaml b/Icarus/Utility/Dictionary.xaml
index 7719848..d81bf6f 100644
--- a/Icarus/Utility/Dictionary.xaml
+++ b/Icarus/Utility/Dictionary.xaml
@@ -4458,7 +4458,8 @@
    <!--ToolTipMsg-->
 
    <Grid x:Key="MachiningParam_Tooltip" 
-         Margin="2.5">
+         Margin="2.5"
+         Visibility="{Binding Tooltip.bVisibilityToolTip}">
       <Grid.RowDefinitions>
          <RowDefinition Height="Auto"/>
          <RowDefinition Height="1*"/>