diff --git a/app/src/main/java/com/hippo/ehviewer/EhApplication.java b/app/src/main/java/com/hippo/ehviewer/EhApplication.java
index 7ff7a771b..507d8a8dc 100644
--- a/app/src/main/java/com/hippo/ehviewer/EhApplication.java
+++ b/app/src/main/java/com/hippo/ehviewer/EhApplication.java
@@ -21,6 +21,7 @@ import android.content.Context;
 import android.os.Build;
 import android.webkit.CookieSyncManager;
 
+import com.hippo.beerbelly.SimpleDiskCache;
 import com.hippo.conaco.Conaco;
 import com.hippo.ehviewer.network.EhOkHttpClient;
 import com.hippo.ehviewer.util.Config;
@@ -29,10 +30,12 @@ import com.hippo.util.Log;
 import com.hippo.vectorold.content.VectorContext;
 
 import java.io.File;
+import java.io.IOException;
 
 public class EhApplication extends SceneApplication {
 
     private Conaco mConaco;
+    private SimpleDiskCache mReadcache;
 
     @Override
     public void onCreate() {
@@ -52,6 +55,12 @@ public class EhApplication extends SceneApplication {
         conacoBuilder.diskCacheMaxSize = 50 * 1024 * 1024;
         conacoBuilder.httpClient = EhOkHttpClient.getInstance();
         mConaco = conacoBuilder.build();
+
+        try {
+            mReadcache = new SimpleDiskCache(new File(getCacheDir(), "readCache"), 200 * 1024 * 1024);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
     }
 
     private int getMemoryCacheMaxSize() {
@@ -79,4 +88,9 @@ public class EhApplication extends SceneApplication {
         EhApplication application = (EhApplication) context.getApplicationContext();
         return application.mConaco;
     }
+
+    public static SimpleDiskCache getReadCache(Context context) {
+        EhApplication application = (EhApplication) context.getApplicationContext();
+        return application.mReadcache;
+    }
 }
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java
new file mode 100644
index 000000000..5cf3a3321
--- /dev/null
+++ b/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2015 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.
+ */
+
+package com.hippo.ehviewer.ui;
+
+import android.support.v7.app.AppCompatActivity;
+
+public class GalleryActivity extends AppCompatActivity {
+}
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java
index 50bd221af..ace86be9a 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java
@@ -421,8 +421,6 @@ public class GalleryDetailScene extends Scene implements View.OnClickListener,
         }
     }
 
-    public static boolean AAA = false;
-
     private class EhDetailListener extends EhClient.OnGetGalleryDetailListener {
 
         @Override
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/MainSettingsScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/MainSettingsScene.java
index 431d6f32d..80f275d3f 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/MainSettingsScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/MainSettingsScene.java
@@ -17,6 +17,7 @@
 package com.hippo.ehviewer.ui.scene;
 
 import android.content.res.Resources;
+import android.support.v4.content.ContextCompat;
 
 import com.hippo.ehviewer.R;
 import com.hippo.ehviewer.ui.ContentActivity;
@@ -67,7 +68,7 @@ public final class MainSettingsScene extends PreferenceHeaderScene {
     private PreferenceHeader newPreferenceHeader(int drawableId, int titleId, Class clazz) {
         Resources resources = getStageActivity().getResources();
         return new PreferenceHeader(
-                resources.getDrawable(drawableId),
+                ContextCompat.getDrawable(getStageActivity(), drawableId),
                 resources.getString(titleId),
                 clazz
         );
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 1ebc4ac22..9c0f4c445 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/SearchBar.java
+++ b/app/src/main/java/com/hippo/ehviewer/widget/SearchBar.java
@@ -162,7 +162,6 @@ public class SearchBar extends CardView implements View.OnClickListener,
             }
         });
 
-        // TODO get source from config
         setSource(Config.getEhSource());
     }
 
diff --git a/app/src/main/java/com/hippo/scene/RippleCurtain.java b/app/src/main/java/com/hippo/scene/RippleCurtain.java
index 7dd4cbecf..1d51a9c05 100644
--- a/app/src/main/java/com/hippo/scene/RippleCurtain.java
+++ b/app/src/main/java/com/hippo/scene/RippleCurtain.java
@@ -4,7 +4,6 @@ import android.animation.Animator;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.animation.PropertyValuesHolder;
-import android.os.Build;
 import android.support.annotation.NonNull;
 import android.view.View;
 import android.view.ViewTreeObserver;
