diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/login/LoginPresenter.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/login/LoginPresenter.java
index 362207d..83df25e 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/login/LoginPresenter.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/login/LoginPresenter.java
@@ -201,7 +201,7 @@ public class LoginPresenter extends MVPAbstractPresenter<LoginView> implements L
         switch(ErrorUtils.getErrorType(throwable)) {
             case DATA_INPUT:
                 if (errorThrowable.getError().loginFailed != null && errorThrowable.getError().loginFailed.size() > 0) {
-                    getView().showError(errorThrowable.getError().loginFailed.get(0));
+                    getView().showError(R.string.error_invalid_login_credentials);
                     return;
                 }
             case WRONG_CHATCODE:
@@ -477,7 +477,7 @@ public class LoginPresenter extends MVPAbstractPresenter<LoginView> implements L
 
         String chatCode = mChatCodePreference.get();
         String customerId = mAccountNumberPreference.get();
-        String userId = (mIsEmployee.get() ? "E" : "C") + mUserIdReference.get().toString();
+        String userId = mUserIdReference.get().toString();
 
         Subscription subscription = mLoginService.verifyChatCode(customerId, userId, chatCode)
                 .compose(RxUtils.provideDefaultTransformer())
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/main/MainActivity.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/main/MainActivity.java
index dcfe431..900ded8 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/main/MainActivity.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/main/MainActivity.java
@@ -16,7 +16,7 @@ import de.beyondsoft.ownchat.page.login.LoginActivity;
 import de.beyondsoft.ownchat.page.login.LoginPresenter;
 import de.beyondsoft.ownchat.page.profile.ProfileFragment;
 import de.beyondsoft.ownchat.utils.Constants;
-import de.beyondsoft.ownchat.utils.DialogHandler;
+import de.beyondsoft.ownchat.utils.DialogHandler;/**/
 import de.beyondsoft.ownchat.utils.SystemUtils;
 import de.beyondsoft.ownchat.utils.Utils;
 
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-hdpi/chat_left.9.png b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-hdpi/chat_left.9.png
deleted file mode 100644
index 6790c49..0000000
Binary files a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-hdpi/chat_left.9.png and /dev/null differ
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-hdpi/chat_left_v2.9.png b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-hdpi/chat_left_v2.9.png
new file mode 100644
index 0000000..d9dbecc
Binary files /dev/null and b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-hdpi/chat_left_v2.9.png differ
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-hdpi/chat_right.9.png b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-hdpi/chat_right.9.png
deleted file mode 100644
index 2b3fef1..0000000
Binary files a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-hdpi/chat_right.9.png and /dev/null differ
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-hdpi/chat_right_v2.9.png b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-hdpi/chat_right_v2.9.png
new file mode 100644
index 0000000..e184a7d
Binary files /dev/null and b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-hdpi/chat_right_v2.9.png differ
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-mdpi/chat_left.9.png b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-mdpi/chat_left.9.png
deleted file mode 100644
index b98a86c..0000000
Binary files a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-mdpi/chat_left.9.png and /dev/null differ
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-mdpi/chat_left_v2.9.png b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-mdpi/chat_left_v2.9.png
new file mode 100644
index 0000000..65ac92d
Binary files /dev/null and b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-mdpi/chat_left_v2.9.png differ
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-mdpi/chat_right.9.png b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-mdpi/chat_right.9.png
deleted file mode 100644
index 60b0f18..0000000
Binary files a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-mdpi/chat_right.9.png and /dev/null differ
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-mdpi/chat_right_v2.9.png b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-mdpi/chat_right_v2.9.png
new file mode 100644
index 0000000..bae924d
Binary files /dev/null and b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-mdpi/chat_right_v2.9.png differ
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-xhdpi/chat_left.9.png b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-xhdpi/chat_left.9.png
deleted file mode 100644
index 1ee1022..0000000
Binary files a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-xhdpi/chat_left.9.png and /dev/null differ
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-xhdpi/chat_left_v2.9.png b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-xhdpi/chat_left_v2.9.png
new file mode 100644
index 0000000..49229f0
Binary files /dev/null and b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-xhdpi/chat_left_v2.9.png differ
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-xhdpi/chat_right.9.png b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-xhdpi/chat_right.9.png
deleted file mode 100644
index 2a40c98..0000000
Binary files a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-xhdpi/chat_right.9.png and /dev/null differ
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-xhdpi/chat_right_v2.9.png b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-xhdpi/chat_right_v2.9.png
new file mode 100644
index 0000000..7f1d178
Binary files /dev/null and b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-xhdpi/chat_right_v2.9.png differ
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-xxhdpi/chat_left.9.png b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-xxhdpi/chat_left.9.png
deleted file mode 100644
index 7cd7380..0000000
Binary files a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-xxhdpi/chat_left.9.png and /dev/null differ
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-xxhdpi/chat_left_v2.9.png b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-xxhdpi/chat_left_v2.9.png
new file mode 100644
index 0000000..e522bd8
Binary files /dev/null and b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-xxhdpi/chat_left_v2.9.png differ
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-xxhdpi/chat_right.9.png b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-xxhdpi/chat_right.9.png
deleted file mode 100644
index 73b7e14..0000000
Binary files a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-xxhdpi/chat_right.9.png and /dev/null differ
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-xxhdpi/chat_right_v2.9.png b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-xxhdpi/chat_right_v2.9.png
new file mode 100644
index 0000000..d21bf02
Binary files /dev/null and b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-xxhdpi/chat_right_v2.9.png differ
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-xxxhdpi/chat_left.9.png b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-xxxhdpi/chat_left.9.png
deleted file mode 100644
index 7402089..0000000
Binary files a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-xxxhdpi/chat_left.9.png and /dev/null differ
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-xxxhdpi/chat_left_v2.9.png b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-xxxhdpi/chat_left_v2.9.png
new file mode 100644
index 0000000..30793c6
Binary files /dev/null and b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-xxxhdpi/chat_left_v2.9.png differ
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-xxxhdpi/chat_right.9.png b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-xxxhdpi/chat_right.9.png
deleted file mode 100644
index 4e895d5..0000000
Binary files a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-xxxhdpi/chat_right.9.png and /dev/null differ
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-xxxhdpi/chat_right_v2.9.png b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-xxxhdpi/chat_right_v2.9.png
new file mode 100644
index 0000000..5475f8c
Binary files /dev/null and b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-xxxhdpi/chat_right_v2.9.png differ
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/activity_login.xml b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/activity_login.xml
index 5794330..9e1f773 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/activity_login.xml
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/activity_login.xml
@@ -19,12 +19,12 @@
         app:layout_behavior="de.beyondsoft.ownchat.utils.ui.LayoutBehavior">
 
         <EditText
-            android:id="@+id/login_chat_code"
+            android:id="@+id/login_account"
             style="@style/AppTheme.EditText"
             android:layout_width="match_parent"
             android:background="@drawable/shape_round_top_corners"
-            android:hint="@string/login_chat_code_hint"
-            android:inputType="text" />
+            android:hint="@string/login_account_number_hint"
+            android:inputType="number" />
 
         <View
             android:id="@+id/login_divider1"
@@ -33,12 +33,12 @@
             android:background="@color/colorDivider" />
 
         <EditText
-            android:id="@+id/login_account"
+            android:id="@+id/login_chat_code"
             style="@style/AppTheme.EditText"
             android:layout_width="match_parent"
             android:background="@color/colorWhite"
-            android:hint="@string/login_account_number_hint"
-            android:inputType="number" />
+            android:hint="@string/login_chat_code_hint"
+            android:inputType="text" />
 
         <View
             android:id="@+id/login_divider2"
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/fragment_profile.xml b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/fragment_profile.xml
index 4457dc1..3e84342 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/fragment_profile.xml
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/fragment_profile.xml
@@ -64,6 +64,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/activity_horizontal_margin"
-        android:text="@string/profile_save_button" />
+        android:text="@string/profile_save_button"
+        android:visibility="invisible"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/item_group_chat_left.xml b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/item_group_chat_left.xml
index 2597f24..36fdc84 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/item_group_chat_left.xml
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/item_group_chat_left.xml
@@ -22,6 +22,7 @@
 
     <RelativeLayout
         style="@style/LeftChatItemRelativeLayout"
+        android:padding="7dp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginLeft="5dp"
@@ -74,8 +75,9 @@
             android:layout_alignParentLeft="true"
             android:layout_alignParentStart="true"
             android:visibility="gone"
-            custom:donut_finished_color="@color/colorWhite"
-            custom:donut_text_color="@color/colorBlack" />
+            custom:donut_finished_color="@color/colorDefault"
+            custom:donut_text_color="@color/colorBlack"
+            tools:visibility="visible"/>
 
         <hani.momanii.supernova_emoji_library.Helper.EmojiconTextView
             android:id="@+id/chat_item_message"
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/item_group_chat_right.xml b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/item_group_chat_right.xml
index 94e1702..ea4b2d8 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/item_group_chat_right.xml
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/item_group_chat_right.xml
@@ -25,6 +25,7 @@
 
     <RelativeLayout
         style="@style/RightChatItemRelativeLayout"
+        android:padding="7dp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginLeft="5dp"
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/item_single_chat_left.xml b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/item_single_chat_left.xml
index 5fa877f..540b1b6 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/item_single_chat_left.xml
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/item_single_chat_left.xml
@@ -12,6 +12,7 @@
 
     <RelativeLayout
         style="@style/LeftChatItemRelativeLayout"
+        android:padding="7dp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content">
 
@@ -51,8 +52,9 @@
             android:layout_below="@id/chat_item_time"
             android:layout_marginTop="4dp"
             android:visibility="gone"
-            custom:donut_finished_color="@color/colorWhite"
-            custom:donut_text_color="@color/colorBlack" />
+            custom:donut_finished_color="@color/colorDefault"
+            custom:donut_text_color="@color/colorBlack"
+            tools:visibility="visible"/>
 
         <hani.momanii.supernova_emoji_library.Helper.EmojiconTextView
             android:id="@+id/chat_item_message"
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/item_single_chat_right.xml b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/item_single_chat_right.xml
index ea696dd..fb8b3e0 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/item_single_chat_right.xml
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/item_single_chat_right.xml
@@ -18,7 +18,8 @@
     <RelativeLayout
         style="@style/RightChatItemRelativeLayout"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:padding="7dp">
 
         <TextView
             android:id="@+id/chat_item_sending_failed"
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/values/strings.xml b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/values/strings.xml
index 81a34a1..3184dab 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/values/strings.xml
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/values/strings.xml
@@ -64,6 +64,7 @@
     <string name="error_deactivated_chat_code">Chat-Code ist deaktiviert</string>
     <string name="error_chat_code_too_short">Chat-Code hat eine falsche Länge</string>
     <string name="error_token_validation_failed">Bitte stellen Sie sicher, dass Sie mit dem Internet verbunden sind.</string>
+    <string name="error_invalid_login_credentials">Ungültige Anmeldedaten</string>
 
     <!-- Permissions -->
     <string name="permission_grant">Erlauben</string>
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/values/styles.xml b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/values/styles.xml
index 1ee3ba2..e14681d 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/values/styles.xml
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/values/styles.xml
@@ -102,11 +102,11 @@
     </style>
 
     <style name="RightChatItemRelativeLayout">
-        <item name="android:background">@drawable/chat_right</item>
+        <item name="android:background">@drawable/chat_right_v2</item>
     </style>
 
     <style name="LeftChatItemRelativeLayout">
-        <item name="android:background">@drawable/chat_left</item>
+        <item name="android:background">@drawable/chat_left_v2</item>
     </style>
 
 </resources>