diff --git a/app/build.gradle b/app/build.gradle
index 28e2c7e5b..78226ea7e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -62,6 +62,7 @@ clean {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation "com.android.support:appcompat-v7:$supportLibrary"
+    implementation "com.android.support:cardview-v7:$supportLibrary"
     implementation "com.android.support:design:$supportLibrary"
     implementation 'com.github.amlcurran.showcaseview:library:5.4.3'
     implementation 'com.github.seven332:android-recaptcha:2bbb3459a8'
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java
index adfeb0357..87babf0f1 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java
@@ -279,7 +279,7 @@ public class FavoritesScene extends BaseScene implements
         mSearchBar.setHelper(this);
         mSearchBar.setAllowEmptySearch(false);
         updateSearchBar();
-        mSearchBarMover = new SearchBarMover(this, mSearchBar, mRecyclerView);
+        mSearchBarMover = new SearchBarMover(this, ViewUtils.$$(view, R.id.search_bar_card), mRecyclerView);
 
         mFabLayout.setExpanded(false, false);
         mFabLayout.setAutoCancel(false);
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java
index 59fe97e5e..63d4d48e5 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java
@@ -452,7 +452,7 @@ public final class GalleryListScene extends BaseScene
 
         mSearchFab.setOnClickListener(this);
 
-        mSearchBarMover = new SearchBarMover(this, mSearchBar, mRecyclerView, mSearchLayout);
+        mSearchBarMover = new SearchBarMover(this, ViewUtils.$$(view, R.id.search_bar_card), mRecyclerView, mSearchLayout);
 
         // Update list url builder
         onUpdateUrlBuilder();
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 d9d91f2ef..017841c85 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/SearchBar.java
+++ b/app/src/main/java/com/hippo/ehviewer/widget/SearchBar.java
@@ -111,8 +111,6 @@ public class SearchBar extends FrameLayout implements View.OnClickListener,
     }
 
     private void init(Context context) {
-        setBackgroundResource(R.drawable.card_white_no_padding_2dp);
-
         mSearchDatabase = SearchDatabase.getInstance(getContext());
 
         LayoutInflater inflater = LayoutInflater.from(context);
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
deleted file mode 100644
index 42e65c7bd..000000000
Binary files a/app/src/main/res/drawable-hdpi/card_grey_no_padding_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
deleted file mode 100644
index 4066b40b9..000000000
Binary files a/app/src/main/res/drawable-hdpi/card_white_no_padding_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
deleted file mode 100644
index 7353a334b..000000000
Binary files a/app/src/main/res/drawable-mdpi/card_grey_no_padding_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
deleted file mode 100644
index 4b41cb22f..000000000
Binary files a/app/src/main/res/drawable-mdpi/card_white_no_padding_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
deleted file mode 100644
index 51888f0db..000000000
Binary files a/app/src/main/res/drawable-xhdpi/card_grey_no_padding_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
deleted file mode 100644
index 07838d0c2..000000000
Binary files a/app/src/main/res/drawable-xhdpi/card_white_no_padding_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
deleted file mode 100644
index 0ebb0ddc7..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/card_grey_no_padding_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
deleted file mode 100644
index 2c05ddeb3..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/card_white_no_padding_2dp.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable/card_background_no_padding.xml b/app/src/main/res/drawable/card_background_no_padding.xml
deleted file mode 100644
index c12e115e8..000000000
--- a/app/src/main/res/drawable/card_background_no_padding.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright 2016 Hippo Seven
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<selector
-    xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <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/gallery_detail_header.xml b/app/src/main/res/layout/gallery_detail_header.xml
index 99e9d23cc..20dfa5b64 100644
--- a/app/src/main/res/layout/gallery_detail_header.xml
+++ b/app/src/main/res/layout/gallery_detail_header.xml
@@ -40,7 +40,7 @@
 
         <Space
             android:layout_width="match_parent"
-            android:layout_height="24dp"/>
+            android:layout_height="26dp"/>
 
     </LinearLayout>
 
@@ -121,38 +121,43 @@
 
         </RelativeLayout>
 
-        <LinearLayout
+        <android.support.v7.widget.CardView
             android:id="@+id/action_card"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/keyline_margin"
             android:layout_marginRight="@dimen/keyline_margin"
-            android:orientation="horizontal"
-            android:background="@drawable/card_white_no_padding_2dp">
+            style="@style/CardView.Normal">
 
-            <TextView
-                android:id="@+id/download"
-                style="@style/ButtonInCard"
-                android:layout_width="0dp"
+            <LinearLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"/>
+                android:orientation="horizontal">
 
-            <View
-                android:layout_width="1dp"
-                android:layout_height="match_parent"
-                android:background="@color/divider"
-                android:layout_marginTop="8dp"
-                android:layout_marginBottom="8dp"/>
+                <TextView
+                    android:id="@+id/download"
+                    style="@style/ButtonInCard"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"/>
 
-            <TextView
-                android:id="@+id/read"
-                style="@style/ButtonInCard"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:textColor="?attr/colorAccent"
-                android:text="@string/read"/>
+                <View
+                    android:layout_width="1dp"
+                    android:layout_height="match_parent"
+                    android:background="@color/divider"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginBottom="8dp"/>
 
-        </LinearLayout>
+                <TextView
+                    android:id="@+id/read"
+                    style="@style/ButtonInCard"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:textColor="?attr/colorAccent"
+                    android:text="@string/read"/>
+
+            </LinearLayout>
+        </android.support.v7.widget.CardView>
     </LinearLayout>
 </FrameLayout>
diff --git a/app/src/main/res/layout/item_download.xml b/app/src/main/res/layout/item_download.xml
index efb719637..4d69bc288 100644
--- a/app/src/main/res/layout/item_download.xml
+++ b/app/src/main/res/layout/item_download.xml
@@ -15,120 +15,125 @@
   ~ limitations under the License.
   -->
 
-<RelativeLayout
+<android.support.v7.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/card_background_no_padding">
+    style="@style/CardView.Normal">
 
-    <com.hippo.widget.LoadImageView
-        android:id="@+id/thumb"
-        android:layout_width="@dimen/gallery_list_thumb_width"
-        android:layout_height="@dimen/gallery_list_thumb_height"/>
+    <RelativeLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content">
 
-    <TextView
-        android:id="@+id/title"
-        style="@style/CardTitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp"
-        android:layout_marginTop="4dp"
-        android:layout_toRightOf="@id/thumb"/>
+        <com.hippo.widget.LoadImageView
+          android:id="@+id/thumb"
+          android:layout_width="@dimen/gallery_list_thumb_width"
+          android:layout_height="@dimen/gallery_list_thumb_height"/>
 
-    <TextView
-        android:id="@+id/uploader"
-        style="@style/CardMessage"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignLeft="@id/title"
-        android:layout_below="@id/title"
-        android:layout_marginTop="2dp"/>
+        <TextView
+          android:id="@+id/title"
+          style="@style/CardTitle"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_alignParentTop="true"
+          android:layout_marginLeft="8dp"
+          android:layout_marginRight="8dp"
+          android:layout_marginTop="4dp"
+          android:layout_toRightOf="@id/thumb"/>
 
-    <com.hippo.ehviewer.widget.SimpleRatingView
-        android:id="@+id/rating"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignLeft="@id/title"
-        android:layout_below="@id/uploader"
-        android:layout_marginTop="2dp"/>
+        <TextView
+          android:id="@+id/uploader"
+          style="@style/CardMessage"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_alignLeft="@id/title"
+          android:layout_below="@id/title"
+          android:layout_marginTop="2dp"/>
 
-    <TextView
-        android:id="@+id/category"
-        style="@style/CardMessage"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignLeft="@id/title"
-        android:layout_alignBottom="@id/thumb"
-        android:layout_marginBottom="8dp"
-        android:paddingBottom="2dp"
-        android:paddingLeft="8dp"
-        android:paddingRight="8dp"
-        android:paddingTop="2dp"
-        android:textColor="@android:color/white"
-        android:textAllCaps="true"/>
+        <com.hippo.ehviewer.widget.SimpleRatingView
+          android:id="@+id/rating"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_alignLeft="@id/title"
+          android:layout_below="@id/uploader"
+          android:layout_marginTop="2dp"/>
 
-    <FrameLayout
-        android:id="@+id/actions"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignBottom="@+id/thumb"
-        android:layout_alignParentRight="true"
-        android:paddingRight="8dp">
+        <TextView
+          android:id="@+id/category"
+          style="@style/CardMessage"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_alignLeft="@id/title"
+          android:layout_alignBottom="@id/thumb"
+          android:layout_marginBottom="8dp"
+          android:paddingBottom="2dp"
+          android:paddingLeft="8dp"
+          android:paddingRight="8dp"
+          android:paddingTop="2dp"
+          android:textColor="@android:color/white"
+          android:textAllCaps="true"/>
 
-        <ImageView
-            android:id="@+id/start"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:padding="8dp"
-            app:srcCompat="@drawable/v_play_x24"/>
+        <FrameLayout
+          android:id="@+id/actions"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_alignBottom="@+id/thumb"
+          android:layout_alignParentRight="true"
+          android:paddingRight="8dp">
 
-        <ImageView
-            android:id="@+id/stop"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:padding="8dp"
-            app:srcCompat="@drawable/v_pause_x24"/>
+            <ImageView
+              android:id="@+id/start"
+              android:layout_width="40dp"
+              android:layout_height="40dp"
+              android:padding="8dp"
+              app:srcCompat="@drawable/v_play_x24"/>
 
-    </FrameLayout>
+            <ImageView
+              android:id="@+id/stop"
+              android:layout_width="40dp"
+              android:layout_height="40dp"
+              android:padding="8dp"
+              app:srcCompat="@drawable/v_pause_x24"/>
 
-    <TextView
-        android:id="@+id/state"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_above="@id/actions"
-        android:layout_marginBottom="4dp"
-        android:layout_alignParentRight="true"
-        android:paddingRight="16dp"
-        android:textColor="?attr/colorAccent"/>
+        </FrameLayout>
 
-    <ProgressBar
-        android:id="@+id/progress_bar"
-        style="?android:attr/progressBarStyleHorizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignLeft="@id/title"
-        android:layout_marginRight="8dp"
-        android:layout_above="@id/actions"
-        android:indeterminate="false"/>
+        <TextView
+          android:id="@+id/state"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_above="@id/actions"
+          android:layout_marginBottom="4dp"
+          android:layout_alignParentRight="true"
+          android:paddingRight="16dp"
+          android:textColor="?attr/colorAccent"/>
 
-    <TextView
-        android:id="@+id/percent"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_above="@id/progress_bar"
-        android:layout_alignLeft="@id/title"
-        android:textSize="@dimen/text_super_small"/>
+        <ProgressBar
+          android:id="@+id/progress_bar"
+          style="?android:attr/progressBarStyleHorizontal"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:layout_alignLeft="@id/title"
+          android:layout_marginRight="8dp"
+          android:layout_above="@id/actions"
+          android:indeterminate="false"/>
 
-    <TextView
-        android:id="@+id/speed"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_above="@id/progress_bar"
-        android:layout_alignParentRight="true"
-        android:layout_marginRight="8dp"
-        android:textSize="@dimen/text_super_small"/>
+        <TextView
+          android:id="@+id/percent"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_above="@id/progress_bar"
+          android:layout_alignLeft="@id/title"
+          android:textSize="@dimen/text_super_small"/>
 
-</RelativeLayout>
+        <TextView
+          android:id="@+id/speed"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_above="@id/progress_bar"
+          android:layout_alignParentRight="true"
+          android:layout_marginRight="8dp"
+          android:textSize="@dimen/text_super_small"/>
+
+    </RelativeLayout>
+</android.support.v7.widget.CardView>
diff --git a/app/src/main/res/layout/item_gallery_grid.xml b/app/src/main/res/layout/item_gallery_grid.xml
index b2ef9e823..18b8e08a9 100644
--- a/app/src/main/res/layout/item_gallery_grid.xml
+++ b/app/src/main/res/layout/item_gallery_grid.xml
@@ -15,11 +15,12 @@
   ~ limitations under the License.
   -->
 
-<FrameLayout
+<android.support.v7.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/card_grey_no_padding_2dp">
+    style="@style/CardView.Normal">
 
     <com.hippo.ehviewer.widget.TileThumb
         xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -48,4 +49,4 @@
         android:textStyle="bold"
         tools:ignore="SpUsage"/>
 
-</FrameLayout>
+</android.support.v7.widget.CardView>
diff --git a/app/src/main/res/layout/item_gallery_list.xml b/app/src/main/res/layout/item_gallery_list.xml
index dff879511..d86412db5 100644
--- a/app/src/main/res/layout/item_gallery_list.xml
+++ b/app/src/main/res/layout/item_gallery_list.xml
@@ -14,88 +14,93 @@
   ~ limitations under the License.
   -->
 
-<RelativeLayout
+<android.support.v7.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/card_background_no_padding">
+    style="@style/CardView.Normal">
 
-    <com.hippo.widget.LoadImageView
-        android:id="@+id/thumb"
-        android:layout_width="@dimen/gallery_list_thumb_width"
-        android:layout_height="@dimen/gallery_list_thumb_height"
-        app:retryType="click"/>
+    <RelativeLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content">
 
-    <TextView
-        android:id="@+id/title"
-        style="@style/CardTitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp"
-        android:layout_marginTop="4dp"
-        android:layout_toRightOf="@id/thumb"/>
+        <com.hippo.widget.LoadImageView
+          android:id="@+id/thumb"
+          android:layout_width="@dimen/gallery_list_thumb_width"
+          android:layout_height="@dimen/gallery_list_thumb_height"
+          app:retryType="click"/>
 
-    <TextView
-        android:id="@+id/uploader"
-        style="@style/CardMessage"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignLeft="@id/title"
-        android:layout_below="@id/title"
-        android:layout_marginTop="2dp"/>
+        <TextView
+          android:id="@+id/title"
+          style="@style/CardTitle"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_alignParentTop="true"
+          android:layout_marginLeft="8dp"
+          android:layout_marginRight="8dp"
+          android:layout_marginTop="4dp"
+          android:layout_toRightOf="@id/thumb"/>
 
-    <TextView
-        android:id="@+id/category"
-        style="@style/CardMessage"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignLeft="@id/title"
-        android:layout_alignBottom="@id/thumb"
-        android:layout_marginBottom="8dp"
-        android:paddingBottom="2dp"
-        android:paddingLeft="8dp"
-        android:paddingRight="8dp"
-        android:paddingTop="2dp"
-        android:textColor="@android:color/white"
-        android:textAllCaps="true"/>
+        <TextView
+          android:id="@+id/uploader"
+          style="@style/CardMessage"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_alignLeft="@id/title"
+          android:layout_below="@id/title"
+          android:layout_marginTop="2dp"/>
 
-    <com.hippo.ehviewer.widget.SimpleRatingView
-        android:id="@+id/rating"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignLeft="@id/title"
-        android:layout_above="@id/category"
-        android:layout_marginBottom="4dp"/>
+        <TextView
+          android:id="@+id/category"
+          style="@style/CardMessage"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_alignLeft="@id/title"
+          android:layout_alignBottom="@id/thumb"
+          android:layout_marginBottom="8dp"
+          android:paddingBottom="2dp"
+          android:paddingLeft="8dp"
+          android:paddingRight="8dp"
+          android:paddingTop="2dp"
+          android:textColor="@android:color/white"
+          android:textAllCaps="true"/>
 
-    <TextView
-        android:id="@+id/posted"
-        style="@style/CardMessage"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignBottom="@id/thumb"
-        android:layout_alignParentRight="true"
-        android:layout_marginRight="6dp"
-        android:layout_marginBottom="4dp"/>
+        <com.hippo.ehviewer.widget.SimpleRatingView
+          android:id="@+id/rating"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_alignLeft="@id/title"
+          android:layout_above="@id/category"
+          android:layout_marginBottom="4dp"/>
 
-    <TextView
-        android:id="@+id/pages"
-        style="@style/CardMessage"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_above="@id/posted"
-        android:layout_alignParentRight="true"
-        android:layout_marginRight="6dp"/>
+        <TextView
+          android:id="@+id/posted"
+          style="@style/CardMessage"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_alignBottom="@id/thumb"
+          android:layout_alignParentRight="true"
+          android:layout_marginRight="6dp"
+          android:layout_marginBottom="4dp"/>
 
-    <TextView
-        android:id="@+id/simple_language"
-        style="@style/CardMessage"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_above="@id/posted"
-        android:layout_toLeftOf="@+id/pages"
-        android:layout_marginRight="6dp"/>
+        <TextView
+          android:id="@+id/pages"
+          style="@style/CardMessage"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_above="@id/posted"
+          android:layout_alignParentRight="true"
+          android:layout_marginRight="6dp"/>
 
-</RelativeLayout>
+        <TextView
+          android:id="@+id/simple_language"
+          style="@style/CardMessage"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_above="@id/posted"
+          android:layout_toLeftOf="@+id/pages"
+          android:layout_marginRight="6dp"/>
+
+    </RelativeLayout>
+</android.support.v7.widget.CardView>
diff --git a/app/src/main/res/layout/scene_favorites.xml b/app/src/main/res/layout/scene_favorites.xml
index f157c49dc..3915a8e4d 100644
--- a/app/src/main/res/layout/scene_favorites.xml
+++ b/app/src/main/res/layout/scene_favorites.xml
@@ -27,13 +27,21 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
 
-    <com.hippo.ehviewer.widget.SearchBar
-        android:id="@+id/search_bar"
+    <android.support.v7.widget.CardView
+        android:id="@+id/search_bar_card"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/gallery_search_bar_margin_h"
         android:layout_marginRight="@dimen/gallery_search_bar_margin_h"
-        android:layout_marginTop="@dimen/gallery_search_bar_margin_v"/>
+        android:layout_marginTop="@dimen/gallery_search_bar_margin_v"
+        style="@style/CardView.Normal">
+
+        <com.hippo.ehviewer.widget.SearchBar
+            android:id="@+id/search_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+
+    </android.support.v7.widget.CardView>
 
     <com.hippo.widget.FabLayout
         xmlns:app="http://schemas.android.com/apk/res-auto"
diff --git a/app/src/main/res/layout/scene_gallery_list.xml b/app/src/main/res/layout/scene_gallery_list.xml
index cda0fbb31..fd5303d45 100644
--- a/app/src/main/res/layout/scene_gallery_list.xml
+++ b/app/src/main/res/layout/scene_gallery_list.xml
@@ -32,13 +32,21 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
 
-    <com.hippo.ehviewer.widget.SearchBar
-        android:id="@+id/search_bar"
+    <android.support.v7.widget.CardView
+        android:id="@+id/search_bar_card"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/gallery_search_bar_margin_h"
         android:layout_marginRight="@dimen/gallery_search_bar_margin_h"
-        android:layout_marginTop="@dimen/gallery_search_bar_margin_v"/>
+        android:layout_marginTop="@dimen/gallery_search_bar_margin_v"
+        style="@style/CardView.Normal">
+
+        <com.hippo.ehviewer.widget.SearchBar
+            android:id="@+id/search_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+
+    </android.support.v7.widget.CardView>
 
     <com.hippo.widget.FabLayout
         xmlns:app="http://schemas.android.com/apk/res-auto"
diff --git a/app/src/main/res/layout/search_category.xml b/app/src/main/res/layout/search_category.xml
index f5023ff02..ecc3deda6 100644
--- a/app/src/main/res/layout/search_category.xml
+++ b/app/src/main/res/layout/search_category.xml
@@ -14,11 +14,11 @@
   ~ limitations under the License.
   -->
 
-<FrameLayout
+<android.support.v7.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/card_white_no_padding_2dp">
+    style="@style/CardView.Normal">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -41,4 +41,4 @@
             android:layout_height="wrap_content"/>
 
     </LinearLayout>
-</FrameLayout>
+</android.support.v7.widget.CardView>
diff --git a/app/src/main/res/layout/widget_search_bar.xml b/app/src/main/res/layout/widget_search_bar.xml
index faa1a51b1..3c5173a63 100644
--- a/app/src/main/res/layout/widget_search_bar.xml
+++ b/app/src/main/res/layout/widget_search_bar.xml
@@ -41,7 +41,7 @@
                 android:layout_marginLeft="48dp"
                 android:layout_marginRight="48dp"
                 android:textSize="@dimen/text_little_large"
-                android:textColor="@color/secondary_text_light"
+                android:textColor="?android:attr/textColorSecondary"
                 android:singleLine="true"
                 android:maxLines="1"/>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index fc3e5c9f4..002724b33 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -41,7 +41,7 @@
 
     <style name="TextAppearance.CardTitle">
         <item name="android:textSize">@dimen/text_little_small</item>
-        <item name="android:textColor">@color/primary_text_light</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
     </style>
 
     <style name="CardTitle">
@@ -53,7 +53,7 @@
 
     <style name="TextAppearance.CardMessage">
         <item name="android:textSize">@dimen/text_small</item>
-        <item name="android:textColor">@color/secondary_text_light</item>
+        <item name="android:textColor">?android:attr/textColorSecondary</item>
     </style>
 
     <style name="CardMessage">
@@ -138,4 +138,13 @@
         <item name="sv_detailTextAppearance">@style/Guide.Text</item>
     </style>
 
+    <style name="CardView.Normal">
+        <item name="cardCornerRadius">2dp</item>
+        <item name="cardUseCompatPadding">true</item>
+        <item name="cardElevation">4dp</item>
+        <item name="cardMaxElevation">4dp</item>
+        <item name="cardPreventCornerOverlap">true</item>
+        <item name="contentPadding">0dp</item>
+    </style>
+
 </resources>