diff --git a/Android/BewoMitarbeiterApp/app/app.iml b/Android/BewoMitarbeiterApp/app/app.iml
index 2b71d64e0..3d5797514 100644
--- a/Android/BewoMitarbeiterApp/app/app.iml
+++ b/Android/BewoMitarbeiterApp/app/app.iml
@@ -66,14 +66,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -82,6 +74,14 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
diff --git a/Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/KontaktChatActivity.java b/Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/KontaktChatActivity.java
index bf83b3ffd..236e5291d 100644
--- a/Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/KontaktChatActivity.java
+++ b/Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/KontaktChatActivity.java
@@ -374,17 +374,6 @@ public class KontaktChatActivity extends ActionBarActivity implements Connectivi
                     databaseHandler.updateContact(contact);
 
                     //TODO: Team updaten, wenn Person Mitglied ist
-//                    if(Util.contains(Util.convertStringArrayToIntegerArray(cp.TeamMemberOids.split(",")), cp.Oid)) {
-//
-//                    }
-
-                    for(ContactListItem item : lc) {
-                        if(!item.isTeam) {
-                            continue;
-                        }
-
-
-                    }
                 }
             }
 
diff --git a/Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/LoginActivity.java b/Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/LoginActivity.java
index 4bc8b12f8..bf30b91dc 100644
--- a/Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/LoginActivity.java
+++ b/Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/LoginActivity.java
@@ -9,6 +9,7 @@ import android.content.SharedPreferences;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.v7.app.ActionBarActivity;
+
 import android.text.TextUtils;
 import android.util.Base64;
 import android.util.Log;
