diff --git a/EnvelopeGenerator.Form/Helper/Thumbnail.vb b/EnvelopeGenerator.Form/Helper/Thumbnail.vb
index 4a20a421..18ea2cb8 100644
--- a/EnvelopeGenerator.Form/Helper/Thumbnail.vb
+++ b/EnvelopeGenerator.Form/Helper/Thumbnail.vb
@@ -12,7 +12,7 @@ Public Class Thumbnail
         MyBase.New(pLogConfig)
 
         GDViewer = New GdViewer()
-        Dim oGDPictureKey As String = "21182889975216572111813147150675976632"
+        Dim oGDPictureKey As String = MS_GDPICTUREKEY
 
         Dim licenseManager As GdPicture14.LicenseManager = New GdPicture14.LicenseManager()
         licenseManager.RegisterKEY(oGDPictureKey)
diff --git a/EnvelopeGenerator.Form/ModuleSettings.vb b/EnvelopeGenerator.Form/ModuleSettings.vb
index 7159fd81..df83979e 100644
--- a/EnvelopeGenerator.Form/ModuleSettings.vb
+++ b/EnvelopeGenerator.Form/ModuleSettings.vb
@@ -4,4 +4,5 @@ Module ModuleSettings
     Public DOCUMENT_PATH_MOVE_AFTSEND As String = ""
     Public CurrLogConfig As LogConfig
     Public Directory2Delete As String = ""
+    Public MS_GDPICTUREKEY As String = ""
 End Module
diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.vb b/EnvelopeGenerator.Form/frmEnvelopeEditor.vb
index 48d4c601..7a7806f9 100644
--- a/EnvelopeGenerator.Form/frmEnvelopeEditor.vb
+++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.vb
@@ -156,13 +156,12 @@ Partial Public Class frmEnvelopeEditor
 
             If ViewDocuments.GetSelectedRows().Count > 0 Then
                 Dim oDocument As EnvelopeDocument = DirectCast(ViewDocuments.GetFocusedRow(), EnvelopeDocument)
-                Dim oGDPictureKey As String = "21182889975216572111813147150675976632"
+                Dim oGDPictureKey As String = MS_GDPICTUREKEY
 
                 Dim oForm As New frmFieldEditor(State) With {
                         .Document = Controller.Envelope.Documents.
                             Where(Function(d) d.Filename = oDocument.Filename).
                             SingleOrDefault(),
-                        .GDPictureKey = oGDPictureKey,
                         .Receivers = Controller.Envelope.Receivers.ToList
                     }
                 oForm.ShowDialog()
diff --git a/EnvelopeGenerator.Form/frmFieldEditor.vb b/EnvelopeGenerator.Form/frmFieldEditor.vb
index d0805a03..9e0959b6 100644
--- a/EnvelopeGenerator.Form/frmFieldEditor.vb
+++ b/EnvelopeGenerator.Form/frmFieldEditor.vb
@@ -19,7 +19,6 @@ Partial Public Class frmFieldEditor
     Private Controller As FieldEditorController
 
     Public Property Document As EnvelopeDocument = Nothing
-    Public Property GDPictureKey As String = ""
     Public Property Receivers As List(Of EnvelopeReceiver)
     Public Property SelectedReceiver As EnvelopeReceiver = Nothing
 
@@ -49,7 +48,7 @@ Partial Public Class frmFieldEditor
             Throw New ArgumentNullException("State")
         End If
 
-        If GDPictureKey = "" Then
+        If MS_GDPICTUREKEY = "" Then
             Throw New ArgumentNullException("GDPictureKey")
         End If
 
@@ -74,7 +73,7 @@ Partial Public Class frmFieldEditor
     End Sub
 
     Private Sub InitializeViewer()
