diff --git a/app/src/main/java/com/hippo/ehviewer/widget/SearchBar.java b/app/src/main/java/com/hippo/ehviewer/widget/SearchBar.java
index 7db72c2b3..ad2914984 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/SearchBar.java
+++ b/app/src/main/java/com/hippo/ehviewer/widget/SearchBar.java
@@ -111,7 +111,7 @@ public class SearchBar extends FrameLayout implements View.OnClickListener,
     }
 
     private void init(Context context) {
-        setBackgroundResource(R.drawable.card_white_2dp);
+        setBackgroundResource(R.drawable.card_white_no_padding_2dp);
 
         mSearchDatabase = SearchDatabase.getInstance(getContext());
 
diff --git a/app/src/main/res/drawable-hdpi/card_grey_2dp.9.png b/app/src/main/res/drawable-hdpi/card_grey_2dp.9.png
deleted file mode 100644
index dbb819aa3..000000000
Binary files a/app/src/main/res/drawable-hdpi/card_grey_2dp.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/card_grey_no_padding_2dp.9.png b/app/src/main/res/drawable-hdpi/card_grey_no_padding_2dp.9.png
new file mode 100644
index 000000000..42e65c7bd
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/card_grey_no_padding_2dp.9.png differ
diff --git a/app/src/main/res/drawable-hdpi/card_white_2dp.9.png b/app/src/main/res/drawable-hdpi/card_white_2dp.9.png
deleted file mode 100644
index cf29e8039..000000000
Binary files a/app/src/main/res/drawable-hdpi/card_white_2dp.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/card_white_no_padding_2dp.9.png b/app/src/main/res/drawable-hdpi/card_white_no_padding_2dp.9.png
new file mode 100644
index 000000000..4066b40b9
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/card_white_no_padding_2dp.9.png differ
diff --git a/app/src/main/res/drawable-mdpi/card_grey_2dp.9.png b/app/src/main/res/drawable-mdpi/card_grey_2dp.9.png
deleted file mode 100644
index 14dbd13b1..000000000
Binary files a/app/src/main/res/drawable-mdpi/card_grey_2dp.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/card_grey_no_padding_2dp.9.png b/app/src/main/res/drawable-mdpi/card_grey_no_padding_2dp.9.png
new file mode 100644
index 000000000..7353a334b
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/card_grey_no_padding_2dp.9.png differ
diff --git a/app/src/main/res/drawable-mdpi/card_white_2dp.9.png b/app/src/main/res/drawable-mdpi/card_white_2dp.9.png
deleted file mode 100644
index fca339269..000000000
Binary files a/app/src/main/res/drawable-mdpi/card_white_2dp.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/card_white_no_padding_2dp.9.png b/app/src/main/res/drawable-mdpi/card_white_no_padding_2dp.9.png
new file mode 100644
index 000000000..4b41cb22f
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/card_white_no_padding_2dp.9.png differ
diff --git a/app/src/main/res/drawable-xhdpi/card_grey_2dp.9.png b/app/src/main/res/drawable-xhdpi/card_grey_2dp.9.png
deleted file mode 100644
index 48fcc7426..000000000
Binary files a/app/src/main/res/drawable-xhdpi/card_grey_2dp.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/card_grey_no_padding_2dp.9.png b/app/src/main/res/drawable-xhdpi/card_grey_no_padding_2dp.9.png
new file mode 100644
index 000000000..51888f0db
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/card_grey_no_padding_2dp.9.png differ
diff --git a/app/src/main/res/drawable-xhdpi/card_white_2dp.9.png b/app/src/main/res/drawable-xhdpi/card_white_2dp.9.png
deleted file mode 100644
index cadeb9686..000000000
Binary files a/app/src/main/res/drawable-xhdpi/card_white_2dp.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/card_white_no_padding_2dp.9.png b/app/src/main/res/drawable-xhdpi/card_white_no_padding_2dp.9.png
new file mode 100644
index 000000000..07838d0c2
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/card_white_no_padding_2dp.9.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/card_grey_2dp.9.png b/app/src/main/res/drawable-xxhdpi/card_grey_2dp.9.png
deleted file mode 100644
index 71173615c..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/card_grey_2dp.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/card_grey_no_padding_2dp.9.png b/app/src/main/res/drawable-xxhdpi/card_grey_no_padding_2dp.9.png
new file mode 100644
index 000000000..0ebb0ddc7
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/card_grey_no_padding_2dp.9.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/card_white_2dp.9.png b/app/src/main/res/drawable-xxhdpi/card_white_2dp.9.png
deleted file mode 100644
index 11834386b..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/card_white_2dp.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/card_white_no_padding_2dp.9.png b/app/src/main/res/drawable-xxhdpi/card_white_no_padding_2dp.9.png
new file mode 100644
index 000000000..2c05ddeb3
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/card_white_no_padding_2dp.9.png differ
diff --git a/app/src/main/res/drawable/card_background.xml b/app/src/main/res/drawable/card_background_no_padding.xml
similarity index 88%
rename from app/src/main/res/drawable/card_background.xml
rename to app/src/main/res/drawable/card_background_no_padding.xml
index 5537b2d90..c12e115e8 100644
--- a/app/src/main/res/drawable/card_background.xml
+++ b/app/src/main/res/drawable/card_background_no_padding.xml
@@ -18,7 +18,7 @@
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_activated="true" android:drawable="@drawable/card_grey_2dp"/>
-    <item android:drawable="@drawable/card_white_2dp"/>
+    <item android:state_activated="true" android:drawable="@drawable/card_grey_no_padding_2dp"/>
+    <item android:drawable="@drawable/card_white_no_padding_2dp"/>
 
 </selector>
diff --git a/app/src/main/res/layout/activity_dir_picker.xml b/app/src/main/res/layout/activity_dir_picker.xml
index 1809549d9..7ac7024eb 100644
--- a/app/src/main/res/layout/activity_dir_picker.xml
+++ b/app/src/main/res/layout/activity_dir_picker.xml
@@ -40,12 +40,11 @@
 
     <TextView
         android:id="@+id/ok"
-        style="@style/CardButton"
+        style="?attr/buttonBarButtonStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="right"
         android:text="@android:string/ok"
-        android:textColor="?attr/colorPrimary"
-        android:background="@null"/>
+        android:textColor="?attr/colorPrimary"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/gallery_detail_header.xml b/app/src/main/res/layout/gallery_detail_header.xml
index c85b298cd..99e9d23cc 100644
--- a/app/src/main/res/layout/gallery_detail_header.xml
+++ b/app/src/main/res/layout/gallery_detail_header.xml
@@ -128,7 +128,7 @@
             android:layout_marginLeft="@dimen/keyline_margin"
             android:layout_marginRight="@dimen/keyline_margin"
             android:orientation="horizontal"
-            android:background="@drawable/card_white_2dp">
+            android:background="@drawable/card_white_no_padding_2dp">
 
             <TextView
                 android:id="@+id/download"
diff --git a/app/src/main/res/layout/item_download.xml b/app/src/main/res/layout/item_download.xml
index 761c54eae..3004c06b3 100644
--- a/app/src/main/res/layout/item_download.xml
+++ b/app/src/main/res/layout/item_download.xml
@@ -20,7 +20,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="@drawable/card_background">
+    android:background="@drawable/card_background_no_padding">
 
     <com.hippo.widget.LoadImageView
         android:id="@+id/thumb"
diff --git a/app/src/main/res/layout/item_gallery_list.xml b/app/src/main/res/layout/item_gallery_list.xml
index fa49e8a6c..6be00c2c8 100644
--- a/app/src/main/res/layout/item_gallery_list.xml
+++ b/app/src/main/res/layout/item_gallery_list.xml
@@ -19,7 +19,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/card_background">
+    android:background="@drawable/card_background_no_padding">
 
     <com.hippo.widget.LoadImageView
         android:id="@+id/thumb"
diff --git a/app/src/main/res/layout/search_category.xml b/app/src/main/res/layout/search_category.xml
index 247102693..f5023ff02 100644
--- a/app/src/main/res/layout/search_category.xml
+++ b/app/src/main/res/layout/search_category.xml
@@ -18,7 +18,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/card_white_2dp">
+    android:background="@drawable/card_white_no_padding_2dp">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 0aaebe577..66bf46a4e 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -44,7 +44,7 @@
     <dimen name="list_content_margin_v">4dp</dimen>
     <dimen name="list_content_interval">4dp</dimen>
     <dimen name="list_search_bar_margin">4dp</dimen>
-    <dimen name="list_padding_top_search_bar">77dp</dimen>
+    <dimen name="list_padding_top_search_bar">72dp</dimen>
     <dimen name="list_padding_bottom_fab">80dp</dimen>
 
     <dimen name="gallery_list_column_width">320dp</dimen>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d3a851e58..fc3e5c9f4 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -39,14 +39,6 @@
         <item name="android:minHeight">76dp</item>
     </style>
 
-    <!-- Card Button -->
-    <style name="CardButton">
-        <item name="android:minWidth">88dp</item>
-        <item name="android:minHeight">48dp</item>
-        <item name="android:gravity">center</item>
-        <item name="android:background">@drawable/card_white_2dp</item>
-    </style>
-
     <style name="TextAppearance.CardTitle">
         <item name="android:textSize">@dimen/text_little_small</item>
         <item name="android:textColor">@color/primary_text_light</item>