diff --git a/app/src/main/kotlin/org/fossify/filemanager/helpers/Config.kt b/app/src/main/kotlin/org/fossify/filemanager/helpers/Config.kt
index 9e9b3fd2..c5278fdb 100644
--- a/app/src/main/kotlin/org/fossify/filemanager/helpers/Config.kt
+++ b/app/src/main/kotlin/org/fossify/filemanager/helpers/Config.kt
@@ -107,7 +107,7 @@ class Config(context: Context) : BaseConfig(context) {
 
     private fun getDefaultFileColumnCount(): Int {
         val isPortrait = context.resources.configuration.orientation == Configuration.ORIENTATION_PORTRAIT
-        return if (isPortrait) 3 else 5
+        return if (isPortrait) 4 else 8
     }
 
     var displayFilenames: Boolean
diff --git a/app/src/main/res/layout/item_dir_grid.xml b/app/src/main/res/layout/item_dir_grid.xml
index c6ec8dcb..43d3c9a2 100644
--- a/app/src/main/res/layout/item_dir_grid.xml
+++ b/app/src/main/res/layout/item_dir_grid.xml
@@ -21,10 +21,11 @@
 
         <ImageView
             android:id="@+id/item_icon"
-            android:layout_width="@dimen/grid_view_icon_size"
-            android:layout_height="@dimen/grid_view_icon_size"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             android:layout_centerHorizontal="true"
             android:adjustViewBounds="true"
+            android:padding="@dimen/small_margin"
             android:src="@drawable/ic_folder_vector" />
 
         <TextView