diff --git a/app/build.gradle b/app/build.gradle
index bd05672..6dc66de 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -19,7 +19,7 @@ android {
         minSdk 26
         targetSdk 30
         versionCode 1
-        versionName "0.2.1"
+        versionName "0.4.0"
 
         configurations.all {
             resolutionStrategy {
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index 581f929..17e7410 100644
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -12,7 +12,7 @@
       "filters": [],
       "attributes": [],
       "versionCode": 1,
-      "versionName": "0.2.1",
+      "versionName": "0.4.0",
       "outputFile": "app-release.apk"
     }
   ],
diff --git a/app/src/main/assets/font/bebas.ttf b/app/src/main/assets/font/bebas.ttf
deleted file mode 100644
index ead2c4d..0000000
Binary files a/app/src/main/assets/font/bebas.ttf and /dev/null differ
diff --git a/app/src/main/assets/font/koho.ttf b/app/src/main/assets/font/koho.ttf
new file mode 100644
index 0000000..78e04aa
Binary files /dev/null and b/app/src/main/assets/font/koho.ttf differ
diff --git a/app/src/main/assets/font/koho_bold.ttf b/app/src/main/assets/font/koho_bold.ttf
new file mode 100644
index 0000000..a0123f5
Binary files /dev/null and b/app/src/main/assets/font/koho_bold.ttf differ
diff --git a/app/src/main/assets/font/opensans.ttf b/app/src/main/assets/font/opensans.ttf
deleted file mode 100644
index ba6db9b..0000000
Binary files a/app/src/main/assets/font/opensans.ttf and /dev/null differ
diff --git a/app/src/main/java/com/capstone/foodify/shipper/Activity/AccountAndProfileActivity.java b/app/src/main/java/com/capstone/foodify/shipper/Activity/AccountAndProfileActivity.java
index 0fe1660..fe0a7d1 100644
--- a/app/src/main/java/com/capstone/foodify/shipper/Activity/AccountAndProfileActivity.java
+++ b/app/src/main/java/com/capstone/foodify/shipper/Activity/AccountAndProfileActivity.java
@@ -32,7 +32,6 @@ import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.android.gms.tasks.Task;
 import com.google.android.material.textfield.TextInputLayout;
 import com.google.firebase.auth.FirebaseAuth;
-import com.google.firebase.auth.FirebaseUser;
 import com.google.firebase.storage.FirebaseStorage;
 import com.google.firebase.storage.OnProgressListener;
 import com.google.firebase.storage.StorageReference;
@@ -244,12 +243,12 @@ public class AccountAndProfileActivity extends AppCompatActivity {
         progressLayout = findViewById(R.id.progress_layout);
     }
     private void setFontUI() {
-        textInput_email.setTypeface(Common.setFontBebas(getAssets()));
-        textInput_phone.setTypeface(Common.setFontBebas(getAssets()));
-        textInput_fullName.setTypeface(Common.setFontBebas(getAssets()));
-        textInput_birthDay.setTypeface(Common.setFontBebas(getAssets()));
+        textInput_email.setTypeface(Common.setFontKoho(getAssets()));
+        textInput_phone.setTypeface(Common.setFontKoho(getAssets()));
+        textInput_fullName.setTypeface(Common.setFontKoho(getAssets()));
+        textInput_birthDay.setTypeface(Common.setFontKoho(getAssets()));
 
-        edt_birthday.setTypeface(Common.setFontBebas(getAssets()));
+        edt_birthday.setTypeface(Common.setFontKoho(getAssets()));
     }
     private void chooseDateOfBirth() {
         //Get date, month, year from user
diff --git a/app/src/main/java/com/capstone/foodify/shipper/Activity/ChangePasswordActivity.java b/app/src/main/java/com/capstone/foodify/shipper/Activity/ChangePasswordActivity.java
index c1c258b..dd7151d 100644
--- a/app/src/main/java/com/capstone/foodify/shipper/Activity/ChangePasswordActivity.java
+++ b/app/src/main/java/com/capstone/foodify/shipper/Activity/ChangePasswordActivity.java
@@ -195,8 +195,8 @@ public class ChangePasswordActivity extends AppCompatActivity {
     }
 
     private void setFontUI() {
-        textInput_password.setTypeface(Common.setFontBebas(getAssets()));
-        textInput_old_password.setTypeface(Common.setFontBebas(getAssets()));
-        textInput_password_confirm.setTypeface(Common.setFontBebas(getAssets()));
+        textInput_password.setTypeface(Common.setFontKoho(getAssets()));
+        textInput_old_password.setTypeface(Common.setFontKoho(getAssets()));
+        textInput_password_confirm.setTypeface(Common.setFontKoho(getAssets()));
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/capstone/foodify/shipper/Activity/ForgotPasswordActivity.java b/app/src/main/java/com/capstone/foodify/shipper/Activity/ForgotPasswordActivity.java
index 70e33c8..5f428a0 100644
--- a/app/src/main/java/com/capstone/foodify/shipper/Activity/ForgotPasswordActivity.java
+++ b/app/src/main/java/com/capstone/foodify/shipper/Activity/ForgotPasswordActivity.java
@@ -121,7 +121,7 @@ public class ForgotPasswordActivity extends AppCompatActivity {
     }
     private void setFontUI() {
 
-        textInput_email.setTypeface(Common.setFontBebas(getAssets()));
+        textInput_email.setTypeface(Common.setFontKoho(getAssets()));
     }
 
     private void initComponent() {
diff --git a/app/src/main/java/com/capstone/foodify/shipper/Activity/OrderDetailActivity.java b/app/src/main/java/com/capstone/foodify/shipper/Activity/OrderDetailActivity.java
index 1af1e2a..6efd16c 100644
--- a/app/src/main/java/com/capstone/foodify/shipper/Activity/OrderDetailActivity.java
+++ b/app/src/main/java/com/capstone/foodify/shipper/Activity/OrderDetailActivity.java
@@ -557,4 +557,14 @@ public class OrderDetailActivity extends AppCompatActivity {
         Common.CURRENT_ORDER = null;
         Common.FCM_TOKEN_CUSTOMER = null;
     }
+
+    @Override
+    public void onBackPressed() {
+        super.onBackPressed();
+
+        stopLocationService();
+        startActivity(new Intent(OrderDetailActivity.this, MainActivity.class));
+        finish();
+        overridePendingTransition(0,0);
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/capstone/foodify/shipper/Activity/SignInActivity.java b/app/src/main/java/com/capstone/foodify/shipper/Activity/SignInActivity.java
index 2fc33ca..8e9da24 100644
--- a/app/src/main/java/com/capstone/foodify/shipper/Activity/SignInActivity.java
+++ b/app/src/main/java/com/capstone/foodify/shipper/Activity/SignInActivity.java
@@ -165,6 +165,7 @@ public class SignInActivity extends AppCompatActivity {
                             // Sign in success, update UI with the signed-in user's information
                             FirebaseUser user = mAuth.getCurrentUser();
 
+                            assert user != null;
                             getInformationAndSignInUser(user);
                         } else {
                             // If sign in fails, display a message to the user.
@@ -204,6 +205,7 @@ public class SignInActivity extends AppCompatActivity {
 
                                                     //Get shipper id
                                                     getShipperId(userData.getId());
+
                                                 } else {
                                                     Toast.makeText(SignInActivity.this, "Tài khoản không hợp lệ! Vui lòng kiểm tra lại!", Toast.LENGTH_SHORT).show();
                                                     FirebaseAuth.getInstance().signOut();
@@ -254,8 +256,8 @@ public class SignInActivity extends AppCompatActivity {
     }
 
     private void setFontUI() {
-        textInput_email.setTypeface(Common.setFontBebas(getAssets()));
-        textInput_password.setTypeface(Common.setFontBebas(getAssets()));
+        textInput_email.setTypeface(Common.setFontKoho(getAssets()));
+        textInput_password.setTypeface(Common.setFontKoho(getAssets()));
     }
 
     private boolean validData(){
diff --git a/app/src/main/java/com/capstone/foodify/shipper/Common.java b/app/src/main/java/com/capstone/foodify/shipper/Common.java
index 7372fb9..0499e04 100644
--- a/app/src/main/java/com/capstone/foodify/shipper/Common.java
+++ b/app/src/main/java/com/capstone/foodify/shipper/Common.java
@@ -18,8 +18,6 @@ import com.thecode.aestheticdialogs.DialogType;
 import com.thecode.aestheticdialogs.OnDialogClickListener;
 
 import java.text.NumberFormat;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Locale;
 
 public class Common {
@@ -45,13 +43,10 @@ public class Common {
     public static final int LOCATION_SERVICE_ID = 175;
     public static final String ACTION_START_LOCATION_SERVICE = "startLocationService";
     public static final String ACTION_STOP_LOCATION_SERVICE = "stopLocationService";
-    public static Typeface setFontBebas(AssetManager assetManager){
-        return Typeface.createFromAsset(assetManager, "font/bebas.ttf");
+    public static Typeface setFontKoho(AssetManager assetManager){
+        return Typeface.createFromAsset(assetManager, "font/koho.ttf");
     }
 
-    public static Typeface setFontOpenSans(AssetManager assetManager){
-        return Typeface.createFromAsset(assetManager, "font/opensans.ttf");
-    }
 
     public static void showErrorDialog(Activity activity, String message){
         new AestheticDialog.Builder(activity, DialogStyle.RAINBOW, DialogType.ERROR)
diff --git a/app/src/main/java/com/capstone/foodify/shipper/Fragment/Order/CancelOrder.java b/app/src/main/java/com/capstone/foodify/shipper/Fragment/Order/CancelOrder.java
index 3178072..573dd63 100644
--- a/app/src/main/java/com/capstone/foodify/shipper/Fragment/Order/CancelOrder.java
+++ b/app/src/main/java/com/capstone/foodify/shipper/Fragment/Order/CancelOrder.java
@@ -101,7 +101,7 @@ public class CancelOrder extends Fragment {
 
     private void getListOrder(){
         if(Common.CURRENT_SHIPPER != null){
-            FoodApiToken.apiService.getListOrder(Common.CURRENT_SHIPPER.getId(), "SHIPPING", CURRENT_PAGE++, PAGE_SIZE, SORT_BY, SORT_DIR).enqueue(new Callback<Orders>() {
+            FoodApiToken.apiService.getListOrder(Common.CURRENT_SHIPPER.getId(), "REJECT_DELIVERY", CURRENT_PAGE++, PAGE_SIZE, SORT_BY, SORT_DIR).enqueue(new Callback<Orders>() {
                 @Override
                 public void onResponse(Call<Orders> call, Response<Orders> response) {
                     if(response.code() == 200){
diff --git a/app/src/main/java/com/capstone/foodify/shipper/Fragment/OrderFragment.java b/app/src/main/java/com/capstone/foodify/shipper/Fragment/OrderFragment.java
index 258b524..2da4b67 100644
--- a/app/src/main/java/com/capstone/foodify/shipper/Fragment/OrderFragment.java
+++ b/app/src/main/java/com/capstone/foodify/shipper/Fragment/OrderFragment.java
@@ -190,7 +190,7 @@ public class OrderFragment extends Fragment {
     private void setNameUser(){
         String[] namePart = Common.CURRENT_USER.getFullName().split(" ");
 
-        welcome_text.setText("Xin chào, " + namePart[namePart.length - 1]);
+        welcome_text.setText("Xin chào, " + namePart[namePart.length - 1] + "!");
 
     }
 
diff --git a/app/src/main/res/font/bebas.ttf b/app/src/main/res/font/bebas.ttf
deleted file mode 100644
index ead2c4d..0000000
Binary files a/app/src/main/res/font/bebas.ttf and /dev/null differ
diff --git a/app/src/main/res/font/koho.ttf b/app/src/main/res/font/koho.ttf
new file mode 100644
index 0000000..78e04aa
Binary files /dev/null and b/app/src/main/res/font/koho.ttf differ
diff --git a/app/src/main/res/font/koho_bold.ttf b/app/src/main/res/font/koho_bold.ttf
new file mode 100644
index 0000000..a0123f5
Binary files /dev/null and b/app/src/main/res/font/koho_bold.ttf differ
diff --git a/app/src/main/res/font/opensans.ttf b/app/src/main/res/font/opensans.ttf
deleted file mode 100644
index ba6db9b..0000000
Binary files a/app/src/main/res/font/opensans.ttf and /dev/null differ
diff --git a/app/src/main/res/layout/activity_account_and_profile.xml b/app/src/main/res/layout/activity_account_and_profile.xml
index a7f4734..3d47bfb 100644
--- a/app/src/main/res/layout/activity_account_and_profile.xml
+++ b/app/src/main/res/layout/activity_account_and_profile.xml
@@ -23,14 +23,14 @@
 
         <TextView
             android:id="@+id/textView"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
             android:layout_marginTop="35dp"
-            android:fontFamily="@font/bebas"
+            android:fontFamily="@font/koho"
             android:text="THAY ĐỔI THÔNG TIN"
             android:textColor="@color/black"
-            android:textSize="40sp"
+            android:textSize="30sp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/back_image" />
 
@@ -50,8 +50,9 @@
         <Button
             android:id="@+id/change_image_button"
             android:text="Đổi ảnh"
+            android:textSize="13sp"
             android:textColor="@color/white"
-            android:fontFamily="@font/bebas"
+            android:fontFamily="@font/koho"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
@@ -76,6 +77,7 @@
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/edt_email"
+                android:fontFamily="@font/koho"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:inputType="textEmailAddress"
@@ -100,6 +102,7 @@
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/edt_phone"
+                android:fontFamily="@font/koho"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:inputType="phone"
@@ -124,6 +127,7 @@
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/edt_fullName"
+                android:fontFamily="@font/koho"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:inputType="text"
@@ -148,6 +152,7 @@
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/edt_birthDay"
+                android:fontFamily="@font/koho"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:clickable="false"
@@ -162,9 +167,9 @@
         <com.google.android.material.button.MaterialButton
             android:id="@+id/updated_button"
             style="@style/DefaultSolid"
-            android:fontFamily="@font/bebas"
+            android:fontFamily="@font/koho"
             android:text="Cập nhật"
-            android:textSize="20sp"
+            android:textSize="17sp"
             android:padding="10dp"
             android:layout_marginStart="40dp"
             android:layout_marginEnd="40dp"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 1f08bc4..8f95732 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -25,14 +25,14 @@
 
         <TextView
             android:id="@+id/textView"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
             android:layout_marginTop="40dp"
-            android:fontFamily="@font/bebas"
+            android:fontFamily="@font/koho"
             android:text="Thay đổi mật khẩu"
             android:textColor="@color/black"
-            android:textSize="40sp"
+            android:textSize="35sp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/back_image" />
 
@@ -123,9 +123,9 @@
         <com.google.android.material.button.MaterialButton
             android:id="@+id/change_password_button"
             style="@style/DefaultSolid"
-            android:fontFamily="@font/bebas"
+            android:fontFamily="@font/koho"
             android:text="Thay đổi mật khẩu"
-            android:textSize="20sp"
+            android:textSize="15sp"
             android:padding="10dp"
             android:layout_marginTop="80dp"
             android:layout_marginStart="40dp"
diff --git a/app/src/main/res/layout/activity_forgot_password.xml b/app/src/main/res/layout/activity_forgot_password.xml
index efed212..f20f29e 100644
--- a/app/src/main/res/layout/activity_forgot_password.xml
+++ b/app/src/main/res/layout/activity_forgot_password.xml
@@ -25,14 +25,14 @@
 
         <TextView
             android:id="@+id/textView"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
             android:layout_marginTop="90dp"
-            android:fontFamily="@font/bebas"
+            android:fontFamily="@font/koho"
             android:text="Quên mật khẩu?"
             android:textColor="@color/black"
-            android:textSize="50sp"
+            android:textSize="40sp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/back_image" />
 
@@ -41,9 +41,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="Vui lòng nhập địa chỉ email vào ô dưới đây để tiến hành đặt lại mật khẩu của bạn."
-            android:fontFamily="@font/opensans"
+            android:fontFamily="@font/koho"
             android:textColor="@color/gray"
-            android:textStyle="bold"
             android:layout_marginStart="20dp"
             android:layout_marginEnd="20dp"
             android:layout_marginTop="25dp"
@@ -72,6 +71,7 @@
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/edt_email"
+                android:fontFamily="@font/koho"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:inputType="textEmailAddress" />
@@ -83,7 +83,7 @@
             style="@style/DefaultSolid"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:fontFamily="@font/bebas"
+            android:fontFamily="@font/koho"
             android:padding="10dp"
             android:layout_marginStart="40dp"
             android:layout_marginEnd="40dp"
diff --git a/app/src/main/res/layout/activity_order_detail.xml b/app/src/main/res/layout/activity_order_detail.xml
index ed510bf..3e8857c 100644
--- a/app/src/main/res/layout/activity_order_detail.xml
+++ b/app/src/main/res/layout/activity_order_detail.xml
@@ -33,7 +33,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="10dp"
                 android:layout_marginTop="35dp"
-                android:fontFamily="@font/bebas"
+                android:fontFamily="@font/koho_bold"
                 android:text="Chi tiết đơn"
                 android:textColor="@color/black"
                 android:textSize="30sp"
@@ -67,7 +67,7 @@
                 android:text="Thông tin người nhận"
                 android:layout_marginTop="10dp"
                 android:layout_marginStart="10dp"
-                android:fontFamily="@font/bebas"
+                android:fontFamily="@font/koho_bold"
                 android:textColor="@color/black"
                 android:textSize="22sp"
                 android:layout_width="wrap_content"
@@ -91,9 +91,8 @@
                 >
                 <TextView
                     android:text="Tên:"
-                    android:fontFamily="@font/opensans"
+                    android:fontFamily="@font/koho"
                     android:textColor="@color/black"
-                    android:textStyle="bold"
                     android:layout_marginEnd="5dp"
                     android:textSize="15sp"
                     android:layout_width="wrap_content"
@@ -102,8 +101,7 @@
 
                 <TextView
                     android:text="Nguyễn Văn A"
-                    android:fontFamily="@font/opensans"
-                    android:textStyle="bold"
+                    android:fontFamily="@font/koho"
                     android:textColor="@color/black"
                     android:textSize="15sp"
                     android:layout_width="wrap_content"
@@ -127,9 +125,8 @@
                 >
                 <TextView
                     android:text="Số điện thoại: "
-                    android:fontFamily="@font/opensans"
+                    android:fontFamily="@font/koho"
                     android:textColor="@color/black"
-                    android:textStyle="bold"
                     android:layout_marginEnd="5dp"
                     android:textSize="15sp"
                     android:layout_width="wrap_content"
@@ -138,8 +135,7 @@
 
                 <TextView
                     android:text="0987654321"
-                    android:fontFamily="@font/opensans"
-                    android:textStyle="bold"
+                    android:fontFamily="@font/koho"
                     android:textColor="@color/black"
                     android:textSize="15sp"
                     android:layout_width="wrap_content"
@@ -160,8 +156,7 @@
                 <TextView
                     android:id="@+id/textView3"
                     android:text="Địa chỉ nhận hàng:"
-                    android:fontFamily="@font/opensans"
-                    android:textStyle="bold"
+                    android:fontFamily="@font/koho"
                     android:layout_marginTop="5dp"
                     android:layout_marginStart="10dp"
                     android:textColor="@color/black"
@@ -175,8 +170,7 @@
                 <TextView
                     android:id="@+id/txt_address"
                     android:text="Hẻm 215, đường Phạm Như Xương, phường Hoà Khánh Nam, quận Liên Chiểu!"
-                    android:fontFamily="@font/opensans"
-                    android:textStyle="bold"
+                    android:fontFamily="@font/koho"
                     android:layout_marginTop="5dp"
                     android:layout_marginStart="10dp"
                     android:textColor="@color/black"
@@ -202,8 +196,7 @@
                 <TextView
                     android:id="@+id/textView5"
                     android:text="Thời gian đặt:"
-                    android:fontFamily="@font/opensans"
-                    android:textStyle="bold"
+                    android:fontFamily="@font/koho"
                     android:layout_marginTop="5dp"
                     android:layout_marginStart="10dp"
                     android:textColor="@color/black"
@@ -217,8 +210,7 @@
                 <TextView
                     android:id="@+id/txt_order_time"
                     android:text="2023-05-23"
-                    android:fontFamily="@font/opensans"
-                    android:textStyle="bold"
+                    android:fontFamily="@font/koho"
                     android:layout_marginTop="5dp"
                     android:layout_marginStart="10dp"
                     android:textColor="@color/black"
@@ -244,8 +236,7 @@
                 <TextView
                     android:id="@+id/textView4"
                     android:text="Khoảng cách (tính từ vị trí của bạn):"
-                    android:fontFamily="@font/opensans"
-                    android:textStyle="bold"
+                    android:fontFamily="@font/koho"
                     android:layout_marginTop="5dp"
                     android:layout_marginStart="10dp"
                     android:textColor="@color/black"
@@ -259,8 +250,7 @@
                 <TextView
                     android:id="@+id/txt_distance"
                     android:text="- km"
-                    android:fontFamily="@font/opensans"
-                    android:textStyle="bold"
+                    android:fontFamily="@font/koho"
                     android:layout_marginTop="5dp"
                     android:layout_marginStart="10dp"
                     android:textColor="@color/black"
@@ -286,9 +276,8 @@
 
                 <TextView
                     android:text="Trạng thái đơn hàng: "
-                    android:fontFamily="@font/opensans"
+                    android:fontFamily="@font/koho"
                     android:textColor="@color/black"
-                    android:textStyle="bold"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
@@ -297,10 +286,9 @@
                 <TextView
                     android:text="-"
                     android:layout_marginStart="5dp"
-                    android:fontFamily="@font/opensans"
+                    android:fontFamily="@font/koho_bold"
                     android:textColor="@color/primaryColor"
                     android:textAllCaps="true"
-                    android:textStyle="bold"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
@@ -325,11 +313,10 @@
                 >
                 <TextView
                     android:text="Tổng tiền cần thu: "
-                    android:fontFamily="@font/opensans"
+                    android:fontFamily="@font/koho_bold"
                     android:textColor="@color/primaryColor"
-                    android:textStyle="bold"
                     android:layout_marginEnd="5dp"
-                    android:textSize="23sp"
+                    android:textSize="20sp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     />
@@ -337,10 +324,9 @@
                 <TextView
                     android:id="@+id/txt_total"
                     android:text="500.000 VNĐ"
-                    android:fontFamily="@font/opensans"
-                    android:textStyle="bold"
+                    android:fontFamily="@font/koho_bold"
                     android:textColor="@color/primaryColor"
-                    android:textSize="23sp"
+                    android:textSize="20sp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     />
@@ -354,11 +340,10 @@
                 android:layout_alignParentBottom="true"
                 android:backgroundTint="@color/colorGrey"
                 android:layout_gravity="center"
-                android:fontFamily="@font/opensans"
+                android:fontFamily="@font/koho"
                 android:gravity="center"
                 android:text="Gọi điện thoại"
                 android:textAllCaps="false"
-                android:textStyle="bold"
                 android:textColor="@color/white"
                 app:iconGravity="textStart"
                 android:drawableLeft="@drawable/baseline_phone_24"
@@ -379,9 +364,8 @@
                 android:layout_marginTop="10dp"
                 android:layout_marginStart="100dp"
                 android:layout_marginEnd="100dp"
-                android:fontFamily="@font/opensans"
+                android:fontFamily="@font/koho"
                 android:gravity="center"
-                android:textStyle="bold"
                 android:text="Đã giao"
                 android:textAllCaps="false"
                 android:textColor="@color/white"
@@ -411,7 +395,7 @@
                     android:layout_height="wrap_content"
                     android:layout_alignParentBottom="true"
                     android:backgroundTint="@color/green"
-                    android:fontFamily="@font/opensans"
+                    android:fontFamily="@font/koho"
                     android:text="Giao đến địa chỉ này!"
                     android:textAllCaps="false"
                     android:textColor="@color/white"
@@ -428,9 +412,8 @@
                     android:backgroundTint="@color/red"
                     android:layout_marginTop="10dp"
                     android:layout_gravity="center"
-                    android:fontFamily="@font/opensans"
+                    android:fontFamily="@font/koho"
                     android:gravity="center"
-                    android:textStyle="bold"
                     android:text="Không giao được"
                     android:textAllCaps="false"
                     android:textColor="@color/white"
diff --git a/app/src/main/res/layout/activity_sign_in.xml b/app/src/main/res/layout/activity_sign_in.xml
index e9bd6c7..6dabcd2 100644
--- a/app/src/main/res/layout/activity_sign_in.xml
+++ b/app/src/main/res/layout/activity_sign_in.xml
@@ -36,8 +36,8 @@
 
             <TextView
                 android:text="Foodify"
-                android:fontFamily="@font/bebas"
-                android:textSize="50sp"
+                android:fontFamily="@font/koho_bold"
+                android:textSize="40sp"
                 android:textColor="#ff8084"
                 android:layout_marginEnd="15dp"
                 android:layout_width="wrap_content"
@@ -46,9 +46,9 @@
 
             <TextView
                 android:text="Shipper"
-                android:fontFamily="@font/bebas"
+                android:fontFamily="@font/koho_bold"
                 android:textColor="@color/primaryColor"
-                android:textSize="50sp"
+                android:textSize="40sp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 />
@@ -58,7 +58,7 @@
         <TextView
             android:id="@+id/txt_sign_in"
             android:text="Đăng nhập"
-            android:fontFamily="@font/bebas"
+            android:fontFamily="@font/koho_bold"
             android:textSize="35sp"
             android:textColor="@color/black"
             android:layout_marginTop="30dp"
@@ -120,8 +120,7 @@
 
         <TextView
             android:id="@+id/txt_forgot_password"
-            android:fontFamily="@font/opensans"
-            android:textStyle="bold"
+            android:fontFamily="@font/koho_bold"
             android:text="Quên mật khẩu?"
             android:layout_marginTop="5dp"
             android:layout_marginEnd="20dp"
@@ -135,7 +134,7 @@
             android:id="@+id/sign_in_button"
             android:text="Đăng nhập"
             android:textSize="20sp"
-            android:fontFamily="@font/bebas"
+            android:fontFamily="@font/koho_bold"
             style="@style/DefaultSolid"
             android:backgroundTint="@color/primaryColor"
             android:layout_marginTop="80dp"
diff --git a/app/src/main/res/layout/fragment_cancel.xml b/app/src/main/res/layout/fragment_cancel.xml
index 6cb8c3e..009c8ca 100644
--- a/app/src/main/res/layout/fragment_cancel.xml
+++ b/app/src/main/res/layout/fragment_cancel.xml
@@ -44,7 +44,7 @@
                 <TextView
                     android:id="@+id/end_of_list_text"
                     android:text="Đã hết"
-                    android:fontFamily="@font/opensans"
+                    android:fontFamily="@font/koho"
                     android:textColor="@color/grayLight"
                     android:visibility="gone"
                     app:layout_constraintTop_toBottomOf="@id/progress_bar"
@@ -60,7 +60,7 @@
                     android:text="Không có đơn hàng nào ở đây cả!"
                     android:textSize="15sp"
                     android:layout_marginTop="20dp"
-                    android:fontFamily="@font/opensans"
+                    android:fontFamily="@font/koho"
                     android:textColor="@color/grayLight"
                     android:visibility="gone"
                     app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/layout/fragment_completed_order.xml b/app/src/main/res/layout/fragment_completed_order.xml
index 267328d..0459943 100644
--- a/app/src/main/res/layout/fragment_completed_order.xml
+++ b/app/src/main/res/layout/fragment_completed_order.xml
@@ -44,7 +44,7 @@
                 <TextView
                     android:id="@+id/end_of_list_text"
                     android:text="Đã hết"
-                    android:fontFamily="@font/opensans"
+                    android:fontFamily="@font/koho"
                     android:textColor="@color/grayLight"
                     android:visibility="gone"
                     app:layout_constraintTop_toBottomOf="@id/progress_bar"
@@ -60,7 +60,7 @@
                     android:text="Không có đơn hàng nào ở đây cả!"
                     android:textSize="15sp"
                     android:layout_marginTop="20dp"
-                    android:fontFamily="@font/opensans"
+                    android:fontFamily="@font/koho"
                     android:textColor="@color/grayLight"
                     android:visibility="gone"
                     app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/layout/fragment_confirmed_order.xml b/app/src/main/res/layout/fragment_confirmed_order.xml
index d2fcbe5..cd29320 100644
--- a/app/src/main/res/layout/fragment_confirmed_order.xml
+++ b/app/src/main/res/layout/fragment_confirmed_order.xml
@@ -45,7 +45,7 @@
                 <TextView
                     android:id="@+id/end_of_list_text"
                     android:text="Đã hết"
-                    android:fontFamily="@font/opensans"
+                    android:fontFamily="@font/koho"
                     android:textColor="@color/grayLight"
                     android:visibility="gone"
                     app:layout_constraintTop_toBottomOf="@id/progress_bar"
@@ -61,7 +61,7 @@
                     android:text="Không có đơn hàng nào ở đây cả!"
                     android:textSize="15sp"
                     android:layout_marginTop="20dp"
-                    android:fontFamily="@font/opensans"
+                    android:fontFamily="@font/koho"
                     android:textColor="@color/grayLight"
                     android:visibility="gone"
                     app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/layout/fragment_order.xml b/app/src/main/res/layout/fragment_order.xml
index 1abd01b..a165f02 100644
--- a/app/src/main/res/layout/fragment_order.xml
+++ b/app/src/main/res/layout/fragment_order.xml
@@ -14,8 +14,8 @@
         android:layout_height="wrap_content">
         <TextView
             android:id="@+id/welcome_text"
-            android:textSize="30sp"
-            android:fontFamily="@font/bebas"
+            android:textSize="25sp"
+            android:fontFamily="@font/koho"
             android:textColor="@color/black"
             android:text="Xin chào, Nguyễn Văn A!"
             android:layout_marginTop="30dp"
@@ -29,7 +29,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="15dp"
+            android:layout_marginTop="10dp"
             app:layout_constraintTop_toBottomOf="@id/welcome_text"
             android:orientation="vertical"
             android:id="@+id/order_shipping_layout"
@@ -38,7 +38,7 @@
 
             <TextView
                 android:text="Đơn hàng đang giao"
-                android:fontFamily="@font/bebas"
+                android:fontFamily="@font/koho"
                 android:textColor="@color/black"
                 android:textSize="20sp"
                 android:layout_marginStart="10dp"
@@ -73,9 +73,9 @@
                         <TextView
                             android:id="@+id/order_tracking_number"
                             android:text="Order #123456789"
-                            android:fontFamily="@font/bebas"
+                            android:fontFamily="@font/koho_bold"
                             android:textColor="@color/primaryColor"
-                            android:textSize="23sp"
+                            android:textSize="18sp"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             app:layout_constraintTop_toTopOf="parent"
@@ -86,8 +86,7 @@
                             android:id="@+id/user_name"
                             android:text="Tên: Nguyễn Văn A"
                             android:textSize="13sp"
-                            android:fontFamily="@font/opensans"
-                            android:textStyle="bold"
+                            android:fontFamily="@font/koho"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             app:layout_constraintTop_toBottomOf="@id/order_tracking_number"
@@ -98,8 +97,7 @@
                             android:id="@+id/phone"
                             android:text="Số điện thoại: 0987654321"
                             android:textSize="13sp"
-                            android:fontFamily="@font/opensans"
-                            android:textStyle="bold"
+                            android:fontFamily="@font/koho"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             app:layout_constraintTop_toBottomOf="@id/user_name"
@@ -110,7 +108,7 @@
                             android:id="@+id/address"
                             android:text="Địa chỉ nhận hàng: Hẻm 215, đường Phạm Như Xương, phường Hoà Khánh Nam, quận Liên Chiểu"
                             android:textSize="13sp"
-                            android:fontFamily="@font/opensans"
+                            android:fontFamily="@font/koho"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             app:layout_constraintTop_toBottomOf="@id/phone"
@@ -121,8 +119,7 @@
                             android:id="@+id/order_time"
                             android:text="Thời gian đặt: 14:05 02/02/2023"
                             android:textSize="13sp"
-                            android:fontFamily="@font/opensans"
-                            android:textStyle="italic"
+                            android:fontFamily="@font/koho"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             app:layout_constraintTop_toBottomOf="@id/address"
@@ -133,8 +130,7 @@
                             android:id="@+id/total"
                             android:text="Tổng đơn hàng: 1.200.000"
                             android:textSize="17sp"
-                            android:fontFamily="@font/opensans"
-                            android:textStyle="bold"
+                            android:fontFamily="@font/koho_bold"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="5dp"
@@ -163,10 +159,9 @@
         <TextView
             android:id="@+id/textView2"
             android:textSize="20sp"
-            android:fontFamily="@font/bebas"
+            android:fontFamily="@font/koho"
             android:textColor="@color/black"
             android:text="Danh sách các đơn hàng"
-            android:layout_marginTop="10dp"
             android:layout_marginStart="15dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml
index 94c73db..e8cbc4c 100644
--- a/app/src/main/res/layout/fragment_profile.xml
+++ b/app/src/main/res/layout/fragment_profile.xml
@@ -14,13 +14,14 @@
 
         <TextView
             android:id="@+id/textView"
-            android:layout_width="wrap_content"
+            android:textAlignment="center"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="30dp"
-            android:fontFamily="@font/bebas"
+            android:fontFamily="@font/koho"
             android:text="Thông tin tài khoản"
             android:textColor="@color/black"
-            android:textSize="40sp"
+            android:textSize="30sp"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
@@ -55,6 +56,7 @@
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/edt_email"
+                android:fontFamily="@font/koho"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:inputType="phone"
@@ -79,6 +81,7 @@
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/edt_phone"
+                android:fontFamily="@font/koho"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:inputType="phone"
@@ -105,6 +108,7 @@
                 android:id="@+id/edt_fullName"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
+                android:fontFamily="@font/koho"
                 android:inputType="text"
                 android:enabled="false"
                 />
@@ -129,6 +133,7 @@
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/edt_birthDay"
                 android:layout_width="match_parent"
+                android:fontFamily="@font/koho"
                 android:layout_height="match_parent"
                 android:enabled="false"
                 android:cursorVisible="false"
@@ -163,7 +168,7 @@
             <TextView
                 android:text="Đổi mật khẩu"
                 android:textSize="18sp"
-                android:fontFamily="@font/opensans"
+                android:fontFamily="@font/koho"
                 android:textColor="@color/black"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -206,7 +211,7 @@
             <TextView
                 android:text="Chỉnh sửa thông tin"
                 android:textSize="18sp"
-                android:fontFamily="@font/opensans"
+                android:fontFamily="@font/koho"
                 android:textColor="@color/black"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -253,7 +258,7 @@
                 android:layout_gravity="center_vertical"
                 android:layout_marginStart="12dp"
                 android:layout_weight="1"
-                android:fontFamily="@font/opensans"
+                android:fontFamily="@font/koho"
                 android:text="Đóng góp ý kiến"
                 android:textColor="@color/black"
                 android:textSize="18sp"
@@ -293,7 +298,7 @@
             <TextView
                 android:text="Đăng xuất"
                 android:textSize="18sp"
-                android:fontFamily="@font/opensans"
+                android:fontFamily="@font/koho"
                 android:textColor="@color/black"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_order.xml b/app/src/main/res/layout/item_order.xml
index 951af3e..13bd899 100644
--- a/app/src/main/res/layout/item_order.xml
+++ b/app/src/main/res/layout/item_order.xml
@@ -30,9 +30,9 @@
                 <TextView
                     android:id="@+id/order_tracking_number"
                     android:text="Order #123456789"
-                    android:fontFamily="@font/bebas"
+                    android:fontFamily="@font/koho_bold"
                     android:textColor="@color/primaryColor"
-                    android:textSize="23sp"
+                    android:textSize="18sp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     app:layout_constraintTop_toTopOf="parent"
@@ -43,8 +43,7 @@
                     android:id="@+id/user_name"
                     android:text="Tên: Nguyễn Văn A"
                     android:textSize="13sp"
-                    android:fontFamily="@font/opensans"
-                    android:textStyle="bold"
+                    android:fontFamily="@font/koho"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     app:layout_constraintTop_toBottomOf="@id/order_tracking_number"
@@ -55,8 +54,7 @@
                     android:id="@+id/phone"
                     android:text="Số điện thoại: 0987654321"
                     android:textSize="13sp"
-                    android:fontFamily="@font/opensans"
-                    android:textStyle="bold"
+                    android:fontFamily="@font/koho"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     app:layout_constraintTop_toBottomOf="@id/user_name"
@@ -67,7 +65,7 @@
                     android:id="@+id/address"
                     android:text="Địa chỉ nhận hàng: Hẻm 215, đường Phạm Như Xương, phường Hoà Khánh Nam, quận Liên Chiểu"
                     android:textSize="13sp"
-                    android:fontFamily="@font/opensans"
+                    android:fontFamily="@font/koho"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     app:layout_constraintTop_toBottomOf="@id/phone"
@@ -78,8 +76,7 @@
                     android:id="@+id/order_time"
                     android:text="Thời gian đặt: 14:05 02/02/2023"
                     android:textSize="13sp"
-                    android:fontFamily="@font/opensans"
-                    android:textStyle="italic"
+                    android:fontFamily="@font/koho"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     app:layout_constraintTop_toBottomOf="@id/address"
@@ -90,8 +87,7 @@
                     android:id="@+id/total"
                     android:text="Tổng đơn hàng: 1.200.000"
                     android:textSize="17sp"
-                    android:fontFamily="@font/opensans"
-                    android:textStyle="bold"
+                    android:fontFamily="@font/koho_bold"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="5dp"
diff --git a/app/src/main/res/layout/item_order_detail.xml b/app/src/main/res/layout/item_order_detail.xml
index 831ce33..5a06fa6 100644
--- a/app/src/main/res/layout/item_order_detail.xml
+++ b/app/src/main/res/layout/item_order_detail.xml
@@ -33,7 +33,7 @@
                 android:text="Food Name"
                 android:textSize="15sp"
                 android:textColor="@color/black"
-                android:fontFamily="@font/opensans"
+                android:fontFamily="@font/koho"
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:layout_marginStart="5dp"
@@ -66,7 +66,7 @@
                         android:text="Shop Name"
                         android:textSize="13sp"
                         android:textColor="@color/secondary"
-                        android:fontFamily="@font/opensans"
+                        android:fontFamily="@font/koho"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="2dp"
@@ -86,7 +86,7 @@
                             android:text="$5.00"
                             android:textSize="20sp"
                             android:textColor="@color/primaryColor"
-                            android:fontFamily="@font/bebas"
+                            android:fontFamily="@font/koho"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             />
@@ -106,7 +106,7 @@
                 <TextView
                     android:id="@+id/quantity_text_view"
                     android:text="Số lượng: 10"
-                    android:fontFamily="@font/opensans"
+                    android:fontFamily="@font/koho"
                     android:textColor="@color/black"
                     android:textSize="13sp"
                     android:layout_width="0dp"
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index c69b99e..81609b5 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -31,7 +31,7 @@
     </style>
 
     <style name="tab_text" parent="@android:style/TextAppearance.Widget.TabWidget">
-        <item name="android:fontFamily">@font/bebas</item>
-        <item name="android:textSize">18sp</item>
+        <item name="android:fontFamily">@font/koho</item>
+        <item name="android:textSize">16sp</item>
     </style>
 </resources>
\ No newline at end of file