diff --git a/app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.java b/app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.java
index 40d5429bc..5e976ee29 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.java
+++ b/app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.java
@@ -39,6 +39,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.hippo.easyrecyclerview.EasyRecyclerView;
+import com.hippo.easyrecyclerview.MarginItemDecoration;
 import com.hippo.ehviewer.R;
 import com.hippo.ehviewer.client.data.ListUrlBuilder;
 import com.hippo.ehviewer.client.exception.EhException;
@@ -122,9 +123,13 @@ public class SearchLayout extends EasyRecyclerView implements CompoundButton.OnC
         setAdapter(mAdapter);
         setHasFixedSize(true);
         setClipToPadding(false);
-        int paddingH = resources.getDimensionPixelOffset(R.dimen.gallery_list_margin_h);
-        int paddingV = resources.getDimensionPixelOffset(R.dimen.gallery_list_margin_v);
-        setPadding(paddingV, paddingH, paddingV, paddingH);
+        int interval = resources.getDimensionPixelOffset(R.dimen.search_layout_interval);
+        int paddingH = resources.getDimensionPixelOffset(R.dimen.search_layout_margin_h);
+        int paddingV = resources.getDimensionPixelOffset(R.dimen.search_layout_margin_v);
+        MarginItemDecoration decoration = new MarginItemDecoration(
+                interval, paddingH, paddingV, paddingH, paddingV);
+        addItemDecoration(decoration);
+        decoration.applyPaddings(this);
 
         // Create normal view
         View normalView = mInflater.inflate(R.layout.search_normal, null);
diff --git a/app/src/main/res/values-sw600dp/dimens.xml b/app/src/main/res/values-sw600dp/dimens.xml
index c73458fad..fe6d18bdd 100644
--- a/app/src/main/res/values-sw600dp/dimens.xml
+++ b/app/src/main/res/values-sw600dp/dimens.xml
@@ -18,17 +18,20 @@
 <resources>
 
     <dimen name="keyline_margin">24dp</dimen>
-    <dimen name="single_max_width">360dp</dimen>
+    <dimen name="single_max_width">480dp</dimen>
 
+    <!-- 8dp - 4dp, 4dp for card padding -->
     <dimen name="gallery_list_interval">4dp</dimen>
+    <!-- 24dp - 4dp, 4dp for card padding -->
     <dimen name="gallery_list_margin_h">20dp</dimen>
-    <dimen name="gallery_list_margin_v">4dp</dimen>
-    <dimen name="gallery_grid_interval">8dp</dimen>
     <dimen name="gallery_grid_margin_h">24dp</dimen>
-    <dimen name="gallery_grid_margin_v">8dp</dimen>
 
+    <!-- 24dp - 4dp, 4dp for card padding -->
     <dimen name="gallery_search_bar_margin_h">20dp</dimen>
-    <dimen name="gallery_search_bar_margin_v">16dp</dimen>
-    <dimen name="gallery_padding_top_search_bar">72dp</dimen>
+
+    <!-- 8dp - 4dp, 4dp for card padding -->
+    <dimen name="search_layout_interval">4dp</dimen>
+    <!-- 24dp - 4dp, 4dp for card padding -->
+    <dimen name="search_layout_margin_h">20dp</dimen>
 
 </resources>
diff --git a/app/src/main/res/values-sw720dp-land/dimens.xml b/app/src/main/res/values-sw720dp-land/dimens.xml
new file mode 100644
index 000000000..573be5ebc
--- /dev/null
+++ b/app/src/main/res/values-sw720dp-land/dimens.xml
@@ -0,0 +1,30 @@
+<?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.
+  -->
+
+<resources>
+
+    <!-- 80dp - 4dp, 4dp for card padding -->
+    <dimen name="gallery_list_margin_h">76dp</dimen>
+    <dimen name="gallery_grid_margin_h">80dp</dimen>
+
+    <!-- 80dp - 4dp, 4dp for card padding -->
+    <dimen name="gallery_search_bar_margin_h">76dp</dimen>
+
+    <!-- 80dp - 4dp, 4dp for card padding -->
+    <dimen name="search_layout_margin_h">76dp</dimen>
+
+</resources>
diff --git a/app/src/main/res/values-sw720dp/dimens.xml b/app/src/main/res/values-sw720dp/dimens.xml
index 784a15e01..c0e7cdfac 100644
--- a/app/src/main/res/values-sw720dp/dimens.xml
+++ b/app/src/main/res/values-sw720dp/dimens.xml
@@ -17,4 +17,6 @@
 
 <resources>
 
+
+
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 52d6a5b8b..9cac74c73 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -37,15 +37,22 @@
 
     <dimen name="gallery_list_thumb_height">120dp</dimen>
     <dimen name="gallery_list_thumb_width">80dp</dimen>
+    <!-- 4dp - 4dp, 4dp for card padding -->
     <dimen name="gallery_list_interval">0dp</dimen>
+    <!-- 8dp - 4dp, 4dp for card padding -->
     <dimen name="gallery_list_margin_h">4dp</dimen>
+    <!-- 8dp - 4dp, 4dp for card padding -->
     <dimen name="gallery_list_margin_v">4dp</dimen>
+
     <dimen name="gallery_grid_interval">8dp</dimen>
     <dimen name="gallery_grid_margin_h">8dp</dimen>
     <dimen name="gallery_grid_margin_v">8dp</dimen>
 
+    <!-- 8dp - 4dp, 4dp for card padding -->
     <dimen name="gallery_search_bar_margin_h">4dp</dimen>
+    <!-- 12dp - 4dp, 4dp for card padding -->
     <dimen name="gallery_search_bar_margin_v">8dp</dimen>
+
     <dimen name="gallery_padding_top_search_bar">64dp</dimen>
     <dimen name="gallery_padding_bottom_fab">80dp</dimen>
 
@@ -54,6 +61,13 @@
     <dimen name="gallery_grid_column_width_middle">120dp</dimen>
     <dimen name="gallery_grid_column_width_small">80dp</dimen>
 
+    <!-- 4dp - 4dp, 4dp for card padding -->
+    <dimen name="search_layout_interval">0dp</dimen>
+    <!-- 8dp - 4dp, 4dp for card padding -->
+    <dimen name="search_layout_margin_h">4dp</dimen>
+    <!-- 8dp - 4dp, 4dp for card padding -->
+    <dimen name="search_layout_margin_v">4dp</dimen>
+
     <!-- DrawerArrowDrawable -->
     <dimen name="dad_drawable_size">24dp</dimen>
     <dimen name="dad_bar_size">18dp</dimen>
@@ -75,8 +89,8 @@
 
     <!-- Search item -->
     <dimen name="search_item_interval">8dp</dimen>
-    <dimen name="search_category_padding_h">16dp</dimen>
-    <dimen name="search_category_padding_v">16dp</dimen>
+    <dimen name="search_category_padding_h">@dimen/keyline_margin</dimen>
+    <dimen name="search_category_padding_v">@dimen/keyline_margin</dimen>
     <dimen name="search_category_title_height">48dp</dimen>
 
     <dimen name="image_search_max_size">240dp</dimen>
diff --git a/unifile b/unifile
index 21d947418..ba9d43c42 160000
--- a/unifile
+++ b/unifile
@@ -1 +1 @@
-Subproject commit 21d947418ecb50da210a610327a941f87e65729a
+Subproject commit ba9d43c423d555aa1aca0de2edcd62b1576294bb