diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MediaActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MediaActivity.kt
index 19c361a43..731ac3e6d 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MediaActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MediaActivity.kt
@@ -157,13 +157,13 @@ class MediaActivity : SimpleActivity(), MediaOperationsListener {
         }
 
         if (mStoredThumbnailSpacing != config.thumbnailSpacing) {
-            handleGridSpacing()
+            media_grid.adapter = null
+            setupAdapter()
         }
 
         if (mStoredRoundedCorners != config.fileRoundedCorners) {
-            handleGridSpacing()
             media_grid.adapter = null
-            getMedia()
+            setupAdapter()
         }
 
         media_horizontal_fastscroller.updateBubbleColors()
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/MediaAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/MediaAdapter.kt
index 6f9b3a168..9139e10f9 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/MediaAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/MediaAdapter.kt
@@ -499,6 +499,14 @@ class MediaAdapter(activity: BaseSimpleActivity, var media: ArrayList<ThumbnailI
     private fun setupThumbnail(view: View, medium: Medium) {
         val isSelected = selectedKeys.contains(medium.path.hashCode())
         view.apply {
+            val padding = if (config.thumbnailSpacing <= 1) {
+                config.thumbnailSpacing
+            } else {
+                0
+            }
+
+            media_item_holder.setPadding(padding, padding, padding, padding)
+
             play_outline.beVisibleIf(medium.isVideo() || medium.isPortrait())
             if (medium.isVideo()) {
                 play_outline.setImageResource(R.drawable.ic_play_outline_vector)
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/GridSpacingItemDecoration.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/GridSpacingItemDecoration.kt
index f9c991740..7b082fe78 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/GridSpacingItemDecoration.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/GridSpacingItemDecoration.kt
@@ -13,6 +13,10 @@ class GridSpacingItemDecoration(val spanCount: Int, val spacing: Int, val isScro
             "items: ${items.hashCode()}, useGridPosition: $useGridPosition"
 
     override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State) {
+        if (spacing <= 1) {
+            return
+        }
+
         val position = parent.getChildAdapterPosition(view)
         val medium = items.getOrNull(position) as? Medium ?: return
         val gridPositionToUse = if (useGridPosition) medium.gridPosition else position