diff --git a/Android/BewoMitarbeiterApp/app/src/main/res/drawable/bewo_btn.xml b/Android/BewoMitarbeiterApp/app/src/main/res/drawable/bewo_btn.xml
new file mode 100644
index 000000000..c607d28e2
--- /dev/null
+++ b/Android/BewoMitarbeiterApp/app/src/main/res/drawable/bewo_btn.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true" android:state_window_focused="false"
+          android:state_enabled="true"
+          android:drawable="@drawable/btn_check_on" />
+    <item android:state_checked="false" android:state_window_focused="false"
+          android:state_enabled="true"
+          android:drawable="@drawable/btn_check_off" />
+
+    <item android:state_checked="true" android:state_pressed="true"
+          android:state_enabled="true"
+          android:drawable="@drawable/btn_check_on_pressed" />
+    <item android:state_checked="false" android:state_pressed="true"
+          android:state_enabled="true"
+          android:drawable="@drawable/btn_check_off_pressed" />
+
+    <item android:state_checked="true" android:state_focused="true"
+          android:state_enabled="true"
+          android:drawable="@drawable/btn_check_on_selected" />
+    <item android:state_checked="false" android:state_focused="true"
+          android:state_enabled="true"
+          android:drawable="@drawable/btn_check_off_selected" />
+
+    <item android:state_checked="false"
+          android:state_enabled="true"
+          android:drawable="@drawable/btn_check_off" />
+    <item android:state_checked="true"
+          android:state_enabled="true"
+          android:drawable="@drawable/btn_check_on" />
+
+
+    <!-- Disabled states -->
+
+    <item android:state_checked="true" android:state_window_focused="false"
+          android:drawable="@drawable/btn_check_on_disable" />
+    <item android:state_checked="false" android:state_window_focused="false"
+          android:drawable="@drawable/btn_check_off_disable" />
+
+    <item android:state_checked="true" android:state_focused="true"
+          android:drawable="@drawable/btn_check_on_disable_focused" />
+    <item android:state_checked="false" android:state_focused="true"
+          android:drawable="@drawable/btn_check_off_disable_focused" />
+
+    <item android:state_checked="false" android:drawable="@drawable/btn_check_off_disable" />
+</selector>
\ No newline at end of file
diff --git a/Android/BewoMitarbeiterApp/app/src/main/res/drawable/orange_button.xml b/Android/BewoMitarbeiterApp/app/src/main/res/drawable/orange_button.xml
new file mode 100644
index 000000000..b2530ba38
--- /dev/null
+++ b/Android/BewoMitarbeiterApp/app/src/main/res/drawable/orange_button.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" >
+        <shape>
+            <solid
+                android:color="#ef4444" />
+            <stroke
+                android:width="1dp"
+                android:color="#992f2f" />
+            <corners
+                android:radius="6dp" />
+            <padding
+                android:left="10dp"
+                android:top="10dp"
+                android:right="10dp"
+                android:bottom="10dp" />
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <gradient
+                android:startColor="#ff6e1a"
+                android:centerX="0.2"
+                android:centerY="0.2"
+                android:centerColor="#FF5E00"
+                android:endColor="#FF5E00"
+                android:type="linear"
+                android:angle="225" />
+
+            <stroke
+                android:width="0dp"
+                android:color="#992f2f" />
+            <corners
+                android:radius="30dp" />
+            <padding
+                android:left="10dp"
+                android:top="10dp"
+                android:right="10dp"
+                android:bottom="10dp" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/Android/BewoMitarbeiterApp/app/src/main/res/drawable/roundedbutton.xml b/Android/BewoMitarbeiterApp/app/src/main/res/drawable/roundedbutton.xml
deleted file mode 100644
index 1a5836519..000000000
--- a/Android/BewoMitarbeiterApp/app/src/main/res/drawable/roundedbutton.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="ring">
-    <solid android:color="#FF9900"/>
-    <fill android:color="#FF9900"/>
-
-
-</shape>
\ No newline at end of file
diff --git a/Android/BewoMitarbeiterApp/app/src/main/res/drawable/serverconnectionoffline.png b/Android/BewoMitarbeiterApp/app/src/main/res/drawable/serverconnectionoffline.png
deleted file mode 100644
index a5c8b9803..000000000
Binary files a/Android/BewoMitarbeiterApp/app/src/main/res/drawable/serverconnectionoffline.png and /dev/null differ
diff --git a/Android/BewoMitarbeiterApp/app/src/main/res/drawable/serverconnectiononline.png b/Android/BewoMitarbeiterApp/app/src/main/res/drawable/serverconnectiononline.png
deleted file mode 100644
index 0ed3222b8..000000000
Binary files a/Android/BewoMitarbeiterApp/app/src/main/res/drawable/serverconnectiononline.png and /dev/null differ
diff --git a/Android/BewoMitarbeiterApp/app/src/main/res/drawable/textlines.xml b/Android/BewoMitarbeiterApp/app/src/main/res/drawable/textlines.xml
new file mode 100644
index 000000000..c9d711afe
--- /dev/null
+++ b/Android/BewoMitarbeiterApp/app/src/main/res/drawable/textlines.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <!-- Draw a 2dp width border around shape -->
+            <stroke
+                android:color="#FF5E00"
+                android:width="2dp"
+                />
+        </shape>
+    </item>
+    <!-- Overlap the left, top and right border using background color  -->
+    <item
+        android:bottom="2dp"
+        >
+        <shape android:shape="rectangle">
+            <solid android:color="#ffffff"/>
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/Android/BewoMitarbeiterApp/app/src/main/res/layout/activity_login.xml b/Android/BewoMitarbeiterApp/app/src/main/res/layout/activity_login.xml
index 963e453ec..81e389ad2 100644
--- a/Android/BewoMitarbeiterApp/app/src/main/res/layout/activity_login.xml
+++ b/Android/BewoMitarbeiterApp/app/src/main/res/layout/activity_login.xml
@@ -8,6 +8,7 @@
               android:paddingLeft="@dimen/activity_horizontal_margin"
               android:paddingRight="@dimen/activity_horizontal_margin"
               android:paddingTop="@dimen/activity_vertical_margin"
+              android:background="@color/white"
               tools:context="beyondsoft.bewomitarbeiterapp.LoginActivity">
 
     <!-- Login progress -->
@@ -37,7 +38,10 @@
                 android:hint="@string/prompt_token"
                 android:inputType="text"
                 android:maxLines="1"
-                android:singleLine="true"/>
+                android:paddingTop="10dp"
+                android:paddingBottom="2dp"
+                android:background="@drawable/textlines"
+                />
 
             <EditText
                 android:id="@+id/tenant"
@@ -46,7 +50,10 @@
                 android:hint="@string/prompt_tenant"
                 android:inputType="text"
                 android:maxLines="1"
-                android:singleLine="true"/>
+                android:paddingTop="10dp"
+                android:paddingBottom="2dp"
+                android:background="@drawable/textlines"
+                />
 
             <EditText
                 android:id="@+id/username"
@@ -55,7 +62,10 @@
                 android:hint="@string/prompt_username"
                 android:inputType="text"
                 android:maxLines="1"
-                android:singleLine="true"/>
+                android:paddingTop="10dp"
+                android:paddingBottom="2dp"
+                android:background="@drawable/textlines"
+                />
 
             <EditText
                 android:id="@+id/password"