-        DocumentViewer1.Init(LogConfig, GDPictureKey, New DigitalData.Controls.DocumentViewer.DocumentViewer.ToolbarSettings With {
+        DocumentViewer1.Init(LogConfig, MS_GDPICTUREKEY, New DigitalData.Controls.DocumentViewer.DocumentViewer.ToolbarSettings With {
             .ShowFlipButton = False,
             .ShowPrintButton = False,
             .ShowRotateButton = False,
diff --git a/EnvelopeGenerator.Form/frmSplashScreen.vb b/EnvelopeGenerator.Form/frmSplashScreen.vb
index afdf7cdf..b333ac13 100644
--- a/EnvelopeGenerator.Form/frmSplashScreen.vb
+++ b/EnvelopeGenerator.Form/frmSplashScreen.vb
@@ -79,8 +79,11 @@ Public Class frmSplashScreen
         oState.DbConfig = ConfigModel.LoadConfiguration()
         DOCUMENT_PATH_MOVE_AFTSEND = oState.DbConfig.DOCUMENT_PATH_MOVE_AFTSEND
         Worker.ReportProgress(60, "Initialize User")
+        Dim oKey = oState.Database.GetScalarValue("SELECT LICENSE FROM TBDD_3RD_PARTY_MODULES WHERE NAME = 'GDPICTURE' and ACTIVE = 1")
         Thread.Sleep(300)
-
+        If oKey.ToString <> String.Empty Then
+            MS_GDPICTUREKEY = oKey
+        End If
         Dim oUserModel = New UserModel(oState)
         oState.UserId = oUserModel.SelectUserId()
 
diff --git a/EnvelopeGenerator.Test/EnvelopeGenerator.Test.vbproj b/EnvelopeGenerator.Test/EnvelopeGenerator.Test.vbproj
index f798ac41..eb2aec88 100644
--- a/EnvelopeGenerator.Test/EnvelopeGenerator.Test.vbproj
+++ b/EnvelopeGenerator.Test/EnvelopeGenerator.Test.vbproj
@@ -76,7 +76,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
     </Reference>
-    <Reference Include="GdPicture.NET.14, Version=14.1.0.152, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb" />
+    <Reference Include="GdPicture.NET.14, Version=14.1.0.152, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
diff --git a/EnvelopeGenerator.Test/frmFieldEditor.vb b/EnvelopeGenerator.Test/frmFieldEditor.vb
index 213d2e5e..d44b83a1 100644
--- a/EnvelopeGenerator.Test/frmFieldEditor.vb
+++ b/EnvelopeGenerator.Test/frmFieldEditor.vb
@@ -19,7 +19,7 @@ Partial Public Class frmFieldEditor
         LogConfig = New LogConfig(LogConfig.PathType.CustomPath, Application.StartupPath, CompanyName:="Digital Data", ProductName:="EnvelopeGenerator")
         Logger = LogConfig.GetLogger()
 
-        DocumentViewer1.Init(LogConfig, "21182889975216572111813147150675976632")
+        DocumentViewer1.Init(LogConfig, "PS231031-44053-15086")
     End Sub
 
     Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick
diff --git a/EnvelopeGenerator.Test/frmFinalizePDF.vb b/EnvelopeGenerator.Test/frmFinalizePDF.vb
index eec4fede..e844ef55 100644
--- a/EnvelopeGenerator.Test/frmFinalizePDF.vb
+++ b/EnvelopeGenerator.Test/frmFinalizePDF.vb
@@ -21,11 +21,11 @@ Public Class frmFinalizePDF
         Database = New MSSQLServer(LogConfig, MSSQLServer.DecryptConnectionString(CONNECTIONSTRING))
 
 
-        PDFBurner = New FinalizeDocument.PDFBurner(LogConfig, "21182889975216572111813147150675976632")
+        PDFBurner = New FinalizeDocument.PDFBurner(LogConfig, "PS231031-44053-15086")
 
         Manager = New AnnotationManager()
         Dim oLicense = New LicenseManager()
-        oLicense.RegisterKEY("21182889975216572111813147150675976632")
+        oLicense.RegisterKEY("PS231031-44053-15086")
     End Sub
 
     Private Function LoadAnnotationDataForReceiver() As String