diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListDelegate.kt b/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListDelegate.kt
index 3f607b3e6b0b..72b08f8ac274 100644
--- a/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListDelegate.kt
+++ b/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListDelegate.kt
@@ -213,6 +213,16 @@ class OCFileListDelegate(
         // thumbnail
         viewHolder.imageFileName?.text = file.fileName
         viewHolder.thumbnail.tag = file.fileId
+        if (gridView) {
+            if (MimeTypeUtil.isImageOrVideo(file)) {
+                viewHolder.thumbnail.scaleType = ImageView.ScaleType.CENTER_CROP
+                viewHolder.thumbnail.setPadding(0, 0, 0, 0)
+            } else {
+                viewHolder.thumbnail.scaleType = ImageView.ScaleType.FIT_CENTER
+                val padding = context.resources.getDimensionPixelSize(R.dimen.standard_padding)
+                viewHolder.thumbnail.setPadding(padding, padding, padding, padding)
+            }
+        }
         setThumbnail(viewHolder.thumbnail, viewHolder.shimmerThumbnail, file, overlayManager)
 
         // item layout + click listeners
diff --git a/app/src/main/res/layout/grid_item.xml b/app/src/main/res/layout/grid_item.xml
index ddbbc8c627c3..97e1084bdbd6 100644
--- a/app/src/main/res/layout/grid_item.xml
+++ b/app/src/main/res/layout/grid_item.xml
@@ -13,7 +13,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/ListItemLayout"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/grid_container_height"
+    android:layout_height="wrap_content"
     android:layout_margin="@dimen/grid_container_margin">
 
     <com.elyeproj.loaderviewlibrary.LoaderImageView
@@ -31,11 +31,12 @@
 
     <com.owncloud.android.ui.SquareImageView
         android:id="@+id/thumbnail"
-        android:layout_width="@dimen/standard_list_item_size"
-        android:layout_height="@dimen/standard_list_item_size"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
         android:layout_marginTop="@dimen/standard_half_margin"
         android:contentDescription="@null"
         android:src="@drawable/folder"
+        app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -149,6 +150,7 @@
         android:visibility="gone"
         android:gravity="center"
         android:orientation="horizontal"
+        android:layout_marginTop="@dimen/standard_quarter_margin"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -201,6 +203,7 @@
         android:id="@+id/Filename"
         android:layout_width="0dp"
         android:layout_height="@dimen/grid_bottom_view_height"
+        android:layout_marginTop="@dimen/standard_quarter_margin"
         android:layout_gravity="center"
         android:ellipsize="middle"
         android:gravity="center"
@@ -219,6 +222,7 @@
         android:id="@+id/more"
         android:layout_width="24dp"
         android:layout_height="@dimen/grid_bottom_view_height"
+        android:layout_marginTop="@dimen/standard_quarter_margin"
         android:layout_gravity="center"
         android:background="@color/transparent"
         android:contentDescription="@string/overflow_menu"