diff --git a/app/src/main/java/io/legato/kazusa/ui/book/changesource/ChangeBookSourceDialog.kt b/app/src/main/java/io/legato/kazusa/ui/book/changesource/ChangeBookSourceDialog.kt
index 045449fbf..8f3072b62 100644
--- a/app/src/main/java/io/legato/kazusa/ui/book/changesource/ChangeBookSourceDialog.kt
+++ b/app/src/main/java/io/legato/kazusa/ui/book/changesource/ChangeBookSourceDialog.kt
@@ -214,7 +214,7 @@ class ChangeBookSourceDialog() : BaseDialogFragment(R.layout.dialog_book_change_
 
     private fun initLiveData() {
         viewModel.searchStateData.observe(viewLifecycleOwner) {
-            binding.refreshProgressBar.isAutoLoading = it
+            //binding.refreshProgressBar.isAutoLoading = it
             if (it) {
                 startStopMenuItem?.let { item ->
                     item.setIcon(R.drawable.ic_stop_black_24dp)
diff --git a/app/src/main/res/layout/dialog_auto_read.xml b/app/src/main/res/layout/dialog_auto_read.xml
index 77a27e22d..12430572c 100644
--- a/app/src/main/res/layout/dialog_auto_read.xml
+++ b/app/src/main/res/layout/dialog_auto_read.xml
@@ -58,7 +58,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:icon="@drawable/ic_toc"
+            app:icon="@drawable/ic_toc"
             android:text="@string/chapter_list"
             android:textSize="12sp"
             android:padding="0dp"
@@ -72,7 +72,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:icon="@drawable/ic_menu"
+            app:icon="@drawable/ic_menu"
             android:text="@string/main_menu"
             android:textSize="12sp"
             android:padding="0dp"
@@ -86,7 +86,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:icon="@drawable/ic_auto_page_stop"
+            app:icon="@drawable/ic_auto_page_stop"
             android:text="@string/stop"
             android:textSize="12sp"
             android:padding="0dp"
@@ -100,7 +100,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:icon="@drawable/ic_settings"
+            app:icon="@drawable/ic_settings"
             android:text="@string/setting"
             android:textSize="12sp"
             android:padding="0dp"
diff --git a/app/src/main/res/layout/dialog_book_change_source.xml b/app/src/main/res/layout/dialog_book_change_source.xml
index 376f0071d..f26027276 100644
--- a/app/src/main/res/layout/dialog_book_change_source.xml
+++ b/app/src/main/res/layout/dialog_book_change_source.xml
@@ -18,10 +18,11 @@
         app:layout_constraintTop_toTopOf="parent"
         app:titleTextAppearance="@style/ToolbarTitle" />
 
-    <io.legato.kazusa.ui.widget.anima.RefreshProgressBar
+    <com.google.android.material.progressindicator.LinearProgressIndicator
         android:id="@+id/refresh_progress_bar"
         android:layout_width="match_parent"
-        android:layout_height="2dp"
+        android:layout_height="wrap_content"
+        android:indeterminate="true"
         app:layout_constraintTop_toBottomOf="@+id/tool_bar" />
 
     <io.legato.kazusa.ui.widget.recycler.scroller.FastScrollRecyclerView
@@ -50,32 +51,29 @@
             android:background="?android:attr/selectableItemBackgroundBorderless"
             android:ellipsize="end"
             android:gravity="center_vertical"
-            android:paddingLeft="10dp"
-            android:paddingRight="10dp"
             android:singleLine="true"
-            android:textColor="@color/primaryText"
             android:textSize="12sp" />
 
-        <androidx.appcompat.widget.AppCompatImageView
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/iv_top"
             android:layout_width="36dp"
             android:layout_height="match_parent"
-            android:background="?android:attr/selectableItemBackgroundBorderless"
+            style="@style/Widget.Material3.Button.IconButton.Filled.Tonal"
             android:contentDescription="@string/go_to_top"
-            android:src="@drawable/ic_arrow_drop_up"
+            app:icon="@drawable/ic_arrow_drop_up"
+            app:iconGravity="textStart"
             android:tooltipText="@string/go_to_top"
-            app:tint="@color/primaryText"
             tools:ignore="UnusedAttribute" />
 
-        <androidx.appcompat.widget.AppCompatImageView
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/iv_bottom"
             android:layout_width="36dp"
             android:layout_height="match_parent"
-            android:background="?android:attr/selectableItemBackgroundBorderless"
+            style="@style/Widget.Material3.Button.IconButton.Filled.Tonal"
             android:contentDescription="@string/go_to_bottom"
-            android:src="@drawable/ic_arrow_drop_down"
+            app:icon="@drawable/ic_arrow_drop_down"
+            app:iconGravity="textStart"
             android:tooltipText="@string/go_to_bottom"
-            app:tint="@color/primaryText"
             tools:ignore="UnusedAttribute" />
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/view_read_menu.xml b/app/src/main/res/layout/view_read_menu.xml
index 7a476f747..be5a487d1 100644
--- a/app/src/main/res/layout/view_read_menu.xml
+++ b/app/src/main/res/layout/view_read_menu.xml
@@ -74,7 +74,6 @@
         android:id="@+id/ll_brightness"
         android:layout_width="wrap_content"
         android:layout_height="0dp"
-
         android:layout_marginTop="16dp"
         android:gravity="left"
         android:orientation="vertical"