@@ -17,6 +16,7 @@ import com.hippo.util.ViewUtils;
 import java.util.HashSet;
 import java.util.Set;
 
+// Do not ues it when Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR2
 public class RippleCurtain extends Curtain {
 
     private static final String TAG = RippleCurtain.class.getSimpleName();
@@ -47,11 +47,6 @@ public class RippleCurtain extends Curtain {
         enterView.setStartPoint(mStartX, mStartY);
         ViewUtils.setVisibility(enterView, View.INVISIBLE);
 
-        // Canvas.clipPath() not work for pre-JELLY_BEAN_MR2 when hardware accelerated
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR2) {
-            ViewUtils.removeHardwareAccelerationSupport(enterView);
-        }
-
         enterView.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
             @Override
             public void onGlobalLayout() {
@@ -92,11 +87,6 @@ public class RippleCurtain extends Curtain {
                         dispatchOpenFinished(enter, exit);
                         hideSceneOnOpen(exit);
                         mAnimatorSet = null;
-
-                        // Canvas.clipPath() not work for pre-JELLY_BEAN_MR2 when hardware accelerated
-                        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR2) {
-                            ViewUtils.addHardwareAccelerationSupport(enterView);
-                        }
                     }
                 });
                 mAnimatorSet.start();
@@ -113,11 +103,6 @@ public class RippleCurtain extends Curtain {
         final SceneView exitView = exit.getSceneView();
         exitView.setStartPoint(mStartX, mStartY);
 
-        // Canvas.clipPath() not work for pre-JELLY_BEAN_MR2 when hardware accelerated
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR2) {
-            ViewUtils.removeHardwareAccelerationSupport(exitView);
-        }
-
         PropertyValuesHolder circlePercentPvh = PropertyValuesHolder.ofFloat("circlePercent", 1f, 0f);
         ObjectAnimator animFrame = ObjectAnimator.ofPropertyValuesHolder(exitView, circlePercentPvh);
         animFrame.setDuration(ANIMATE_TIME);
@@ -130,11 +115,6 @@ public class RippleCurtain extends Curtain {
             public void onAnimationEnd(Animator animation) {
                 dispatchCloseFinished(enter, exit);
                 mAnimatorSet = null;
-
-                // Canvas.clipPath() not work for pre-JELLY_BEAN_MR2 when hardware accelerated
-                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR2) {
-                    ViewUtils.addHardwareAccelerationSupport(exitView);
-                }
             }
         });
         mAnimatorSet.start();
