diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-hdpi/splash.png b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-hdpi/splash.png
deleted file mode 100644
index 2b8635c..0000000
Binary files a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-hdpi/splash.png and /dev/null differ
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-mdpi/splash.png b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-mdpi/splash.png
deleted file mode 100644
index 584565f..0000000
Binary files a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-mdpi/splash.png and /dev/null differ
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-xhdpi/splash.png b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-xhdpi/splash.png
deleted file mode 100644
index b392fca..0000000
Binary files a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-xhdpi/splash.png and /dev/null differ
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-xxhdpi/splash.png b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-xxhdpi/splash.png
deleted file mode 100644
index b6963f2..0000000
Binary files a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-xxhdpi/splash.png and /dev/null differ
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-xxxhdpi/splash.png b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-xxxhdpi/splash.png
deleted file mode 100644
index c0b4672..0000000
Binary files a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable-xxxhdpi/splash.png and /dev/null differ
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable/splash_one_size_fits_all.png b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable/splash_one_size_fits_all.png
new file mode 100644
index 0000000..ffc2247
Binary files /dev/null and b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable/splash_one_size_fits_all.png differ
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/activity_chat.xml b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/activity_chat.xml
index 4b693a5..2e70971 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/activity_chat.xml
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/activity_chat.xml
@@ -15,7 +15,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_gravity="bottom"
-        android:layout_marginBottom="50dp"
+        android:layout_marginBottom="56dp"
         android:layout_marginLeft="16dp"
         android:layout_marginRight="16dp"
         android:layout_marginTop="?attr/actionBarSize"
@@ -29,7 +29,7 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="48dp"
+        android:layout_height="wrap_content"
         android:layout_gravity="bottom"
         android:background="@color/colorWhite"
         android:gravity="center"
@@ -64,12 +64,17 @@
         <hani.momanii.supernova_emoji_library.Helper.EmojiconEditText
             android:id="@+id/chat_message"
             android:layout_width="0dp"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
+            android:maxHeight="100dp"
             android:layout_weight="1"
             android:background="@android:color/transparent"
             android:hint="@string/chat_type_your_message"
             android:paddingEnd="5dp"
             android:paddingRight="5dp"
+            android:paddingTop="10dp"
+            android:paddingBottom="10dp"
+            android:scrollHorizontally="false"
+            android:scrollbars="vertical"
             android:textColor="@color/colorBlack"
             android:textColorHint="@color/colorManatee"
             emojicon:emojiconSize="28sp"
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 b0d65f1..ca1e39a 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
@@ -71,7 +71,7 @@
         android:adjustViewBounds="true"
         android:contentDescription="@null"
         android:scaleType="fitEnd"
-        android:src="@drawable/splash"
+        android:src="@drawable/splash_one_size_fits_all"
         android:visibility="gone" />
 
     <com.github.lzyzsd.circleprogress.DonutProgress
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 cf085fe..a56a9f3 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
@@ -23,7 +23,7 @@
 
     <style name="AppTheme.FullBackground" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="android:windowTranslucentStatus" tools:targetApi="kitkat">true</item>
-        <item name="android:windowBackground">@drawable/splash</item>
+        <item name="android:windowBackground">@drawable/splash_one_size_fits_all</item>
     </style>
 
     <!-- Login style -->