diff --git a/mifospay/src/main/res/drawable/button_round_black.xml b/mifospay/src/main/res/drawable/button_round_black.xml
index 73f5a6d9f..92536fe5a 100644
--- a/mifospay/src/main/res/drawable/button_round_black.xml
+++ b/mifospay/src/main/res/drawable/button_round_black.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <solid android:color="@color/primaryDarkBlue"/>
+    <solid android:color="@color/black"/>
 
     <corners
         android:bottomLeftRadius="20dp"
diff --git a/mifospay/src/main/res/layout/activity_login.xml b/mifospay/src/main/res/layout/activity_login.xml
index db5e8ea5d..dc9108824 100644
--- a/mifospay/src/main/res/layout/activity_login.xml
+++ b/mifospay/src/main/res/layout/activity_login.xml
@@ -7,65 +7,100 @@
     android:background="@color/colorPrimary"
     android:padding="@dimen/paddingLayout">
 
-    <ImageView
-        android:id="@+id/image_logo"
-        android:layout_width="wrap_content"
-        android:layout_height="@dimen/value_150dp"
-        android:layout_marginBottom="@dimen/value_50dp"
-        app:layout_constraintBottom_toTopOf="@+id/textInputLayout2"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.774"
-        app:srcCompat="@drawable/ic_logo_outline" />
-
-    <android.support.design.widget.TextInputLayout
-        android:id="@+id/textInputLayout2"
-        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/marginItemsInSectionLarge"
-        app:layout_constraintBottom_toTopOf="@+id/textInputLayout"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent">
+        android:orientation="vertical"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        >
 
-        <android.support.design.widget.TextInputEditText
-            android:id="@+id/et_username"
+        <TextView
+            android:id="@+id/tv_loginLabel"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:hint="@string/username"
-            android:inputType="textEmailAddress" />
-    </android.support.design.widget.TextInputLayout>
+            android:fontFamily="@font/roboto_medium"
+            android:text="@string/login"
+            android:textColor="@color/black"
+            android:textSize="@dimen/value_24sp"
+            android:layout_marginBottom="@dimen/marginItemsInSectionSmall"
+            app:layout_constraintBottom_toTopOf="@+id/tv_welcomeBackLabel"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            />
+
+        <TextView
+            android:id="@+id/tv_welcomeBackLabel"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="@font/roboto"
+            android:text="@string/glad_to_see_you_again"
+            android:textColor="@color/colorBlack50"
+            android:textSize="@dimen/value_18sp"
+            android:layout_marginBottom="@dimen/marginItemsInSectionLarge"
+            app:layout_constraintBottom_toTopOf="@+id/textInputLayout2"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            />
 
-    <android.support.design.widget.TextInputLayout
-        android:id="@+id/textInputLayout"
-        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/marginBetweenSections"
-        app:layout_constraintBottom_toTopOf="@+id/btn_login"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:passwordToggleEnabled="true">
 
-        <android.support.design.widget.TextInputEditText
-            android:id="@+id/et_password"
+
+        <android.support.design.widget.TextInputLayout
+            android:id="@+id/textInputLayout2"
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:hint="@string/password"
-            android:inputType="textPassword" />
-    </android.support.design.widget.TextInputLayout>
+            android:layout_marginBottom="@dimen/marginItemsInSectionLarge"
+            app:layout_constraintBottom_toTopOf="@+id/textInputLayout"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            >
 
-    <Button
-        android:id="@+id/btn_login"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/marginBetweenSections"
-        android:background="@drawable/button_round_black"
-        android:text="@string/login"
-        app:layout_constraintBottom_toTopOf="@+id/ll_signup"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+            <android.support.design.widget.TextInputEditText
+                android:id="@+id/et_username"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:fontFamily="@font/roboto"
+                android:hint="@string/username"
+                android:inputType="textEmailAddress" />
+        </android.support.design.widget.TextInputLayout>
+
+        <android.support.design.widget.TextInputLayout
+            android:id="@+id/textInputLayout"
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/marginItemsInSectionLarge"
+            app:layout_constraintBottom_toTopOf="@+id/btn_login"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:passwordToggleEnabled="true">
+
+            <android.support.design.widget.TextInputEditText
+                android:id="@+id/et_password"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:fontFamily="@font/roboto"
+                android:hint="@string/password"
+                android:inputType="textPassword" />
+        </android.support.design.widget.TextInputLayout>
+
+        <Button
+            android:id="@+id/btn_login"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingVertical="@dimen/value_12dp"
+            android:layout_marginBottom="@dimen/marginBetweenSections"
+            app:backgroundTint="@color/black"
+            android:background="@drawable/button_round_black"
+            android:text="@string/login"
+            android:textColor="@color/white"
+            android:textSize="@dimen/value_16sp"
+            android:fontFamily="@font/roboto_medium"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
+
+    </LinearLayout>
 
     <LinearLayout
         android:id="@+id/ll_signup"
@@ -86,15 +121,17 @@
             android:layout_marginLeft="0dp"
             android:layout_marginEnd="@dimen/marginBetweenWords"
             android:layout_marginRight="@dimen/marginBetweenWords"
+            android:fontFamily="@font/roboto"
             android:text="@string/don_t_have_an_account"
-            android:textColor="@color/colorTextSecondary" />
+            android:textColor="@color/black" />
 
         <TextView
             android:id="@+id/tv_create_account"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:fontFamily="@font/roboto_medium"
             android:text="@string/create_one"
-            android:textColor="@color/colorAccent" />
+            android:textColor="@color/black" />
 
     </LinearLayout>
 
diff --git a/mifospay/src/main/res/values/strings.xml b/mifospay/src/main/res/values/strings.xml
index e1eca4074..2f297c59b 100644
--- a/mifospay/src/main/res/values/strings.xml
+++ b/mifospay/src/main/res/values/strings.xml
@@ -37,6 +37,7 @@
     <string name="profile">Profile</string>
     <string name="mifos_pay">Mifos Pay</string>
     <string name="login">Login</string>
+    <string name="glad_to_see_you_again">Glad to see you again!</string>
     <string name="enter_name_or_vpa">Enter name or vpa</string>
     <string name="balance_hint">Total balance</string>
     <string name="show_more">Show more</string>
@@ -68,7 +69,7 @@
     <string name="unique_payment_link">Unique Payment Link</string>
     <string name="view_receipt">View Receipt</string>
     <string name="don_t_have_an_account">Don\'t have an account?</string>
-    <string name="create_one">Create one</string>
+    <string name="create_one"><u>Create one</u></string>
     <string name="enter_mobile_number_description">It should be currently activated on your device
         and linked with your bank account as well.
     </string>