diff --git a/app/src/main/java/com/hippo/scene/Scene.java b/app/src/main/java/com/hippo/scene/Scene.java
index f943aea94..9bec380a7 100644
--- a/app/src/main/java/com/hippo/scene/Scene.java
+++ b/app/src/main/java/com/hippo/scene/Scene.java
@@ -60,7 +60,6 @@ public abstract class Scene {
 
     private @Nullable Announcer mAnnouncer;
 
-    @SuppressWarnings("deprecation")
     private SceneView mSceneView;
 
     private int mBackgroundColor = 0xffeeeeee; // TODO Need a better to set background color
@@ -184,9 +183,14 @@ public abstract class Scene {
         if (mSceneView == null) {
             // Not call setContentView in onCreate, create scene view by ourself
             mSceneView = createSceneView(getStageActivity());
-            initBackground(mSceneView);
         }
 
+        mSceneView.setBackgroundColor(mBackgroundColor);
+
+        mSceneView.setFocusable(true);
+        mSceneView.setFocusableInTouchMode(true);
+        mSceneView.requestFocus();
+
         // Make sure scene view is attach from stage
         attachToStage();
 
@@ -212,16 +216,16 @@ public abstract class Scene {
     }
 
     void destroy(boolean die) {
-        // Make sure soft key broad is hidden
-        InputMethodManager imm = (InputMethodManager) getStageActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
-        imm.hideSoftInputFromWindow(getSceneView().getWindowToken(), 0);
-
         onDestroy(die);
     }
 
     void die(boolean keepView) {
         onDie();
 
+        // Make sure soft key broad is hidden
+        InputMethodManager imm = (InputMethodManager) getStageActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
+        imm.hideSoftInputFromWindow(getSceneView().getWindowToken(), 0);
+
         if (!keepView) {
             detachFromeStage();
         }
@@ -238,6 +242,8 @@ public abstract class Scene {
     void resume() {
         getSceneView().setEnableTouch(true);
 
+        mSceneView.requestFocus();
+
         onResume();
     }
 
@@ -332,7 +338,6 @@ public abstract class Scene {
     protected void setContentView(int resId) {
         StageActivity sa = getStageActivity();
         mSceneView = createSceneView(sa);
-        initBackground(mSceneView);
         mSceneView.setBackgroundColor(mBackgroundColor);
         sa.getLayoutInflater().inflate(resId, mSceneView);
     }
@@ -340,18 +345,10 @@ public abstract class Scene {
     protected void setContentView(View view) {
         StageActivity sa = getStageActivity();
         mSceneView = createSceneView(sa);
-        initBackground(mSceneView);
         mSceneView.addView(view, new FrameLayout.LayoutParams(
                 ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
     }
 
-    private void initBackground(@NonNull View bg) {
-        bg.setBackgroundColor(mBackgroundColor);
-        bg.setFocusable(true);
-        bg.setFocusableInTouchMode(true);
-        bg.requestFocus();
-    }
-
     protected void onNewAnnouncer(Announcer announcer) {
     }
 
diff --git a/app/src/main/java/com/hippo/widget/CardButton.java b/app/src/main/java/com/hippo/widget/CardButton.java
index f81c3a0ac..f07c7cd81 100644
--- a/app/src/main/java/com/hippo/widget/CardButton.java
+++ b/app/src/main/java/com/hippo/widget/CardButton.java
@@ -44,17 +44,12 @@ public class CardButton extends Button implements CardViewDelegate {
     }
 
     @Override
-    public void setPadding(int left, int top, int right, int bottom) {
+    public void setCardPadding(int left, int top, int right, int bottom) {
         if (mCardHelper != null) {
             mCardHelper.setPadding(left, top, right, bottom);
         }
     }
 
-    @Override
-    public void setRawPadding(int left, int top, int right, int bottom) {
-        super.setPadding(left, top, right, bottom);
-    }
-
     @SuppressWarnings("deprecation")
     @Override
     public void setRawBackgroundDrawable(Drawable drawable) {
diff --git a/app/src/main/java/com/hippo/widget/CardLinearLayout.java b/app/src/main/java/com/hippo/widget/CardLinearLayout.java
index 78eb1342b..a3d17aa51 100644
--- a/app/src/main/java/com/hippo/widget/CardLinearLayout.java
+++ b/app/src/main/java/com/hippo/widget/CardLinearLayout.java
@@ -44,17 +44,12 @@ public class CardLinearLayout extends LinearLayout implements CardViewDelegate {
     }
 
     @Override
-    public void setPadding(int left, int top, int right, int bottom) {
+    public void setCardPadding(int left, int top, int right, int bottom) {
         if (mCardHelper != null) {
             mCardHelper.setPadding(left, top, right, bottom);
         }
     }
 
-    @Override
-    public void setRawPadding(int left, int top, int right, int bottom) {
-        super.setPadding(left, top, right, bottom);
-    }
-
     @SuppressWarnings("deprecation")
     @Override
     public void setRawBackgroundDrawable(Drawable drawable) {
diff --git a/app/src/main/res/layout-v21/gallery_detail_header.xml b/app/src/main/res/layout-v21/gallery_detail_header.xml
new file mode 100644
index 000000000..9370ca2ba
--- /dev/null
+++ b/app/src/main/res/layout-v21/gallery_detail_header.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2015 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.
+  -->
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/header"
+    android:layout_width="match_parent"
+    android:layout_height="248dp"
+    android:background="@color/theme_primary"
+    android:elevation="4dp">
+
+    <com.hippo.ehviewer.widget.LoadImageView
+        android:id="@+id/thumb"
+        android:layout_width="@dimen/gallery_detail_thumb_width"
+        android:layout_height="@dimen/gallery_detail_thumb_height"
+        android:layout_marginLeft="@dimen/keyline_margin"
+        android:layout_marginTop="16dp"/>
+
+    <TextView
+        android:id="@+id/title"
+        style="@style/Text.Gallery.Detail.Title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_toRightOf="@id/thumb"
+        android:layout_alignTop="@id/thumb"
+        android:layout_marginLeft="@dimen/keyline_margin"
+        android:layout_marginRight="@dimen/keyline_margin"/>
+
+    <TextView
+        android:id="@+id/uploader"
+        style="@style/Text.Gallery.Detail.Subtitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignLeft="@id/title"
+        android:layout_below="@id/title"
+        android:layout_marginTop="8dp"
+        android:layout_marginRight="@dimen/keyline_margin"/>
+
+    <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_below="@id/uploader"
+        android:layout_marginTop="12dp"
+        android:layout_marginRight="@dimen/keyline_margin"
+        android:paddingBottom="2dp"
+        android:paddingLeft="8dp"
+        android:paddingRight="8dp"
+        android:paddingTop="2dp"
+        android:background="@android:color/white"
+        android:textAllCaps="true"
+        android:textStyle="bold"/>
+
+</RelativeLayout>
diff --git a/app/src/main/res/layout-v21/scene_gallery_detail.xml b/app/src/main/res/layout-v21/scene_gallery_detail.xml
deleted file mode 100644
index 94200be0b..000000000
--- a/app/src/main/res/layout-v21/scene_gallery_detail.xml
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2015 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.
-  -->
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:auto="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:overScrollMode="never"
-        android:scrollbarThumbVertical="@null">
-
-        <FrameLayout
-            android:id="@+id/detail_frame_layout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <LinearLayout
-                android:id="@+id/content"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:paddingTop="@dimen/gallery_detail_content_margin_top"
-                android:orientation="vertical">
-
-                <include
-                    layout="@layout/gallery_detail_info"/>
-
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:layout_marginLeft="@dimen/keyline_margin"
-                    android:layout_marginRight="@dimen/keyline_margin"
-                    android:background="@color/divider_light"/>
-
-                <include
-                    layout="@layout/gallery_detail_action"/>
-
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:layout_marginLeft="@dimen/keyline_margin"
-                    android:layout_marginRight="@dimen/keyline_margin"
-                    android:background="@color/divider_light"/>
-
-                <include
-                    layout="@layout/gallery_detail_tag"/>
-
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:layout_marginLeft="@dimen/keyline_margin"
-                    android:layout_marginRight="@dimen/keyline_margin"
-                    android:background="@color/divider_light"/>
-
-                <include
-                    layout="@layout/gallery_detail_comment"/>
-
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:layout_marginLeft="@dimen/keyline_margin"
-                    android:layout_marginRight="@dimen/keyline_margin"
-                    android:background="@color/divider_light"/>
-
-                <include
-                    layout="@layout/gallery_detail_preview"/>
-
-            </LinearLayout>
-
-            <!-- Header -->
-            <RelativeLayout
-                android:id="@+id/header"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@color/theme_primary"
-                android:elevation="4dp">
-
-                <com.hippo.ehviewer.widget.LoadImageView
-                    android:id="@+id/thumb"
-                    android:layout_width="@dimen/gallery_detail_thumb_width"
-                    android:layout_height="@dimen/gallery_detail_thumb_height"
-                    android:layout_marginLeft="@dimen/keyline_margin"
-                    android:layout_marginTop="@dimen/keyline_margin"
-                    android:layout_marginBottom="@dimen/gallery_detail_thumb_margin_bottom"
-                    tools:ignore="RtlHardcoded"/>
-
-                <TextView
-                    android:id="@+id/title"
-                    style="@style/Text.Gallery.Detail.Title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_toRightOf="@id/thumb"
-                    android:layout_alignTop="@id/thumb"
-                    android:layout_marginLeft="@dimen/keyline_margin"
-                    android:layout_marginRight="@dimen/keyline_margin"
-                    tools:ignore="RtlHardcoded"/>
-
-                <TextView
-                    android:id="@+id/uploader"
-                    style="@style/Text.Gallery.Detail.Subtitle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignLeft="@id/title"
-                    android:layout_below="@id/title"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginRight="@dimen/keyline_margin"
-                    tools:ignore="RtlHardcoded"/>
-
-                <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_below="@id/uploader"
-                    android:layout_marginTop="12dp"
-                    android:layout_marginRight="@dimen/keyline_margin"
-                    android:paddingBottom="2dp"
-                    android:paddingLeft="8dp"
-                    android:paddingRight="8dp"
-                    android:paddingTop="2dp"
-                    android:background="@android:color/white"
-                    android:textAllCaps="true"
-                    android:textStyle="bold"
-                    tools:ignore="RtlHardcoded"/>
-
-            </RelativeLayout>
-
-            <!-- ActionCard -->
-            <com.hippo.widget.CardLinearLayout
-                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:layout_marginTop="@dimen/gallery_detail_action_card_margin_top"
-                android:layout_marginBottom="8dp"
-                auto:cardElevation="4dp">
-
-                <TextView
-                    android:id="@+id/download"
-                    style="@style/ButtonInCard"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="@string/download"/>
-
-                <View
-                    android:layout_width="1dp"
-                    android:layout_height="match_parent"
-                    android:background="@color/divider_light"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginBottom="8dp"/>
-
-                <TextView
-                    android:id="@+id/read"
-                    style="@style/ButtonInCard"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:textColor="@color/theme_accent"
-                    android:text="@string/read"/>
-
-            </com.hippo.widget.CardLinearLayout>
-
-        </FrameLayout>
-
-    </ScrollView>
-
-    <ProgressBar
-        android:id="@+id/progress_bar"
-        style="@style/ProgressBar"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"/>
-
-</FrameLayout>
diff --git a/app/src/main/res/layout/gallery_detail_header.xml b/app/src/main/res/layout/gallery_detail_header.xml
new file mode 100644
index 000000000..ca2132b03
--- /dev/null
+++ b/app/src/main/res/layout/gallery_detail_header.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2015 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.
+  -->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:id="@+id/header"
+        android:layout_width="match_parent"
+        android:layout_height="248dp"
+        android:background="@color/theme_primary">
+
+        <com.hippo.ehviewer.widget.LoadImageView
+            android:id="@+id/thumb"
+            android:layout_width="@dimen/gallery_detail_thumb_width"
+            android:layout_height="@dimen/gallery_detail_thumb_height"
+            android:layout_marginLeft="@dimen/keyline_margin"
+            android:layout_marginTop="16dp"/>
+
+        <TextView
+            android:id="@+id/title"
+            style="@style/Text.Gallery.Detail.Title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_toRightOf="@id/thumb"
+            android:layout_alignTop="@id/thumb"
+            android:layout_marginLeft="@dimen/keyline_margin"
+            android:layout_marginRight="@dimen/keyline_margin"/>
+
+        <TextView
+            android:id="@+id/uploader"
+            style="@style/Text.Gallery.Detail.Subtitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignLeft="@id/title"
+            android:layout_below="@id/title"
+            android:layout_marginTop="8dp"
+            android:layout_marginRight="@dimen/keyline_margin"/>
+
+        <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_below="@id/uploader"
+            android:layout_marginTop="12dp"
+            android:layout_marginRight="@dimen/keyline_margin"
+            android:paddingBottom="2dp"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:paddingTop="2dp"
+            android:background="@android:color/white"
+            android:textAllCaps="true"
+            android:textStyle="bold"/>
+
+    </RelativeLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="4dp"
+        android:background="@drawable/drop_shadow"/>
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/scene_gallery_detail.xml b/app/src/main/res/layout/scene_gallery_detail.xml
index 18eba37a4..eceae815d 100644
--- a/app/src/main/res/layout/scene_gallery_detail.xml
+++ b/app/src/main/res/layout/scene_gallery_detail.xml
@@ -17,7 +17,6 @@
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:auto="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -85,62 +84,8 @@
             </LinearLayout>
 
             <!-- Header -->
-            <RelativeLayout
-                android:id="@+id/header"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@color/theme_primary">
-
-                <com.hippo.ehviewer.widget.LoadImageView
-                    android:id="@+id/thumb"
-                    android:layout_width="@dimen/gallery_detail_thumb_width"
-                    android:layout_height="@dimen/gallery_detail_thumb_height"
-                    android:layout_marginLeft="@dimen/keyline_margin"
-                    android:layout_marginTop="@dimen/keyline_margin"
-                    android:layout_marginBottom="@dimen/gallery_detail_thumb_margin_bottom"
-                    tools:ignore="RtlHardcoded"/>
-
-                <TextView
-                    android:id="@+id/title"
-                    style="@style/Text.Gallery.Detail.Title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_toRightOf="@id/thumb"
-                    android:layout_alignTop="@id/thumb"
-                    android:layout_marginLeft="@dimen/keyline_margin"
-                    android:layout_marginRight="@dimen/keyline_margin"
-                    tools:ignore="RtlHardcoded"/>
-
-                <TextView
-                    android:id="@+id/uploader"
-                    style="@style/Text.Gallery.Detail.Subtitle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignLeft="@id/title"
-                    android:layout_below="@id/title"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginRight="@dimen/keyline_margin"
-                    tools:ignore="RtlHardcoded"/>
-
-                <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_below="@id/uploader"
-                    android:layout_marginTop="12dp"
-                    android:layout_marginRight="@dimen/keyline_margin"
-                    android:paddingBottom="2dp"
-                    android:paddingLeft="8dp"
-                    android:paddingRight="8dp"
-                    android:paddingTop="2dp"
-                    android:background="@android:color/white"
-                    android:textAllCaps="true"
-                    android:textStyle="bold"
-                    tools:ignore="RtlHardcoded"/>
-
-            </RelativeLayout>
+            <include
+                layout="@layout/gallery_detail_header"/>
 
             <!-- ActionCard -->
             <com.hippo.widget.CardLinearLayout
diff --git a/app/src/main/res/layout/scene_gallery_list.xml b/app/src/main/res/layout/scene_gallery_list.xml
index 550945081..db3dd741d 100644
--- a/app/src/main/res/layout/scene_gallery_list.xml
+++ b/app/src/main/res/layout/scene_gallery_list.xml
@@ -42,7 +42,6 @@
         android:layout_marginLeft="@dimen/search_bar_padding_horizontal"
         android:layout_marginRight="@dimen/search_bar_padding_horizontal"
         android:layout_marginTop="@dimen/search_bar_padding_vertical"
-        auto:cardElevation="4dp"
         auto:forceNoElevation="true"/>
 
     <com.hippo.widget.FabLayout
diff --git a/beerbelly b/beerbelly
index d2c75ad6c..35d3e8bc9 160000
--- a/beerbelly
+++ b/beerbelly
@@ -1 +1 @@
-Subproject commit d2c75ad6c030757babe8ff0870830cdfbe591e0f
+Subproject commit 35d3e8bc9e64a93c95e622efa8a4569af1cb0bff
diff --git a/cardsalon b/cardsalon
index 834b8482b..65aba287e 160000
--- a/cardsalon
+++ b/cardsalon
@@ -1 +1 @@
-Subproject commit 834b8482bd21f93d5008220b7bffc9ca5bc49751
+Subproject commit 65aba287e3989cf45b6afc3ad8f2fcae800a51eb
diff --git a/conaco b/conaco
index 3e65839be..a7df428c7 160000
--- a/conaco
+++ b/conaco
@@ -1 +1 @@
-Subproject commit 3e65839beeaee1b79aedc606ab46f2dcb5ca456e
+Subproject commit a7df428c7a50124999033a505649ceb3b43bb4ff
diff --git a/vectorold b/vectorold
index 20b90d9a8..4002db713 160000
--- a/vectorold
+++ b/vectorold
@@ -1 +1 @@
-Subproject commit 20b90d9a8fdcc790cac6cd4f8e657850d8cdce55
+Subproject commit 4002db71373006a704383a66b3c64809a3e4c379