diff --git a/app/src/main/java/org/fdroid/fdroid/views/categories/CategoryController.java b/app/src/main/java/org/fdroid/fdroid/views/categories/CategoryController.java
index 1f49b441b..b4ca76bdc 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/categories/CategoryController.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/categories/CategoryController.java
@@ -44,6 +44,7 @@ public class CategoryController extends RecyclerView.ViewHolder implements Loade
     private final Activity activity;
     private final LoaderManager loaderManager;
     private final DisplayImageOptions displayImageOptions;
+    private static int categoryItemCount = 20;
 
     private String currentCategory;
 
@@ -150,7 +151,7 @@ public class CategoryController extends RecyclerView.ViewHolder implements Loade
         } else {
             return new CursorLoader(
                     activity,
-                    AppProvider.getTopFromCategoryUri(currentCategory, 20),
+                    AppProvider.getTopFromCategoryUri(currentCategory, categoryItemCount),
                     new String[]{
                             Schema.AppMetadataTable.Cols.NAME,
                             Schema.AppMetadataTable.Cols.Package.PACKAGE_NAME,
@@ -225,14 +226,17 @@ public class CategoryController extends RecyclerView.ViewHolder implements Loade
             int horizontalPadding = (int) r.getDimension(R.dimen.category_preview__app_list__padding__horizontal);
             int horizontalPaddingFirst = (int) r.getDimension(
                     R.dimen.category_preview__app_list__padding__horizontal__first);
+            int horizontalPaddingLast = (int) r.getDimension(
+                    R.dimen.category_preview__app_list__padding__horizontal__last);
             boolean isLtr = ViewCompat.getLayoutDirection(parent) == ViewCompat.LAYOUT_DIRECTION_LTR;
             int itemPosition = parent.getChildLayoutPosition(view);
             boolean first = itemPosition == 0;
+            boolean end = itemPosition == categoryItemCount - 1;
 
             // Leave this "paddingEnd" local variable here for clarity when converting from
             // left/right to start/end for RTL friendly layout.
             // noinspection UnnecessaryLocalVariable
-            int paddingEnd = horizontalPadding;
+            int paddingEnd = end ? horizontalPaddingLast : horizontalPadding;
             int paddingStart = first ? horizontalPaddingFirst : horizontalPadding;
 
             int paddingLeft = isLtr ? paddingStart : paddingEnd;
diff --git a/app/src/main/res/layout/category_item.xml b/app/src/main/res/layout/category_item.xml
index 177790c75..c6a17f017 100644
--- a/app/src/main/res/layout/category_item.xml
+++ b/app/src/main/res/layout/category_item.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+                                             xmlns:app="http://schemas.android.com/apk/res-auto"
+                                             xmlns:tools="http://schemas.android.com/tools"
+                                             android:orientation="vertical" android:layout_width="match_parent"
+                                             android:layout_height="wrap_content">
 
     <TextView
         android:id="@+id/name"
@@ -68,18 +68,18 @@
 
     <android.support.v7.widget.RecyclerView
         android:id="@+id/app_cards"
-        tools:listitem="@layout/app_card_normal"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        app:layout_constraintStart_toStartOf="parent"
+        android:clipToPadding="false"
+        android:orientation="horizontal"
+        android:paddingBottom="@dimen/category_preview__app_list__padding__vertical"
+        android:paddingTop="@dimen/category_preview__app_list__padding__vertical"
+        app:layoutManager="LinearLayoutManager"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/button"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layoutManager="LinearLayoutManager"
-        android:orientation="horizontal"
-        android:paddingTop="@dimen/category_preview__app_list__padding__vertical"
-        android:paddingBottom="@dimen/category_preview__app_list__padding__vertical"
-        android:clipToPadding="false" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/button"
+        tools:listitem="@layout/app_card_normal"/>
 
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 91a41362a..acc6983eb 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -26,6 +26,7 @@
 
     <dimen name="category_preview__app_list__padding__horizontal">4dp</dimen>
     <dimen name="category_preview__app_list__padding__horizontal__first">72dp</dimen>
+    <dimen name="category_preview__app_list__padding__horizontal__last">90dp</dimen>
     <dimen name="category_preview__app_list__padding__vertical">18dp</dimen>
 
     <dimen name="banner__padding">4dp</dimen>