diff --git a/Clover/app/src/main/java/org/floens/chan/ui/layout/ThreadListLayout.java b/Clover/app/src/main/java/org/floens/chan/ui/layout/ThreadListLayout.java
index 85c43e5d..487492ec 100644
--- a/Clover/app/src/main/java/org/floens/chan/ui/layout/ThreadListLayout.java
+++ b/Clover/app/src/main/java/org/floens/chan/ui/layout/ThreadListLayout.java
@@ -129,12 +129,7 @@ public class ThreadListLayout extends LinearLayout implements ReplyLayout.ReplyL
         super.onMeasure(widthMeasureSpec, heightMeasureSpec);
 
         int cardWidth = getResources().getDimensionPixelSize(R.dimen.grid_card_width);
-        int maxSpans = getResources().getInteger(R.integer.grid_card_max_spans);
-
         spanCount = Math.max(1, Math.round(getMeasuredWidth() / cardWidth));
-        if (maxSpans > 1 && spanCount > maxSpans) {
-            spanCount = maxSpans;
-        }
 
         if (postViewMode == PostCellInterface.PostViewMode.CARD) {
             ((GridLayoutManager) layoutManager).setSpanCount(spanCount);
diff --git a/Clover/app/src/main/res/layout/cell_post_card.xml b/Clover/app/src/main/res/layout/cell_post_card.xml
index 854ad3c1..f74721b5 100644
--- a/Clover/app/src/main/res/layout/cell_post_card.xml
+++ b/Clover/app/src/main/res/layout/cell_post_card.xml
@@ -28,7 +28,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="280dp"
+        android:layout_height="@dimen/grid_card_height"
         android:background="@drawable/item_background"
         android:orientation="vertical">
 
@@ -46,8 +46,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="top|right"
-                android:paddingBottom="15dp"
-                android:paddingLeft="15dp"
                 android:paddingRight="5dp"
                 android:paddingTop="5dp"
                 android:src="?post_options_drawable"
diff --git a/Clover/app/src/main/res/values-sw600dp/dimens.xml b/Clover/app/src/main/res/values-sw600dp/dimens.xml
index 8d98c14c..b96e43bd 100644
--- a/Clover/app/src/main/res/values-sw600dp/dimens.xml
+++ b/Clover/app/src/main/res/values-sw600dp/dimens.xml
@@ -18,8 +18,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 <resources>
     <bool name="is_tablet">true</bool>
 
-    <dimen name="grid_card_width">180dp</dimen>
-    <integer name="grid_card_max_spans">5</integer>
+    <dimen name="grid_card_width">105dp</dimen>
+    <dimen name="grid_card_height">240dp</dimen>
 
     <dimen name="reply_height_loading">400dp</dimen>
 
diff --git a/Clover/app/src/main/res/values/dimens.xml b/Clover/app/src/main/res/values/dimens.xml
index 4d0855c9..86687ec6 100644
--- a/Clover/app/src/main/res/values/dimens.xml
+++ b/Clover/app/src/main/res/values/dimens.xml
@@ -20,8 +20,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
     <dimen name="toolbar_height">56dp</dimen>
 
-    <dimen name="grid_card_width">140dp</dimen>
-    <integer name="grid_card_max_spans">-1</integer>
+    <dimen name="grid_card_width">120dp</dimen>
+    <dimen name="grid_card_height">200dp</dimen>
 
     <dimen name="reply_height_loading">250dp</dimen>