diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/GalleryAdapter.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/GalleryAdapter.kt
index 90079b978..11badba50 100644
--- a/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/GalleryAdapter.kt
+++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/GalleryAdapter.kt
@@ -74,31 +74,15 @@ class GalleryAdapter(
                     layoutManager.setStrategy(STRATEGY_MIN_SIZE)
                     if (null != mGirdDecoration) {
                         recyclerView.removeItemDecoration(mGirdDecoration!!)
-                        val paddingH = resources.getDimensionPixelOffset(R.dimen.gallery_grid_margin_h)
-                        val paddingV = resources.getDimensionPixelOffset(R.dimen.gallery_grid_margin_v)
-                        recyclerView.setPadding(
-                            recyclerView.paddingLeft - paddingH,
-                            recyclerView.paddingTop - paddingV,
-                            recyclerView.paddingRight - paddingH,
-                            recyclerView.paddingBottom - paddingV,
-                        )
                         mGirdDecoration = null
                     }
                     if (null == mListDecoration) {
                         val interval = resources.getDimensionPixelOffset(R.dimen.gallery_list_interval)
-                        val paddingH = resources.getDimensionPixelOffset(R.dimen.gallery_list_margin_h)
-                        val paddingV = resources.getDimensionPixelOffset(R.dimen.gallery_list_margin_v)
                         mListDecoration = object : ItemDecoration() {
                             override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State) {
                                 outRect.set(0, interval / 2, 0, interval / 2)
                             }
                         }
-                        recyclerView.setPadding(
-                            recyclerView.paddingLeft + paddingH,
-                            recyclerView.paddingTop + paddingV,
-                            recyclerView.paddingRight + paddingH,
-                            recyclerView.paddingBottom + paddingV,
-                        )
                         recyclerView.addItemDecoration(mListDecoration!!)
                     }
                 }
@@ -109,27 +93,11 @@ class GalleryAdapter(
                     layoutManager.setStrategy(STRATEGY_SUITABLE_SIZE)
                     if (null != mListDecoration) {
                         recyclerView.removeItemDecoration(mListDecoration!!)
-                        val paddingH = resources.getDimensionPixelOffset(R.dimen.gallery_list_margin_h)
-                        val paddingV = resources.getDimensionPixelOffset(R.dimen.gallery_list_margin_v)
-                        recyclerView.setPadding(
-                            recyclerView.paddingLeft - paddingH,
-                            recyclerView.paddingTop - paddingV,
-                            recyclerView.paddingRight - paddingH,
-                            recyclerView.paddingBottom - paddingV,
-                        )
                         mListDecoration = null
                     }
                     if (null == mGirdDecoration) {
                         val interval = resources.getDimensionPixelOffset(R.dimen.gallery_grid_interval)
-                        val paddingH = resources.getDimensionPixelOffset(R.dimen.gallery_grid_margin_h)
-                        val paddingV = resources.getDimensionPixelOffset(R.dimen.gallery_grid_margin_v)
                         mGirdDecoration = MarginItemDecoration(interval, 0, 0, 0, 0)
-                        recyclerView.setPadding(
-                            recyclerView.paddingLeft + paddingH,
-                            recyclerView.paddingTop + paddingV,
-                            recyclerView.paddingRight + paddingH,
-                            recyclerView.paddingBottom + paddingV,
-                        )
                         recyclerView.addItemDecoration(mGirdDecoration!!)
                     }
                 }
diff --git a/app/src/main/res/layout/scene_searchbar.xml b/app/src/main/res/layout/scene_searchbar.xml
index b5eb803cd..7a2d1c65e 100644
--- a/app/src/main/res/layout/scene_searchbar.xml
+++ b/app/src/main/res/layout/scene_searchbar.xml
@@ -50,7 +50,6 @@
     <com.hippo.ehviewer.ui.legacy.FabLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:elevation="6dp"
         android:paddingEnd="@dimen/corner_fab_margin"
         android:paddingBottom="@dimen/corner_fab_margin"
         app:fitsSystemWindowsInsets="top|bottom">
diff --git a/app/src/main/res/layout/widget_content_layout.xml b/app/src/main/res/layout/widget_content_layout.xml
index 04eedd32e..d19da5d5f 100644
--- a/app/src/main/res/layout/widget_content_layout.xml
+++ b/app/src/main/res/layout/widget_content_layout.xml
@@ -52,7 +52,10 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:clipChildren="false"
-            android:clipToPadding="false" />
+            android:clipToPadding="false"
+            android:paddingHorizontal="@dimen/gallery_list_margin_h"
+            android:paddingVertical="@dimen/gallery_list_margin_v"
+            app:fitsSystemWindowsInsets="bottom" />
 
     </androidx.swiperefreshlayout.widget.ThemedSwipeRefreshLayout>
 
@@ -63,8 +66,8 @@
         android:layout_gravity="end"
         android:layout_marginTop="@dimen/gallery_padding_top_search_bar"
         android:paddingStart="20dp"
-        android:paddingTop="8dp"
         android:paddingEnd="4dp"
-        android:paddingBottom="8dp" />
+        android:paddingVertical="8dp"
+        app:fitsSystemWindowsInsets="bottom" />
 
 </FrameLayout>