@@ -67,23 +77,31 @@
                 android:imeOptions="actionUnspecified"
                 android:inputType="textPassword"
                 android:maxLines="1"
-                android:singleLine="true"/>
+                android:paddingTop="10dp"
+                android:paddingBottom="3dp"
+                android:background="@drawable/textlines"
+                />
 
             <CheckBox
                 android:id="@+id/remember_me_checkbox"
+                style="checkBoxStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/prompt_remember_me"
+                android:paddingTop="8dp"
+                android:paddingBottom="8dp"
                 android:onClick="rememberMeOnClick"/>
 
             <Button
                 android:id="@+id/sign_in_button"
-                style="?android:textAppearanceSmall"
+                style="@style/button_text"
+                android:background="@drawable/orange_button"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
                 android:text="@string/action_sign_in_short"
-                android:textStyle="bold"/>
+                android:fontFamily="sans-serif"
+                />
 
         </LinearLayout>
     </ScrollView>
diff --git a/Android/BewoMitarbeiterApp/app/src/main/res/values/colors.xml b/Android/BewoMitarbeiterApp/app/src/main/res/values/colors.xml
index 3fcee70e5..7b939d45b 100644
--- a/Android/BewoMitarbeiterApp/app/src/main/res/values/colors.xml
+++ b/Android/BewoMitarbeiterApp/app/src/main/res/values/colors.xml
@@ -2,4 +2,5 @@
 <resources>
     <color name="red">#f12727</color>
     <color name="green">#25ea20</color>
+    <color name="white">#ffffff</color>
 </resources>
\ No newline at end of file
diff --git a/Android/BewoMitarbeiterApp/app/src/main/res/values/styles.xml b/Android/BewoMitarbeiterApp/app/src/main/res/values/styles.xml
index 4b0244387..c108b71f6 100644
--- a/Android/BewoMitarbeiterApp/app/src/main/res/values/styles.xml
+++ b/Android/BewoMitarbeiterApp/app/src/main/res/values/styles.xml
@@ -5,5 +5,23 @@
         <!-- Customize your theme here. -->
     </style>
 
+    <style name="button_text" >
+        <item name="android:layout_width" >fill_parent</item>
+        <item name="android:layout_height" >wrap_content</item>
+        <item name="android:textColor" >#ffffff</item>
+        <item name="android:gravity" >center</item>
+        <item name="android:layout_margin" >3dp</item>
+        <item name="android:textSize" >30dp</item>
+        <item name="android:textStyle" >normal</item>
+        <item name="android:shadowColor" >#000000</item>
+        <item name="android:shadowDx" >1</item>
+        <item name="android:shadowDy" >1</item>
+        <item name="android:shadowRadius" >2</item>
+    </style>
+
+    <style name="checkBoxStyle" parent="Base.Theme.AppCompat">
+        <item name="colorAccent">#ff0000</item>
+        <item name="android:textColorSecondary">#fcad49</item>
+    </style>
 
 </resources>
diff --git a/BeWo/View/HomeDragPanelView.xaml.cs b/BeWo/View/HomeDragPanelView.xaml.cs
index c02b1ecf9..9504278aa 100644
--- a/BeWo/View/HomeDragPanelView.xaml.cs
+++ b/BeWo/View/HomeDragPanelView.xaml.cs
@@ -1849,11 +1849,11 @@ namespace BeWo.View
                        chatView.SetServerStats(person[0].FirstName + " " + person[0].LastName + " Connected");
 
                        if(person[0].Type == PersonType.Customer)
-                           miniChatView = new MiniChatView(person[0].FirstName + " " + person[0].LastName, "", chatView, personOid, ChatType.Klienten);
+                           miniChatView = new MiniChatView(person[0].FirstName, person[0].LastName, "", chatView, personOid, ChatType.Klienten);
                        else if (person[0].Type == PersonType.Employee)
-                           miniChatView = new MiniChatView(person[0].FirstName + " " + person[0].LastName, "", chatView, personOid, ChatType.Mitarbeiter);
+                           miniChatView = new MiniChatView(person[0].FirstName, person[0].LastName, "", chatView, personOid, ChatType.Mitarbeiter);
                        else if(person[0].Type == PersonType.Others)
-                           miniChatView = new MiniChatView(person[0].FirstName + " " + person[0].LastName, "", chatView, personOid, ChatType.Team);
+                           miniChatView = new MiniChatView(person[0].FirstName, person[0].LastName, "", chatView, personOid, ChatType.Team);
 
                        miniChatView.Visibility = Visibility.Collapsed;