diff --git a/ChatController/ChatController.csproj b/ChatController/ChatController.csproj
index d963002..d253163 100644
--- a/ChatController/ChatController.csproj
+++ b/ChatController/ChatController.csproj
@@ -30,6 +30,9 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>ownchat_favicon.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\libs\Newtonsoft.Json.dll</HintPath>
@@ -110,5 +113,14 @@
   <ItemGroup>
     <Resource Include="Ressourcen\SymbolRefresh32.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Ressourcen\ownChat-Background.png" />
+    <Resource Include="Ressourcen\ownchat_favicon.png" />
+    <Resource Include="Ressourcen\ownchat_icon.png" />
+    <Resource Include="Ressourcen\ownchat_logo.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="ownchat_favicon.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/ChatController/LoginControl.xaml b/ChatController/LoginControl.xaml
index 364ba19..28cef19 100644
--- a/ChatController/LoginControl.xaml
+++ b/ChatController/LoginControl.xaml
@@ -10,7 +10,7 @@
       <Grid.Background>
         <ImageBrush>
           <ImageBrush.ImageSource>
-            <BitmapImage UriSource="Ressourcen/BeyondsoftChat.jpg" />
+            <BitmapImage UriSource="Ressourcen/ownChat-Background.png" />
           </ImageBrush.ImageSource>
         </ImageBrush>
       </Grid.Background>
@@ -23,7 +23,9 @@
           <ColumnDefinition Width="*"/>
         </Grid.ColumnDefinitions>
 
-        <GroupBox Grid.Column="0" Header="Login" HorizontalAlignment="Center" VerticalAlignment="Center" x:Name="GroupBoxLogin">
+        <!-- <Image Source="Ressourcen/ownchat_logo.png" HorizontalAlignment="Right" VerticalAlignment="Top" Height="200" Width="200" RenderOptions.BitmapScalingMode="HighQuality"/>-->
+        
+        <GroupBox Grid.Column="0" Header="Login" HorizontalAlignment="Center" VerticalAlignment="Center" x:Name="GroupBoxLogin" Foreground="White">
           <Grid>
             <Grid.RowDefinitions>
               <RowDefinition Height="30"/>
@@ -38,16 +40,16 @@
               <ColumnDefinition Width="150"/>
             </Grid.ColumnDefinitions>
 
-            <Label Grid.Column="0" Grid.Row="0" Margin="3">Kundennummer:</Label>
+            <Label Grid.Column="0" Grid.Row="0" Margin="3" Foreground="White">Kundennummer:</Label>
             <TextBox x:Name="TextBoxKundennummer" Grid.Column="1" Grid.Row="0" Margin="3" VerticalContentAlignment="Center"/>
 
-            <Label Grid.Column="0" Grid.Row="1" Margin="3">ChatCode:</Label>
+            <Label Grid.Column="0" Grid.Row="1" Margin="3" Foreground="White">ChatCode:</Label>
             <TextBox x:Name="TextBoxChatCode" Grid.Column="1" Grid.Row="1" Margin="3" VerticalContentAlignment="Center"/>
 
-            <Label Grid.Column="0" Grid.Row="2" Margin="3">Benutzername:</Label>
+            <Label Grid.Column="0" Grid.Row="2" Margin="3" Foreground="White">Benutzername:</Label>
             <TextBox x:Name="TextBoxBenutzerName" Grid.Column="1" Grid.Row="2" Margin="3" VerticalContentAlignment="Center" />
 
-            <Label Grid.Column="0" Grid.Row="3" Margin="3">Passwort:</Label>
+            <Label Grid.Column="0" Grid.Row="3" Margin="3" Foreground="White">Passwort:</Label>
             <PasswordBox x:Name="TextBoxPasswort" Grid.Column="1" Grid.Row="3" Margin="3" VerticalContentAlignment="Center"/>
 
             <!--
@@ -64,6 +66,7 @@
 
           </Grid>
         </GroupBox>
+        <Label x:Name="lblVersion" HorizontalAlignment="Right" VerticalAlignment="Bottom" Foreground="White"/>
       </Grid>
       
     </Grid>
diff --git a/ChatController/LoginControl.xaml.cs b/ChatController/LoginControl.xaml.cs
index 217a76e..4569b87 100644
--- a/ChatController/LoginControl.xaml.cs
+++ b/ChatController/LoginControl.xaml.cs
@@ -53,6 +53,9 @@ namespace ChatController
 
             //encrypt verschlüsselte datei
             LeseDateiFallsVorhanden();
+
+            var version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
+            lblVersion.Content = String.Format("Version: {0}", version);
         }
 
         private void AnmeldenButton_OnClick(object sender, RoutedEventArgs e)
