diff --git a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java
index 219be5e11..73a06f2e9 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java
@@ -6,6 +6,7 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.res.Resources;
+import android.graphics.Rect;
 import android.net.Uri;
 import android.os.Build;
 import android.support.annotation.DrawableRes;
@@ -719,11 +720,13 @@ public class AppDetailsRecyclerViewAdapter
     private class ScreenShotsViewHolder extends AppDetailsViewHolder
             implements ScreenShotsRecyclerViewAdapter.Listener {
         final RecyclerView recyclerView;
-        LinearLayoutManagerSnapHelper snapHelper;
+        ItemDecorator itemDecorator;
 
         ScreenShotsViewHolder(View view) {
             super(view);
-            recyclerView = (RecyclerView) view.findViewById(R.id.screenshots);
+            recyclerView = view.findViewById(R.id.screenshots);
+            itemDecorator = new ItemDecorator(context);
+            recyclerView.addItemDecoration(itemDecorator);
         }
 
         @Override
@@ -734,17 +737,31 @@ public class AppDetailsRecyclerViewAdapter
             recyclerView.setAdapter(adapter);
             recyclerView.setHasFixedSize(true);
             recyclerView.setNestedScrollingEnabled(false);
-            if (snapHelper != null) {
-                snapHelper.attachToRecyclerView(null);
-            }
-            snapHelper = new LinearLayoutManagerSnapHelper(lm);
-            snapHelper.attachToRecyclerView(recyclerView);
         }
 
         @Override
         public void onScreenshotClick(int position) {
             context.startActivity(ScreenShotsActivity.getStartIntent(context, app.packageName, position));
         }
+
+        private class ItemDecorator extends RecyclerView.ItemDecoration {
+            private final Context context;
+
+            ItemDecorator(Context context) {
+                this.context = context.getApplicationContext();
+            }
+
+            @Override
+            public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
+                int position = parent.getChildAdapterPosition(view);
+                int padding = (int) context.getResources().getDimension(R.dimen.details_activity_padding_screenshot);
+                if (position == 0) {
+                    outRect.set(padding, view.getPaddingTop(), view.getPaddingRight(), view.getPaddingBottom());
+                } else {
+                    outRect.set(view.getPaddingLeft(), view.getPaddingTop(), view.getPaddingRight(), view.getPaddingBottom());
+                }
+            }
+        }
     }
 
     private class DonateViewHolder extends AppDetailsViewHolder {
diff --git a/app/src/main/res/layout/app_details2.xml b/app/src/main/res/layout/app_details2.xml
index 108f24621..125be7f6b 100644
--- a/app/src/main/res/layout/app_details2.xml
+++ b/app/src/main/res/layout/app_details2.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.design.widget.CoordinatorLayout 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:layout_width="match_parent"
-                                                 android:layout_height="match_parent"
-                                                 android:fitsSystemWindows="true"
-                                                 tools:context="org.fdroid.fdroid.views.AppDetailsActivity"
-                                                 android:background="?attr/appDetailsBackground"
-                                                 android:id="@+id/rootCoordinator">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context="org.fdroid.fdroid.views.AppDetailsActivity"
+    android:background="?attr/appDetailsBackground"
+    android:id="@+id/rootCoordinator">
 
     <android.support.design.widget.AppBarLayout
         android:id="@+id/app_bar"
@@ -41,12 +41,10 @@
                 app:popupTheme="@style/AppThemeLight.PopupOverlay" />
 
         </android.support.design.widget.CollapsingToolbarLayout>
+
     </android.support.design.widget.AppBarLayout>
 
     <android.support.v7.widget.RecyclerView
-        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:id="@+id/rvDetails"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index acc6983eb..12f97a102 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -5,6 +5,7 @@
     <dimen name="material_listitem_height">48dp</dimen>
     <dimen name="app_bar_height">180dp</dimen>
     <dimen name="details_activity_padding">16dp</dimen>
+    <dimen name="details_activity_padding_screenshot">14dp</dimen>
 
     <dimen name="details_activity__collapsable_lists__padding__vertical">3dp</dimen>
     <!-- This is in addition to the padding that almost all items in the app details screen have