diff --git a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ChatActivity.kt b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ChatActivity.kt
index 30758a7..16db632 100644
--- a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ChatActivity.kt
+++ b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ChatActivity.kt
@@ -31,6 +31,7 @@ import com.remax.visualnovel.ui.chat.setting.model.ChatModelDialog
 import com.remax.visualnovel.ui.chat.ui.HoldToTalkDialog
 import com.remax.visualnovel.utils.RecordHelper
 import com.remax.visualnovel.utils.StatusBarUtil2
+import com.remax.visualnovel.utils.StatusBarUtil3
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.Job
 import timber.log.Timber
@@ -50,15 +51,13 @@ class ChatActivity : BaseBindingActivity<ActivityActorChatBinding>() {
     override fun initView() {
         /*ARouter.getInstance().inject(this)
         StatusBarUtils.setStatusBarAndNavBarIsLight(this, false)
-        StatusBarUtils.setTransparent(this)*/
-        StatusBarUtil2.initImmersive(this, lightStatusBar = true)
-        binding.root.setPadding(binding.root.paddingStart, binding.root.paddingTop + StatusBarUtil2.getStatusBarHeight(this) * 2,
-                    binding.root.paddingEnd, binding.root.paddingBottom)
+        StatusBarUtils.setTransparent(this)
+        StatusBarUtil2.initImmersive(this, lightStatusBar = true) */
+        StatusBarUtil3.setImmersiveStatusBar(this, true)
         binding.toolbar.addRightIcon(R.mipmap.chat_title_setting) {
             binding.drawerMenu.openDrawer(GravityCompat.END)
         }
 
-
         with(binding) {
             initInputPanelEvents()
             initCallViewEvents()
diff --git a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ChatEditView.kt b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ChatEditView.kt
index 95e2bf8..dcf0860 100644
--- a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ChatEditView.kt
+++ b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ChatEditView.kt
@@ -2,13 +2,14 @@ package com.remax.visualnovel.ui.chat
 
 import android.content.Context
 import android.util.AttributeSet
+import androidx.appcompat.widget.AppCompatEditText
 import com.remax.visualnovel.R
 import com.remax.visualnovel.utils.spannablex.utils.dp
 import com.remax.visualnovel.widget.uitoken.view.UITokenEditView
 
 
 class ChatEditView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0)
-    : UITokenEditView(context, attrs, defStyleAttr) {
+    : AppCompatEditText(context, attrs, defStyleAttr) {
 
 
     init {
diff --git a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/main/MainActivity.kt b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/main/MainActivity.kt
index d871d8b..952305c 100644
--- a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/main/MainActivity.kt
+++ b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/main/MainActivity.kt
@@ -30,6 +30,7 @@ import com.remax.visualnovel.ui.main.actor.ActorListFragment
 import com.remax.visualnovel.ui.main.book.BookListFragment
 import com.remax.visualnovel.ui.main.history.HistoryFragment
 import com.remax.visualnovel.ui.main.managa.MangaListFragment
+import com.remax.visualnovel.utils.StatusBarUtil3
 import dagger.hilt.android.AndroidEntryPoint
 
 
@@ -41,8 +42,9 @@ class MainActivity : BaseBindingActivity<ActivityMainBinding>() {
     private val mainViewModel by viewModels<MainViewModel>()
 
     override fun initView() {
-        StatusBarUtils.setStatusBarAndNavBarIsLight(this, false)
-        StatusBarUtils.setTransparent(this)
+        /*StatusBarUtils.setStatusBarAndNavBarIsLight(this, false)
+        StatusBarUtils.setTransparent(this)*/
+        StatusBarUtil3.setImmersiveStatusBar(this, true)
 
         onBackPressedDispatcher.addCallback(this) {
             if (mainViewModel.canBack) {
diff --git a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/main/MainToolbar.kt b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/main/MainToolbar.kt
new file mode 100644
index 0000000..d58aff8
--- /dev/null
+++ b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/main/MainToolbar.kt
@@ -0,0 +1,41 @@
+package com.remax.visualnovel.ui.main
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.widget.LinearLayout
+import com.remax.visualnovel.R
+import com.remax.visualnovel.databinding.ToolbarMainBinding
+import com.remax.visualnovel.entity.response.ChatSound
+
+class MainToolbar @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : LinearLayout(context, attrs, defStyleAttr) {
+    private lateinit var items: List<ChatSound>
+    private var mBinding: ToolbarMainBinding
+
+    private lateinit var mEventListener: IEventListener
+
+
+    interface IEventListener {
+        fun onSoundSelected(sound: ChatSound)
+    }
+
+
+    init {
+        mBinding = ToolbarMainBinding.inflate(LayoutInflater.from(context), this, true)
+        with(mBinding) {
+            avatarView.loadImageResourceAvatar(R.mipmap.sex_man_big)
+            tvDiamondLevel.text = "150"
+        }
+    }
+
+
+    fun setEventListener(eventListener: IEventListener) {
+        mEventListener = eventListener
+    }
+
+
+}
\ No newline at end of file
diff --git a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/main/actor/ActorListFragment.kt b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/main/actor/ActorListFragment.kt
index 438690a..551ec95 100644
--- a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/main/actor/ActorListFragment.kt
+++ b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/main/actor/ActorListFragment.kt
@@ -15,6 +15,7 @@ import com.remax.visualnovel.app.base.BaseBindingFragment
 import com.remax.visualnovel.configs.NovelApplication
 import com.remax.visualnovel.databinding.FragmentMainActorBinding
 import com.remax.visualnovel.utils.Routers
+import com.remax.visualnovel.utils.StatusBarUtil3
 import dagger.hilt.android.AndroidEntryPoint
 import kotlin.getValue
 import kotlin.math.max
@@ -36,17 +37,20 @@ class ActorListFragment : BaseBindingFragment<FragmentMainActorBinding>() {
     }
 
     private fun setUI() {
+        with(binding.root) {
+            setPadding(
+                paddingLeft,
+                paddingTop + StatusBarUtil3.getStatusBarHeight(context),
+                paddingRight,
+                paddingBottom
+            )
+        }
+
         initTagLayout()
         initRecyclerView()
-        initTitleView()
     }
 
-    private fun initTitleView() {
-        with(binding) {
-            avatarView.loadImageResourceAvatar(R.mipmap.sex_man_big)
-            tvDiamondLevel.text = "150"
-        }
-    }
+
 
     private fun initRecyclerView() {
         with(binding) {
diff --git a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/main/book/BookListFragment.kt b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/main/book/BookListFragment.kt
index 443f6d0..5c12211 100644
--- a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/main/book/BookListFragment.kt
+++ b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/main/book/BookListFragment.kt
@@ -8,6 +8,7 @@ import com.dylanc.loadingstateview.BgColorType
 import com.remax.visualnovel.app.base.BaseBindingFragment
 import com.remax.visualnovel.databinding.FragmentMainBookBinding
 import com.remax.visualnovel.utils.Routers
+import com.remax.visualnovel.utils.StatusBarUtil3
 import dagger.hilt.android.AndroidEntryPoint
 import kotlin.getValue
 
@@ -28,8 +29,13 @@ class BookListFragment : BaseBindingFragment<FragmentMainBookBinding>() {
     }
 
     private fun setUI() {
-        with(binding) {
-
+        with(binding.root) {
+            setPadding(
+                paddingLeft,
+                paddingTop + StatusBarUtil3.getStatusBarHeight(context),
+                paddingRight,
+                paddingBottom
+            )
         }
     }
 
diff --git a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/main/history/HistoryFragment.kt b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/main/history/HistoryFragment.kt
index 408877c..68e03c4 100644
--- a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/main/history/HistoryFragment.kt
+++ b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/main/history/HistoryFragment.kt
@@ -8,6 +8,7 @@ import com.dylanc.loadingstateview.BgColorType
 import com.remax.visualnovel.app.base.BaseBindingFragment
 import com.remax.visualnovel.databinding.FragmentMainHistoryBinding
 import com.remax.visualnovel.utils.Routers
+import com.remax.visualnovel.utils.StatusBarUtil3
 import dagger.hilt.android.AndroidEntryPoint
 import kotlin.getValue
 
@@ -28,8 +29,13 @@ class HistoryFragment : BaseBindingFragment<FragmentMainHistoryBinding>() {
     }
 
     private fun setUI() {
-        with(binding) {
-
+        with(binding.root) {
+            setPadding(
+                paddingLeft,
+                paddingTop + StatusBarUtil3.getStatusBarHeight(context),
+                paddingRight,
+                paddingBottom
+            )
         }
     }
 
diff --git a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/main/managa/MangaListFragment.kt b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/main/managa/MangaListFragment.kt
index 52be620..d76f078 100644
--- a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/main/managa/MangaListFragment.kt
+++ b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/main/managa/MangaListFragment.kt
@@ -8,6 +8,7 @@ import com.dylanc.loadingstateview.BgColorType
 import com.remax.visualnovel.app.base.BaseBindingFragment
 import com.remax.visualnovel.databinding.FragmentMainMangaBinding
 import com.remax.visualnovel.utils.Routers
+import com.remax.visualnovel.utils.StatusBarUtil3
 import dagger.hilt.android.AndroidEntryPoint
 import kotlin.getValue
 
@@ -28,8 +29,13 @@ class MangaListFragment : BaseBindingFragment<FragmentMainMangaBinding>() {
     }
 
     private fun setUI() {
-        with(binding) {
-
+        with(binding.root) {
+            setPadding(
+                paddingLeft,
+                paddingTop + StatusBarUtil3.getStatusBarHeight(context),
+                paddingRight,
+                paddingBottom
+            )
         }
     }
 
diff --git a/VisualNovel/app/src/main/java/com/remax/visualnovel/utils/StatusBarUtil3.kt b/VisualNovel/app/src/main/java/com/remax/visualnovel/utils/StatusBarUtil3.kt
new file mode 100644
index 0000000..1bbac52
--- /dev/null
+++ b/VisualNovel/app/src/main/java/com/remax/visualnovel/utils/StatusBarUtil3.kt
@@ -0,0 +1,53 @@
+package com.remax.visualnovel.utils
+
+import android.app.Activity
+import android.content.Context
+import android.graphics.Color
+import android.os.Build
+import android.view.View
+import android.view.WindowManager
+import kotlin.apply
+
+
+
+object StatusBarUtil3 {
+    /**
+     * 设置沉浸式状态栏
+     */
+    fun setImmersiveStatusBar(activity: Activity, lightStatusBar: Boolean = true) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            activity.window.apply {
+                // 设置状态栏透明
+                clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS)
+                addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS)
+                statusBarColor = Color.TRANSPARENT
+
+
+                // 设置状态栏文字颜色
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                    var systemUiVisibility = decorView.systemUiVisibility
+                    systemUiVisibility = systemUiVisibility or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+                    systemUiVisibility = if (lightStatusBar) {
+                        systemUiVisibility or View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
+                    } else {
+                        systemUiVisibility and View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR.inv()
+                    }
+                    decorView.systemUiVisibility = systemUiVisibility
+                }
+            }
+        }
+    }
+
+
+    /**
+     * 获取状态栏高度
+     */
+    fun getStatusBarHeight(context: Context): Int {
+        var result = 0
+        val resourceId = context.resources.getIdentifier("status_bar_height", "dimen", "android")
+        if (resourceId > 0) {
+            result = context.resources.getDimensionPixelSize(resourceId)
+        }
+        return result
+    }
+}
\ No newline at end of file
diff --git a/VisualNovel/app/src/main/java/com/remax/visualnovel/widget/toolbar/CommonToolbar.kt b/VisualNovel/app/src/main/java/com/remax/visualnovel/widget/toolbar/CommonToolbar.kt
index 93796a5..01b0be2 100644
--- a/VisualNovel/app/src/main/java/com/remax/visualnovel/widget/toolbar/CommonToolbar.kt
+++ b/VisualNovel/app/src/main/java/com/remax/visualnovel/widget/toolbar/CommonToolbar.kt
@@ -2,7 +2,6 @@ package com.remax.visualnovel.widget.toolbar
 
 
 import android.content.Context
-import android.graphics.drawable.Drawable
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
@@ -10,6 +9,7 @@ import android.widget.ImageView
 import android.widget.LinearLayout
 import androidx.annotation.DrawableRes
 import com.remax.visualnovel.R
+import com.remax.visualnovel.utils.StatusBarUtil3
 import com.remax.visualnovel.widget.uitoken.view.UITokenFrameLayout
 import com.remax.visualnovel.widget.uitoken.view.UITokenImageView
 import com.remax.visualnovel.widget.uitoken.view.UITokenLinearLayout
@@ -30,17 +30,24 @@ class CommonToolbar @JvmOverloads constructor(
     private var onChildClickListener: ((View) -> Unit)? = null
 
     init {
-        LayoutInflater.from(context).inflate(R.layout.common_toolbar_layout, this, true)
+        val rootView = LayoutInflater.from(context).inflate(R.layout.common_toolbar_layout, this, true)
         ivBack = findViewById(R.id.iv_left)
         llCenter = findViewById(R.id.ll_center)
         ivTitle = findViewById(R.id.iv_title)
         llRight = findViewById(R.id.ll_right)
 
+        with(rootView) {
+            setPadding(
+                paddingLeft,
+                paddingTop + StatusBarUtil3.getStatusBarHeight(context),
+                paddingRight,
+                paddingBottom
+            )
+        }
 
         setOnChildClickListener { view ->
             when (view.id) {
                 R.id.iv_left -> {
-                    // 默认返回按钮处理
                     performBackAction()
                 }
                 // TODO - 其他子view
@@ -48,32 +55,16 @@ class CommonToolbar @JvmOverloads constructor(
         }
     }
 
-    /**
-     * 设置标题文本
-     */
-    fun setTitle(text: String) {
-        ivTitle.text = text
-    }
-
-    /**
-     * 设置标题文本
-     */
     fun setTitle(resId: Int) {
         ivTitle.setText(resId)
     }
 
-    /**
-     * 向中心区域添加自定义视图
-     */
     fun addCenterView(view: View) {
         llCenter.removeAllViews()
         llCenter.addView(view)
         setupClickListener(view)
     }
 
-    /**
-     * 向右侧区域添加图标
-     */
     fun addRightIcon(@DrawableRes resId: Int, tag: String? = null): ImageView {
         val imageView = ImageView(context).apply {
             setImageResource(resId)
@@ -95,14 +86,14 @@ class CommonToolbar @JvmOverloads constructor(
         val imageView = ImageView(context).apply {
             setImageResource(resId)
             scaleType = ImageView.ScaleType.CENTER_INSIDE
+            setOnClickListener {
+                onClick.invoke()
+            }
             layoutParams = LinearLayout.LayoutParams(
                 LayoutParams.WRAP_CONTENT,
                 LayoutParams.WRAP_CONTENT
             ).apply {
                 setMargins(16, 0, 16, 0)
-                setOnClickListener {
-                    onClick.invoke()
-                }
             }
             this.tag = tag
         }
@@ -110,54 +101,30 @@ class CommonToolbar @JvmOverloads constructor(
         setupClickListener(imageView)
     }
 
-    /**
-     * 向右侧区域添加自定义视图
-     */
     fun addRightView(view: View, tag: String? = null) {
         view.tag = tag
         llRight.addView(view)
         setupClickListener(view)
     }
 
-    /**
-     * 清除右侧所有视图
-     */
     fun clearRightViews() {
         llRight.removeAllViews()
     }
 
-    /**
-     * 设置子视图点击监听器
-     */
     fun setOnChildClickListener(listener: (View) -> Unit) {
         this.onChildClickListener = listener
         setupClickListeners()
     }
 
-    /**
-     * 设置返回按钮可见性
-     */
-    fun setBackButtonVisible(visible: Boolean) {
+    fun setBackVisible(visible: Boolean) {
         ivBack.visibility = if (visible) View.VISIBLE else View.GONE
     }
 
-    /**
-     * 设置返回按钮图标
-     */
-    fun setBackButtonIcon(@DrawableRes resId: Int) {
+    fun setBackIcon(@DrawableRes resId: Int) {
         ivBack.setImageResource(resId)
     }
 
-    /**
-     * 设置返回按钮图标
-     */
-    fun setBackButtonIcon(drawable: Drawable) {
-        ivBack.setImageDrawable(drawable)
-    }
-
-    /**
-     * 获取右侧指定tag的视图
-     */
+    // 通过tag查询右侧cotnainer中View
     fun findRightViewByTag(tag: String): View? {
         for (i in 0 until llRight.childCount) {
             val child = llRight.getChildAt(i)
@@ -173,7 +140,6 @@ class CommonToolbar @JvmOverloads constructor(
         setupClickListener(llCenter)
         setupClickListener(ivTitle)
 
-        // 为右侧所有子视图设置监听
         for (i in 0 until llRight.childCount) {
             setupClickListener(llRight.getChildAt(i))
         }
diff --git a/VisualNovel/app/src/main/res/drawable/character1.png b/VisualNovel/app/src/main/res/drawable/character1.png
deleted file mode 100644
index 9aedac1..0000000
Binary files a/VisualNovel/app/src/main/res/drawable/character1.png and /dev/null differ
diff --git a/VisualNovel/app/src/main/res/drawable/character1.webp b/VisualNovel/app/src/main/res/drawable/character1.webp
new file mode 100644
index 0000000..c872263
Binary files /dev/null and b/VisualNovel/app/src/main/res/drawable/character1.webp differ
diff --git a/VisualNovel/app/src/main/res/drawable/character2.png b/VisualNovel/app/src/main/res/drawable/character2.png
deleted file mode 100644
index 785cef3..0000000
Binary files a/VisualNovel/app/src/main/res/drawable/character2.png and /dev/null differ
diff --git a/VisualNovel/app/src/main/res/drawable/character2.webp b/VisualNovel/app/src/main/res/drawable/character2.webp
new file mode 100644
index 0000000..e417171
Binary files /dev/null and b/VisualNovel/app/src/main/res/drawable/character2.webp differ
diff --git a/VisualNovel/app/src/main/res/drawable/character_placeholder.png b/VisualNovel/app/src/main/res/drawable/character_placeholder.png
deleted file mode 100644
index 9a19629..0000000
Binary files a/VisualNovel/app/src/main/res/drawable/character_placeholder.png and /dev/null differ
diff --git a/VisualNovel/app/src/main/res/drawable/character_placeholder.webp b/VisualNovel/app/src/main/res/drawable/character_placeholder.webp
new file mode 100644
index 0000000..728a1cc
Binary files /dev/null and b/VisualNovel/app/src/main/res/drawable/character_placeholder.webp differ
diff --git a/VisualNovel/app/src/main/res/layout/activity_main.xml b/VisualNovel/app/src/main/res/layout/activity_main.xml
index 72b1e95..30f5a42 100644
--- a/VisualNovel/app/src/main/res/layout/activity_main.xml
+++ b/VisualNovel/app/src/main/res/layout/activity_main.xml
@@ -4,10 +4,9 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@mipmap/bg_level_1_page"
+    android:fitsSystemWindows="false"
     android:orientation="vertical">
 
-
     <androidx.viewpager2.widget.ViewPager2
         android:id="@+id/viewPager2"
         android:layout_width="match_parent"
@@ -16,6 +15,7 @@
         app:layout_constraintBottom_toTopOf="@+id/bottomLayout"
         app:layout_constraintTop_toTopOf="parent" />
 
+
     <com.remax.visualnovel.widget.uitoken.view.UITokenConstraintLayout
         android:id="@+id/bottomLayout"
         android:layout_width="match_parent"
diff --git a/VisualNovel/app/src/main/res/layout/fragment_main_actor.xml b/VisualNovel/app/src/main/res/layout/fragment_main_actor.xml
index befdaf5..6d1078b 100644
--- a/VisualNovel/app/src/main/res/layout/fragment_main_actor.xml
+++ b/VisualNovel/app/src/main/res/layout/fragment_main_actor.xml
@@ -7,93 +7,11 @@
     android:background="@mipmap/bg_level_1_page"
     android:orientation="vertical">
 
-
-
-    <com.remax.visualnovel.widget.uitoken.view.UITokenConstraintLayout
+    <com.remax.visualnovel.ui.main.MainToolbar
+        android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingHorizontal="@dimen/dp_16"
-        android:paddingVertical="@dimen/dp_4"
-        android:layout_marginTop="@dimen/dp_40"
-        >
-
-        <com.remax.visualnovel.widget.uitoken.view.UITokenLinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:gravity="center_vertical"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            >
-            <com.remax.visualnovel.widget.ui.UserAvatarView
-                android:id="@+id/avatarView"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:avatarSizeType="M"
-                />
-
-            <com.remax.visualnovel.widget.uitoken.view.UITokenTextView
-                android:id="@+id/tv_diamond_level"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/dp_15"
-                android:background="@drawable/diamond_info_bg"
-                android:paddingVertical="@dimen/dp_6"
-                android:paddingStart="@dimen/dp_6"
-                android:paddingEnd="@dimen/dp_12"
-                android:gravity="center_vertical"
-                app:drawableLeftCompat="@mipmap/diamond_3"
-                android:drawablePadding="@dimen/dp_6"
-                android:textSize="@dimen/sp_14"
-                android:textColor="@color/black"
-                android:textStyle="bold"
-                app:radiusToken="@string/radius_pill"
-                />
-
-        </com.remax.visualnovel.widget.uitoken.view.UITokenLinearLayout>
-
-        <com.remax.visualnovel.widget.uitoken.view.UITokenLinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:gravity="center_vertical"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            >
-
-            <com.remax.visualnovel.widget.uitoken.view.UITokenImageView
-                android:id="@+id/iv_search"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/dp_4"
-                android:src="@mipmap/icon_search_on"
-                />
-
-            <com.remax.visualnovel.widget.uitoken.view.UITokenImageView
-                android:id="@+id/iv_sign"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/dp_4"
-                android:layout_marginStart="@dimen/dp_10"
-                android:src="@mipmap/icon_sign"
-                />
-
-            <com.remax.visualnovel.widget.uitoken.view.UITokenImageView
-                android:id="@+id/iv_discussion"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/dp_4"
-                android:layout_marginStart="@dimen/dp_10"
-                android:src="@mipmap/icon_discussion"
-                />
-
-        </com.remax.visualnovel.widget.uitoken.view.UITokenLinearLayout>
-
-
-    </com.remax.visualnovel.widget.uitoken.view.UITokenConstraintLayout>
-
+        />
 
     <com.remax.visualnovel.widget.custom.TagFlowLayout2
         android:id="@+id/tagFlowLayout"
diff --git a/VisualNovel/app/src/main/res/layout/fragment_main_book.xml b/VisualNovel/app/src/main/res/layout/fragment_main_book.xml
index c952614..9e94f26 100644
--- a/VisualNovel/app/src/main/res/layout/fragment_main_book.xml
+++ b/VisualNovel/app/src/main/res/layout/fragment_main_book.xml
@@ -4,13 +4,20 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:gravity="center_vertical"
+    android:background="@mipmap/bg_level_1_page"
     android:orientation="vertical">
 
+    <com.remax.visualnovel.ui.main.MainToolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        />
+
     <com.remax.visualnovel.widget.uitoken.view.UITokenTextView
         android:id="@+id/tvTitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginTop="100dp"
         android:gravity="center"
         android:layout_marginStart="@dimen/nav_title_margin"
         android:layout_marginEnd="@dimen/nav_title_margin"
diff --git a/VisualNovel/app/src/main/res/layout/fragment_main_history.xml b/VisualNovel/app/src/main/res/layout/fragment_main_history.xml
index 50d307f..94f7996 100644
--- a/VisualNovel/app/src/main/res/layout/fragment_main_history.xml
+++ b/VisualNovel/app/src/main/res/layout/fragment_main_history.xml
@@ -4,13 +4,20 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:gravity="center_vertical"
+    android:background="@mipmap/bg_level_1_page"
     android:orientation="vertical">
 
+    <com.remax.visualnovel.ui.main.MainToolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        />
+
     <com.remax.visualnovel.widget.uitoken.view.UITokenTextView
         android:id="@+id/tvTitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginTop="100dp"
         android:gravity="center"
         android:layout_marginStart="@dimen/nav_title_margin"
         android:layout_marginEnd="@dimen/nav_title_margin"
diff --git a/VisualNovel/app/src/main/res/layout/fragment_main_manga.xml b/VisualNovel/app/src/main/res/layout/fragment_main_manga.xml
index 4e75101..5bc99b4 100644
--- a/VisualNovel/app/src/main/res/layout/fragment_main_manga.xml
+++ b/VisualNovel/app/src/main/res/layout/fragment_main_manga.xml
@@ -4,13 +4,20 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:gravity="center_vertical"
+    android:background="@mipmap/bg_level_1_page"
     android:orientation="vertical">
 
+    <com.remax.visualnovel.ui.main.MainToolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        />
+
     <com.remax.visualnovel.widget.uitoken.view.UITokenTextView
         android:id="@+id/tvTitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginTop="100dp"
         android:gravity="center"
         android:layout_marginStart="@dimen/nav_title_margin"
         android:layout_marginEnd="@dimen/nav_title_margin"
diff --git a/VisualNovel/app/src/main/res/layout/toolbar_main.xml b/VisualNovel/app/src/main/res/layout/toolbar_main.xml
new file mode 100644
index 0000000..75e0d42
--- /dev/null
+++ b/VisualNovel/app/src/main/res/layout/toolbar_main.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.remax.visualnovel.widget.uitoken.view.UITokenConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/title_root"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingHorizontal="@dimen/dp_16"
+    android:paddingVertical="@dimen/dp_4"
+    >
+
+    <com.remax.visualnovel.widget.uitoken.view.UITokenLinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:gravity="center_vertical"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        >
+        <com.remax.visualnovel.widget.ui.UserAvatarView
+            android:id="@+id/avatarView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:avatarSizeType="M"
+            />
+
+        <com.remax.visualnovel.widget.uitoken.view.UITokenTextView
+            android:id="@+id/tv_diamond_level"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dp_15"
+            android:background="@drawable/diamond_info_bg"
+            android:paddingVertical="@dimen/dp_6"
+            android:paddingStart="@dimen/dp_6"
+            android:paddingEnd="@dimen/dp_12"
+            android:gravity="center_vertical"
+            app:drawableLeftCompat="@mipmap/diamond_3"
+            android:drawablePadding="@dimen/dp_6"
+            android:textSize="@dimen/sp_14"
+            android:textColor="@color/black"
+            android:textStyle="bold"
+            app:radiusToken="@string/radius_pill"
+            />
+
+    </com.remax.visualnovel.widget.uitoken.view.UITokenLinearLayout>
+
+    <com.remax.visualnovel.widget.uitoken.view.UITokenLinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:gravity="center_vertical"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        >
+
+        <com.remax.visualnovel.widget.uitoken.view.UITokenImageView
+            android:id="@+id/iv_search"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="@dimen/dp_4"
+            android:src="@mipmap/icon_search_on"
+            />
+
+        <com.remax.visualnovel.widget.uitoken.view.UITokenImageView
+            android:id="@+id/iv_sign"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="@dimen/dp_4"
+            android:layout_marginStart="@dimen/dp_10"
+            android:src="@mipmap/icon_sign"
+            />
+
+        <com.remax.visualnovel.widget.uitoken.view.UITokenImageView
+            android:id="@+id/iv_discussion"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="@dimen/dp_4"
+            android:layout_marginStart="@dimen/dp_10"
+            android:src="@mipmap/icon_discussion"
+            />
+
+    </com.remax.visualnovel.widget.uitoken.view.UITokenLinearLayout>
+</com.remax.visualnovel.widget.uitoken.view.UITokenConstraintLayout>
diff --git a/VisualNovel/app/src/main/res/mipmap-hdpi/img.png b/VisualNovel/app/src/main/res/mipmap-hdpi/img.png
deleted file mode 100644
index e10003f..0000000
Binary files a/VisualNovel/app/src/main/res/mipmap-hdpi/img.png and /dev/null differ
diff --git a/VisualNovel/app/src/main/res/mipmap-hdpi/img.webp b/VisualNovel/app/src/main/res/mipmap-hdpi/img.webp
new file mode 100644
index 0000000..5ea09e9
Binary files /dev/null and b/VisualNovel/app/src/main/res/mipmap-hdpi/img.webp differ
diff --git a/VisualNovel/app/src/main/res/mipmap-xxhdpi/img.png b/VisualNovel/app/src/main/res/mipmap-xxhdpi/img.png
deleted file mode 100644
index d501a79..0000000
Binary files a/VisualNovel/app/src/main/res/mipmap-xxhdpi/img.png and /dev/null differ
diff --git a/VisualNovel/app/src/main/res/mipmap-xxhdpi/img_1.png b/VisualNovel/app/src/main/res/mipmap-xxhdpi/img_1.png
deleted file mode 100644
index d501a79..0000000
Binary files a/VisualNovel/app/src/main/res/mipmap-xxhdpi/img_1.png and /dev/null differ
diff --git a/VisualNovel/app/src/main/res/mipmap-xxhdpi/img_1.webp b/VisualNovel/app/src/main/res/mipmap-xxhdpi/img_1.webp
new file mode 100644
index 0000000..ba58f38
Binary files /dev/null and b/VisualNovel/app/src/main/res/mipmap-xxhdpi/img_1.webp differ
diff --git a/VisualNovel/app/src/main/res/mipmap-xxhdpi/temp_avatar.jpg b/VisualNovel/app/src/main/res/mipmap-xxhdpi/temp_avatar.jpg
deleted file mode 100644
index 69e254c..0000000
Binary files a/VisualNovel/app/src/main/res/mipmap-xxhdpi/temp_avatar.jpg and /dev/null differ
diff --git a/VisualNovel/app/src/main/res/mipmap-xxxhdpi/crush_level_bg.png b/VisualNovel/app/src/main/res/mipmap-xxxhdpi/crush_level_bg.png
deleted file mode 100644
index 160bbe2..0000000
Binary files a/VisualNovel/app/src/main/res/mipmap-xxxhdpi/crush_level_bg.png and /dev/null differ
diff --git a/VisualNovel/app/src/main/res/mipmap-xxxhdpi/crush_level_bg.webp b/VisualNovel/app/src/main/res/mipmap-xxxhdpi/crush_level_bg.webp
new file mode 100644
index 0000000..9f16a14
Binary files /dev/null and b/VisualNovel/app/src/main/res/mipmap-xxxhdpi/crush_level_bg.webp differ
diff --git a/VisualNovel/app/src/main/res/mipmap-xxxhdpi/crush_level_bg_bottom.png b/VisualNovel/app/src/main/res/mipmap-xxxhdpi/crush_level_bg_bottom.png
deleted file mode 100644
index 054aecd..0000000
Binary files a/VisualNovel/app/src/main/res/mipmap-xxxhdpi/crush_level_bg_bottom.png and /dev/null differ
diff --git a/VisualNovel/app/src/main/res/mipmap-xxxhdpi/crush_level_bg_bottom.webp b/VisualNovel/app/src/main/res/mipmap-xxxhdpi/crush_level_bg_bottom.webp
new file mode 100644
index 0000000..40afe4e
Binary files /dev/null and b/VisualNovel/app/src/main/res/mipmap-xxxhdpi/crush_level_bg_bottom.webp differ
diff --git a/VisualNovel/app/src/main/res/mipmap-xxxhdpi/crush_level_bg_top.png b/VisualNovel/app/src/main/res/mipmap-xxxhdpi/crush_level_bg_top.png
deleted file mode 100644
index e5b2ac5..0000000
Binary files a/VisualNovel/app/src/main/res/mipmap-xxxhdpi/crush_level_bg_top.png and /dev/null differ
diff --git a/VisualNovel/app/src/main/res/mipmap-xxxhdpi/crush_level_bg_top.webp b/VisualNovel/app/src/main/res/mipmap-xxxhdpi/crush_level_bg_top.webp
new file mode 100644
index 0000000..b2a1a14
Binary files /dev/null and b/VisualNovel/app/src/main/res/mipmap-xxxhdpi/crush_level_bg_top.webp differ
diff --git a/VisualNovel/app/src/main/res/mipmap-xxxhdpi/ic_gender_nonconforming.png b/VisualNovel/app/src/main/res/mipmap-xxxhdpi/ic_gender_nonconforming.png
deleted file mode 100644
index e6b18a8..0000000
Binary files a/VisualNovel/app/src/main/res/mipmap-xxxhdpi/ic_gender_nonconforming.png and /dev/null differ
diff --git a/VisualNovel/app/src/main/res/mipmap-xxxhdpi/ic_gender_nonconforming.webp b/VisualNovel/app/src/main/res/mipmap-xxxhdpi/ic_gender_nonconforming.webp
new file mode 100644
index 0000000..23a52ed
Binary files /dev/null and b/VisualNovel/app/src/main/res/mipmap-xxxhdpi/ic_gender_nonconforming.webp differ
diff --git a/VisualNovel/app/src/main/res/mipmap-xxxhdpi/ic_transaction.png b/VisualNovel/app/src/main/res/mipmap-xxxhdpi/ic_transaction.png
deleted file mode 100644
index b4a17d6..0000000
Binary files a/VisualNovel/app/src/main/res/mipmap-xxxhdpi/ic_transaction.png and /dev/null differ
diff --git a/VisualNovel/app/src/main/res/mipmap-xxxhdpi/ic_transaction.webp b/VisualNovel/app/src/main/res/mipmap-xxxhdpi/ic_transaction.webp
new file mode 100644
index 0000000..d6cec9c
Binary files /dev/null and b/VisualNovel/app/src/main/res/mipmap-xxxhdpi/ic_transaction.webp differ
diff --git a/VisualNovel/app/src/main/res/mipmap-xxxhdpi/picker_icon_fill.png b/VisualNovel/app/src/main/res/mipmap-xxxhdpi/picker_icon_fill.png
deleted file mode 100644
index ed92f63..0000000
Binary files a/VisualNovel/app/src/main/res/mipmap-xxxhdpi/picker_icon_fill.png and /dev/null differ
diff --git a/VisualNovel/app/src/main/res/mipmap-xxxhdpi/picker_icon_fill.webp b/VisualNovel/app/src/main/res/mipmap-xxxhdpi/picker_icon_fill.webp
new file mode 100644
index 0000000..21feb2e
Binary files /dev/null and b/VisualNovel/app/src/main/res/mipmap-xxxhdpi/picker_icon_fill.webp differ
diff --git a/VisualNovel/app/src/main/res/mipmap-xxxhdpi/picker_icon_fit.png b/VisualNovel/app/src/main/res/mipmap-xxxhdpi/picker_icon_fit.png
deleted file mode 100644
index ac2f8ef..0000000
Binary files a/VisualNovel/app/src/main/res/mipmap-xxxhdpi/picker_icon_fit.png and /dev/null differ
diff --git a/VisualNovel/app/src/main/res/mipmap-xxxhdpi/picker_icon_fit.webp b/VisualNovel/app/src/main/res/mipmap-xxxhdpi/picker_icon_fit.webp
new file mode 100644
index 0000000..33c9ca2
Binary files /dev/null and b/VisualNovel/app/src/main/res/mipmap-xxxhdpi/picker_icon_fit.webp differ
diff --git a/VisualNovel/app/src/main/res/mipmap-xxxhdpi/picker_icon_full.png b/VisualNovel/app/src/main/res/mipmap-xxxhdpi/picker_icon_full.png
deleted file mode 100644
index a4881ac..0000000
Binary files a/VisualNovel/app/src/main/res/mipmap-xxxhdpi/picker_icon_full.png and /dev/null differ
diff --git a/VisualNovel/app/src/main/res/mipmap-xxxhdpi/picker_icon_full.webp b/VisualNovel/app/src/main/res/mipmap-xxxhdpi/picker_icon_full.webp
new file mode 100644
index 0000000..972b514
Binary files /dev/null and b/VisualNovel/app/src/main/res/mipmap-xxxhdpi/picker_icon_full.webp differ
diff --git a/VisualNovel/app/src/main/res/mipmap-xxxhdpi/picker_icon_haswhite.png b/VisualNovel/app/src/main/res/mipmap-xxxhdpi/picker_icon_haswhite.png
deleted file mode 100644
index 9ebce3c..0000000
Binary files a/VisualNovel/app/src/main/res/mipmap-xxxhdpi/picker_icon_haswhite.png and /dev/null differ
diff --git a/VisualNovel/app/src/main/res/mipmap-xxxhdpi/picker_icon_haswhite.webp b/VisualNovel/app/src/main/res/mipmap-xxxhdpi/picker_icon_haswhite.webp
new file mode 100644
index 0000000..d1604c5
Binary files /dev/null and b/VisualNovel/app/src/main/res/mipmap-xxxhdpi/picker_icon_haswhite.webp differ
diff --git a/VisualNovel/app/src/main/res/mipmap-xxxhdpi/picker_icon_video.png b/VisualNovel/app/src/main/res/mipmap-xxxhdpi/picker_icon_video.png
deleted file mode 100644
index 6ec8e45..0000000
Binary files a/VisualNovel/app/src/main/res/mipmap-xxxhdpi/picker_icon_video.png and /dev/null differ
diff --git a/VisualNovel/app/src/main/res/mipmap-xxxhdpi/picker_icon_video.webp b/VisualNovel/app/src/main/res/mipmap-xxxhdpi/picker_icon_video.webp
new file mode 100644
index 0000000..7935763
Binary files /dev/null and b/VisualNovel/app/src/main/res/mipmap-xxxhdpi/picker_icon_video.webp differ
diff --git a/VisualNovel/app/src/main/res/mipmap-xxxhdpi/picker_item_video.png b/VisualNovel/app/src/main/res/mipmap-xxxhdpi/picker_item_video.png
deleted file mode 100644
index 14c8398..0000000
Binary files a/VisualNovel/app/src/main/res/mipmap-xxxhdpi/picker_item_video.png and /dev/null differ
diff --git a/VisualNovel/app/src/main/res/mipmap-xxxhdpi/picker_item_video.webp b/VisualNovel/app/src/main/res/mipmap-xxxhdpi/picker_item_video.webp
new file mode 100644
index 0000000..21dd178
Binary files /dev/null and b/VisualNovel/app/src/main/res/mipmap-xxxhdpi/picker_item_video.webp differ
diff --git a/VisualNovel/app/src/main/res/mipmap-xxxhdpi/picker_item_video_mask.png b/VisualNovel/app/src/main/res/mipmap-xxxhdpi/picker_item_video_mask.png
deleted file mode 100644
index 77fe43c..0000000
Binary files a/VisualNovel/app/src/main/res/mipmap-xxxhdpi/picker_item_video_mask.png and /dev/null differ
diff --git a/VisualNovel/app/src/main/res/mipmap-xxxhdpi/picker_item_video_mask.webp b/VisualNovel/app/src/main/res/mipmap-xxxhdpi/picker_item_video_mask.webp
new file mode 100644
index 0000000..a773760
Binary files /dev/null and b/VisualNovel/app/src/main/res/mipmap-xxxhdpi/picker_item_video_mask.webp differ
diff --git a/VisualNovel/app/src/test/java/com/remax/visualnovel/ExampleUnitTest.kt b/VisualNovel/app/src/test/java/com/remax/visualnovel/ExampleUnitTest.kt
deleted file mode 100644
index 5a7caf7..0000000
--- a/VisualNovel/app/src/test/java/com/remax/visualnovel/ExampleUnitTest.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.remax.visualnovel
-
-import org.junit.Test
-
-import org.junit.Assert.*
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-class ExampleUnitTest {
-    @Test
-    fun addition_isCorrect() {
-        assertEquals(4, 2 + 2)
-    }
-}
\ No newline at end of file