diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj
index a51f72198..65d14c7a1 100644
--- a/BeWo/BeWo.csproj
+++ b/BeWo/BeWo.csproj
@@ -399,6 +399,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="View\Controls\Utils\ColorPicker.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="View\Controls\Wohnhilfe\CustomerWohnhilfeControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -1316,6 +1320,9 @@
     <Compile Include="View\Controls\CustomerVermittlungArbeitControl.xaml.cs">
       <DependentUpon>CustomerVermittlungArbeitControl.xaml</DependentUpon>
     </Compile>
+    <Compile Include="View\Controls\Utils\ColorPicker.xaml.cs">
+      <DependentUpon>ColorPicker.xaml</DependentUpon>
+    </Compile>
     <Compile Include="View\Controls\Wohnhilfe\CustomerWohnhilfeControl.xaml.cs">
       <DependentUpon>CustomerWohnhilfeControl.xaml</DependentUpon>
     </Compile>
diff --git a/BeWo/DebugConfig.cs b/BeWo/DebugConfig.cs
index 668901304..b3128a2ec 100644
--- a/BeWo/DebugConfig.cs
+++ b/BeWo/DebugConfig.cs
@@ -123,7 +123,7 @@ namespace BeWo
 						{
 							DebugConfigMode = DebugConfigMode.FeatureDakota,
 							AutoLogin = true,
-							SelectView = UIContext.Finance,
+							SelectView = UIContext.Administration,
 							SelectIndex = 8,
 							//Username = "m1",
 							//Password = "bewobewo",
diff --git a/BeWo/View/Controls/ComboBoxes/ComboBoxEmployeeSearch.xaml b/BeWo/View/Controls/ComboBoxes/ComboBoxEmployeeSearch.xaml
index 8b0843804..46240d26b 100644
--- a/BeWo/View/Controls/ComboBoxes/ComboBoxEmployeeSearch.xaml
+++ b/BeWo/View/Controls/ComboBoxes/ComboBoxEmployeeSearch.xaml
@@ -15,9 +15,9 @@
             x:Name="popupedit"
             MinHeight="23"
             DeleteButtonVisibility="Visible"
+            DeleteClick="popupedit_DeleteClick"
             IsReadOnly="True"
-            PopUpClick="popupedit_PopUpClick" 
-            DeleteClick="popupedit_DeleteClick"/>
+            PopUpClick="popupedit_PopUpClick" />
         <Popup
             x:Name="popup"
             Width="370"
diff --git a/BeWo/View/Controls/Utils/ColorPicker.xaml b/BeWo/View/Controls/Utils/ColorPicker.xaml
new file mode 100644
index 000000000..c1e810156
--- /dev/null
+++ b/BeWo/View/Controls/Utils/ColorPicker.xaml
@@ -0,0 +1,62 @@
+<UserControl
+    x:Class="BeWo.View.Controls.Utils.ColorPicker"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:diagnostics="clr-namespace:System.Diagnostics;assembly=WindowsBase"
+    xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
+    xmlns:local="clr-namespace:BeWo.View.Controls.Utils"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    x:Name="root"
+    d:DesignHeight="50"
+    d:DesignWidth="100"
+    mc:Ignorable="d">
+    <Grid Background="White">
+        <Button
+            x:Name="btn"
+            HorizontalAlignment="Stretch"
+            dx:ThemeManager.ThemeName="None"
+            Background="{Binding ElementName=root, Path=SelectedColor}"
+            BorderThickness="1"
+            BorderBrush="Black"
+            Click="button_select_color_Click"
+            Style="{x:Null}" />
+        <Popup
+            x:Name="popup_color"
+            Placement="MousePoint"
+            StaysOpen="false">
+            <ListBox
+                x:Name="listbox_colorpicker"
+                BorderThickness="0"
+                ItemsSource="{Binding ElementName=root, Path=AllBrushes}"
+                SelectionChanged="listbox_colorpicker_SelectionChanged">
+                <ListBox.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <UniformGrid
+                            Columns="12"
+                            IsItemsHost="True"
+                            Rows="12" />
+                    </ItemsPanelTemplate>
+                </ListBox.ItemsPanel>
+                <ListBox.ItemTemplate>
+                    <DataTemplate>
+                        <Border
+                            Height="20"
+                            MinWidth="20"
+                            HorizontalAlignment="Stretch"
+                            Background="{Binding}"
+                            BorderBrush="Black"
+                            BorderThickness="1"
+                            CornerRadius="1" />
+                    </DataTemplate>
+                </ListBox.ItemTemplate>
+                <ListBox.ItemContainerStyle>
+                    <Style TargetType="{x:Type ListBoxItem}">
+                        <Setter Property="Margin" Value="2" />
+                        <Setter Property="Padding" Value="0" />
+                    </Style>
+                </ListBox.ItemContainerStyle>
+            </ListBox>
+        </Popup>
+    </Grid>
+</UserControl>
diff --git a/BeWo/View/Controls/Utils/ColorPicker.xaml.cs b/BeWo/View/Controls/Utils/ColorPicker.xaml.cs
new file mode 100644
index 000000000..a11977517
--- /dev/null
+++ b/BeWo/View/Controls/Utils/ColorPicker.xaml.cs
@@ -0,0 +1,80 @@
+using BeWo.Core;
+using BS.Shared.Extensions;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+using Color = System.Drawing.Color;
+
+namespace BeWo.View.Controls.Utils
+{
+	/// <summary>
+	/// Interaktionslogik für ColorPicker.xaml
+	/// </summary>
+	public partial class ColorPicker : UserControl
+	{
+		public SolidColorBrush SelectedColor
+		{
+			get { return (SolidColorBrush)GetValue(SelectedColorProperty); }
+			set { SetValue(SelectedColorProperty, value); }
+		}
+
+		// Using a DependencyProperty as the backing store for SelectedColor.  This enables animation, styling, binding, etc...
+		public static readonly DependencyProperty SelectedColorProperty =
+			DependencyProperty.Register("SelectedColor", typeof(SolidColorBrush), typeof(ColorPicker), new PropertyMetadata(null, SelectedColor_Update));
+
+		private static void SelectedColor_Update(DependencyObject d, DependencyPropertyChangedEventArgs e)
+		{
+			//var btn = (d as ColorPicker).btn;
+
+			//btn.Background = e.NewValue as SolidColorBrush;
+			//btn.DataContext = e.NewValue as SolidColorBrush;
+		}
+
+		public ColorPicker()
+		{
+			InitializeComponent();
+		}
+
+		public List<SolidColorBrush> AllBrushes
+		{
+			get
+			{
+				var lTemp = typeof(Color).GetProperties(BindingFlags.GetProperty | BindingFlags.Public | BindingFlags.Static).Select(pi => (Color)pi.GetGetMethod().Invoke(null, null)).ToList();
+
+				lTemp.Sort((x, y) => x.GetBrightness().CompareTo(y.GetBrightness()));
+
+				return lTemp.Select(c => new SolidColorBrush(System.Windows.Media.Color.FromArgb(c.A, c.R, c.G, c.B))).ToList();
+			}
+		}
+
+		private void button_select_color_Click(object sender, RoutedEventArgs e)
+		{
+			popup_color.IsOpen = true;
+		}
+
+		private void listbox_colorpicker_SelectionChanged(object sender, SelectionChangedEventArgs e)
+		{
+			if (e.AddedItems.Count == 1)
+			{
+				var selection = e.AddedItems[0] as SolidColorBrush;
+
+				SelectedColor = selection;
+
+				popup_color.IsOpen = false;
+			}
+		}
+	}
+}
diff --git a/BeWo/View/Detail/Administration/SoziotherapieSettingsView.xaml b/BeWo/View/Detail/Administration/SoziotherapieSettingsView.xaml
index 4d649fd8f..f0fc87933 100644
--- a/BeWo/View/Detail/Administration/SoziotherapieSettingsView.xaml
+++ b/BeWo/View/Detail/Administration/SoziotherapieSettingsView.xaml
@@ -7,9 +7,10 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:BeWo.View.Detail.Administration"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:utils="clr-namespace:BeWo.View.Controls.Utils"
     xmlns:view="clr-namespace:BeWo.View"
     mc:Ignorable="d">
-    <Grid>
+    <Grid HorizontalAlignment="Left">
         <GroupBox
             x:Name="groupBoxSozio"
             Grid.Row="3"
@@ -19,10 +20,12 @@
             Style="{StaticResource ObjectEditGroupBox}"
             Visibility="{Binding Path=Itself, Converter={StaticResource UserPermission2BoolConverter}, ConverterParameter={x:Static core:SettingsKeys.AllowGkvAbrechnung}}">
             <!--  Kann frei genutzt werden  -->
-            <Grid ToolTip="Wenn kein Ansprechpartner hinterlegt ist, so wird der aktuelle Benutzer als Ansprechpartner verwendet.">
+            <Grid>
                 <Grid.RowDefinitions>
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="Auto" SharedSizeGroup="g1" />
@@ -32,7 +35,8 @@
                     Grid.Row="0"
                     Grid.Column="0"
                     Margin="3"
-                    VerticalAlignment="Center">
+                    VerticalAlignment="Center"
+                    ToolTip="Wenn kein Ansprechpartner hinterlegt ist, so wird der aktuelle Benutzer als Ansprechpartner verwendet.">
                     IK Nummer (Leistungserbringer)
                 </Label>
                 <TextBox
@@ -58,6 +62,17 @@
                     Margin="3"
                     SearchMode="All"
                     SelectedCompactEmployeeDC="{Binding SoziotherapieAnsprechpartner, Mode=TwoWay}" />
+                <Label
+                    Grid.Row="2"
+                    Grid.Column="0"
+                    Margin="3"
+                    VerticalAlignment="Center">
+                    Signalfarbe 1
+                </Label>
+                <utils:ColorPicker
+                    Grid.Row="2"
+                    Grid.Column="1"
+                    Margin="3" />
             </Grid>
         </GroupBox>
     </Grid>
diff --git a/Data/Entities/Mandator.cs b/Data/Entities/Mandator.cs
index c00bd7633..b40288345 100644
--- a/Data/Entities/Mandator.cs
+++ b/Data/Entities/Mandator.cs
@@ -46,6 +46,10 @@ namespace BeWo.Data.Entities
 			this._Tid = TableID.Mandator;
 		}
 
+		public virtual BankAccount BankAccount { get; set; }
+		public virtual Employee SoziotherapieAnsprechpartner { get; set; }
+		public virtual Image Logo { get; set; }
+		
 		public virtual long BeWoClientType
 		{
 			get
@@ -364,9 +368,6 @@ namespace BeWo.Data.Entities
 				}
 			}
 		}
-		public virtual BankAccount BankAccount { get; set; }
-		public virtual Employee SoziotherapieAnsprechpartner { get; set; }
-		public virtual Image Logo { get; set; }
 
 		protected virtual string GetSettingValue(string key)
 		{