diff --git a/ChatController/Ressourcen/ownChat-Background.png b/ChatController/Ressourcen/ownChat-Background.png
new file mode 100644
index 0000000..fad169c
Binary files /dev/null and b/ChatController/Ressourcen/ownChat-Background.png differ
diff --git a/ChatController/Ressourcen/ownchat_favicon.ico b/ChatController/Ressourcen/ownchat_favicon.ico
new file mode 100644
index 0000000..a0441f4
Binary files /dev/null and b/ChatController/Ressourcen/ownchat_favicon.ico differ
diff --git a/ChatController/Ressourcen/ownchat_favicon.png b/ChatController/Ressourcen/ownchat_favicon.png
new file mode 100644
index 0000000..b87fdb6
Binary files /dev/null and b/ChatController/Ressourcen/ownchat_favicon.png differ
diff --git a/ChatController/Ressourcen/ownchat_icon.png b/ChatController/Ressourcen/ownchat_icon.png
new file mode 100644
index 0000000..4dd58ac
Binary files /dev/null and b/ChatController/Ressourcen/ownchat_icon.png differ
diff --git a/ChatController/Ressourcen/ownchat_logo.png b/ChatController/Ressourcen/ownchat_logo.png
new file mode 100644
index 0000000..e8d084b
Binary files /dev/null and b/ChatController/Ressourcen/ownchat_logo.png differ
diff --git a/ChatController/ownchat_favicon.ico b/ChatController/ownchat_favicon.ico
new file mode 100644
index 0000000..a0441f4
Binary files /dev/null and b/ChatController/ownchat_favicon.ico differ
diff --git a/PrototypChat/.vs/PrototypChat/v15/.suo b/PrototypChat/.vs/PrototypChat/v15/.suo
index 4ff70f4..72086e0 100644
Binary files a/PrototypChat/.vs/PrototypChat/v15/.suo and b/PrototypChat/.vs/PrototypChat/v15/.suo differ
diff --git a/PrototypChat/ChatEmojisView.xaml b/PrototypChat/ChatEmojisView.xaml
index 75e3eea..7380f00 100644
--- a/PrototypChat/ChatEmojisView.xaml
+++ b/PrototypChat/ChatEmojisView.xaml
@@ -7,7 +7,7 @@
         xmlns:hauptKlassen="clr-namespace:ChatController.HauptKlassen;assembly=ChatController"
         xmlns:cc="clr-namespace:ChatController;assembly=ChatController"
         mc:Ignorable="d"
-        Title="ChatEmojisView" x:Name="ChatEmojiView"
+        Title="ChatEmojisView" x:Name="ChatEmojiView"  Icon="pack://application:,,,/ChatController;component/Ressourcen/ownchat_icon.png"
         Height="150" Width="300" WindowStartupLocation="Manual" WindowStyle="None" Deactivated="ChatEmojisView_OnFocusableChanged">
   <Grid>
 
diff --git a/PrototypChat/LoginMaske.xaml b/PrototypChat/LoginMaske.xaml
index e3a2dd6..a8c86f7 100644
--- a/PrototypChat/LoginMaske.xaml
+++ b/PrototypChat/LoginMaske.xaml
@@ -3,11 +3,11 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:ownChat"
+        xmlns:local="clr-namespace:ownChat" Icon="pack://application:,,,/ChatController;component/Ressourcen/ownchat_icon.png"
         xmlns:cc="clr-namespace:ChatController;assembly=ChatController"
 
         mc:Ignorable="d" WindowStartupLocation="CenterScreen" ResizeMode="NoResize"
-        Title="ownChat Desktop Login" Height="500" Width="700" >
+        Title="ownChat Desktop" Height="500" Width="700" >
   <Grid>
     <cc:LoginControl OnLogin="LoginControl_OnOnLogin"></cc:LoginControl>
     
diff --git a/PrototypChat/MainWindow.xaml b/PrototypChat/MainWindow.xaml
index 1e13701..6581e72 100644
--- a/PrototypChat/MainWindow.xaml
+++ b/PrototypChat/MainWindow.xaml
@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:ownChat"
         xmlns:cc="clr-namespace:ChatController;assembly=ChatController"
-        mc:Ignorable="d" WindowStartupLocation="CenterScreen"
+        mc:Ignorable="d" WindowStartupLocation="CenterScreen"  Icon="pack://application:,,,/ChatController;component/Ressourcen/ownchat_icon.png"
         Title="ownChat Desktop" Height="700" Width="900" x:Name="MainView" Closed="MainWindow_OnClosed">
     <Grid>
         <cc:ChatMainControl x:Name="ChatMainControl" OnClose="ChatMainControl_OnOnClose" OnEmojii="ChatMainControl_OnOnEmojii" ></cc:ChatMainControl>
diff --git a/PrototypChat/PrototypChat.csproj.user b/PrototypChat/PrototypChat.csproj.user
new file mode 100644
index 0000000..2e3e041
--- /dev/null
+++ b/PrototypChat/PrototypChat.csproj.user
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <EnableSecurityDebugging>false</EnableSecurityDebugging>
+  </PropertyGroup>
+</Project>
\ No newline at end of file