diff --git a/GUIs.Common/DocumentResultList/frmDocumentResultList.vb b/GUIs.Common/DocumentResultList/frmDocumentResultList.vb
index 8c11855d..56048b90 100644
--- a/GUIs.Common/DocumentResultList/frmDocumentResultList.vb
+++ b/GUIs.Common/DocumentResultList/frmDocumentResultList.vb
@@ -182,7 +182,12 @@ Public Class frmDocumentResultList
 
             ' Initialize Viewer with GDPicture.NET License
             If Environment.Settings.GdPictureKey <> String.Empty Then
-                DocumentViewer1.Init(LogConfig, Environment.Settings.GdPictureKey)
+                DocumentViewer1.Init(LogConfig, Environment.Settings.GdPictureKey, New DigitalData.Controls.DocumentViewer.DocumentViewer.ToolbarSettings() With {
+            .ShowPrintButton = True,
+            .ShowRotateButton = True,
+            .ShowFlipButton = True,
+            .ShowSettingButton = True
+        })
             End If
 
             ' Hide options relating to a filepath for zooflow
diff --git a/GUIs.Common/My Project/AssemblyInfo.vb b/GUIs.Common/My Project/AssemblyInfo.vb
index af045448..6c9cb4f9 100644
--- a/GUIs.Common/My Project/AssemblyInfo.vb	
+++ b/GUIs.Common/My Project/AssemblyInfo.vb	
@@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyCompany("")>
 <Assembly: AssemblyProduct("Common")>
 <Assembly: AssemblyCopyright("Copyright ©  2023")>
-<Assembly: AssemblyTrademark("2.5.5.0")>
+<Assembly: AssemblyTrademark("2.5.8.2")>
 
 <Assembly: ComVisible(False)>
 
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2.5.8.1")>
-<Assembly: AssemblyFileVersion("2.5.8.1")>
+<Assembly: AssemblyVersion("2.5.8.2")>
+<Assembly: AssemblyFileVersion("2.5.8.2")>
diff --git a/GUIs.Common/NNfrmNotification_Startup.vb b/GUIs.Common/NNfrmNotification_Startup.vb
index 7fec48e0..d1419ff0 100644
--- a/GUIs.Common/NNfrmNotification_Startup.vb
+++ b/GUIs.Common/NNfrmNotification_Startup.vb
@@ -50,7 +50,12 @@ Public Class NNfrmNotification_Startup
 
     Private Sub frmNotification_Startup_Load(sender As Object, e As EventArgs) Handles Me.Load
         Try
-            DocumentViewer1.Init(LogConfig, GDPictureKey)
+            DocumentViewer1.Init(LogConfig, GDPictureKey, New DigitalData.Controls.DocumentViewer.DocumentViewer.ToolbarSettings() With {
+            .ShowPrintButton = True,
+            .ShowRotateButton = True,
+            .ShowFlipButton = True,
+            .ShowSettingButton = True
+        })
             OperationMode = GetOperationMode()
             Client = Environment.Service.Client
             Me.Text = MyCaption
diff --git a/GUIs.Common/SQLEditor/Placeholders.vb b/GUIs.Common/SQLEditor/Placeholders.vb
index 45efcf8b..bf09691b 100644
--- a/GUIs.Common/SQLEditor/Placeholders.vb
+++ b/GUIs.Common/SQLEditor/Placeholders.vb
@@ -13,8 +13,12 @@ Namespace SQLEditor
             Dim oItems As New List(Of GalleryItem)() From {
                 GetGalleryItem(New Placeholder("USERNAME", "Benutzername", oModule, "USERNAME"), oImage),
                 GetGalleryItem(New Placeholder("MACHINE", "Aktuelles Datum", oModule, "MACHINE"), oImage),
-                GetGalleryItem(New Placeholder("DOMAIN", "Email-Adresse", oModule, "DOMAIN"), oImage),
-                GetGalleryItem(New Placeholder("DATE", "Vorname", oModule, "DATE"), oImage)
+                GetGalleryItem(New Placeholder("DOMAIN", "Domain des Computers", oModule, "DOMAIN"), oImage),
+                GetGalleryItem(New Placeholder("DATE", "Aktuelles Datum", oModule, "DATE"), oImage),
+                GetGalleryItem(New Placeholder("FILENAME_EXT", "Dateiname (mit Endung)", oModule, "FILENAME_EXT"), oImage),
+                GetGalleryItem(New Placeholder("FILENAME_ONLY", "Dateiname (ohne Endung)", oModule, "FILENAME_ONLY"), oImage),
+                GetGalleryItem(New Placeholder("FILE_DATE", "Datei Erstellt wann", oModule, "FILE_DATE"), oImage),
+                GetGalleryItem(New Placeholder("FILE_EXT", "Datei Extension", oModule, "FILE_EXT"), oImage)
             }
             Dim oGroup1 = New GalleryItemGroup() With {.Caption = "Intern"}
 
diff --git a/GUIs.Common/frmNotification_Startup.vb b/GUIs.Common/frmNotification_Startup.vb
index 9c0a9115..f1de0466 100644
--- a/GUIs.Common/frmNotification_Startup.vb
+++ b/GUIs.Common/frmNotification_Startup.vb
@@ -55,7 +55,12 @@ Public Class frmNotification_Startup
 
     Private Sub frmNotification_Startup_Load(sender As Object, e As EventArgs) Handles Me.Load
         Try
-            DocumentViewer1.Init(LogConfig, _GDPictureKey)
+            DocumentViewer1.Init(LogConfig, _GDPictureKey, New DigitalData.Controls.DocumentViewer.DocumentViewer.ToolbarSettings() With {
+            .ShowPrintButton = True,
+            .ShowRotateButton = True,
+            .ShowFlipButton = True,
+            .ShowSettingButton = True
+        })
             OperationMode = GetOperationMode()
             Client = _Environment.Service.Client
             Me.Text = _FormCaption
diff --git a/GUIs.Test.TestGUI/TestGUI.vbproj b/GUIs.Test.TestGUI/TestGUI.vbproj
index 80cbb200..b84b0441 100644
--- a/GUIs.Test.TestGUI/TestGUI.vbproj
+++ b/GUIs.Test.TestGUI/TestGUI.vbproj
@@ -377,9 +377,7 @@
     <Compile Include="frmRelations.Designer.vb">
       <DependentUpon>frmRelations.vb</DependentUpon>
     </Compile>
-    <Compile Include="frmRelations.vb">
-      <SubType>Form</SubType>
-    </Compile>
+    <Compile Include="frmRelations.vb" />
     <Compile Include="frmStart.Designer.vb">
       <DependentUpon>frmStart.vb</DependentUpon>
     </Compile>