diff --git a/GUIs.ZooFlow/My Project/Resources.Designer.vb b/GUIs.ZooFlow/My Project/Resources.Designer.vb
index dbbed815..3f7f2b78 100644
--- a/GUIs.ZooFlow/My Project/Resources.Designer.vb	
+++ b/GUIs.ZooFlow/My Project/Resources.Designer.vb	
@@ -63,9 +63,9 @@ Namespace My.Resources
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>
-        Friend ReadOnly Property _0_ZOO_FLOW_Hintergrund() As System.Drawing.Bitmap
+        Friend ReadOnly Property _1_LOGO_ZOO_FLOW() As System.Drawing.Bitmap
             Get
-                Dim obj As Object = ResourceManager.GetObject("0_ZOO_FLOW_Hintergrund", resourceCulture)
+                Dim obj As Object = ResourceManager.GetObject("1_LOGO_ZOO_FLOW", resourceCulture)
                 Return CType(obj,System.Drawing.Bitmap)
             End Get
         End Property
@@ -73,9 +73,9 @@ Namespace My.Resources
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>
-        Friend ReadOnly Property _1_ZOO_FLOW_GLOBIX() As System.Drawing.Bitmap
+        Friend ReadOnly Property _2_LUPE_AKTIV_ZOO() As System.Drawing.Bitmap
             Get
-                Dim obj As Object = ResourceManager.GetObject("1_ZOO_FLOW_GLOBIX", resourceCulture)
+                Dim obj As Object = ResourceManager.GetObject("2_LUPE_AKTIV_ZOO", resourceCulture)
                 Return CType(obj,System.Drawing.Bitmap)
             End Get
         End Property
@@ -83,9 +83,9 @@ Namespace My.Resources
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>
-        Friend ReadOnly Property _1_ZOO_FLOW_GLOBIX_MouseOver() As System.Drawing.Bitmap
+        Friend ReadOnly Property _2_LUPE_INAKTIV_ZOO() As System.Drawing.Bitmap
             Get
-                Dim obj As Object = ResourceManager.GetObject("1_ZOO_FLOW_GLOBIX_MouseOver", resourceCulture)
+                Dim obj As Object = ResourceManager.GetObject("2_LUPE_INAKTIV_ZOO", resourceCulture)
                 Return CType(obj,System.Drawing.Bitmap)
             End Get
         End Property
@@ -93,9 +93,9 @@ Namespace My.Resources
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>
-        Friend ReadOnly Property _1_ZOO_FLOW_Suche() As System.Drawing.Bitmap
+        Friend ReadOnly Property _3_PERSON_AKTIV_ZOO() As System.Drawing.Bitmap
             Get
-                Dim obj As Object = ResourceManager.GetObject("1_ZOO_FLOW_Suche", resourceCulture)
+                Dim obj As Object = ResourceManager.GetObject("3_PERSON_AKTIV_ZOO", resourceCulture)
                 Return CType(obj,System.Drawing.Bitmap)
             End Get
         End Property
@@ -103,9 +103,9 @@ Namespace My.Resources
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>
-        Friend ReadOnly Property _1_ZOO_FLOW_Suche_MouseOver() As System.Drawing.Bitmap
+        Friend ReadOnly Property _3_PERSON_INAKTIV_ZOO() As System.Drawing.Bitmap
             Get
-                Dim obj As Object = ResourceManager.GetObject("1_ZOO_FLOW_Suche_MouseOver", resourceCulture)
+                Dim obj As Object = ResourceManager.GetObject("3_PERSON_INAKTIV_ZOO", resourceCulture)
                 Return CType(obj,System.Drawing.Bitmap)
             End Get
         End Property
@@ -113,9 +113,9 @@ Namespace My.Resources
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>
-        Friend ReadOnly Property _1_ZOO_FLOW_User() As System.Drawing.Bitmap
+        Friend ReadOnly Property _4_GLOBIX_AKTIV_ZOO() As System.Drawing.Bitmap
             Get
-                Dim obj As Object = ResourceManager.GetObject("1_ZOO_FLOW_User", resourceCulture)
+                Dim obj As Object = ResourceManager.GetObject("4_GLOBIX_AKTIV_ZOO", resourceCulture)
                 Return CType(obj,System.Drawing.Bitmap)
             End Get
         End Property
@@ -123,119 +123,9 @@ Namespace My.Resources
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>
-        Friend ReadOnly Property _1_ZOO_FLOW_User_MouseOver_() As System.Drawing.Bitmap
+        Friend ReadOnly Property _4_GLOBIX_INAKTIV_ZOO() As System.Drawing.Bitmap
             Get
