diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index 7213e63..95567db 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ

diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index 7213e63..95567db 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt
index 16405b6..d5ec7aa 100644
--- a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt
+++ b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt
@@ -57,8 +57,7 @@
         uploadFileViewModel = ViewModelProvider(this).get(UploadFileViewModel::class.java)
         applyViewModel = ViewModelProvider(this).get(ApplyViewModel::class.java)
 
-        imageAdapter = EditableImageAdapter(this, 1)
-        imageAdapter.setImageMargins(10f, 10f, 3f)
+        imageAdapter = EditableImageAdapter(this, 1, 13f)
         addImageRecyclerView.layoutManager = GridLayoutManager(this, 3)
         addImageRecyclerView.adapter = imageAdapter
     }

diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index 7213e63..95567db 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt
index 16405b6..d5ec7aa 100644
--- a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt
+++ b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt
@@ -57,8 +57,7 @@
         uploadFileViewModel = ViewModelProvider(this).get(UploadFileViewModel::class.java)
         applyViewModel = ViewModelProvider(this).get(ApplyViewModel::class.java)
 
-        imageAdapter = EditableImageAdapter(this, 1)
-        imageAdapter.setImageMargins(10f, 10f, 3f)
+        imageAdapter = EditableImageAdapter(this, 1, 13f)
         addImageRecyclerView.layoutManager = GridLayoutManager(this, 3)
         addImageRecyclerView.adapter = imageAdapter
     }
diff --git a/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt
index 7cdde14..7165908 100644
--- a/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt
+++ b/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt
@@ -79,9 +79,7 @@
         uploadFileViewModel = ViewModelProvider(this).get(UploadFileViewModel::class.java)
         eventViewModel = ViewModelProvider(this).get(EventViewModel::class.java)
 
-        imageAdapter = EditableImageAdapter(this, 3)
-        imageAdapter.setImageMargins(10f, 10f, 3f)
-        addImageRecyclerView.layoutManager = GridLayoutManager(this, 3)
+        imageAdapter = EditableImageAdapter(this, 3, 13f)
         addImageRecyclerView.adapter = imageAdapter
     }
 

diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar
index 7213e63..95567db 100644
--- a/app/libs/lite-release.aar
+++ b/app/libs/lite-release.aar
Binary files differ
diff --git a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt
index 16405b6..d5ec7aa 100644
--- a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt
+++ b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt
@@ -57,8 +57,7 @@
         uploadFileViewModel = ViewModelProvider(this).get(UploadFileViewModel::class.java)
         applyViewModel = ViewModelProvider(this).get(ApplyViewModel::class.java)
 
-        imageAdapter = EditableImageAdapter(this, 1)
-        imageAdapter.setImageMargins(10f, 10f, 3f)
+        imageAdapter = EditableImageAdapter(this, 1, 13f)
         addImageRecyclerView.layoutManager = GridLayoutManager(this, 3)
         addImageRecyclerView.adapter = imageAdapter
     }
diff --git a/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt
index 7cdde14..7165908 100644
--- a/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt
+++ b/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt
@@ -79,9 +79,7 @@
         uploadFileViewModel = ViewModelProvider(this).get(UploadFileViewModel::class.java)
         eventViewModel = ViewModelProvider(this).get(EventViewModel::class.java)
 
-        imageAdapter = EditableImageAdapter(this, 3)
-        imageAdapter.setImageMargins(10f, 10f, 3f)
-        addImageRecyclerView.layoutManager = GridLayoutManager(this, 3)
+        imageAdapter = EditableImageAdapter(this, 3, 13f)
         addImageRecyclerView.adapter = imageAdapter
     }
 
diff --git a/app/src/main/res/layout/activity_upload_activity.xml b/app/src/main/res/layout/activity_upload_activity.xml
index a368e93..5b590d4 100644
--- a/app/src/main/res/layout/activity_upload_activity.xml
+++ b/app/src/main/res/layout/activity_upload_activity.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mainBackColor"
@@ -133,7 +134,9 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="@dimen/dp_10"
-                android:paddingHorizontal="@dimen/dp_10" />
+                android:paddingHorizontal="@dimen/dp_10"
+                app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+                app:spanCount="3" />
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>