diff --git a/app/build.gradle b/app/build.gradle
index 78d4add..434d676 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -121,4 +121,6 @@ dependencies {
     implementation 'com.youth.banner:banner:2.0.7'
 
     implementation 'de.hdodenhof:circleimageview:3.1.0'
+    implementation 'com.rengwuxian.materialedittext:library:2.1.4'
+
 }
diff --git a/app/src/main/java/com/community/pocket/ui/login/LoginActivity.java b/app/src/main/java/com/community/pocket/ui/login/LoginActivity.java
index 7af6e26..b17b3c4 100644
--- a/app/src/main/java/com/community/pocket/ui/login/LoginActivity.java
+++ b/app/src/main/java/com/community/pocket/ui/login/LoginActivity.java
@@ -10,6 +10,7 @@ import android.text.TextWatcher;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 
 import androidx.annotation.RequiresApi;
@@ -70,7 +71,7 @@ public class LoginActivity extends BaseActivity {
     private ProgressBar loadingProgressBar;
 
     @ViewInject(R.id.login_layout)
-    private ConstraintLayout layout;
+    private LinearLayout layout;
 
     private MutableLiveData<Boolean> bool = new MutableLiveData<>();
 
diff --git a/app/src/main/java/com/community/pocket/ui/register/RegisterActivity.java b/app/src/main/java/com/community/pocket/ui/register/RegisterActivity.java
index e2f85ec..4b8ad13 100644
--- a/app/src/main/java/com/community/pocket/ui/register/RegisterActivity.java
+++ b/app/src/main/java/com/community/pocket/ui/register/RegisterActivity.java
@@ -6,8 +6,8 @@ import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.View;
-import android.widget.Button;
 import android.widget.EditText;
+import android.widget.TextView;
 
 import androidx.annotation.Nullable;
 import androidx.lifecycle.Observer;
@@ -55,7 +55,7 @@ public class RegisterActivity extends BaseActivity {
 
     //注册按钮
     @ViewInject(R.id.register)
-    private Button registerButton;
+    private TextView registerButton;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -136,7 +136,7 @@ public class RegisterActivity extends BaseActivity {
 
     @Event(value = R.id.back)
     private void back(View v) {
-        startActivity(new Intent(this, LoginActivity.class));
+//        startActivity(new Intent(this, LoginActivity.class));
         finish();
     }
 }
diff --git a/app/src/main/java/com/community/pocket/ui/resetpwd/ResetPwdStep1.java b/app/src/main/java/com/community/pocket/ui/resetpwd/ResetPwdStep1.java
index 5ac29d5..03ce712 100644
--- a/app/src/main/java/com/community/pocket/ui/resetpwd/ResetPwdStep1.java
+++ b/app/src/main/java/com/community/pocket/ui/resetpwd/ResetPwdStep1.java
@@ -9,6 +9,7 @@ import android.text.TextWatcher;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -46,7 +47,7 @@ public class ResetPwdStep1 extends BaseFragment {
     private ResetPwdViewModel resetPwdViewModel;
 
     @ViewInject(R.id.next)
-    private Button resetpwdButton;
+    private TextView resetpwdButton;
 
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
diff --git a/app/src/main/java/com/community/pocket/ui/resetpwd/ResetPwdStep2.java b/app/src/main/java/com/community/pocket/ui/resetpwd/ResetPwdStep2.java
index 7c36e3d..1ecee41 100644
--- a/app/src/main/java/com/community/pocket/ui/resetpwd/ResetPwdStep2.java
+++ b/app/src/main/java/com/community/pocket/ui/resetpwd/ResetPwdStep2.java
@@ -7,6 +7,7 @@ import android.text.TextWatcher;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -45,11 +46,11 @@ public class ResetPwdStep2 extends BaseFragment {
 
     //发送验证码按钮
     @ViewInject(R.id.sendcode)
-    private Button sendCode;
+    private TextView sendCode;
 
     //下一步按钮
     @ViewInject(R.id.next)
-    private Button next;
+    private TextView next;
 
     private ResetPwdViewModel resetPwdViewModel;
 
diff --git a/app/src/main/java/com/community/pocket/ui/resetpwd/ResetPwdStep3.java b/app/src/main/java/com/community/pocket/ui/resetpwd/ResetPwdStep3.java
index ff79e4a..eafa501 100644
--- a/app/src/main/java/com/community/pocket/ui/resetpwd/ResetPwdStep3.java
+++ b/app/src/main/java/com/community/pocket/ui/resetpwd/ResetPwdStep3.java
@@ -8,6 +8,7 @@ import android.text.TextWatcher;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -46,7 +47,7 @@ public class ResetPwdStep3 extends BaseFragment {
 
     //重置密码按钮
     @ViewInject(R.id.reset_pwd)
-    private Button resetpwdButton;
+    private TextView resetpwdButton;
 
     private ResetPwdViewModel resetPwdViewModel;
 
diff --git a/app/src/main/res/drawable/bg_round_main.xml b/app/src/main/res/drawable/bg_round_main.xml
new file mode 100644
index 0000000..bba8856
--- /dev/null
+++ b/app/src/main/res/drawable/bg_round_main.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="30dp"/>
+
+    <solid android:color="@color/colorBlue" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index e595ea5..17c12be 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -11,46 +11,62 @@
         android:id="@+id/titlebar"
         layout="@layout/titlebar_layout"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/login_layout"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:layout_gravity="center_vertical"
-        android:visibility="gone"
+        android:visibility="visible"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/titlebar">
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:id="@+id/imageView"
+            android:layout_width="300dp"
+            android:layout_height="230dp"
+            android:layout_marginTop="60dp"
+            android:src="@mipmap/bg_login"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
-        <EditText
+        <com.rengwuxian.materialedittext.MaterialEditText
             android:id="@+id/username"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-
             android:hint="@string/prompt_user"
-            android:importantForAutofill="no"
             android:inputType="text"
-            android:selectAllOnFocus="true"
-            app:layout_constraintEnd_toStartOf="@id/login_to_resetPwd"
+            android:layout_marginTop="20dp"
+            android:layout_marginStart="44dp"
+            android:layout_marginEnd="44dp"
+            app:met_iconLeft="@mipmap/ic_user"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toBottomOf="@+id/imageView"
+            app:met_floatingLabel="highlight" />
 
-        <EditText
+        <com.rengwuxian.materialedittext.MaterialEditText
             android:id="@+id/password"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-
+            android:layout_marginStart="44dp"
+            android:layout_marginEnd="44dp"
             android:layout_marginTop="8dp"
             android:hint="@string/prompt_password"
             android:imeActionLabel="@string/action_sign_in_short"
-            android:importantForAutofill="no"
             android:inputType="textPassword"
+            app:met_iconLeft="@mipmap/ic_clock"
             android:selectAllOnFocus="true"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="1.0"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/username" />
+            app:layout_constraintTop_toBottomOf="@id/username"
+            app:met_floatingLabel="highlight" />
 
         <ProgressBar
             android:id="@+id/loading"
@@ -62,43 +78,69 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/password" />
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="0dp"
+
+        <LinearLayout
+            android:id="@+id/register"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal"
+            android:layout_marginTop="32dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/loading">
+            app:layout_constraintTop_toBottomOf="@+id/loading">
+
+            <ImageView
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:src="@mipmap/ic_register"
+                app:layout_constraintBottom_toBottomOf="@+id/register"
+                app:layout_constraintEnd_toStartOf="@+id/register"
+                app:layout_constraintTop_toTopOf="@+id/register" />
 
-            <Button
-                android:id="@+id/login"
+            <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/size_50"
-                android:enabled="false"
-                android:text="@string/action_sign_in"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                android:enabled="true"
+                android:paddingTop="4dp"
+                android:paddingBottom="4dp"
+                android:text="@string/action_register" />
+
+            <TextView
+                android:layout_width="1dp"
+                android:layout_height="16dp"
+                android:background="#999999"
+                android:layout_marginStart="8dp"
+                android:layout_marginEnd="8dp" />
 
-            <Button
-                android:id="@+id/register"
+            <TextView
+                android:id="@+id/login_to_resetPwd"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/size_50"
-                android:enabled="true"
-                android:text="@string/action_register"
-                app:layout_constraintBottom_toBottomOf="parent"
+                android:padding="4dp"
+                android:text="@string/action_reset_password"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/password" />
+        </LinearLayout>
 
-        <Button
-            android:id="@+id/login_to_resetPwd"
-            android:layout_width="wrap_content"
+        <TextView
+            android:id="@+id/login"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:text="@string/action_reset_password"
+            android:layout_marginLeft="44dp"
+            android:layout_marginRight="44dp"
+            android:layout_marginTop="20dp"
+            android:background="@drawable/bg_round_main"
+            android:enabled="false"
+            android:gravity="center"
+            android:padding="8dp"
+            android:text="@string/action_sign_in"
+            android:textColor="@android:color/white"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@id/username" />
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/register" />
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_register.xml b/app/src/main/res/layout/activity_register.xml
index 65cf57f..b1d50ec 100644
--- a/app/src/main/res/layout/activity_register.xml
+++ b/app/src/main/res/layout/activity_register.xml
@@ -12,113 +12,150 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/titlebar">
-
-        <EditText
-            android:id="@+id/username"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-
-            android:importantForAutofill="no"
-            android:hint="@string/prompt_user"
-            android:inputType="text"
-            android:selectAllOnFocus="true"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <EditText
-            android:id="@+id/password"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-
-            android:layout_marginTop="8dp"
-            android:importantForAutofill="no"
-            android:hint="@string/prompt_password"
-            android:inputType="text|textPassword"
-            android:selectAllOnFocus="true"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/username" />
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
-        <EditText
-            android:id="@+id/confirmPassword"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <ImageView
+                android:id="@+id/imageView"
+                android:layout_width="300dp"
+                android:layout_height="230dp"
+                android:layout_marginTop="60dp"
+                android:src="@mipmap/bg_login"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
-            android:layout_marginTop="8dp"
-            android:importantForAutofill="no"
-            android:hint="@string/prompt_confirm_password"
-            android:inputType="text|textPassword"
-            android:selectAllOnFocus="true"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/password" />
 
-        <EditText
-            android:id="@+id/phone"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
+            <com.rengwuxian.materialedittext.MaterialEditText
+                android:id="@+id/username"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="44dp"
+                android:layout_marginEnd="44dp"
+                android:hint="@string/prompt_user"
+                android:importantForAutofill="no"
+                android:inputType="text"
+                android:selectAllOnFocus="true"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/imageView"
+                app:met_floatingLabel="highlight"
+                app:met_iconLeft="@mipmap/ic_user" />
 
-            android:layout_marginTop="8dp"
-            android:importantForAutofill="no"
-            android:hint="@string/prompt_phone"
-            android:inputType="text|phone"
-            android:selectAllOnFocus="true"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/confirmPassword" />
+            <com.rengwuxian.materialedittext.MaterialEditText
+                android:id="@+id/password"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="44dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginEnd="44dp"
+                android:hint="@string/prompt_password"
+                android:importantForAutofill="no"
+                android:inputType="text|textPassword"
+                android:selectAllOnFocus="true"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/username"
+                app:met_floatingLabel="highlight"
+                app:met_iconLeft="@mipmap/ic_clock" />
 
-        <EditText
-            android:id="@+id/email"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
+            <com.rengwuxian.materialedittext.MaterialEditText
+                android:id="@+id/confirmPassword"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="44dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginEnd="44dp"
+                android:hint="@string/prompt_confirm_password"
+                android:importantForAutofill="no"
+                android:inputType="text|textPassword"
+                android:selectAllOnFocus="true"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/password"
+                app:met_floatingLabel="highlight"
+                app:met_iconLeft="@mipmap/ic_clock" />
 
-            android:layout_marginTop="8dp"
-            android:importantForAutofill="no"
-            android:hint="@string/prompt_email"
-            android:inputType="none|textEmailAddress"
-            android:selectAllOnFocus="true"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/phone" />
+            <com.rengwuxian.materialedittext.MaterialEditText
+                android:id="@+id/phone"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="44dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginEnd="44dp"
+                android:hint="@string/prompt_phone"
+                android:importantForAutofill="no"
+                android:inputType="text|phone"
+                android:selectAllOnFocus="true"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/confirmPassword"
+                app:met_floatingLabel="highlight"
+                app:met_iconLeft="@mipmap/ic_tel" />
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/email">
+            <com.rengwuxian.materialedittext.MaterialEditText
+                android:id="@+id/email"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="44dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginEnd="44dp"
+                android:hint="@string/prompt_email"
+                android:importantForAutofill="no"
+                android:inputType="none|textEmailAddress"
+                android:selectAllOnFocus="true"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/phone"
+                app:met_floatingLabel="highlight"
+                app:met_iconLeft="@mipmap/ic_email" />
 
-            <Button
+            <TextView
                 android:id="@+id/register"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/size_50"
+                android:layout_marginStart="44dp"
+                android:layout_marginTop="24dp"
+                android:layout_marginEnd="16dp"
+                android:background="@drawable/bg_round_main"
                 android:enabled="false"
+                android:gravity="center"
+                android:padding="8dp"
                 android:text="@string/action_register"
-                app:layout_constraintBottom_toBottomOf="parent"
+                android:textColor="@android:color/white"
+                app:layout_constraintEnd_toStartOf="@+id/guideline"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintTop_toBottomOf="@+id/email" />
 
-            <Button
+            <TextView
                 android:id="@+id/back"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/size_50"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="24dp"
+                android:layout_marginEnd="44dp"
+                android:background="@drawable/bg_round_main"
+                android:gravity="center"
+                android:padding="8dp"
                 android:text="@string/action_back"
-                app:layout_constraintBottom_toBottomOf="parent"
+                android:textColor="@android:color/white"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintHorizontal_bias="1.0"
+                app:layout_constraintStart_toStartOf="@+id/guideline"
+                app:layout_constraintTop_toBottomOf="@+id/email" />
+
+            <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/guideline"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                app:layout_constraintGuide_percent="0.5" />
         </androidx.constraintlayout.widget.ConstraintLayout>
-    </androidx.constraintlayout.widget.ConstraintLayout>
+    </ScrollView>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/resetpwd/layout/step1.xml b/app/src/main/res/layout/resetpwd/layout/step1.xml
index dec276e..09a8164 100644
--- a/app/src/main/res/layout/resetpwd/layout/step1.xml
+++ b/app/src/main/res/layout/resetpwd/layout/step1.xml
@@ -6,60 +6,75 @@
     android:layout_height="match_parent"
     tools:context=".ui.resetpwd.ResetPwdStep1">
 
-    <EditText
+    <com.rengwuxian.materialedittext.MaterialEditText
+        android:layout_marginStart="44dp"
+        android:layout_marginEnd="44dp"
         android:id="@+id/username"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-
         android:importantForAutofill="no"
         android:hint="@string/prompt_user"
         android:inputType="text"
+        app:met_iconLeft="@mipmap/ic_user"
         android:selectAllOnFocus="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <EditText
+    <com.rengwuxian.materialedittext.MaterialEditText
+        android:layout_marginTop="8dp"
+        android:layout_marginStart="44dp"
+        android:layout_marginEnd="44dp"
         android:id="@+id/email"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-
-        android:layout_marginTop="8dp"
         android:importantForAutofill="no"
         android:hint="@string/prompt_email"
+        app:met_iconLeft="@mipmap/ic_email"
         android:inputType="text|textEmailAddress"
         android:selectAllOnFocus="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/username" />
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <TextView
+        android:id="@+id/next"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="24dp"
+        android:layout_marginEnd="44dp"
+        android:background="@drawable/bg_round_main"
+        android:enabled="false"
+        android:gravity="center"
+        android:padding="8dp"
+        android:text="@string/next"
+        android:textColor="@android:color/white"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/email">
+        app:layout_constraintStart_toStartOf="@+id/guideline2"
+        app:layout_constraintTop_toBottomOf="@+id/email" />
 
-        <Button
-            android:id="@+id/next"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/size_50"
-            android:enabled="false"
-            android:text="@string/next"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+    <TextView
+        android:id="@+id/back"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="44dp"
+        android:layout_marginTop="24dp"
+        android:layout_marginEnd="16dp"
+        android:background="@drawable/bg_round_main"
+        android:enabled="false"
+        android:gravity="center"
+        android:padding="8dp"
+        android:text="@string/action_back"
+        android:textColor="@android:color/white"
+        app:layout_constraintEnd_toStartOf="@+id/guideline2"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/email" />
 
-        <Button
-            android:id="@+id/back"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/size_50"
-            android:text="@string/action_back"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="0.5" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/resetpwd/layout/step2.xml b/app/src/main/res/layout/resetpwd/layout/step2.xml
index 6f8c3a3..28a6f2e 100644
--- a/app/src/main/res/layout/resetpwd/layout/step2.xml
+++ b/app/src/main/res/layout/resetpwd/layout/step2.xml
@@ -6,13 +6,15 @@
     android:layout_height="match_parent"
     tools:context=".ui.resetpwd.ResetPwdStep2">
 
-    <EditText
+    <com.rengwuxian.materialedittext.MaterialEditText
+        android:layout_marginStart="44dp"
+        android:layout_marginEnd="44dp"
         android:id="@+id/username"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-
         android:enabled="false"
         android:hint="@string/prompt_user"
+        app:met_iconLeft="@mipmap/ic_user"
         android:selectAllOnFocus="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -20,14 +22,16 @@
         tools:ignore="TextFields"
         android:importantForAutofill="no" />
 
-    <EditText
+    <com.rengwuxian.materialedittext.MaterialEditText
+        android:layout_marginStart="44dp"
+        android:layout_marginEnd="44dp"
         android:id="@+id/email"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
-
         android:enabled="false"
         android:hint="@string/prompt_email"
+        app:met_iconLeft="@mipmap/ic_email"
         android:selectAllOnFocus="true"
         app:layout_constraintEnd_toStartOf="@id/sendcode"
         app:layout_constraintStart_toStartOf="parent"
@@ -35,11 +39,14 @@
         tools:ignore="TextFields"
         android:importantForAutofill="no" />
 
-    <EditText
+    <com.rengwuxian.materialedittext.MaterialEditText
+        android:layout_marginStart="44dp"
+        android:layout_marginEnd="44dp"
         android:id="@+id/code"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
+        app:met_iconLeft="@mipmap/ic_clock"
         android:ems="10"
         android:enabled="false"
         android:hint="@string/prompt_code"
@@ -48,42 +55,59 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/email" />
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+
+    <TextView
+        android:id="@+id/next"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="24dp"
+        android:layout_marginEnd="44dp"
+        android:background="@drawable/bg_round_main"
+        android:enabled="false"
+        android:gravity="center"
+        android:padding="8dp"
+        android:text="@string/next"
+        android:textColor="@android:color/white"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/code">
+        app:layout_constraintStart_toStartOf="@+id/guideline2"
+        app:layout_constraintTop_toBottomOf="@+id/email" />
 
-        <Button
-            android:id="@+id/next"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/size_50"
-            android:enabled="false"
-            android:text="@string/next"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+    <TextView
+        android:id="@+id/back"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="44dp"
+        android:layout_marginTop="24dp"
+        android:layout_marginEnd="16dp"
+        android:background="@drawable/bg_round_main"
+        android:enabled="false"
+        android:gravity="center"
+        android:padding="8dp"
+        android:text="@string/action_back"
+        android:textColor="@android:color/white"
+        app:layout_constraintEnd_toStartOf="@+id/guideline2"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/email" />
 
-        <Button
-            android:id="@+id/back"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/size_50"
-            android:text="@string/previous"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="0.5" />
 
-    <Button
+    <TextView
         android:id="@+id/sendcode"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
+        android:background="@drawable/bg_round_main"
+        android:enabled="false"
+        android:gravity="center"
+        android:padding="8dp"
         android:text="@string/action_sendcode"
+        android:textColor="@android:color/white"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@id/username" />
 
diff --git a/app/src/main/res/layout/resetpwd/layout/step3.xml b/app/src/main/res/layout/resetpwd/layout/step3.xml
index f97c656..70ede6e 100644
--- a/app/src/main/res/layout/resetpwd/layout/step3.xml
+++ b/app/src/main/res/layout/resetpwd/layout/step3.xml
@@ -4,26 +4,30 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <EditText
+    <com.rengwuxian.materialedittext.MaterialEditText
+        android:layout_marginStart="44dp"
+        android:layout_marginEnd="44dp"
         android:id="@+id/password"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-
         android:importantForAutofill="no"
         android:hint="@string/prompt_password"
         android:inputType="text|textPassword"
+        app:met_iconLeft="@mipmap/ic_clock"
         android:selectAllOnFocus="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <EditText
+    <com.rengwuxian.materialedittext.MaterialEditText
+        android:layout_marginStart="44dp"
+        android:layout_marginEnd="44dp"
         android:id="@+id/confirmPwd"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
-
         android:importantForAutofill="no"
+        app:met_iconLeft="@mipmap/ic_clock"
         android:hint="@string/prompt_confirm_password"
         android:inputType="text|textPassword"
         android:selectAllOnFocus="true"
@@ -31,33 +35,44 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/password" />
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <TextView
+        android:id="@+id/reset_pwd"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="24dp"
+        android:layout_marginEnd="44dp"
+        android:background="@drawable/bg_round_main"
+        android:enabled="false"
+        android:gravity="center"
+        android:padding="8dp"
+        android:text="@string/action_reset_password"
+        android:textColor="@android:color/white"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/confirmPwd">
+        app:layout_constraintStart_toStartOf="@+id/guideline2"
+        app:layout_constraintTop_toBottomOf="@+id/confirmPwd" />
 
-        <Button
-            android:id="@+id/back"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/size_50"
-            android:text="@string/action_back"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+    <TextView
+        android:id="@+id/back"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="44dp"
+        android:layout_marginTop="24dp"
+        android:layout_marginEnd="16dp"
+        android:background="@drawable/bg_round_main"
+        android:enabled="false"
+        android:gravity="center"
+        android:padding="8dp"
+        android:text="@string/action_back"
+        android:textColor="@android:color/white"
+        app:layout_constraintEnd_toStartOf="@+id/guideline2"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/confirmPwd" />
 
-        <Button
-            android:id="@+id/reset_pwd"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/size_50"
-            android:enabled="false"
-            android:text="@string/action_reset_password"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="0.5" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-mdpi/bg_login.png b/app/src/main/res/mipmap-mdpi/bg_login.png
new file mode 100644
index 0000000..111dc8a
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/bg_login.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_clock.png b/app/src/main/res/mipmap-mdpi/ic_clock.png
new file mode 100644
index 0000000..330a004
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_clock.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_email.png b/app/src/main/res/mipmap-mdpi/ic_email.png
new file mode 100644
index 0000000..be74263
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_email.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_register.png b/app/src/main/res/mipmap-mdpi/ic_register.png
new file mode 100644
index 0000000..8648706
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_register.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_tel.png b/app/src/main/res/mipmap-mdpi/ic_tel.png
new file mode 100644
index 0000000..3794656
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_tel.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_user.png b/app/src/main/res/mipmap-mdpi/ic_user.png
new file mode 100644
index 0000000..25b2c02
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_user.png differ