diff --git a/app/src/main/ic_profile-playstore.png b/app/src/main/ic_profile-playstore.png
new file mode 100644
index 0000000..ce3d1f5
Binary files /dev/null and b/app/src/main/ic_profile-playstore.png differ
diff --git a/app/src/main/java/com/scalability4all/sathi/ChatListActivity.java b/app/src/main/java/com/scalability4all/sathi/ChatListActivity.java
index a6c73d0..8ad7ba4 100755
--- a/app/src/main/java/com/scalability4all/sathi/ChatListActivity.java
+++ b/app/src/main/java/com/scalability4all/sathi/ChatListActivity.java
@@ -95,7 +95,6 @@ protected void onCreate(Bundle savedInstanceState) {
             mAdapter.setOnItemLongClickListener(this);
             chatsRecyclerView.setAdapter(mAdapter);
             FloatingActionButton newConversationButton = findViewById(R.id.new_conversation_floating_button);
-            newConversationButton.setBackgroundTintList(getResources().getColorStateList(R.color.colorPrimary));
             newConversationButton.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
diff --git a/app/src/main/java/com/scalability4all/sathi/ContactDetailsActivity.java b/app/src/main/java/com/scalability4all/sathi/ContactDetailsActivity.java
index 9c4574a..e2425a8 100755
--- a/app/src/main/java/com/scalability4all/sathi/ContactDetailsActivity.java
+++ b/app/src/main/java/com/scalability4all/sathi/ContactDetailsActivity.java
@@ -35,7 +35,7 @@ protected void onCreate(Bundle savedInstanceState) {
         setTitle(contactJid);
         ImageView profileImage = findViewById(R.id.contact_details_user_profile);
         RoosterConnection rc = RoosterConnectionService.getConnection();
-        profileImage.setImageResource(R.drawable.ic_profile);
+        profileImage.setImageResource(R.mipmap.ic_profile);
         if(rc != null)
         {
             String imageAbsPath = rc.getProfileImageAbsolutePath(contactJid);
diff --git a/app/src/main/java/com/scalability4all/sathi/ContactListActivity.java b/app/src/main/java/com/scalability4all/sathi/ContactListActivity.java
index c50d74e..a4617bc 100755
--- a/app/src/main/java/com/scalability4all/sathi/ContactListActivity.java
+++ b/app/src/main/java/com/scalability4all/sathi/ContactListActivity.java
@@ -43,7 +43,6 @@ protected void onCreate(Bundle savedInstanceState) {
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
         FloatingActionButton newContactButton = findViewById(R.id.new_contact_button);
-        newContactButton.setBackgroundTintList(getResources().getColorStateList(R.color.colorPrimary));
         newContactButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
diff --git a/app/src/main/java/com/scalability4all/sathi/LoginActivity.java b/app/src/main/java/com/scalability4all/sathi/LoginActivity.java
index 9f94933..8eb6530 100755
--- a/app/src/main/java/com/scalability4all/sathi/LoginActivity.java
+++ b/app/src/main/java/com/scalability4all/sathi/LoginActivity.java
@@ -17,11 +17,12 @@
 import android.view.inputmethod.EditorInfo;
 import android.widget.AutoCompleteTextView;
 import android.widget.EditText;
-import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.appcompat.app.AppCompatActivity;
 
+import com.google.android.material.button.MaterialButton;
+import com.google.android.material.textfield.TextInputEditText;
 import com.scalability4all.sathi.services.VolleyCallback;
 import com.scalability4all.sathi.services.VolleyService;
 import com.scalability4all.sathi.xmpp.RoosterConnectionService;
@@ -49,8 +50,8 @@
 
 public class LoginActivity extends AppCompatActivity {
     private static final String LOGTAG = "RoosterPlus";
-    private AutoCompleteTextView mJidView;
-    private EditText mPasswordView;
+    private TextInputEditText mJidView;
+    private TextInputEditText mPasswordView;
     private View mProgressView;
     private View mLoginFormView;
     private BroadcastReceiver mBroadcastReceiver;
@@ -72,7 +73,7 @@ public boolean onEditorAction(TextView textView, int id, KeyEvent keyEvent) {
                 return false;
             }
         });
-        ImageView mJidSignInButton = findViewById(R.id.jid_sign_in_button);
+        MaterialButton mJidSignInButton = findViewById(R.id.jid_sign_in_button);
         mJidSignInButton.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View view) {
@@ -89,39 +90,7 @@ public void onClick(View view) {
                 startActivity(i);
             }
         });
-//        ImageView mJidRegisterButton = findViewById(R.id.jid_register_button);
-//        // Registrierungsdialog
-//        mJidRegisterButton.setOnClickListener(new OnClickListener() {
-//            @Override
-//            public void onClick(View view) {
-//                final Dialog dialog = new Dialog(LoginActivity.this);
-//                dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-//                dialog.setCancelable(false);
-//                dialog.setContentView(R.layout.register_dialog);
-//                ImageView rJidReg = dialog.findViewById(R.id.login_register_reg);
-//                ImageView rJidCancel = dialog.findViewById(R.id.login_register_cancel);
-//                rJidReg.setOnClickListener(new OnClickListener() {
-//                    @Override
-//                    public void onClick(View view) {
-//                        EditText username = dialog.findViewById(R.id.dialog_register_jid);
-//                        EditText password = dialog.findViewById(R.id.dialog_register_password);
-//                        try {
-//                            attemptRegister(username.getText().toString(), password.getText().toString());
-//                            dialog.dismiss();
-//                        } catch (IOException e) {
-//                            e.printStackTrace();
-//                        }
-//                    }
-//                });
-//                rJidCancel.setOnClickListener(new OnClickListener() {
-//                    @Override
-//                    public void onClick(View view) {
-//                        dialog.dismiss();
-//                    }
-//                });
-//                dialog.show();
-//            }
-//        });
+
     }
     @Override
     protected void onPause() {
@@ -160,20 +129,20 @@ public void onReceive(Context context, Intent intent) {
         this.registerReceiver(mBroadcastReceiver, filter);
     }
     private void attemptLogin() {
-        // Errors zurücksetzen
+        // Errors reset to default
         mJidView.setError(null);
         mPasswordView.setError(null);
         String jid = mJidView.getText().toString();
         String password = mPasswordView.getText().toString();
         boolean cancel = false;
         View focusView = null;
-        // Passwortüberprüfung (hier nur noch Länge, nicht ob auf Server richtig
+        //Password check (length only here, not correct on server
         if (!TextUtils.isEmpty(password) && !isPasswordValid(password)) {
             mPasswordView.setError(getString(R.string.error_invalid_password));
             focusView = mPasswordView;
             cancel = true;
         }
-        // JID überprüfen (per @)
+        // JID check (per @)
         if (TextUtils.isEmpty(jid)) {
             mJidView.setError(getString(R.string.error_field_required));
             focusView = mJidView;
@@ -196,7 +165,7 @@ private boolean isJidValid(String email) {
     private boolean isPasswordValid(String password) {
         return password.length() > 4;
     }
-    // Progressbar zeigen und Login ausblenden
+    // Show progress bar and hide login
     @TargetApi(Build.VERSION_CODES.HONEYCOMB_MR2)
     private void showProgress(final boolean show) {
         mProgressView.setVisibility(show ? View.VISIBLE : View.GONE);
diff --git a/app/src/main/java/com/scalability4all/sathi/MeActivity.java b/app/src/main/java/com/scalability4all/sathi/MeActivity.java
index 0c51244..f87a3d2 100755
--- a/app/src/main/java/com/scalability4all/sathi/MeActivity.java
+++ b/app/src/main/java/com/scalability4all/sathi/MeActivity.java
@@ -47,7 +47,7 @@ protected void onCreate(Bundle savedInstanceState) {
         profileImageView.setOnClickListener(this);
         String selfJid = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()).getString("xmpp_jid",null);
         RoosterConnection rc = RoosterConnectionService.getConnection();
-        profileImageView.setImageResource(R.drawable.ic_profile);
+        profileImageView.setImageResource(R.mipmap.ic_profile);
         if(rc != null)
         {
             String imageAbsPath = rc.getProfileImageAbsolutePath(selfJid);
diff --git a/app/src/main/java/com/scalability4all/sathi/adapters/ChatListAdapter.java b/app/src/main/java/com/scalability4all/sathi/adapters/ChatListAdapter.java
index aeb7fd3..9349125 100755
--- a/app/src/main/java/com/scalability4all/sathi/adapters/ChatListAdapter.java
+++ b/app/src/main/java/com/scalability4all/sathi/adapters/ChatListAdapter.java
@@ -182,7 +182,7 @@ public void bindChat(Chat chat)
         timestampTextView.setMovementMethod(LinkMovementMethod.getInstance());
         timestampTextView.setText(Utilities.getFormattedTime(mChat.getLastMessageTimeStamp()));
 
-        profileImage.setImageResource(R.drawable.ic_profile);
+        profileImage.setImageResource(R.mipmap.ic_profile);
         RoosterConnection rc = RoosterConnectionService.getConnection();
         if(rc != null)
         {
diff --git a/app/src/main/java/com/scalability4all/sathi/adapters/ChatMessagesAdapter.java b/app/src/main/java/com/scalability4all/sathi/adapters/ChatMessagesAdapter.java
index 1dc3761..f1bf625 100755
--- a/app/src/main/java/com/scalability4all/sathi/adapters/ChatMessagesAdapter.java
+++ b/app/src/main/java/com/scalability4all/sathi/adapters/ChatMessagesAdapter.java
@@ -146,7 +146,7 @@ public void bindChat(ChatMessage chatMessage)
         mChatMessage = chatMessage;
         mMessageBody.setText(chatMessage.getMessage());
         mMessageTimestamp.setText(Utilities.getFormattedTime(chatMessage.getTimestamp()));
-        profileImage.setImageResource(R.drawable.ic_profile);
+        profileImage.setImageResource(R.mipmap.ic_profile);
         ChatMessage.Type type = mChatMessage.getType();
         if( type == ChatMessage.Type.RECEIVED)
         {
diff --git a/app/src/main/java/com/scalability4all/sathi/adapters/ContactListAdapter.java b/app/src/main/java/com/scalability4all/sathi/adapters/ContactListAdapter.java
index f005d79..4366a8d 100755
--- a/app/src/main/java/com/scalability4all/sathi/adapters/ContactListAdapter.java
+++ b/app/src/main/java/com/scalability4all/sathi/adapters/ContactListAdapter.java
@@ -113,7 +113,7 @@ void bindContact(Contact c)
         }
         jidTexView.setText(mContact.getJid());
         subscriptionTypeTextView.setText(mContact.getTypeStringValue(mContact.getSubscriptionType()));
-        profile_image.setImageResource(R.drawable.ic_profile);
+        profile_image.setImageResource(R.mipmap.ic_profile);
         RoosterConnection rc = RoosterConnectionService.getConnection();
         if(rc != null)
         {
diff --git a/app/src/main/java/com/scalability4all/sathi/xmpp/RoosterConnection.java b/app/src/main/java/com/scalability4all/sathi/xmpp/RoosterConnection.java
index d98e0ff..b7badf4 100755
--- a/app/src/main/java/com/scalability4all/sathi/xmpp/RoosterConnection.java
+++ b/app/src/main/java/com/scalability4all/sathi/xmpp/RoosterConnection.java
@@ -689,7 +689,7 @@ private void gatherCredentials()
         if( jid != null)
         {
             mUsername = jid.split("@")[0];
-            mServiceName = jid.split("@")[1];
+            mServiceName = jid.split("@").length>1?jid.split("@")[1]:"";
         }else
         {
             mUsername ="";
diff --git a/app/src/main/res/drawable-hdpi/ic_profile.png b/app/src/main/res/drawable-hdpi/ic_profile.png
deleted file mode 100755
index 278f8c5..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_profile.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_profile.png b/app/src/main/res/drawable-mdpi/ic_profile.png
deleted file mode 100755
index c19fbcb..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_profile.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_profile.png b/app/src/main/res/drawable-xhdpi/ic_profile.png
deleted file mode 100755
index 599262f..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_profile.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_profile.png b/app/src/main/res/drawable-xxhdpi/ic_profile.png
deleted file mode 100755
index 755efb4..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_profile.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/logo.png b/app/src/main/res/drawable-xxhdpi/logo.png
new file mode 100644
index 0000000..0bc0a82
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/logo.png differ
diff --git a/app/src/main/res/drawable/background_border.xml b/app/src/main/res/drawable/background_border.xml
new file mode 100644
index 0000000..8f7d437
--- /dev/null
+++ b/app/src/main/res/drawable/background_border.xml
@@ -0,0 +1,17 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle" >
+    <!-- This is the stroke you want to define -->
+    <stroke android:width="1dp" 
+            android:color="@color/grey"/>
+
+    <!-- Optional, round your corners -->
+    <corners android:bottomLeftRadius="0dp"
+             android:topLeftRadius="5dp"
+             android:bottomRightRadius="5dp"
+             android:topRightRadius="0dp" />
+
+    <!-- Optional, fill the rest of your background with a color or gradient, use transparent if you only want the border to be displayed-->
+    <gradient android:startColor="@android:color/transparent"
+              android:endColor="@android:color/transparent"
+              android:angle="90"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_profile_foreground.xml b/app/src/main/res/drawable/ic_profile_foreground.xml
new file mode 100644
index 0000000..dea7a5c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_profile_foreground.xml
@@ -0,0 +1,17 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="30.379747"
+    android:viewportHeight="30.379747">
+  <group android:translateX="3.1898735"
+      android:translateY="3.1898735">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,4c-4.41,0 -8,3.59 -8,8 0,1.82 0.62,3.49 1.64,4.83 1.43,-1.74 4.9,-2.33 6.36,-2.33s4.93,0.59 6.36,2.33C19.38,15.49 20,13.82 20,12c0,-4.41 -3.59,-8 -8,-8zM12,13c-1.94,0 -3.5,-1.56 -3.5,-3.5S10.06,6 12,6s3.5,1.56 3.5,3.5S13.94,13 12,13z"
+        android:strokeAlpha="0.3"
+        android:fillAlpha="0.3"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM7.07,18.28c0.43,-0.9 3.05,-1.78 4.93,-1.78s4.51,0.88 4.93,1.78C15.57,19.36 13.86,20 12,20s-3.57,-0.64 -4.93,-1.72zM18.36,16.83c-1.43,-1.74 -4.9,-2.33 -6.36,-2.33s-4.93,0.59 -6.36,2.33C4.62,15.49 4,13.82 4,12c0,-4.41 3.59,-8 8,-8s8,3.59 8,8c0,1.82 -0.62,3.49 -1.64,4.83zM12,6c-1.94,0 -3.5,1.56 -3.5,3.5S10.06,13 12,13s3.5,-1.56 3.5,-3.5S13.94,6 12,6zM12,11c-0.83,0 -1.5,-0.67 -1.5,-1.5S11.17,8 12,8s1.5,0.67 1.5,1.5S12.83,11 12,11z"/>
+  </group>
+</vector>
diff --git a/app/src/main/res/drawable/tinput_border.xml b/app/src/main/res/drawable/tinput_border.xml
index e083c14..bc3bcda 100755
--- a/app/src/main/res/drawable/tinput_border.xml
+++ b/app/src/main/res/drawable/tinput_border.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
-    <solid android:color="@color/cardview_light_background" />
+    <solid android:color="@color/white" />
     <stroke android:width="1dip" android:color="@color/colorPrimaryDark"/>
     <corners android:radius="50dp"/>
     <padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />
diff --git a/app/src/main/res/layout/activity_chat_list.xml b/app/src/main/res/layout/activity_chat_list.xml
index 0c5b9db..5e299f8 100755
--- a/app/src/main/res/layout/activity_chat_list.xml
+++ b/app/src/main/res/layout/activity_chat_list.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/cardview_light_background"
+    android:background="@color/white"
     android:orientation="vertical"
     android:paddingBottom="@dimen/activity_vertical_margin"
     android:paddingLeft="@dimen/activity_horizontal_margin"
@@ -15,19 +15,20 @@
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/chatsRecyclerView"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:padding="4dp">
 
 
     </androidx.recyclerview.widget.RecyclerView>
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:id="@+id/new_conversation_floating_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|right"
         android:layout_margin="16dp"
         android:src="@drawable/message"
+        app:backgroundTint="@color/floating_button"
         app:layout_anchor="@id/chatsRecyclerView"
         app:layout_anchorGravity="bottom|right|end" />
 
diff --git a/app/src/main/res/layout/activity_contact_details.xml b/app/src/main/res/layout/activity_contact_details.xml
index e5fd2a5..a0b3090 100755
--- a/app/src/main/res/layout/activity_contact_details.xml
+++ b/app/src/main/res/layout/activity_contact_details.xml
@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
 
-    android:background="@color/cardview_light_background"
+    android:background="@color/white"
 
     android:paddingBottom="@dimen/activity_vertical_margin"
     tools:context="com.scalability4all.sathi.ContactDetailsActivity">
@@ -19,7 +19,7 @@
         android:layout_centerHorizontal="true"
         android:layout_marginRight="16dp"
         android:layout_marginTop="5dp"
-        android:src="@drawable/ic_profile"
+        android:src="@mipmap/ic_profile"
         app:riv_border_color="@color/riv_border_color"
         app:riv_border_width="1dip"
         app:riv_corner_radius="12dp" />
diff --git a/app/src/main/res/layout/activity_contact_list.xml b/app/src/main/res/layout/activity_contact_list.xml
index ca69ddf..8d10548 100755
--- a/app/src/main/res/layout/activity_contact_list.xml
+++ b/app/src/main/res/layout/activity_contact_list.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/cardview_light_background"
+    android:background="@color/white"
     tools:context="com.scalability4all.sathi.ContactListActivity">
 
     <com.google.android.material.appbar.AppBarLayout
@@ -16,7 +16,6 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
             app:popupTheme="@style/AppTheme.PopupOverlay" />
 
     </com.google.android.material.appbar.AppBarLayout>
@@ -38,6 +37,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
+        app:backgroundTint="@color/floating_button"
         android:layout_margin="@dimen/fab_margin"
         android:src="@drawable/add_contact" />
 
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 0ce51b6..5924a7f 100755
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/cardview_light_background"
+    android:background="@color/white"
     android:gravity="center_vertical|center_horizontal"
     android:orientation="vertical"
     android:paddingBottom="@dimen/activity_vertical_margin"
@@ -24,139 +24,99 @@
     <ScrollView
         android:id="@+id/login_form"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:foregroundGravity="center_vertical">
 
-        <RelativeLayout
+        <LinearLayout
+            android:id="@+id/jid_login_form"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:clipChildren="false"
+            android:clipToPadding="false"
+            android:orientation="vertical"
+            android:padding="24dp"
+            android:paddingTop="16dp">
+
+            <ImageView
+                android:layout_width="236dp"
+                android:layout_height="113dp"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="68dp"
+                android:layout_marginBottom="10dp"
+                app:srcCompat="@drawable/logo" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginBottom="110dp"
+                android:text="@string/app_name"
+                android:textAllCaps="true"
+                android:textSize="16sp" />
+
 
-            <LinearLayout
-                android:id="@+id/jid_login_form"
+            <com.google.android.material.textfield.TextInputLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical">
+                android:layout_margin="4dp">
 
-               <!-- <ImageView
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/jid"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="15dp"
-                    app:srcCompat="@drawable/unichat" />-->
+                    android:hint="@string/hint_user_name"
+                    android:inputType="text"
+                    android:maxLines="1" />
 
-                <com.google.android.material.textfield.TextInputLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-
-                    <AutoCompleteTextView
-                        android:id="@+id/jid"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginEnd="50dp"
-                        android:layout_marginStart="50dp"
-                        android:gravity="center_horizontal"
-                        android:hint="@string/prompt_jid"
-                        android:inputType="textEmailAddress"
-                        android:maxLines="1"
-                        android:singleLine="true"
-                        android:textSize="12sp" />
-
-                </com.google.android.material.textfield.TextInputLayout>
-
-                <com.google.android.material.textfield.TextInputLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-
-                    <EditText
-                        android:id="@+id/password"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginEnd="50dp"
-                        android:layout_marginStart="50dp"
-                        android:gravity="center_horizontal"
-                        android:hint="@string/prompt_password"
-                        android:imeActionId="6"
-                        android:imeActionLabel="@string/action_sign_in_short"
-                        android:imeOptions="actionUnspecified"
-                        android:inputType="textPassword"
-                        android:maxLines="1"
-                        android:singleLine="true"
-                        android:textSize="12sp" />
-
-                </com.google.android.material.textfield.TextInputLayout>
-
-                <LinearLayout
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="4dp">
+
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/password"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_marginEnd="50dp"
-                    android:layout_marginStart="50dp"
-                    android:layout_marginTop="10dp"
-                    android:orientation="horizontal">
-
-               <!--     <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout_weight="1"
-                        android:gravity="center_horizontal"
-                        android:orientation="vertical">
-
-                        <ImageView
-                            android:id="@+id/jid_register_button"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_centerInParent="true"
-                            android:layout_weight="1"
-                            android:background="@drawable/imageview_border"
-                            app:srcCompat="@mipmap/ic_launcher_pummel_round" />
-
-                        <TextView
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:gravity="center_horizontal"
-                            android:text="@string/action_register"
-                            android:textSize="10sp" />
-
-                    </LinearLayout>-->
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:orientation="vertical"
-                        android:layout_weight="1">
-
-                        <ImageView
-                            android:id="@+id/jid_sign_in_button"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_centerInParent="true"
-                            android:layout_gravity="center_horizontal"
-                            android:layout_weight="1"
-                            android:background="@drawable/imageview_border"
-                            app:srcCompat="@mipmap/ic_launcher_unicorn" />
-
-                        <TextView
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:gravity="center_horizontal"
-                            android:text="@string/action_sign_in"
-                            android:textSize="10sp" />
-
-                        <TextView android:id="@+id/link_to_register"
-                            android:layout_width="fill_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="40dip"
-                            android:layout_marginBottom="40dip"
-                            android:text="Don't have an account ? Register here"
-                            android:gravity="center"
-                            android:textColor="#0b84aa"/>
-                    </LinearLayout>
-
-                </LinearLayout>
-
-            </LinearLayout>
-
-        </RelativeLayout>
+                    android:layout_height="wrap_content"
+                    android:hint="@string/prompt_password"
+                    android:imeActionId="6"
+                    android:imeActionLabel="@string/action_sign_in_short"
+                    android:imeOptions="actionUnspecified"
+                    android:inputType="textPassword"
+                    android:maxLines="1" />
+
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/jid_sign_in_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentRight="true"
+                    android:text="@string/action_sign_in"
+                    app:errorEnabled="true" />
+
+                <TextView
+                    android:id="@+id/link_to_register"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dip"
+                    android:layout_toStartOf="@id/jid_sign_in_button"
+                    android:layout_toLeftOf="@id/jid_sign_in_button"
+                    android:gravity="center"
+                    android:text="Don't have an account ? Register here"
+                    android:textColor="#0b84aa" />
+
+            </RelativeLayout>
+
+
+        </LinearLayout>
     </ScrollView>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/activity_me.xml b/app/src/main/res/layout/activity_me.xml
index 628b571..fa3e874 100755
--- a/app/src/main/res/layout/activity_me.xml
+++ b/app/src/main/res/layout/activity_me.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:background="@color/cardview_light_background">
+    android:background="@color/white">
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -17,7 +17,7 @@
             android:layout_alignParentTop="true"
             android:layout_centerHorizontal="true"
             android:layout_marginRight="16dp"
-            android:src="@drawable/ic_profile"
+            android:src="@mipmap/ic_profile"
             app:riv_border_color="@color/riv_border_color"
             app:riv_border_width="1dip"
             app:riv_corner_radius="12dp" />
diff --git a/app/src/main/res/layout/activity_register.xml b/app/src/main/res/layout/activity_register.xml
index 5abf11e..92af869 100644
--- a/app/src/main/res/layout/activity_register.xml
+++ b/app/src/main/res/layout/activity_register.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:background="@color/cardview_light_background"
+    android:background="@color/white"
     android:padding="20dp"
     android:layout_gravity="center"
     tools:context=".Register">
diff --git a/app/src/main/res/layout/chat_list_item.xml b/app/src/main/res/layout/chat_list_item.xml
index 81291d3..cdc17ce 100755
--- a/app/src/main/res/layout/chat_list_item.xml
+++ b/app/src/main/res/layout/chat_list_item.xml
@@ -3,33 +3,35 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-
-    android:layout_height="90dp"
-
-    android:layout_marginBottom="2dp"
-    android:background="#f0f0f0">
+    android:layout_height="wrap_content"
+    android:layout_marginBottom="4dp"
+    android:background="@drawable/background_border"
+    android:elevation="2dp"
+    android:paddingLeft="10dp"
+    android:paddingTop="10dp"
+    android:paddingRight="10dp">
 
     <com.makeramen.roundedimageview.RoundedImageView
         android:id="@+id/profile"
         android:layout_width="72dp"
-        android:layout_height="match_parent"
-        android:layout_marginLeft="5dp"
-        android:layout_marginRight="10dp"
-        android:src="@drawable/ic_profile"
-        app:riv_border_color="@color/riv_border_color"
-        app:riv_border_width="1dip"
+        android:layout_height="60dp"
+        android:src="@mipmap/ic_profile"
         app:riv_corner_radius="52dp" />
 
-    <FrameLayout xmlns:app="http://schemas.android.com/apk/res-auto"
+    <FrameLayout
         android:id="@+id/message_body"
         android:layout_width="match_parent"
-        android:layout_height="90dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="5dp"
         android:layout_toRightOf="@id/profile">
 
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginLeft="4dp"
+            android:layout_marginTop="4dp"
             android:gravity="end"
             android:orientation="vertical">
 
@@ -39,7 +41,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:text="@string/user_example_com"
-                android:textColor="@color/default_bubble_color_rcv"
+                android:textColor="@color/textColor"
                 android:textSize="@dimen/default_message_chat_text_size"
                 tools:text="@string/server_text" />
 
diff --git a/app/src/main/res/layout/chat_message_received.xml b/app/src/main/res/layout/chat_message_received.xml
index b49d029..ce09648 100755
--- a/app/src/main/res/layout/chat_message_received.xml
+++ b/app/src/main/res/layout/chat_message_received.xml
@@ -14,7 +14,7 @@
         app:riv_border_color="@color/riv_border_color"
         app:riv_border_width="1dip"
         android:layout_alignParentRight="true"
-        android:src="@drawable/ic_profile"
+        android:src="@mipmap/ic_profile"
         android:layout_centerVertical="true"/>
 
     <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/chat_message_sent.xml b/app/src/main/res/layout/chat_message_sent.xml
index a0d37ab..b419a7d 100755
--- a/app/src/main/res/layout/chat_message_sent.xml
+++ b/app/src/main/res/layout/chat_message_sent.xml
@@ -14,7 +14,7 @@
         app:riv_corner_radius="52dp"
         app:riv_border_color="@color/riv_border_color"
         app:riv_border_width="1dip"
-        android:src="@drawable/ic_profile"
+        android:src="@mipmap/ic_profile"
         android:layout_centerVertical="true"/>
 
     <FrameLayout
diff --git a/app/src/main/res/layout/contact_list_item.xml b/app/src/main/res/layout/contact_list_item.xml
index 65a632d..64c3956 100755
--- a/app/src/main/res/layout/contact_list_item.xml
+++ b/app/src/main/res/layout/contact_list_item.xml
@@ -3,27 +3,23 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-
     android:layout_height="wrap_content"
-
-    android:layout_marginBottom="2dp"
-    android:background="#f0f0f0">
+    android:layout_marginBottom="4dp"
+    android:background="@drawable/background_border"
+    android:elevation="2dp"
+    android:padding="10dp">
 
     <com.makeramen.roundedimageview.RoundedImageView
         android:id="@+id/profile_contact"
         android:layout_width="72dp"
-        android:layout_height="90dp"
-        android:layout_marginRight="10dp"
-        android:layout_marginStart="5dp"
-        android:src="@drawable/ic_profile"
-        app:riv_border_color="@color/riv_border_color"
-        app:riv_border_width="1dip"
+        android:layout_height="60dp"
+        android:src="@mipmap/ic_profile"
         app:riv_corner_radius="52dp" />
 
     <FrameLayout xmlns:app="http://schemas.android.com/apk/res-auto"
         android:id="@+id/message_body"
         android:layout_width="match_parent"
-        android:layout_height="90dp"
+        android:layout_height="wrap_content"
         android:layout_marginStart="5dp"
         android:layout_toRightOf="@id/profile_contact">
 
@@ -31,6 +27,9 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginLeft="4dp"
+            android:layout_marginTop="4dp"
             android:gravity="end"
             android:orientation="vertical">
 
@@ -39,8 +38,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:text="user@example.com"
-                android:textColor="@color/default_bubble_color_rcv"
+                android:text="@string/user_example_com"
+                android:textColor="@color/textColor"
                 android:textSize="@dimen/default_message_chat_text_size"
                 tools:text="user@server.com" />
 
diff --git a/app/src/main/res/layout/groupchat_dialog.xml b/app/src/main/res/layout/groupchat_dialog.xml
index d545f9c..0aa564b 100755
--- a/app/src/main/res/layout/groupchat_dialog.xml
+++ b/app/src/main/res/layout/groupchat_dialog.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="280dp"
     android:layout_height="wrap_content"
-    android:background="@color/cardview_light_background"
+    android:background="@color/white"
     android:orientation="vertical">
 
     <com.google.android.material.textfield.TextInputLayout
diff --git a/app/src/main/res/layout/register_dialog.xml b/app/src/main/res/layout/register_dialog.xml
index 848bf23..3d70f3a 100755
--- a/app/src/main/res/layout/register_dialog.xml
+++ b/app/src/main/res/layout/register_dialog.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="280dp"
     android:layout_height="wrap_content"
-    android:background="@color/cardview_light_background"
+    android:background="@color/white"
     android:orientation="vertical">
 
     <ImageView
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_profile.xml b/app/src/main/res/mipmap-anydpi-v26/ic_profile.xml
new file mode 100644
index 0000000..907c66f
--- /dev/null
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_profile.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_profile_background"/>
+    <foreground android:drawable="@mipmap/ic_profile_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_profile_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_profile_round.xml
new file mode 100644
index 0000000..907c66f
--- /dev/null
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_profile_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_profile_background"/>
+    <foreground android:drawable="@mipmap/ic_profile_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_profile.png b/app/src/main/res/mipmap-hdpi/ic_profile.png
new file mode 100644
index 0000000..fb4b111
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_profile.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_profile_foreground.png b/app/src/main/res/mipmap-hdpi/ic_profile_foreground.png
new file mode 100644
index 0000000..3c29730
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_profile_foreground.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_profile_round.png b/app/src/main/res/mipmap-hdpi/ic_profile_round.png
new file mode 100644
index 0000000..1581010
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_profile_round.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_profile.png b/app/src/main/res/mipmap-mdpi/ic_profile.png
new file mode 100644
index 0000000..6eba14f
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_profile.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_profile_foreground.png b/app/src/main/res/mipmap-mdpi/ic_profile_foreground.png
new file mode 100644
index 0000000..8bb3c06
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_profile_foreground.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_profile_round.png b/app/src/main/res/mipmap-mdpi/ic_profile_round.png
new file mode 100644
index 0000000..59ba8d9
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_profile_round.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_profile.png b/app/src/main/res/mipmap-xhdpi/ic_profile.png
new file mode 100644
index 0000000..bf6e8a4
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_profile.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_profile_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_profile_foreground.png
new file mode 100644
index 0000000..4361e3c
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_profile_foreground.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_profile_round.png b/app/src/main/res/mipmap-xhdpi/ic_profile_round.png
new file mode 100644
index 0000000..467fa25
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_profile_round.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_profile.png b/app/src/main/res/mipmap-xxhdpi/ic_profile.png
new file mode 100644
index 0000000..b5af298
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_profile.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_profile_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_profile_foreground.png
new file mode 100644
index 0000000..8f4fb11
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_profile_foreground.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_profile_round.png b/app/src/main/res/mipmap-xxhdpi/ic_profile_round.png
new file mode 100644
index 0000000..96837f3
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_profile_round.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_profile.png b/app/src/main/res/mipmap-xxxhdpi/ic_profile.png
new file mode 100644
index 0000000..f665ba9
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_profile.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_profile_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_profile_foreground.png
new file mode 100644
index 0000000..4a7b5f3
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_profile_foreground.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_profile_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_profile_round.png
new file mode 100644
index 0000000..8a55601
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_profile_round.png differ
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index c4f535d..e660b50 100755
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -12,7 +12,7 @@
     <color name="default_bubble_color_rcv">#f98aff</color>
     <color name="default_bubble_color_send">#c78eff</color>
 
-    <color name="cardview_light_background">#bae2fc</color>
+    <color name="white">#FFFFFF</color>
 
     <color name="riv_border_color">#552a78</color>
     <color name="chat_light_background">#cbcbcb</color>
@@ -23,4 +23,8 @@
     <color name="bottomChatBar">#015850</color>
     <color name="background_light">#FDFDFD</color>
     <color name="background_dark">#FAFAFA</color>
+    <color name="grey">#E5E5E5</color>
+    <color name="textColor">#01579B</color>
+    <color name="floating_button">#B3E5FC</color>
+
 </resources>
diff --git a/app/src/main/res/values/ic_profile_background.xml b/app/src/main/res/values/ic_profile_background.xml
new file mode 100644
index 0000000..0b3e2d4
--- /dev/null
+++ b/app/src/main/res/values/ic_profile_background.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_profile_background">#E4E6E7</color>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8fe3139..347186a 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -55,6 +55,8 @@
     <string name="category_choose_stmt">Select News Categories</string>
     <string name="save">Save</string>
     <string name="cancel">Cancel</string>
+    <string name="hint_user_name">User Name</string>
+    <string name="login">Login</string>
 <!--    <string-array name="languages">-->
 <!--        <item>English</item>-->
 <!--        <item>Hindi</item>-->
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 545b9c6..47c2f9e 100755
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="AppTheme" parent="Theme.MaterialComponents.Light.DarkActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
diff --git a/build.gradle b/build.gradle
index 936b28f..a88c622 100755
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.0'
+        classpath 'com.android.tools.build:gradle:3.6.2'
         
 
         // NOTE: Do not place your application dependencies here; they belong