-                Dim obj As Object = ResourceManager.GetObject("1_ZOO_FLOW_User_MouseOver.", resourceCulture)
-                Return CType(obj,System.Drawing.Bitmap)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
-        '''</summary>
-        Friend ReadOnly Property _2_ZOO_FLOW_Abo() As System.Drawing.Bitmap
-            Get
-                Dim obj As Object = ResourceManager.GetObject("2_ZOO_FLOW_Abo", resourceCulture)
-                Return CType(obj,System.Drawing.Bitmap)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
-        '''</summary>
-        Friend ReadOnly Property _2_ZOO_FLOW_Abo_MouseOver() As System.Drawing.Bitmap
-            Get
-                Dim obj As Object = ResourceManager.GetObject("2_ZOO_FLOW_Abo_MouseOver", resourceCulture)
-                Return CType(obj,System.Drawing.Bitmap)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
-        '''</summary>
-        Friend ReadOnly Property _2_ZOO_FLOW_Con() As System.Drawing.Bitmap
-            Get
-                Dim obj As Object = ResourceManager.GetObject("2_ZOO_FLOW_Con", resourceCulture)
-                Return CType(obj,System.Drawing.Bitmap)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
-        '''</summary>
-        Friend ReadOnly Property _2_ZOO_FLOW_Converations_MouseOver() As System.Drawing.Bitmap
-            Get
-                Dim obj As Object = ResourceManager.GetObject("2_ZOO_FLOW_Converations_MouseOver", resourceCulture)
-                Return CType(obj,System.Drawing.Bitmap)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
-        '''</summary>
-        Friend ReadOnly Property _2_ZOO_FLOW_Conversations() As System.Drawing.Bitmap
-            Get
-                Dim obj As Object = ResourceManager.GetObject("2_ZOO_FLOW_Conversations", resourceCulture)
-                Return CType(obj,System.Drawing.Bitmap)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
-        '''</summary>
-        Friend ReadOnly Property _2_ZOO_FLOW_CW() As System.Drawing.Bitmap
-            Get
-                Dim obj As Object = ResourceManager.GetObject("2_ZOO_FLOW_CW", resourceCulture)
-                Return CType(obj,System.Drawing.Bitmap)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
-        '''</summary>
-        Friend ReadOnly Property _2_ZOO_FLOW_CW_MouseOver() As System.Drawing.Bitmap
-            Get
-                Dim obj As Object = ResourceManager.GetObject("2_ZOO_FLOW_CW_MouseOver", resourceCulture)
-                Return CType(obj,System.Drawing.Bitmap)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
-        '''</summary>
-        Friend ReadOnly Property _2_ZOO_FLOW_CW_Search() As System.Drawing.Bitmap
-            Get
-                Dim obj As Object = ResourceManager.GetObject("2_ZOO_FLOW_CW_Search", resourceCulture)
-                Return CType(obj,System.Drawing.Bitmap)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
-        '''</summary>
-        Friend ReadOnly Property _2_ZOO_FLOW_PM() As System.Drawing.Bitmap
-            Get
-                Dim obj As Object = ResourceManager.GetObject("2_ZOO_FLOW_PM", resourceCulture)
-                Return CType(obj,System.Drawing.Bitmap)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
-        '''</summary>
-        Friend ReadOnly Property _2_ZOO_FLOW_PM_MouseOver() As System.Drawing.Bitmap
-            Get
-                Dim obj As Object = ResourceManager.GetObject("2_ZOO_FLOW_PM_MouseOver", resourceCulture)
-                Return CType(obj,System.Drawing.Bitmap)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
-        '''</summary>
-        Friend ReadOnly Property _2_ZOO_FLOW_Process() As System.Drawing.Bitmap
-            Get
-                Dim obj As Object = ResourceManager.GetObject("2_ZOO_FLOW_Process", resourceCulture)
+                Dim obj As Object = ResourceManager.GetObject("4_GLOBIX_INAKTIV_ZOO", resourceCulture)
                 Return CType(obj,System.Drawing.Bitmap)
             End Get
         End Property
@@ -329,5 +219,15 @@ Namespace My.Resources
                 Return CType(obj,System.Drawing.Bitmap)
             End Get
         End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property ZOO_FLOW__sysicon_256() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ZOO_FLOW_ sysicon_256", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
     End Module
 End Namespace
diff --git a/GUIs.ZooFlow/My Project/Resources.resx b/GUIs.ZooFlow/My Project/Resources.resx
index d7d1c3ee..76645957 100644
--- a/GUIs.ZooFlow/My Project/Resources.resx	
+++ b/GUIs.ZooFlow/My Project/Resources.resx	
@@ -118,85 +118,55 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="1_ZOO_FLOW_User_MouseOver." type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\1_ZOO_FLOW_User_MouseOver..png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="StatusAnnotations_Stop_16xLG_color" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\StatusAnnotations_Stop_16xLG_color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="CW_GEFUNDEN_klein" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\CW_GEFUNDEN_klein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="2_ZOO_FLOW_Conversations" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\2_ZOO_FLOW_Conversations.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="2_ZOO_FLOW_CW" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\2_ZOO_FLOW_CW.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="2_ZOO_FLOW_Process" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\2_ZOO_FLOW_Process.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="DD_Icons_ICO_PMANAGER_128px" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\DD_Icons_ICO_PMANAGER_128px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="2_ZOO_FLOW_PM_MouseOver" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\2_ZOO_FLOW_PM_MouseOver.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="2_ZOO_FLOW_PM" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\2_ZOO_FLOW_PM.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Editdatasetwithdesigner_8449" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Editdatasetwithdesigner_8449.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="1_ZOO_FLOW_Suche_MouseOver" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\1_ZOO_FLOW_Suche_MouseOver.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="2_ZOO_FLOW_CW_MouseOver" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\2_ZOO_FLOW_CW_MouseOver.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="2_ZOO_FLOW_CW_Search" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\2_ZOO_FLOW_CW_Search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="2_ZOO_FLOW_Abo_MouseOver" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\2_ZOO_FLOW_Abo_MouseOver.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="DD_Icons_ICO_PMANAGER_256px" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\DD_Icons_ICO_PMANAGER_256px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="CW_klein" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\CW_klein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Checked-outforEdit_13297" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Checked-outforEdit_13297.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="2_ZOO_FLOW_Con" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\2_ZOO_FLOW_Con.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="1_ZOO_FLOW_Suche" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\1_ZOO_FLOW_Suche.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Checked-outforEdit_Color_13297" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Checked-outforEdit_Color_13297.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="0_ZOO_FLOW_Hintergrund" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\0_ZOO_FLOW_Hintergrund1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="1_LOGO_ZOO_FLOW" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\1_LOGO_ZOO_FLOW.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="StatusAnnotations_Stop_32xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\StatusAnnotations_Stop_32xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="1_ZOO_FLOW_User" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\1_ZOO_FLOW_User.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="2_LUPE_INAKTIV_ZOO" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\2_LUPE_INAKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="2_ZOO_FLOW_Converations_MouseOver" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\2_ZOO_FLOW_Converations_MouseOver.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="DD_Icons_ICO_PMANAGER_256px" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\DD_Icons_ICO_PMANAGER_256px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="2_ZOO_FLOW_Abo" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\2_ZOO_FLOW_Abo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="3_PERSON_AKTIV_ZOO" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\3_PERSON_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="1_ZOO_FLOW_GLOBIX" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\1_ZOO_FLOW_GLOBIX.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="2_LUPE_AKTIV_ZOO" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\2_LUPE_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="1_ZOO_FLOW_GLOBIX_MouseOver" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\1_ZOO_FLOW_GLOBIX_MouseOver.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="CW_klein" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\CW_klein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="3_PERSON_INAKTIV_ZOO" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\3_PERSON_INAKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Checked-outforEdit_13297" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Checked-outforEdit_13297.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ZOO_FLOW_ sysicon_256" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ZOO_FLOW_ sysicon_256.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="DD_Icons_ICO_PMANAGER_128px" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\DD_Icons_ICO_PMANAGER_128px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Editdatasetwithdesigner_8449" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Editdatasetwithdesigner_8449.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Checked-outforEdit_Color_13297" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Checked-outforEdit_Color_13297.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="CW_GEFUNDEN_klein" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\CW_GEFUNDEN_klein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="StatusAnnotations_Stop_16xLG_color" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\StatusAnnotations_Stop_16xLG_color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="4_GLOBIX_AKTIV_ZOO" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\4_GLOBIX_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="4_GLOBIX_INAKTIV_ZOO" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\4_GLOBIX_INAKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/GUIs.ZooFlow/Resources/0_ZOO_FLOW_Hintergrund1.png b/GUIs.ZooFlow/Resources/0_ZOO_FLOW_Hintergrund1.png
deleted file mode 100644
index cec251fd..00000000
Binary files a/GUIs.ZooFlow/Resources/0_ZOO_FLOW_Hintergrund1.png and /dev/null differ
diff --git a/GUIs.ZooFlow/Resources/1_LOGO_ZOO_FLOW.png b/GUIs.ZooFlow/Resources/1_LOGO_ZOO_FLOW.png
new file mode 100644
index 00000000..b5852fe7
Binary files /dev/null and b/GUIs.ZooFlow/Resources/1_LOGO_ZOO_FLOW.png differ
diff --git a/GUIs.ZooFlow/Resources/1_ZOO_FLOW_GLOBIX_MouseOver.png b/GUIs.ZooFlow/Resources/1_ZOO_FLOW_GLOBIX_MouseOver.png
deleted file mode 100644
index ff13d59e..00000000
Binary files a/GUIs.ZooFlow/Resources/1_ZOO_FLOW_GLOBIX_MouseOver.png and /dev/null differ
diff --git a/GUIs.ZooFlow/Resources/1_ZOO_FLOW_Globix.png b/GUIs.ZooFlow/Resources/1_ZOO_FLOW_Globix.png
deleted file mode 100644
index 2a3d45b7..00000000
Binary files a/GUIs.ZooFlow/Resources/1_ZOO_FLOW_Globix.png and /dev/null differ
diff --git a/GUIs.ZooFlow/Resources/1_ZOO_FLOW_Suche.png b/GUIs.ZooFlow/Resources/1_ZOO_FLOW_Suche.png
deleted file mode 100644
index 09be64f2..00000000
Binary files a/GUIs.ZooFlow/Resources/1_ZOO_FLOW_Suche.png and /dev/null differ
diff --git a/GUIs.ZooFlow/Resources/1_ZOO_FLOW_Suche_MouseOver.png b/GUIs.ZooFlow/Resources/1_ZOO_FLOW_Suche_MouseOver.png
deleted file mode 100644
index 4bd90ed2..00000000
Binary files a/GUIs.ZooFlow/Resources/1_ZOO_FLOW_Suche_MouseOver.png and /dev/null differ
diff --git a/GUIs.ZooFlow/Resources/1_ZOO_FLOW_User.png b/GUIs.ZooFlow/Resources/1_ZOO_FLOW_User.png
deleted file mode 100644
index 3c151bb1..00000000
Binary files a/GUIs.ZooFlow/Resources/1_ZOO_FLOW_User.png and /dev/null differ
diff --git a/GUIs.ZooFlow/Resources/1_ZOO_FLOW_User_MouseOver..png b/GUIs.ZooFlow/Resources/1_ZOO_FLOW_User_MouseOver..png
deleted file mode 100644
index 4aaf50ff..00000000
Binary files a/GUIs.ZooFlow/Resources/1_ZOO_FLOW_User_MouseOver..png and /dev/null differ
diff --git a/GUIs.ZooFlow/Resources/2_LUPE_AKTIV_ZOO.png b/GUIs.ZooFlow/Resources/2_LUPE_AKTIV_ZOO.png
new file mode 100644
index 00000000..d4fa9edc
Binary files /dev/null and b/GUIs.ZooFlow/Resources/2_LUPE_AKTIV_ZOO.png differ
diff --git a/GUIs.ZooFlow/Resources/2_LUPE_INAKTIV_ZOO.png b/GUIs.ZooFlow/Resources/2_LUPE_INAKTIV_ZOO.png
new file mode 100644
index 00000000..0ee94be7
Binary files /dev/null and b/GUIs.ZooFlow/Resources/2_LUPE_INAKTIV_ZOO.png differ
diff --git a/GUIs.ZooFlow/Resources/2_ZOO_FLOW_Abo.png b/GUIs.ZooFlow/Resources/2_ZOO_FLOW_Abo.png
deleted file mode 100644
index 53f44620..00000000
Binary files a/GUIs.ZooFlow/Resources/2_ZOO_FLOW_Abo.png and /dev/null differ
diff --git a/GUIs.ZooFlow/Resources/2_ZOO_FLOW_Abo_MouseOver.png b/GUIs.ZooFlow/Resources/2_ZOO_FLOW_Abo_MouseOver.png
deleted file mode 100644
index 4a5f464e..00000000
Binary files a/GUIs.ZooFlow/Resources/2_ZOO_FLOW_Abo_MouseOver.png and /dev/null differ
diff --git a/GUIs.ZooFlow/Resources/2_ZOO_FLOW_CW.png b/GUIs.ZooFlow/Resources/2_ZOO_FLOW_CW.png
deleted file mode 100644
index 1cd4e102..00000000
Binary files a/GUIs.ZooFlow/Resources/2_ZOO_FLOW_CW.png and /dev/null differ
diff --git a/GUIs.ZooFlow/Resources/2_ZOO_FLOW_CW_MouseOver.png b/GUIs.ZooFlow/Resources/2_ZOO_FLOW_CW_MouseOver.png
deleted file mode 100644
index b3eb48e1..00000000
Binary files a/GUIs.ZooFlow/Resources/2_ZOO_FLOW_CW_MouseOver.png and /dev/null differ
diff --git a/GUIs.ZooFlow/Resources/2_ZOO_FLOW_CW_Search.png b/GUIs.ZooFlow/Resources/2_ZOO_FLOW_CW_Search.png
deleted file mode 100644
index 842f691a..00000000
Binary files a/GUIs.ZooFlow/Resources/2_ZOO_FLOW_CW_Search.png and /dev/null differ
diff --git a/GUIs.ZooFlow/Resources/2_ZOO_FLOW_Con.png b/GUIs.ZooFlow/Resources/2_ZOO_FLOW_Con.png
deleted file mode 100644
index dfeb5adb..00000000
Binary files a/GUIs.ZooFlow/Resources/2_ZOO_FLOW_Con.png and /dev/null differ
diff --git a/GUIs.ZooFlow/Resources/2_ZOO_FLOW_Converations_MouseOver.png b/GUIs.ZooFlow/Resources/2_ZOO_FLOW_Converations_MouseOver.png
deleted file mode 100644
index ff1bc087..00000000
Binary files a/GUIs.ZooFlow/Resources/2_ZOO_FLOW_Converations_MouseOver.png and /dev/null differ
diff --git a/GUIs.ZooFlow/Resources/2_ZOO_FLOW_Conversations.png b/GUIs.ZooFlow/Resources/2_ZOO_FLOW_Conversations.png
deleted file mode 100644
index 5db22f75..00000000
Binary files a/GUIs.ZooFlow/Resources/2_ZOO_FLOW_Conversations.png and /dev/null differ
diff --git a/GUIs.ZooFlow/Resources/2_ZOO_FLOW_PM.png b/GUIs.ZooFlow/Resources/2_ZOO_FLOW_PM.png
deleted file mode 100644
index c17b97fd..00000000
Binary files a/GUIs.ZooFlow/Resources/2_ZOO_FLOW_PM.png and /dev/null differ
diff --git a/GUIs.ZooFlow/Resources/2_ZOO_FLOW_PM_MouseOver.png b/GUIs.ZooFlow/Resources/2_ZOO_FLOW_PM_MouseOver.png
deleted file mode 100644
index c29441d3..00000000
Binary files a/GUIs.ZooFlow/Resources/2_ZOO_FLOW_PM_MouseOver.png and /dev/null differ
diff --git a/GUIs.ZooFlow/Resources/2_ZOO_FLOW_Process.png b/GUIs.ZooFlow/Resources/2_ZOO_FLOW_Process.png
deleted file mode 100644
index bf8215ac..00000000
Binary files a/GUIs.ZooFlow/Resources/2_ZOO_FLOW_Process.png and /dev/null differ
diff --git a/GUIs.ZooFlow/Resources/3_PERSON_AKTIV_ZOO.png b/GUIs.ZooFlow/Resources/3_PERSON_AKTIV_ZOO.png
new file mode 100644
index 00000000..7726fe38
Binary files /dev/null and b/GUIs.ZooFlow/Resources/3_PERSON_AKTIV_ZOO.png differ
diff --git a/GUIs.ZooFlow/Resources/3_PERSON_INAKTIV_ZOO.png b/GUIs.ZooFlow/Resources/3_PERSON_INAKTIV_ZOO.png
new file mode 100644
index 00000000..87ac04b3
Binary files /dev/null and b/GUIs.ZooFlow/Resources/3_PERSON_INAKTIV_ZOO.png differ
diff --git a/GUIs.ZooFlow/Resources/4_GLOBIX_AKTIV_ZOO.png b/GUIs.ZooFlow/Resources/4_GLOBIX_AKTIV_ZOO.png
new file mode 100644
index 00000000..9f31e765
Binary files /dev/null and b/GUIs.ZooFlow/Resources/4_GLOBIX_AKTIV_ZOO.png differ
diff --git a/GUIs.ZooFlow/Resources/4_GLOBIX_INAKTIV_ZOO.png b/GUIs.ZooFlow/Resources/4_GLOBIX_INAKTIV_ZOO.png
new file mode 100644
index 00000000..1c959ab9
Binary files /dev/null and b/GUIs.ZooFlow/Resources/4_GLOBIX_INAKTIV_ZOO.png differ
diff --git a/GUIs.ZooFlow/Resources/ZOO_FLOW_ sysicon_256.png b/GUIs.ZooFlow/Resources/ZOO_FLOW_ sysicon_256.png
new file mode 100644
index 00000000..ac8496b2
Binary files /dev/null and b/GUIs.ZooFlow/Resources/ZOO_FLOW_ sysicon_256.png differ
diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj
index 97e5f1f1..837ef7c4 100644
--- a/GUIs.ZooFlow/ZooFlow.vbproj
+++ b/GUIs.ZooFlow/ZooFlow.vbproj
@@ -98,6 +98,12 @@
     <Compile Include="ClipboardWatcher\State.vb" />
     <Compile Include="Events\OnFlowFormInteractionEvent.vb" />
     <Compile Include="Events\OnFlowFormStateChangedEvent.vb" />
+    <Compile Include="frmDevexpressForm.Designer.vb">
+      <DependentUpon>frmDevexpressForm.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmDevexpressForm.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="frmFlowForm.Designer.vb">
       <DependentUpon>frmFlowForm.vb</DependentUpon>
     </Compile>
@@ -165,6 +171,9 @@
     <EmbeddedResource Include="frmAdmin.resx">
       <DependentUpon>frmAdmin.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="frmDevexpressForm.resx">
+      <DependentUpon>frmDevexpressForm.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="frmFlowForm_Layered.resx">
       <DependentUpon>frmFlowForm_Layered.vb</DependentUpon>
     </EmbeddedResource>
@@ -209,6 +218,10 @@
       <Project>{B7D465A2-AE31-4CDF-A8B2-34B42D3EA84E}</Project>
       <Name>ClipboardWatcher</Name>
     </ProjectReference>
+    <ProjectReference Include="..\GUIs.Common\Common.vbproj">
+      <Project>{D20A6BF2-C7C6-4A7A-B34D-FA27D775A049}</Project>
+      <Name>Common</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Modules.Config\Config.vbproj">
       <Project>{44982F9B-6116-44E2-85D0-F39650B1EF99}</Project>
       <Name>Config</Name>
@@ -253,9 +266,6 @@
     <None Include="Resources\Editdatasetwithdesigner_8449.png" />
     <None Include="Resources\DD_Icons_ICO_PMANAGER_256px.png" />
     <None Include="Resources\DD_Icons_ICO_PMANAGER_128px.png" />
-    <None Include="Resources\2_ZOO_FLOW_CW_Search.png" />
-    <None Include="Resources\2_ZOO_FLOW_Process.png" />
-    <None Include="Resources\2_ZOO_FLOW_Con.png" />
     <None Include="Resources\StatusAnnotations_Stop_16xLG_color.png" />
   </ItemGroup>
   <ItemGroup>
@@ -266,49 +276,28 @@
     <None Include="Resources\CW_klein.png" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\0_ZOO_FLOW_Hintergrund1.png" />
+    <None Include="Resources\ZOO_FLOW_ sysicon_256.png" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\1_ZOO_FLOW_Suche.png" />
+    <None Include="Resources\1_LOGO_ZOO_FLOW.png" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\1_ZOO_FLOW_Suche_MouseOver.png" />
+    <None Include="Resources\2_LUPE_AKTIV_ZOO.png" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\1_ZOO_FLOW_User.png" />
+    <None Include="Resources\2_LUPE_INAKTIV_ZOO.png" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\1_ZOO_FLOW_User_MouseOver..png" />
+    <None Include="Resources\3_PERSON_AKTIV_ZOO.png" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\2_ZOO_FLOW_CW.png" />
+    <None Include="Resources\3_PERSON_INAKTIV_ZOO.png" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\2_ZOO_FLOW_CW_MouseOver.png" />
+    <None Include="Resources\4_GLOBIX_AKTIV_ZOO.png" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\2_ZOO_FLOW_Abo.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\2_ZOO_FLOW_Abo_MouseOver.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\2_ZOO_FLOW_PM.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\2_ZOO_FLOW_PM_MouseOver.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\2_ZOO_FLOW_Converations_MouseOver.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\2_ZOO_FLOW_Conversations.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\1_ZOO_FLOW_GLOBIX.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\1_ZOO_FLOW_GLOBIX_MouseOver.png" />
+    <None Include="Resources\4_GLOBIX_INAKTIV_ZOO.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
diff --git a/GUIs.ZooFlow/frmDevexpressForm.Designer.vb b/GUIs.ZooFlow/frmDevexpressForm.Designer.vb
new file mode 100644
index 00000000..88c81a52
--- /dev/null
+++ b/GUIs.ZooFlow/frmDevexpressForm.Designer.vb
@@ -0,0 +1,44 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class frmDevexpressForm
+    Inherits DevExpress.XtraEditors.XtraForm
+
+    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Wird vom Windows Form-Designer benötigt.
+    Private components As System.ComponentModel.IContainer
+
+    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
+    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
+    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        Me.SuspendLayout()
+        '
+        'frmDevexpressForm
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.BackgroundImageLayoutStore = System.Windows.Forms.ImageLayout.Center
+
+        Me.ClientSize = New System.Drawing.Size(580, 257)
+        Me.DoubleBuffered = True
+        Me.FormBorderEffect = DevExpress.XtraEditors.FormBorderEffect.Glow
+        Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D
+        Me.IconOptions.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.ZOO_FLOW__sysicon_256
+        Me.MaximizeBox = False
+        Me.MinimizeBox = False
+        Me.Name = "frmDevexpressForm"
+        Me.ResumeLayout(False)
+
+    End Sub
+End Class
diff --git a/GUIs.ZooFlow/frmDevexpressForm.resx b/GUIs.ZooFlow/frmDevexpressForm.resx
new file mode 100644
index 00000000..1af7de15
--- /dev/null
+++ b/GUIs.ZooFlow/frmDevexpressForm.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/GUIs.ZooFlow/frmDevexpressForm.vb b/GUIs.ZooFlow/frmDevexpressForm.vb
new file mode 100644
index 00000000..adff52a3
--- /dev/null
+++ b/GUIs.ZooFlow/frmDevexpressForm.vb
@@ -0,0 +1,5 @@
+Public Class frmDevexpressForm
+    Private Sub frmDevexpressForm_Load(sender As Object, e As EventArgs) Handles Me.Load
+        ' Me.FormThickBorder = True
+    End Sub
+End Class
\ No newline at end of file
diff --git a/GUIs.ZooFlow/frmFlowForm.Designer.vb b/GUIs.ZooFlow/frmFlowForm.Designer.vb
index e70fc3f8..c83ae304 100644
--- a/GUIs.ZooFlow/frmFlowForm.Designer.vb
+++ b/GUIs.ZooFlow/frmFlowForm.Designer.vb
@@ -28,19 +28,17 @@ Partial Class frmFlowForm
         Me.ContextMenuSystray = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.VerwaltungToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ZooFlowBeendenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.AlleAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.DevexpressFormToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.PictureBox1 = New System.Windows.Forms.PictureBox()
         Me.PictureBoxGlobix = New System.Windows.Forms.PictureBox()
-        Me.PictureBoxConversation = New System.Windows.Forms.PictureBox()
-        Me.PictureBoxPMTask = New System.Windows.Forms.PictureBox()
-        Me.PictureBoxSearchAbo = New System.Windows.Forms.PictureBox()
-        Me.PictureBoxCWFound = New System.Windows.Forms.PictureBox()
         Me.PictureBoxPM = New System.Windows.Forms.PictureBox()
         Me.PictureBoxSearch = New System.Windows.Forms.PictureBox()
         Me.ContextMenuSystray.SuspendLayout()
+        Me.ContextMenuStrip1.SuspendLayout()
+        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.PictureBoxGlobix, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.PictureBoxConversation, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.PictureBoxPMTask, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.PictureBoxSearchAbo, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.PictureBoxCWFound, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.PictureBoxPM, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.PictureBoxSearch, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
@@ -70,79 +68,65 @@ Partial Class frmFlowForm
         Me.ZooFlowBeendenToolStripMenuItem.Size = New System.Drawing.Size(169, 22)
         Me.ZooFlowBeendenToolStripMenuItem.Text = "ZooFlow beenden"
         '
+        'ContextMenuStrip1
+        '
+        Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.AlleAnzeigenToolStripMenuItem, Me.DevexpressFormToolStripMenuItem})
+        Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
+        Me.ContextMenuStrip1.Size = New System.Drawing.Size(161, 48)
+        '
+        'AlleAnzeigenToolStripMenuItem
+        '
+        Me.AlleAnzeigenToolStripMenuItem.Name = "AlleAnzeigenToolStripMenuItem"
+        Me.AlleAnzeigenToolStripMenuItem.Size = New System.Drawing.Size(160, 22)
+        Me.AlleAnzeigenToolStripMenuItem.Text = "Alle anzeigen"
+        '
+        'DevexpressFormToolStripMenuItem
+        '
+        Me.DevexpressFormToolStripMenuItem.Name = "DevexpressFormToolStripMenuItem"
+        Me.DevexpressFormToolStripMenuItem.Size = New System.Drawing.Size(160, 22)
+        Me.DevexpressFormToolStripMenuItem.Text = "DevexpressForm"
+        '
+        'PictureBox1
+        '
+        Me.PictureBox1.Dock = System.Windows.Forms.DockStyle.Left
+        Me.PictureBox1.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources._1_LOGO_ZOO_FLOW
+        Me.PictureBox1.Location = New System.Drawing.Point(0, 0)
+        Me.PictureBox1.Name = "PictureBox1"
+        Me.PictureBox1.Size = New System.Drawing.Size(197, 150)
+        Me.PictureBox1.TabIndex = 10
+        Me.PictureBox1.TabStop = False
+        '
         'PictureBoxGlobix
         '
         Me.PictureBoxGlobix.BackColor = System.Drawing.Color.Transparent
-        Me.PictureBoxGlobix.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources._1_ZOO_FLOW_GLOBIX
-        Me.PictureBoxGlobix.Location = New System.Drawing.Point(12, 12)
+        Me.PictureBoxGlobix.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources._4_GLOBIX_INAKTIV_ZOO
+        Me.PictureBoxGlobix.Location = New System.Drawing.Point(448, 23)
         Me.PictureBoxGlobix.Name = "PictureBoxGlobix"
-        Me.PictureBoxGlobix.Size = New System.Drawing.Size(50, 50)
+        Me.PictureBoxGlobix.Size = New System.Drawing.Size(90, 101)
         Me.PictureBoxGlobix.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
         Me.PictureBoxGlobix.TabIndex = 9
         Me.PictureBoxGlobix.TabStop = False
-        '
-        'PictureBoxConversation
-        '
-        Me.PictureBoxConversation.BackColor = System.Drawing.Color.Transparent
-        Me.PictureBoxConversation.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources._2_ZOO_FLOW_Conversations
-        Me.PictureBoxConversation.Location = New System.Drawing.Point(100, 163)
-        Me.PictureBoxConversation.Name = "PictureBoxConversation"
-        Me.PictureBoxConversation.Size = New System.Drawing.Size(20, 25)
-        Me.PictureBoxConversation.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
-        Me.PictureBoxConversation.TabIndex = 8
-        Me.PictureBoxConversation.TabStop = False
-        '
-        'PictureBoxPMTask
-        '
-        Me.PictureBoxPMTask.BackColor = System.Drawing.Color.Transparent
-        Me.PictureBoxPMTask.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources._2_ZOO_FLOW_PM
-        Me.PictureBoxPMTask.Location = New System.Drawing.Point(100, 138)
-        Me.PictureBoxPMTask.Name = "PictureBoxPMTask"
-        Me.PictureBoxPMTask.Size = New System.Drawing.Size(20, 25)
-        Me.PictureBoxPMTask.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
-        Me.PictureBoxPMTask.TabIndex = 7
-        Me.PictureBoxPMTask.TabStop = False
-        '
-        'PictureBoxSearchAbo
-        '
-        Me.PictureBoxSearchAbo.BackColor = System.Drawing.Color.Transparent
-        Me.PictureBoxSearchAbo.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources._2_ZOO_FLOW_Abo
-        Me.PictureBoxSearchAbo.Location = New System.Drawing.Point(100, 34)
-        Me.PictureBoxSearchAbo.Name = "PictureBoxSearchAbo"
-        Me.PictureBoxSearchAbo.Size = New System.Drawing.Size(20, 28)
-        Me.PictureBoxSearchAbo.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
-        Me.PictureBoxSearchAbo.TabIndex = 6
-        Me.PictureBoxSearchAbo.TabStop = False
-        '
-        'PictureBoxCWFound
-        '
-        Me.PictureBoxCWFound.BackColor = System.Drawing.Color.Transparent
-        Me.PictureBoxCWFound.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources._2_ZOO_FLOW_CW
-        Me.PictureBoxCWFound.Location = New System.Drawing.Point(100, 12)
-        Me.PictureBoxCWFound.Name = "PictureBoxCWFound"
-        Me.PictureBoxCWFound.Size = New System.Drawing.Size(20, 25)
-        Me.PictureBoxCWFound.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
-        Me.PictureBoxCWFound.TabIndex = 5
-        Me.PictureBoxCWFound.TabStop = False
+        Me.PictureBoxGlobix.Visible = False
         '
         'PictureBoxPM
         '
         Me.PictureBoxPM.BackColor = System.Drawing.Color.Transparent
-        Me.PictureBoxPM.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources._1_ZOO_FLOW_User
-        Me.PictureBoxPM.Location = New System.Drawing.Point(126, 138)
+        Me.PictureBoxPM.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources._3_PERSON_INAKTIV_ZOO
+        Me.PictureBoxPM.Location = New System.Drawing.Point(335, 23)
         Me.PictureBoxPM.Name = "PictureBoxPM"
-        Me.PictureBoxPM.Size = New System.Drawing.Size(50, 50)
+        Me.PictureBoxPM.Size = New System.Drawing.Size(90, 101)
         Me.PictureBoxPM.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
         Me.PictureBoxPM.TabIndex = 4
         Me.PictureBoxPM.TabStop = False
+        Me.PictureBoxPM.Visible = False
         '
         'PictureBoxSearch
         '
         Me.PictureBoxSearch.BackColor = System.Drawing.Color.Transparent
-        Me.PictureBoxSearch.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources._1_ZOO_FLOW_Suche
-        Me.PictureBoxSearch.Location = New System.Drawing.Point(126, 12)
+        Me.PictureBoxSearch.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources._2_LUPE_INAKTIV_ZOO
+        Me.PictureBoxSearch.Location = New System.Drawing.Point(220, 23)
         Me.PictureBoxSearch.Name = "PictureBoxSearch"
-        Me.PictureBoxSearch.Size = New System.Drawing.Size(50, 50)
+        Me.PictureBoxSearch.Size = New System.Drawing.Size(90, 101)
         Me.PictureBoxSearch.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
         Me.PictureBoxSearch.TabIndex = 3
         Me.PictureBoxSearch.TabStop = False
@@ -151,15 +135,12 @@ Partial Class frmFlowForm
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.BackColor = System.Drawing.Color.Gray
-        Me.BackgroundImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources._0_ZOO_FLOW_Hintergrund
-        Me.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
-        Me.ClientSize = New System.Drawing.Size(197, 198)
+        Me.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(214, Byte), Integer), CType(CType(49, Byte), Integer))
+        Me.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center
+        Me.ClientSize = New System.Drawing.Size(577, 150)
+        Me.ContextMenuStrip = Me.ContextMenuStrip1
+        Me.Controls.Add(Me.PictureBox1)
         Me.Controls.Add(Me.PictureBoxGlobix)
-        Me.Controls.Add(Me.PictureBoxConversation)
-        Me.Controls.Add(Me.PictureBoxPMTask)
-        Me.Controls.Add(Me.PictureBoxSearchAbo)
-        Me.Controls.Add(Me.PictureBoxCWFound)
         Me.Controls.Add(Me.PictureBoxPM)
         Me.Controls.Add(Me.PictureBoxSearch)
         Me.DoubleBuffered = True
@@ -170,11 +151,9 @@ Partial Class frmFlowForm
         Me.Text = "frmFlowForm_Test1"
         Me.TopMost = True
         Me.ContextMenuSystray.ResumeLayout(False)
+        Me.ContextMenuStrip1.ResumeLayout(False)
+        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.PictureBoxGlobix, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.PictureBoxConversation, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.PictureBoxPMTask, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.PictureBoxSearchAbo, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.PictureBoxCWFound, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.PictureBoxPM, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.PictureBoxSearch, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
@@ -182,13 +161,13 @@ Partial Class frmFlowForm
     End Sub
     Friend WithEvents PictureBoxSearch As PictureBox
     Friend WithEvents PictureBoxPM As PictureBox
-    Friend WithEvents PictureBoxCWFound As PictureBox
-    Friend WithEvents PictureBoxSearchAbo As PictureBox
-    Friend WithEvents PictureBoxPMTask As PictureBox
-    Friend WithEvents PictureBoxConversation As PictureBox
     Friend WithEvents PictureBoxGlobix As PictureBox
     Friend WithEvents NotifyIcon1 As NotifyIcon
     Friend WithEvents ContextMenuSystray As ContextMenuStrip
     Friend WithEvents VerwaltungToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents ZooFlowBeendenToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents ContextMenuStrip1 As ContextMenuStrip
+    Friend WithEvents AlleAnzeigenToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents DevexpressFormToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents PictureBox1 As PictureBox
 End Class
diff --git a/GUIs.ZooFlow/frmFlowForm.resx b/GUIs.ZooFlow/frmFlowForm.resx
index 1343d1ba..15f18551 100644
--- a/GUIs.ZooFlow/frmFlowForm.resx
+++ b/GUIs.ZooFlow/frmFlowForm.resx
@@ -1956,4 +1956,7 @@
         AMADAADwDwAA
 </value>
   </data>
+  <metadata name="ContextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>296, 17</value>
+  </metadata>
 </root>
\ No newline at end of file
diff --git a/GUIs.ZooFlow/frmFlowForm.vb b/GUIs.ZooFlow/frmFlowForm.vb
index 69dd352c..bf37a7e8 100644
--- a/GUIs.ZooFlow/frmFlowForm.vb
+++ b/GUIs.ZooFlow/frmFlowForm.vb
@@ -101,54 +101,35 @@ Public Class frmFlowForm
     End Sub
 
     Private Sub PictureBoxSearch_MouseEnter(sender As Object, e As EventArgs) Handles PictureBoxSearch.MouseEnter
-        PictureBoxSearch.Image = My.Resources._1_ZOO_FLOW_Suche_MouseOver
+        PictureBoxSearch.Image = My.Resources._2_LUPE_AKTIV_ZOO
     End Sub
     Private Sub PictureBoxSearch_MouseLeave(sender As Object, e As EventArgs) Handles PictureBoxSearch.MouseLeave
-        PictureBoxSearch.Image = My.Resources._1_ZOO_FLOW_Suche
+        PictureBoxSearch.Image = My.Resources._2_LUPE_INAKTIV_ZOO
     End Sub
     Private Sub PictureBoxPM_MouseEnter(sender As Object, e As EventArgs) Handles PictureBoxPM.MouseEnter
-        PictureBoxPM.Image = My.Resources._1_ZOO_FLOW_User_MouseOver_
+        PictureBoxPM.Image = My.Resources._3_PERSON_AKTIV_ZOO
     End Sub
     Private Sub PictureBoxPM_MouseLeave(sender As Object, e As EventArgs) Handles PictureBoxPM.MouseLeave
-        PictureBoxPM.Image = My.Resources._1_ZOO_FLOW_User
+        PictureBoxPM.Image = My.Resources._3_PERSON_INAKTIV_ZOO
     End Sub
 
-    Private Sub PictureBoxCWFound_MouseEnter(sender As Object, e As EventArgs) Handles PictureBoxCWFound.MouseEnter
-        PictureBoxCWFound.Image = My.Resources._2_ZOO_FLOW_CW_MouseOver
-        Opacity = OPACITY_SHOWN
-    End Sub
-
-    Private Sub PictureBoxCWFound_MouseLeave(sender As Object, e As EventArgs) Handles PictureBoxCWFound.MouseLeave
-        PictureBoxCWFound.Image = My.Resources._2_ZOO_FLOW_CW
-    End Sub
-    Private Sub PictureBoxSearchAbo_MouseEnter(sender As Object, e As EventArgs) Handles PictureBoxSearchAbo.MouseEnter
-        PictureBoxSearchAbo.Image = My.Resources._2_ZOO_FLOW_Abo_MouseOver
-    End Sub
-    Private Sub PictureBoxPMTask_MouseEnter(sender As Object, e As EventArgs) Handles PictureBoxPMTask.MouseEnter
-        PictureBoxPMTask.Image = My.Resources._2_ZOO_FLOW_PM_MouseOver
-    End Sub
-    Private Sub PictureBoxConversation_MouseEnter(sender As Object, e As EventArgs) Handles PictureBoxConversation.MouseEnter
-        PictureBoxConversation.Image = My.Resources._2_ZOO_FLOW_Converations_MouseOver
-    End Sub
     Private Sub PictureBoxGlobix_MouseEnter(sender As Object, e As EventArgs) Handles PictureBoxGlobix.MouseEnter
-        PictureBoxGlobix.Image = My.Resources._1_ZOO_FLOW_GLOBIX_MouseOver
+        PictureBoxGlobix.Image = My.Resources._4_GLOBIX_AKTIV_ZOO
     End Sub
     Private Sub PictureBoxGlobix_MouseLeave(sender As Object, e As EventArgs) Handles PictureBoxGlobix.MouseLeave
-        PictureBoxGlobix.Image = My.Resources._1_ZOO_FLOW_GLOBIX
+        PictureBoxGlobix.Image = My.Resources._4_GLOBIX_INAKTIV_ZOO
     End Sub
     Private Sub ZooFlowBeendenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ZooFlowBeendenToolStripMenuItem.Click
         ExitZooflow()
     End Sub
-
-    Private Sub PictureBoxSearchAbo_MouseLeave(sender As Object, e As EventArgs) Handles PictureBoxSearchAbo.MouseLeave
-        PictureBoxSearchAbo.Image = My.Resources._2_ZOO_FLOW_Abo
+    Private Sub DevexpressFormToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DevexpressFormToolStripMenuItem.Click
+        frmDevexpressForm.Show()
     End Sub
 
-    Private Sub PictureBoxConversation_MouseLeave(sender As Object, e As EventArgs) Handles PictureBoxConversation.MouseLeave
-        PictureBoxConversation.Image = My.Resources._2_ZOO_FLOW_Conversations
+    Private Sub AlleAnzeigenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AlleAnzeigenToolStripMenuItem.Click
+        For Each oControl As Control In Me.Controls
+            oControl.Visible = True
+        Next
     End Sub
 
-    Private Sub PictureBoxPMTask_MouseLeave(sender As Object, e As EventArgs) Handles PictureBoxPMTask.MouseLeave
-        PictureBoxPMTask.Image = My.Resources._2_ZOO_FLOW_PM
-    End Sub
 End Class
\ No newline at end of file
diff --git a/GUIs.ZooFlow/frmFlowForm_Layered.vb b/GUIs.ZooFlow/frmFlowForm_Layered.vb
index b679833d..971e1c08 100644
--- a/GUIs.ZooFlow/frmFlowForm_Layered.vb
+++ b/GUIs.ZooFlow/frmFlowForm_Layered.vb
@@ -130,7 +130,7 @@ Public Class frmFlowForm_Layered
             Case OnFlowFormStateChangedEvent.FlowFormState.HasFileDropped
                 ' SetBitmap(My.Resources.GLOBIX_GEFUNDEN_klein)
             Case Else
-                SetBitmap(My.Resources._0_ZOO_FLOW_Hintergrund)
+                SetBitmap(My.Resources._1_LOGO_ZOO_FLOW)
         End Select
     End Sub
 
diff --git a/Modules.Interfaces/ActiveDirectoryInterface/SyncUsers.MSSQL.vb b/Modules.Interfaces/ActiveDirectoryInterface/SyncUsers.MSSQL.vb
index 5f57fca2..b8e5b9d8 100644
--- a/Modules.Interfaces/ActiveDirectoryInterface/SyncUsers.MSSQL.vb
+++ b/Modules.Interfaces/ActiveDirectoryInterface/SyncUsers.MSSQL.vb
@@ -178,7 +178,7 @@ Namespace SyncUsers
             Try
                 Dim oUserId As Integer = GetUserId(User.samAccountName)
                 If oUserId = 0 Then
-                    Dim oSQL As String = $"INSERT INTO TBDD_USER (PRENAME, NAME, USERNAME, EMAIL, ADDED_WHO) VALUES ('{User.GivenName}', '{User.Surname}', UPPER('{User.samAccountName}'), '{User.Email}', '{ADDED_WHO}')"
+                    Dim oSQL As String = $"INSERT INTO TBDD_USER (PRENAME, NAME, USERNAME, EMAIL, ADDED_WHO) VALUES ('{User.GivenName}', '{User.Surname.Replace("'", "''")}', UPPER('{User.samAccountName.Replace("'", "''")}'), '{User.Email.Replace("'", "''")}', '{ADDED_WHO}')"
                     Dim oResult = _mssql.ExecuteNonQuery(oSQL)
 
                     If oResult = True Then
@@ -201,7 +201,7 @@ Namespace SyncUsers
             Try
                 Dim oUserId As Integer = GetUserId(User.samAccountName)
                 If oUserId > 0 Then
-                    Dim oSQL As String = $"UPDATE TBDD_USER SET PRENAME = '{User.GivenName}', NAME = '{User.Surname}', EMAIL = '{User.Email}', CHANGED_WHO = '{ADDED_WHO}' WHERE GUID = {oUserId}"
+                    Dim oSQL As String = $"UPDATE TBDD_USER SET PRENAME = '{User.GivenName}', NAME = '{User.Surname.Replace("'", "''")}', EMAIL = '{User.Email.Replace("'", "''")}', CHANGED_WHO = '{ADDED_WHO}' WHERE GUID = {oUserId}"
                     Dim oResult = _mssql.ExecuteNonQuery(oSQL)
 
                     If oResult = True Then
diff --git a/Modules.Interfaces/My Project/AssemblyInfo.vb b/Modules.Interfaces/My Project/AssemblyInfo.vb
index 46251954..957974e5 100644
--- a/Modules.Interfaces/My Project/AssemblyInfo.vb	
+++ b/Modules.Interfaces/My Project/AssemblyInfo.vb	
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.4.0.0")>
-<Assembly: AssemblyFileVersion("1.4.0.0")>
+<Assembly: AssemblyVersion("1.5.0.0")>
+<Assembly: AssemblyFileVersion("1.5.0.0")>