diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/act/MainActivity.kt b/app/src/main/java/com/all/pdfreader/pro/app/ui/act/MainActivity.kt
index 4882006..85b93e1 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/ui/act/MainActivity.kt
+++ b/app/src/main/java/com/all/pdfreader/pro/app/ui/act/MainActivity.kt
@@ -14,13 +14,9 @@ import com.all.pdfreader.pro.app.databinding.ActivityMainBinding
 import com.all.pdfreader.pro.app.model.FileActionEvent
 import com.all.pdfreader.pro.app.model.FragmentType
 import com.all.pdfreader.pro.app.model.PdfPickerSource
-import com.all.pdfreader.pro.app.model.SortConfig
-import com.all.pdfreader.pro.app.model.SortField
-import com.all.pdfreader.pro.app.room.entity.PdfDocumentEntity
 import com.all.pdfreader.pro.app.ui.dialog.PermissionDialogFragment
 import com.all.pdfreader.pro.app.ui.dialog.ProgressDialogFragment
 import com.all.pdfreader.pro.app.ui.dialog.PromptDialogFragment
-import com.all.pdfreader.pro.app.ui.dialog.SortDialogFragment
 import com.all.pdfreader.pro.app.ui.fragment.FavoriteFrag
 import com.all.pdfreader.pro.app.ui.fragment.HomeFrag
 import com.all.pdfreader.pro.app.ui.fragment.RecentlyFrag
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/act/MergePdfActivity.kt b/app/src/main/java/com/all/pdfreader/pro/app/ui/act/MergePdfActivity.kt
index 57e22cf..0a9f93d 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/ui/act/MergePdfActivity.kt
+++ b/app/src/main/java/com/all/pdfreader/pro/app/ui/act/MergePdfActivity.kt
@@ -39,7 +39,7 @@ class MergePdfActivity : BaseActivity() {
         setContentView(binding.root)
         setupBackPressedCallback()
         ImmersionBar.with(this).statusBarView(binding.view).statusBarDarkFont(true)
-            .navigationBarColor(R.color.bg_color).init()
+            .navigationBarColor(R.color.white).init()
         val list: ArrayList<PdfDocumentEntity> = requireParcelableArrayList(EXTRA_PDF_LIST)
         updateContinueNowBtnState(list.size >= 2)
         lifecycleScope.launch {
@@ -166,7 +166,7 @@ class MergePdfActivity : BaseActivity() {
         onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(true) {
             override fun handleOnBackPressed() {
                 PromptDialogFragment(
-                    getString(R.string.exit_split),
+                    getString(R.string.exit_merge),
                     getString(R.string.confirm_discard_changes),
                     getString(R.string.discard),
                     onOkClick = {
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/act/PdfPickerActivity.kt b/app/src/main/java/com/all/pdfreader/pro/app/ui/act/PdfPickerActivity.kt
index ef81d49..ecba6dc 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/ui/act/PdfPickerActivity.kt
+++ b/app/src/main/java/com/all/pdfreader/pro/app/ui/act/PdfPickerActivity.kt
@@ -46,7 +46,7 @@ class PdfPickerActivity : BaseActivity() {
         fromActivityResult = intent.getStringExtra(EXTRA_FROM) ?: ""
         historyList = requireParcelableArrayList(EXTRA_HISTORY_LIST)
         ImmersionBar.with(this).statusBarView(binding.view).statusBarDarkFont(true)
-            .navigationBarColor(R.color.bg_color).init()
+            .navigationBarColor(R.color.white).init()
         updateViewAndState()
         initView()
         setupClick()
@@ -159,6 +159,8 @@ class PdfPickerActivity : BaseActivity() {
                 adapter.updateData(displayList)
                 binding.noFilesLayout.visibility =
                     if (displayList.isEmpty()) View.VISIBLE else View.GONE
+                val selectedItems = adapter.getSelectedItems()
+                updateViewAndState(selectedItems.size)
             }
         }
     }
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/adapter/PdfAdapter.kt b/app/src/main/java/com/all/pdfreader/pro/app/ui/adapter/PdfAdapter.kt
index 7c3e60e..a29dbbd 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/ui/adapter/PdfAdapter.kt
+++ b/app/src/main/java/com/all/pdfreader/pro/app/ui/adapter/PdfAdapter.kt
@@ -52,7 +52,7 @@ class PdfAdapter(
             holder.binding.lockLayout.visibility = View.GONE
             holder.binding.tvFileImg.visibility = View.VISIBLE
             Glide.with(holder.binding.root).load(item.thumbnailPath)
-                .transform(CenterCrop(), RoundedCorners(8.dpToPx(holder.binding.root.context)))
+                .transform(CenterCrop(), RoundedCorners(4.dpToPx(holder.binding.root.context)))
                 .into(holder.binding.tvFileImg)
         }
         if (item.isFavorite) {
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/PdfPasswordProtectionDialogFragment.kt b/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/PdfPasswordProtectionDialogFragment.kt
index 0919ffe..78e7f45 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/PdfPasswordProtectionDialogFragment.kt
+++ b/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/PdfPasswordProtectionDialogFragment.kt
@@ -58,7 +58,7 @@ class PdfPasswordProtectionDialogFragment(
 
         if (isPrompt) {
             binding.promptTv.visibility = View.VISIBLE
-            val color = ContextCompat.getColor(requireContext(), R.color.icon_sel_on_color)
+            val color = ContextCompat.getColor(requireContext(), R.color.text_color_lv1)
             binding.promptTv.setColoredPlaceholder(
                 R.string.file_is_password_protected,
                 file.name,
@@ -68,11 +68,11 @@ class PdfPasswordProtectionDialogFragment(
             binding.promptTv.visibility = View.GONE
         }
 
-        binding.tvCancel.setOnClickListener {
+        binding.cancelBtn.setOnClickListener {
             onCancelClick()
             dismiss()
         }
-        binding.tvConfirm.setOnClickListener {
+        binding.okBtn.setOnClickListener {
             val password = binding.etPassword.text.toString()
             if (password.isEmpty()) {
                 binding.tilPassword.error = getString(R.string.password_not_empty)
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/SortDialogFragment.kt b/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/SortDialogFragment.kt
index df0ba53..36c1c10 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/SortDialogFragment.kt
+++ b/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/SortDialogFragment.kt
@@ -1,14 +1,9 @@
 package com.all.pdfreader.pro.app.ui.dialog
 
-import android.annotation.SuppressLint
-import android.media.Image
 import android.os.Bundle
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.TextView
 import androidx.fragment.app.Fragment
 import com.all.pdfreader.pro.app.R
 import com.all.pdfreader.pro.app.databinding.DialogSortBinding
diff --git a/app/src/main/res/drawable/add_icon_black.xml b/app/src/main/res/drawable/add_icon_black.xml
new file mode 100644
index 0000000..283c11c
--- /dev/null
+++ b/app/src/main/res/drawable/add_icon_black.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,3.803C16.522,3.803 20.197,7.478 20.197,12C20.197,16.522 16.522,20.197 12,20.197C7.478,20.197 3.803,16.522 3.803,12C3.803,7.478 7.478,3.803 12,3.803ZM12,2C6.481,2 2,6.481 2,12C2,17.519 6.481,22 12,22C17.519,22 22,17.519 22,12C22,6.481 17.519,2 12,2ZM17.559,12.896H6.441C6.048,12.896 5.736,12.493 5.736,12C5.736,11.507 6.048,11.104 6.441,11.104H17.549C17.942,11.104 18.254,11.507 18.254,12C18.264,12.503 17.942,12.896 17.559,12.896ZM11.104,17.559V6.441C11.104,6.048 11.507,5.736 12,5.736C12.493,5.736 12.896,6.048 12.896,6.441V17.549C12.896,17.942 12.493,18.254 12,18.254C11.497,18.264 11.104,17.942 11.104,17.559Z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/back_black.xml b/app/src/main/res/drawable/back_black.xml
index 5e39e91..fd82dac 100644
--- a/app/src/main/res/drawable/back_black.xml
+++ b/app/src/main/res/drawable/back_black.xml
@@ -1,9 +1,13 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="256dp"
-    android:height="256dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
+    android:width="8dp"
+    android:height="14dp"
+    android:viewportWidth="8"
+    android:viewportHeight="14">
   <path
-      android:pathData="M927.9,478.1 L168.9,478.1l308.7,-308.9c11.7,-11.7 11.4,-30.9 -0.6,-42.9 -12,-12 -31.2,-12.2 -42.9,-0.5L75.2,484.9c-2,1.7 -3.8,3.6 -5.3,5.7 -4,5.4 -6,11.8 -5.9,18.3 -0.1,7.8 2.7,15.6 8.6,21.4l361.6,361.7c11.7,11.7 30.9,11.4 42.9,-0.5 12,-12 12.2,-31.2 0.6,-42.9L168.4,539.5l759.4,0c16.5,0 29.9,-13.7 29.9,-30.7S944.4,478.1 927.9,478.1z"
-      android:fillColor="#000000"/>
+      android:pathData="M7,1L1,7L7,13"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"
+      android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/bg_custom_toast.xml b/app/src/main/res/drawable/bg_custom_toast.xml
index 6d1fcde..152bbda 100644
--- a/app/src/main/res/drawable/bg_custom_toast.xml
+++ b/app/src/main/res/drawable/bg_custom_toast.xml
@@ -1,5 +1,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="#CC333333"/>
-    <corners android:radius="8dp"/>
+    <solid android:color="#9A333333"/>
+    <corners android:radius="10dp"/>
 </shape>
diff --git a/app/src/main/res/drawable/delete.xml b/app/src/main/res/drawable/delete.xml
index 74a2c77..d35fc83 100644
--- a/app/src/main/res/drawable/delete.xml
+++ b/app/src/main/res/drawable/delete.xml
@@ -1,12 +1,21 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
   <path
-      android:pathData="M874.7,202.7L360.5,202.7c-21.3,0 -40.5,8.5 -55.5,23.5l-217.6,234.7c-25.6,27.7 -25.6,72.5 0,100.3l217.6,234.7c14.9,14.9 34.1,23.5 55.5,23.5L874.7,819.2c40.5,0 74.7,-34.1 74.7,-74.7L949.3,277.3c0,-40.5 -34.1,-74.7 -74.7,-74.7zM885.3,746.7c0,6.4 -4.3,10.7 -10.7,10.7L360.5,757.3c-2.1,0 -6.4,-2.1 -8.5,-4.3l-217.6,-234.7c-4.3,-4.3 -4.3,-10.7 0,-14.9l217.6,-234.7c2.1,-2.1 4.3,-4.3 8.5,-4.3L874.7,264.5c6.4,0 10.7,4.3 10.7,10.7L885.3,746.7z"
-      android:fillColor="#666666"/>
+      android:pathData="M20.72,6.76H3.28C3.041,6.76 2.812,6.665 2.644,6.496C2.475,6.328 2.38,6.099 2.38,5.86C2.38,5.621 2.475,5.392 2.644,5.224C2.812,5.055 3.041,4.96 3.28,4.96H20.72C20.959,4.96 21.188,5.055 21.356,5.224C21.525,5.392 21.62,5.621 21.62,5.86C21.62,6.099 21.525,6.328 21.356,6.496C21.188,6.665 20.959,6.76 20.72,6.76Z"
+      android:fillColor="@color/icon_off"/>
   <path
-      android:pathData="M684.8,403.2c-12.8,-12.8 -32,-12.8 -44.8,0l-64,64 -61.9,-61.9c-12.8,-12.8 -32,-12.8 -44.8,0 -12.8,12.8 -12.8,32 0,44.8l61.9,61.9 -61.9,61.9c-12.8,12.8 -12.8,32 0,44.8 6.4,6.4 14.9,8.5 23.5,8.5s17.1,-2.1 23.5,-8.5l61.9,-61.9L640,618.7c6.4,6.4 14.9,8.5 23.5,8.5s17.1,-2.1 23.5,-8.5c12.8,-12.8 12.8,-32 0,-44.8L620.8,512l61.9,-61.9c12.8,-12.8 12.8,-34.1 2.1,-46.9z"
-      android:fillColor="#666666"/>
+      android:pathData="M16.11,22.07H7.82C6.916,22.089 6.042,21.749 5.388,21.125C4.734,20.501 4.354,19.643 4.33,18.74V5.86C4.33,5.621 4.425,5.392 4.594,5.224C4.762,5.055 4.991,4.96 5.23,4.96C5.469,4.96 5.698,5.055 5.866,5.224C6.035,5.392 6.13,5.621 6.13,5.86V18.74C6.153,19.166 6.344,19.566 6.66,19.853C6.977,20.139 7.394,20.289 7.82,20.27H16.11C16.535,20.286 16.949,20.135 17.263,19.849C17.577,19.563 17.767,19.164 17.79,18.74V5.86C17.79,5.742 17.813,5.625 17.858,5.516C17.904,5.406 17.97,5.307 18.054,5.224C18.137,5.14 18.236,5.074 18.346,5.028C18.455,4.983 18.572,4.96 18.69,4.96C18.808,4.96 18.925,4.983 19.034,5.028C19.144,5.074 19.243,5.14 19.326,5.224C19.41,5.307 19.476,5.406 19.521,5.516C19.567,5.625 19.59,5.742 19.59,5.86V18.74C19.569,19.643 19.191,20.5 18.538,21.125C17.886,21.749 17.013,22.089 16.11,22.07Z"
+      android:fillColor="@color/icon_off"/>
+  <path
+      android:pathData="M10.01,18.14C9.772,18.137 9.545,18.042 9.376,17.874C9.208,17.705 9.113,17.478 9.11,17.24V9.76C9.11,9.521 9.205,9.292 9.374,9.124C9.542,8.955 9.771,8.86 10.01,8.86C10.249,8.86 10.478,8.955 10.646,9.124C10.815,9.292 10.91,9.521 10.91,9.76V17.24C10.91,17.479 10.815,17.708 10.646,17.876C10.478,18.045 10.249,18.14 10.01,18.14Z"
+      android:fillColor="@color/icon_off"/>
+  <path
+      android:pathData="M13.99,18.14C13.751,18.14 13.522,18.045 13.354,17.876C13.185,17.708 13.09,17.479 13.09,17.24V9.76C13.09,9.521 13.185,9.292 13.354,9.124C13.522,8.955 13.751,8.86 13.99,8.86C14.229,8.86 14.458,8.955 14.626,9.124C14.795,9.292 14.89,9.521 14.89,9.76V17.24C14.89,17.479 14.795,17.708 14.626,17.876C14.458,18.045 14.229,18.14 13.99,18.14Z"
+      android:fillColor="@color/icon_off"/>
+  <path
+      android:pathData="M17.53,6.76H6.38V5.04C6.383,4.216 6.711,3.426 7.294,2.844C7.877,2.261 8.666,1.933 9.49,1.93H14.41C15.236,1.93 16.028,2.257 16.613,2.84C17.198,3.423 17.527,4.214 17.53,5.04V6.76ZM8.18,4.96H15.73C15.707,4.626 15.558,4.313 15.313,4.084C15.068,3.856 14.745,3.729 14.41,3.73H9.49C9.156,3.729 8.834,3.856 8.591,4.085C8.347,4.314 8.2,4.627 8.18,4.96Z"
+      android:fillColor="@color/icon_off"/>
 </vector>
diff --git a/app/src/main/res/drawable/delete_cha_icon.xml b/app/src/main/res/drawable/delete_cha_icon.xml
index c2064e5..f52c147 100644
--- a/app/src/main/res/drawable/delete_cha_icon.xml
+++ b/app/src/main/res/drawable/delete_cha_icon.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <!-- 斜线 1 -->
-    <path
-        android:pathData="M6,6L18,18"
-        android:strokeWidth="2"
-        android:strokeColor="@color/icon_color"
-        android:fillColor="@android:color/transparent"
-        android:strokeLineCap="round"
-        android:strokeLineJoin="round" />
-
-    <!-- 斜线 2 -->
-    <path
-        android:pathData="M6,18L18,6"
-        android:strokeWidth="2"
-        android:strokeColor="@color/icon_color"
-        android:fillColor="@android:color/transparent"
-        android:strokeLineCap="round"
-        android:strokeLineJoin="round" />
-
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M8,1.28C4.267,1.28 1.209,4.338 1.209,8.071C1.209,11.804 4.267,14.862 8,14.862C11.733,14.862 14.791,11.84 14.791,8.071C14.791,4.302 11.733,1.28 8,1.28ZM11.129,10.453C11.342,10.667 11.342,10.986 11.129,11.2C11.022,11.307 10.88,11.342 10.738,11.342C10.596,11.342 10.453,11.307 10.347,11.2L7.965,8.818L5.582,11.2C5.476,11.307 5.333,11.342 5.191,11.342C5.049,11.342 4.907,11.307 4.8,11.2C4.587,10.986 4.587,10.667 4.8,10.453L7.182,8.071L4.8,5.689C4.587,5.475 4.587,5.155 4.8,4.942C5.013,4.729 5.333,4.729 5.547,4.942L7.929,7.324L10.311,4.942C10.524,4.729 10.844,4.729 11.058,4.942C11.271,5.155 11.271,5.475 11.058,5.689L8.676,8.071L11.129,10.453Z"
+      android:fillColor="#A9A4A4"/>
 </vector>
diff --git a/app/src/main/res/drawable/dr_bookmarks_bg.xml b/app/src/main/res/drawable/dr_bookmarks_bg.xml
index 845014f..973ce51 100644
--- a/app/src/main/res/drawable/dr_bookmarks_bg.xml
+++ b/app/src/main/res/drawable/dr_bookmarks_bg.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
-    <solid android:color="@color/btn_sel_on_color"/>
+    <solid android:color="@color/icon_on"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/dr_btn_not_clickable_bg.xml b/app/src/main/res/drawable/dr_btn_not_clickable_bg.xml
index c4e3244..3fb2dfb 100644
--- a/app/src/main/res/drawable/dr_btn_not_clickable_bg.xml
+++ b/app/src/main/res/drawable/dr_btn_not_clickable_bg.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="@color/btn_sel_off_color" /> <!-- 默认颜色 -->
-    <corners android:radius="24dp" />
+    <corners android:radius="8dp" />
+    <gradient android:startColor="@color/no_click_btn_bg_lv1_color"
+        android:endColor="@color/no_click_btn_bg_lv2_color"/>
 </shape>
diff --git a/app/src/main/res/drawable/dr_cancel_btn_bg.xml b/app/src/main/res/drawable/dr_cancel_btn_bg.xml
index e1a41a5..581af17 100644
--- a/app/src/main/res/drawable/dr_cancel_btn_bg.xml
+++ b/app/src/main/res/drawable/dr_cancel_btn_bg.xml
@@ -5,8 +5,8 @@
     <!-- 按钮背景 -->
     <item>
         <shape android:shape="rectangle">
-            <solid android:color="@color/grey" />
-            <corners android:radius="24dp" />
+            <solid android:color="@color/cancel_btn_bg_color" />
+            <corners android:radius="8dp" />
         </shape>
     </item>
 
diff --git a/app/src/main/res/drawable/dr_click_btn_bg.xml b/app/src/main/res/drawable/dr_click_btn_bg.xml
index ae6cbd9..e33d2d6 100644
--- a/app/src/main/res/drawable/dr_click_btn_bg.xml
+++ b/app/src/main/res/drawable/dr_click_btn_bg.xml
@@ -5,8 +5,10 @@
     <!-- 按钮背景 -->
     <item>
         <shape android:shape="rectangle">
-            <solid android:color="#E43521"/>
-            <corners android:radius="24dp"/>
+            <corners android:radius="8dp" />
+            <gradient
+                android:endColor="@color/ok_btn_bg_lv2_color"
+                android:startColor="@color/ok_btn_bg_lv1_color" />
         </shape>
     </item>
 
diff --git a/app/src/main/res/drawable/dr_edit_frame.xml b/app/src/main/res/drawable/dr_edit_frame.xml
new file mode 100644
index 0000000..fd731c3
--- /dev/null
+++ b/app/src/main/res/drawable/dr_edit_frame.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <stroke android:color="@color/line_color"
+        android:width="1dp"/>
+    <corners android:radius="10dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/dr_item_img_30_frame.xml b/app/src/main/res/drawable/dr_item_img_30_frame.xml
new file mode 100644
index 0000000..c2508ae
--- /dev/null
+++ b/app/src/main/res/drawable/dr_item_img_30_frame.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <stroke android:color="@color/line_color"
+        android:width="1dp"/>
+    <corners android:radius="30dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/dr_rc_top_20_bg_white.xml b/app/src/main/res/drawable/dr_rc_top_20_bg_white.xml
new file mode 100644
index 0000000..2b0a41d
--- /dev/null
+++ b/app/src/main/res/drawable/dr_rc_top_20_bg_white.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners
+        android:topLeftRadius="20dp"
+        android:topRightRadius="20dp" />
+    <solid android:color="@color/white" />
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/icon_delete.xml b/app/src/main/res/drawable/icon_delete.xml
new file mode 100644
index 0000000..aa2b60f
--- /dev/null
+++ b/app/src/main/res/drawable/icon_delete.xml
@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M20.72,6.76H3.28C3.041,6.76 2.812,6.665 2.644,6.496C2.475,6.328 2.38,6.099 2.38,5.86C2.38,5.621 2.475,5.392 2.644,5.224C2.812,5.055 3.041,4.96 3.28,4.96H20.72C20.959,4.96 21.188,5.055 21.356,5.224C21.525,5.392 21.62,5.621 21.62,5.86C21.62,6.099 21.525,6.328 21.356,6.496C21.188,6.665 20.959,6.76 20.72,6.76Z"
+      android:fillColor="#E43521"/>
+  <path
+      android:pathData="M16.11,22.07H7.82C6.916,22.089 6.042,21.749 5.388,21.125C4.734,20.501 4.354,19.643 4.33,18.74V5.86C4.33,5.621 4.425,5.392 4.594,5.224C4.762,5.055 4.991,4.96 5.23,4.96C5.469,4.96 5.698,5.055 5.866,5.224C6.035,5.392 6.13,5.621 6.13,5.86V18.74C6.153,19.166 6.344,19.566 6.66,19.853C6.977,20.139 7.394,20.289 7.82,20.27H16.11C16.535,20.286 16.949,20.135 17.263,19.849C17.577,19.563 17.767,19.164 17.79,18.74V5.86C17.79,5.742 17.813,5.625 17.858,5.516C17.904,5.406 17.97,5.307 18.054,5.224C18.137,5.14 18.236,5.074 18.346,5.028C18.455,4.983 18.572,4.96 18.69,4.96C18.808,4.96 18.925,4.983 19.034,5.028C19.144,5.074 19.243,5.14 19.326,5.224C19.41,5.307 19.476,5.406 19.521,5.516C19.567,5.625 19.59,5.742 19.59,5.86V18.74C19.569,19.643 19.191,20.5 18.538,21.125C17.886,21.749 17.013,22.089 16.11,22.07Z"
+      android:fillColor="#E43521"/>
+  <path
+      android:pathData="M10.01,18.14C9.772,18.137 9.545,18.042 9.376,17.874C9.208,17.705 9.113,17.478 9.11,17.24V9.76C9.11,9.521 9.205,9.292 9.374,9.124C9.542,8.955 9.771,8.86 10.01,8.86C10.249,8.86 10.478,8.955 10.646,9.124C10.815,9.292 10.91,9.521 10.91,9.76V17.24C10.91,17.479 10.815,17.708 10.646,17.876C10.478,18.045 10.249,18.14 10.01,18.14Z"
+      android:fillColor="#E43521"/>
+  <path
+      android:pathData="M13.99,18.14C13.751,18.14 13.522,18.045 13.354,17.876C13.185,17.708 13.09,17.479 13.09,17.24V9.76C13.09,9.521 13.185,9.292 13.354,9.124C13.522,8.955 13.751,8.86 13.99,8.86C14.229,8.86 14.458,8.955 14.626,9.124C14.795,9.292 14.89,9.521 14.89,9.76V17.24C14.89,17.479 14.795,17.708 14.626,17.876C14.458,18.045 14.229,18.14 13.99,18.14Z"
+      android:fillColor="#E43521"/>
+  <path
+      android:pathData="M17.53,6.76H6.38V5.04C6.383,4.216 6.711,3.426 7.294,2.844C7.877,2.261 8.666,1.933 9.49,1.93H14.41C15.236,1.93 16.028,2.257 16.613,2.84C17.198,3.423 17.527,4.214 17.53,5.04V6.76ZM8.18,4.96H15.73C15.707,4.626 15.558,4.313 15.313,4.084C15.068,3.856 14.745,3.729 14.41,3.73H9.49C9.156,3.729 8.834,3.856 8.591,4.085C8.347,4.314 8.2,4.627 8.18,4.96Z"
+      android:fillColor="#E43521"/>
+</vector>
diff --git a/app/src/main/res/drawable/icon_delete_circular.xml b/app/src/main/res/drawable/icon_delete_circular.xml
new file mode 100644
index 0000000..40b4c7d
--- /dev/null
+++ b/app/src/main/res/drawable/icon_delete_circular.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,20.529C13.687,20.529 15.336,20.029 16.739,19.092C18.141,18.155 19.235,16.823 19.88,15.264C20.526,13.705 20.695,11.991 20.365,10.336C20.036,8.681 19.224,7.162 18.031,5.969C16.838,4.776 15.319,3.964 13.664,3.634C12.009,3.305 10.295,3.474 8.736,4.12C7.177,4.765 5.845,5.859 4.908,7.261C3.971,8.664 3.471,10.313 3.471,12C3.471,14.262 4.369,16.432 5.969,18.031C7.568,19.631 9.738,20.529 12,20.529ZM12,22C10.022,22 8.089,21.413 6.444,20.315C4.8,19.216 3.518,17.654 2.761,15.827C2.004,14 1.806,11.989 2.192,10.049C2.578,8.109 3.53,6.327 4.929,4.929C6.327,3.53 8.109,2.578 10.049,2.192C11.989,1.806 14,2.004 15.827,2.761C17.654,3.518 19.216,4.8 20.315,6.444C21.413,8.089 22,10.022 22,12C22,13.313 21.741,14.614 21.239,15.827C20.736,17.04 20,18.142 19.071,19.071C18.142,20 17.04,20.736 15.827,21.239C14.614,21.741 13.313,22 12,22Z"
+      android:fillColor="#5A5A68"/>
+  <path
+      android:pathData="M13.02,12L15.789,14.769C15.924,14.904 16,15.088 16,15.279C16,15.47 15.924,15.654 15.789,15.789C15.654,15.924 15.47,16 15.279,16C15.088,16 14.904,15.924 14.769,15.789L12,13.02L9.231,15.789C9.164,15.856 9.084,15.909 8.997,15.945C8.909,15.981 8.816,16 8.721,16C8.626,16 8.533,15.981 8.445,15.945C8.358,15.909 8.278,15.856 8.211,15.789C8.144,15.722 8.091,15.642 8.055,15.555C8.019,15.467 8,15.374 8,15.279C8,15.184 8.019,15.091 8.055,15.003C8.091,14.916 8.144,14.836 8.211,14.769L10.98,12L8.211,9.231C8.144,9.164 8.091,9.084 8.055,8.997C8.019,8.909 8,8.816 8,8.721C8,8.626 8.019,8.533 8.055,8.445C8.091,8.358 8.144,8.278 8.211,8.211C8.278,8.144 8.358,8.091 8.445,8.055C8.533,8.019 8.626,8 8.721,8C8.816,8 8.909,8.019 8.997,8.055C9.084,8.091 9.164,8.144 9.231,8.211L12,10.98L14.769,8.211C14.836,8.144 14.916,8.091 15.003,8.055C15.091,8.019 15.184,8 15.279,8C15.374,8 15.467,8.019 15.555,8.055C15.642,8.091 15.722,8.144 15.789,8.211C15.856,8.278 15.909,8.358 15.945,8.445C15.981,8.533 16,8.626 16,8.721C16,8.816 15.981,8.909 15.945,8.997C15.909,9.084 15.856,9.164 15.789,9.231L13.02,12Z"
+      android:fillColor="#5A5A68"/>
+</vector>
diff --git a/app/src/main/res/drawable/icon_search_black.xml b/app/src/main/res/drawable/icon_search_black.xml
new file mode 100644
index 0000000..914c491
--- /dev/null
+++ b/app/src/main/res/drawable/icon_search_black.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M11.79,20.24C10.118,20.242 8.484,19.748 7.093,18.821C5.702,17.893 4.617,16.574 3.976,15.031C3.335,13.487 3.166,11.787 3.491,10.148C3.816,8.508 4.62,7.001 5.801,5.818C6.983,4.636 8.488,3.83 10.128,3.503C11.767,3.176 13.467,3.343 15.011,3.982C16.556,4.621 17.876,5.704 18.805,7.094C19.734,8.484 20.23,10.118 20.23,11.79C20.23,14.029 19.341,16.177 17.759,17.761C16.176,19.346 14.029,20.237 11.79,20.24ZM11.79,5.15C10.474,5.148 9.187,5.536 8.092,6.266C6.997,6.996 6.143,8.035 5.638,9.25C5.134,10.466 5.001,11.804 5.257,13.095C5.514,14.386 6.147,15.571 7.078,16.502C8.008,17.433 9.194,18.066 10.485,18.323C11.776,18.579 13.114,18.446 14.33,17.942C15.545,17.437 16.583,16.583 17.313,15.488C18.043,14.393 18.432,13.106 18.43,11.79C18.431,10.917 18.261,10.052 17.928,9.244C17.595,8.437 17.106,7.703 16.489,7.085C15.873,6.466 15.14,5.975 14.334,5.64C13.528,5.304 12.663,5.131 11.79,5.13V5.15Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M19.75,20.65C19.633,20.65 19.517,20.627 19.409,20.583C19.301,20.538 19.203,20.473 19.12,20.39L16.74,18.01C16.571,17.84 16.477,17.61 16.477,17.37C16.477,17.13 16.571,16.9 16.74,16.73C16.909,16.562 17.137,16.468 17.375,16.468C17.613,16.468 17.841,16.562 18.01,16.73L20.39,19.11C20.559,19.28 20.653,19.51 20.653,19.75C20.653,19.99 20.559,20.22 20.39,20.39C20.218,20.556 19.989,20.649 19.75,20.65Z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/num_oval_selected.xml b/app/src/main/res/drawable/num_oval_selected.xml
index 89c689c..fd29773 100644
--- a/app/src/main/res/drawable/num_oval_selected.xml
+++ b/app/src/main/res/drawable/num_oval_selected.xml
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval"
     android:useLevel="false">
-    <solid android:color="@color/btn_sel_on_color" />
+    <solid android:color="@color/icon_on" />
     <size
         android:width="18dp"
         android:height="18dp" />
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index f5b8d1a..80b24e3 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -34,10 +34,10 @@
 
 
         <TextView
-            style="@style/TextViewFont_PopMedium"
+            style="@style/TextViewFont_PopSemiBold"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
+            android:layout_marginStart="6dp"
             android:layout_marginEnd="6dp"
             android:layout_weight="1"
             android:text="@string/app_name"
diff --git a/app/src/main/res/layout/activity_pdf_merge.xml b/app/src/main/res/layout/activity_pdf_merge.xml
index 16aa98f..bfb2810 100644
--- a/app/src/main/res/layout/activity_pdf_merge.xml
+++ b/app/src/main/res/layout/activity_pdf_merge.xml
@@ -14,7 +14,7 @@
     <LinearLayout
         android:id="@+id/statusLayout"
         android:layout_width="match_parent"
-        android:layout_height="48dp"
+        android:layout_height="44dp"
         android:gravity="center_vertical"
         android:orientation="horizontal">
 
@@ -22,14 +22,12 @@
             android:id="@+id/backBtn"
             android:layout_width="40dp"
             android:layout_height="40dp"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="8dp"
             android:background="@drawable/dr_click_effect_oval_transparent"
             android:gravity="center">
 
             <ImageView
-                android:layout_width="24dp"
-                android:layout_height="24dp"
+                android:layout_width="8dp"
+                android:layout_height="14dp"
                 android:src="@drawable/back_black" />
 
         </LinearLayout>
@@ -42,7 +40,7 @@
             android:layout_weight="1"
             android:text="@string/merge_pdf"
             android:textColor="@color/black"
-            android:textSize="16sp" />
+            android:textSize="18sp" />
 
         <LinearLayout
             android:id="@+id/addBtn"
@@ -54,12 +52,9 @@
             android:gravity="center">
 
             <ImageView
-                android:id="@+id/addIv"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                android:background="@drawable/dr_circular_sel_on_bg"
-                android:padding="2dp"
-                android:src="@drawable/add_icon_white" />
+                android:src="@drawable/add_icon_black" />
         </LinearLayout>
 
     </LinearLayout>
@@ -82,7 +77,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/no_files_yet"
-            android:textColor="#B6BFCC"
+            android:textColor="@color/text_color_lv2"
             android:textSize="20sp" />
     </LinearLayout>
 
@@ -90,6 +85,8 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:layout_marginTop="16dp"
+        android:background="@drawable/dr_rc_top_20_bg_white"
         android:visibility="visible">
 
         <androidx.recyclerview.widget.RecyclerView
@@ -97,6 +94,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_above="@+id/continue_now_btn"
+            android:layout_marginTop="10dp"
             android:overScrollMode="never"
             android:scrollbars="none" />
 
diff --git a/app/src/main/res/layout/activity_pdf_picker.xml b/app/src/main/res/layout/activity_pdf_picker.xml
index d2cd608..1d1f865 100644
--- a/app/src/main/res/layout/activity_pdf_picker.xml
+++ b/app/src/main/res/layout/activity_pdf_picker.xml
@@ -14,7 +14,7 @@
     <LinearLayout
         android:id="@+id/statusLayout"
         android:layout_width="match_parent"
-        android:layout_height="48dp"
+        android:layout_height="44dp"
         android:gravity="center_vertical"
         android:orientation="horizontal">
 
@@ -22,14 +22,12 @@
             android:id="@+id/backBtn"
             android:layout_width="40dp"
             android:layout_height="40dp"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="8dp"
             android:background="@drawable/dr_click_effect_oval_transparent"
             android:gravity="center">
 
             <ImageView
-                android:layout_width="24dp"
-                android:layout_height="24dp"
+                android:layout_width="8dp"
+                android:layout_height="14dp"
                 android:src="@drawable/back_black" />
 
         </LinearLayout>
@@ -42,7 +40,7 @@
             android:layout_weight="1"
             android:text="@string/app_name"
             android:textColor="@color/black"
-            android:textSize="16sp" />
+            android:textSize="18sp" />
 
         <LinearLayout
             android:id="@+id/searchBtn"
@@ -56,7 +54,7 @@
             <ImageView
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                android:src="@drawable/icon_search" />
+                android:src="@drawable/icon_search_black" />
         </LinearLayout>
 
     </LinearLayout>
@@ -79,7 +77,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/no_files_yet"
-            android:textColor="#B6BFCC"
+            android:textColor="@color/text_color_lv2"
             android:textSize="20sp" />
     </LinearLayout>
 
@@ -87,12 +85,15 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:layout_marginTop="16dp"
+        android:background="@drawable/dr_rc_top_20_bg_white"
         android:visibility="visible">
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:layout_marginTop="10dp"
             android:layout_above="@+id/continue_now_btn"
             android:overScrollMode="never"
             android:scrollbars="none" />
diff --git a/app/src/main/res/layout/activity_search_pdf.xml b/app/src/main/res/layout/activity_search_pdf.xml
index 19c0a6c..50c9f8c 100644
--- a/app/src/main/res/layout/activity_search_pdf.xml
+++ b/app/src/main/res/layout/activity_search_pdf.xml
@@ -14,7 +14,7 @@
     <LinearLayout
         android:id="@+id/statusLayout"
         android:layout_width="match_parent"
-        android:layout_height="48dp"
+        android:layout_height="44dp"
         android:gravity="center_vertical"
         android:orientation="horizontal">
 
@@ -22,31 +22,29 @@
             android:id="@+id/backBtn"
             android:layout_width="40dp"
             android:layout_height="40dp"
-            android:layout_marginStart="8dp"
             android:background="@drawable/dr_click_effect_oval_transparent"
-            android:layout_marginEnd="8dp"
             android:gravity="center">
 
             <ImageView
-                android:layout_width="24dp"
-                android:layout_height="24dp"
+                android:layout_width="8dp"
+                android:layout_height="14dp"
                 android:src="@drawable/back_black" />
 
         </LinearLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="32dp"
             android:layout_marginEnd="16dp"
-            android:background="@drawable/dr_item_img_frame"
+            android:background="@drawable/dr_item_img_30_frame"
             android:gravity="center_vertical">
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/searchEdit"
-                style="@style/TextViewFont_PopRegular"
+                style="@style/TextViewFont_PopMedium"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_margin="8dp"
+                android:layout_marginStart="10dp"
                 android:layout_weight="1"
                 android:background="@null"
                 android:hint="@string/search_hint"
@@ -61,14 +59,16 @@
 
                 <ImageView
                     android:id="@+id/searchIv"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/icon_search" />
+                    android:layout_width="16dp"
+                    android:layout_height="16dp"
+                    android:layout_centerInParent="true"
+                    android:src="@drawable/icon_search_black" />
 
                 <ImageView
                     android:id="@+id/deleteIv"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_width="16dp"
+                    android:layout_height="16dp"
+                    android:layout_centerInParent="true"
                     android:src="@drawable/delete_cha_icon"
                     android:visibility="gone" />
 
@@ -94,7 +94,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/no_files_yet"
-            android:textColor="#B6BFCC"
+            android:textColor="@color/text_color_lv2"
             android:textSize="20sp" />
     </LinearLayout>
 
@@ -116,7 +116,7 @@
 
             <TextView
                 android:id="@+id/historyTitle"
-                style="@style/TextViewFont_PopMedium"
+                style="@style/TextViewFont_PopSemiBold"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/history"
@@ -153,11 +153,19 @@
 
     </LinearLayout>
 
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recyclerView"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:clipToPadding="false"
-        android:paddingBottom="32dp" />
+        android:layout_marginTop="16dp"
+        android:background="@drawable/dr_rc_top_20_bg_white">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recyclerView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="10dp"
+            android:clipToPadding="false"
+            android:paddingBottom="32dp" />
+
+    </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/adapter_pdf_item.xml b/app/src/main/res/layout/adapter_pdf_item.xml
index 4556fc6..ede144c 100644
--- a/app/src/main/res/layout/adapter_pdf_item.xml
+++ b/app/src/main/res/layout/adapter_pdf_item.xml
@@ -4,9 +4,9 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginStart="16dp"
-    android:layout_marginTop="8dp"
+    android:layout_marginTop="16dp"
     android:layout_marginEnd="6dp"
-    android:layout_marginBottom="8dp"
+    android:layout_marginBottom="16dp"
     android:orientation="vertical"
     tools:ignore="RtlSymmetry">
 
@@ -74,8 +74,8 @@
         <RelativeLayout
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_marginStart="12dp"
-            android:layout_marginEnd="12dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="6dp"
             android:layout_weight="1"
             android:orientation="vertical">
 
@@ -187,7 +187,7 @@
             <ImageView
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                android:src="@drawable/delete_cha_icon" />
+                android:src="@drawable/icon_delete_circular" />
         </LinearLayout>
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/dialog_pdf_password_protection.xml b/app/src/main/res/layout/dialog_pdf_password_protection.xml
index 775e7ed..25c8a46 100644
--- a/app/src/main/res/layout/dialog_pdf_password_protection.xml
+++ b/app/src/main/res/layout/dialog_pdf_password_protection.xml
@@ -5,7 +5,7 @@
     android:layout_height="wrap_content"
     android:background="@drawable/dr_rounded_corner_12_bg_white"
     android:orientation="vertical"
-    android:padding="24dp">
+    android:padding="20dp">
 
     <TextView
         android:id="@+id/tvTitle"
@@ -13,8 +13,10 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
+        android:layout_marginStart="3dp"
+        android:layout_marginEnd="3dp"
         android:text="@string/password_protection"
-        android:textColor="@color/black"
+        android:textColor="@color/text_color_lv1"
         android:textSize="20sp" />
 
     <TextView
@@ -23,18 +25,22 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
-        android:textColor="@color/black"
+        android:layout_marginStart="3dp"
+        android:layout_marginEnd="3dp"
+        android:textColor="@color/text_color_lv2"
         android:textSize="14sp"
         android:visibility="gone" />
 
     <TextView
         android:id="@+id/tvMessage"
-        style="@style/TextViewFont_PopRegular"
+        style="@style/TextViewFont_PopMedium"
         android:layout_width="match_parent"
+        android:layout_marginStart="3dp"
+        android:layout_marginEnd="3dp"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
         android:text="@string/password_protection_dialog_desc"
-        android:textColor="@color/black_80"
+        android:textColor="@color/text_color_lv2"
         android:textSize="14sp" />
 
     <RelativeLayout
@@ -62,31 +68,50 @@
 
     </RelativeLayout>
 
-
     <LinearLayout
         android:layout_width="match_parent"
+        android:layout_marginTop="24dp"
         android:layout_height="wrap_content"
-        android:gravity="end"
+        android:layout_marginStart="3dp"
+        android:layout_marginEnd="3dp"
         android:orientation="horizontal">
 
-        <TextView
-            android:id="@+id/tvCancel"
-            style="@style/TextViewFont_PopRegular"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+        <LinearLayout
+            android:id="@+id/cancelBtn"
+            android:layout_width="0dp"
+            android:layout_height="48dp"
             android:layout_marginEnd="8dp"
-            android:padding="12dp"
-            android:text="@string/cancel"
-            android:textColor="@color/black_80" />
+            android:layout_weight="1"
+            android:background="@drawable/dr_cancel_btn_bg"
+            android:gravity="center">
 
-        <TextView
-            android:id="@+id/tvConfirm"
-            style="@style/TextViewFont_PopMedium"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="12dp"
-            android:text="@string/ok"
-            android:textColor="@color/black" />
+            <TextView
+                style="@style/TextViewFont_PopSemiBold"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/cancel"
+                android:textColor="@color/black_60"
+                android:textSize="16sp" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/okBtn"
+            android:layout_width="0dp"
+            android:layout_height="48dp"
+            android:layout_marginStart="8dp"
+            android:layout_weight="1"
+            android:background="@drawable/dr_click_btn_bg"
+            android:gravity="center">
+
+            <TextView
+                android:id="@+id/okBtnTv"
+                style="@style/TextViewFont_PopSemiBold"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/ok"
+                android:textColor="@color/white"
+                android:textSize="16sp" />
+        </LinearLayout>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index adc85bd..6cf0d3b 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -27,7 +27,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/no_files_yet"
-            android:textColor="#B6BFCC"
+            android:textColor="@color/text_color_lv2"
             android:textSize="20sp" />
     </LinearLayout>
 
diff --git a/app/src/main/res/mipmap-xhdpi/img_no_files_yet.png b/app/src/main/res/mipmap-xhdpi/img_no_files_yet.png
index 5e7ffd2..5063a25 100644
Binary files a/app/src/main/res/mipmap-xhdpi/img_no_files_yet.png and b/app/src/main/res/mipmap-xhdpi/img_no_files_yet.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/img_no_files_yet.png b/app/src/main/res/mipmap-xxhdpi/img_no_files_yet.png
new file mode 100644
index 0000000..5fb6e3c
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/img_no_files_yet.png differ
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 2edb103..28cbc7d 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -8,10 +8,12 @@
     <color name="black">#222222</color>
     <color name="black_80">#CC222222</color>
     <color name="black_60">#99222222</color>
+    <color name="text_color_lv1">#000000</color>
+    <color name="text_color_lv2">#A9A4A4</color>
     <color name="white">#FFFFFFFF</color>
     <color name="transparent">#00000000</color>
     <color name="grey">#E6E6E6</color>
-    <color name="bg_color">#F9F9F9</color>
+    <color name="bg_color">#F8F8F8</color>
     <color name="line_color">#E0E0E0</color>
     <color name="black_img_color">#2c2c2c</color>
     <color name="grey_text_color">#666666</color>
@@ -21,11 +23,15 @@
     <color name="icon_sel_on_color">#E43521</color>
     <color name="icon_sel_off_color">#CCCCCC</color>
     <color name="text_red_lv1">#E43521</color>
-    <color name="text_red_lv2">#BB6D64</color>
-    <color name="btn_sel_on_color">#E43521</color>
+    <color name="text_red_lv2">#FD4E1D</color>
     <color name="btn_sel_off_color">#33E43521</color>
     <color name="placeholder_bg_color">#E5E5E5</color>
     <color name="night_mode_bg_color">#A6000000</color>
     <color name="icon_off">#A9A4A4</color>
     <color name="icon_on">#E43521</color>
+    <color name="cancel_btn_bg_color">#F8F8F8</color>
+    <color name="ok_btn_bg_lv1_color">#E43521</color>
+    <color name="ok_btn_bg_lv2_color">#FD4E1D</color>
+    <color name="no_click_btn_bg_lv1_color">#7FE43521</color>
+    <color name="no_click_btn_bg_lv2_color">#80FD4E1D</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6104b63..719260b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -138,6 +138,7 @@
     <string name="loading">Loading</string>
     <string name="continue_now">Continue Now</string>
     <string name="exit_split">Exit Split</string>
+    <string name="exit_merge">Exit Merge</string>
     <string name="confirm_discard_changes">Are you sure you want to exit and discard changes?</string>
     <string name="discard">Discard</string>
     <string name="pages">Pages:</string>