diff --git a/imagepicker/src/main/java/com/esafirm/imagepicker/adapter/ImagePickerAdapter.kt b/imagepicker/src/main/java/com/esafirm/imagepicker/adapter/ImagePickerAdapter.kt
index 60585429..dfc606f5 100644
--- a/imagepicker/src/main/java/com/esafirm/imagepicker/adapter/ImagePickerAdapter.kt
+++ b/imagepicker/src/main/java/com/esafirm/imagepicker/adapter/ImagePickerAdapter.kt
@@ -20,6 +20,7 @@ import com.esafirm.imagepicker.helper.diff.SimpleDiffUtilCallBack
 import com.esafirm.imagepicker.listeners.OnImageClickListener
 import com.esafirm.imagepicker.listeners.OnImageSelectedListener
 import com.esafirm.imagepicker.model.Image
+import kotlin.math.min
 
 class ImagePickerAdapter(
     context: Context,
@@ -130,6 +131,20 @@ class ImagePickerAdapter(
         }
     }
 
+    fun selectAll(limit: Int) {
+        mutateSelection {
+            selectedImages.clear()
+            val itemCount = min(limit, this.itemCount)
+            for (i in 0 until itemCount) {
+                val image = this.getItem(i)
+                if (image != null) {
+                    selectedImages.add(image)
+                }
+            }
+            notifyDataSetChanged()
+        }
+    }
+
     private fun mutateSelection(runnable: Runnable) {
         runnable.run()
         imageSelectedListener?.invoke(selectedImages)
@@ -147,4 +162,4 @@ class ImagePickerAdapter(
         val fileTypeIndicator = binding.efItemFileTypeIndicator
         val container = binding.root as FrameLayout
     }
-}
\ No newline at end of file
+}
diff --git a/imagepicker/src/main/java/com/esafirm/imagepicker/features/ImagePickerActivity.kt b/imagepicker/src/main/java/com/esafirm/imagepicker/features/ImagePickerActivity.kt
index 8ece339f..3755fd5f 100644
--- a/imagepicker/src/main/java/com/esafirm/imagepicker/features/ImagePickerActivity.kt
+++ b/imagepicker/src/main/java/com/esafirm/imagepicker/features/ImagePickerActivity.kt
@@ -108,6 +108,10 @@ class ImagePickerActivity : AppCompatActivity(), ImagePickerInteractionListener
                 title = ConfigUtils.getDoneButtonText(this@ImagePickerActivity, config!!)
                 isVisible = imagePickerFragment.isShowDoneButton
             }
+            menu.findItem(R.id.menu_select_all).apply {
+                title = ConfigUtils.getAllButtonText(this@ImagePickerActivity, config!!)
+                isVisible = imagePickerFragment.isShowAllButton
+            }
         }
         return super.onPrepareOptionsMenu(menu)
     }
@@ -125,6 +129,10 @@ class ImagePickerActivity : AppCompatActivity(), ImagePickerInteractionListener
             imagePickerFragment.onDone()
             return true
         }
+        if (id == R.id.menu_select_all) {
+            imagePickerFragment.onSelectAll()
+            return true
+        }
         if (id == R.id.menu_camera) {
             imagePickerFragment.captureImage()
             return true
diff --git a/imagepicker/src/main/java/com/esafirm/imagepicker/features/ImagePickerConfig.kt b/imagepicker/src/main/java/com/esafirm/imagepicker/features/ImagePickerConfig.kt
index 2e266a41..01c55270 100644
--- a/imagepicker/src/main/java/com/esafirm/imagepicker/features/ImagePickerConfig.kt
+++ b/imagepicker/src/main/java/com/esafirm/imagepicker/features/ImagePickerConfig.kt
@@ -15,6 +15,7 @@ class ImagePickerConfig(
     var folderTitle: String? = null,
     var imageTitle: String? = null,
     var doneButtonText: String? = null,
+    var allButtonText: String? = null,
     var arrowColor: Int = NO_COLOR,
     var limit: Int = IpCons.MAX_LIMIT,
     @StyleRes var theme: Int = 0,
@@ -28,7 +29,8 @@ class ImagePickerConfig(
     override var savePath: ImagePickerSavePath = ImagePickerSavePath.DEFAULT,
     override var returnMode: ReturnMode = ReturnMode.NONE,
     override var isSaveImage: Boolean = true,
-    var showDoneButtonAlways: Boolean = false
+    var showDoneButtonAlways: Boolean = false,
+    var showAllButton: Boolean = false,
 ) : BaseConfig(), Parcelable {
 
     @IgnoredOnParcel
@@ -52,4 +54,4 @@ fun ImagePickerConfig.enableLog(isEnable: Boolean) {
     IpLogger.setEnable(isEnable)
 }
 
-fun List<Image>.toFiles() = this.map { File(it.path) }
\ No newline at end of file
+fun List<Image>.toFiles() = this.map { File(it.path) }
diff --git a/imagepicker/src/main/java/com/esafirm/imagepicker/features/ImagePickerFragment.kt b/imagepicker/src/main/java/com/esafirm/imagepicker/features/ImagePickerFragment.kt
index b6eda312..2cf435f0 100644
--- a/imagepicker/src/main/java/com/esafirm/imagepicker/features/ImagePickerFragment.kt
+++ b/imagepicker/src/main/java/com/esafirm/imagepicker/features/ImagePickerFragment.kt
@@ -49,8 +49,12 @@ class ImagePickerFragment : Fragment() {
 
     private val permissions: Array<String> by lazy {
         when {
-            Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU ->
-                arrayOf(Manifest.permission.READ_MEDIA_IMAGES, Manifest.permission.READ_MEDIA_VIDEO)
+            Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU -> {
+                if (config.isIncludeVideo)
+                    arrayOf(Manifest.permission.READ_MEDIA_IMAGES, Manifest.permission.READ_MEDIA_VIDEO)
+                else
+                    arrayOf(Manifest.permission.READ_MEDIA_IMAGES)
+            }
 
             Build.VERSION.SDK_INT < Build.VERSION_CODES.Q
                 || Environment.isExternalStorageLegacy() -> arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE)
@@ -247,6 +251,14 @@ class ImagePickerFragment : Fragment() {
         presenter.onDoneSelectImages(recyclerViewManager.selectedImages, config)
     }
 
+    /**
+     * On select all images clicked
+     * Select all images in the current folder
+     */
+    fun onSelectAll() {
+        recyclerViewManager.selectAllImages()
+    }
+
     /**
      * Config recyclerView when configuration changed
      */
@@ -355,6 +367,9 @@ class ImagePickerFragment : Fragment() {
     val isShowDoneButton: Boolean
         get() = recyclerViewManager.isShowDoneButton
 
+    val isShowAllButton: Boolean
+        get() = recyclerViewManager.isShowAllButton
+
     override fun onAttach(context: Context) {
         super.onAttach(context)
         if (context is ImagePickerInteractionListener) {
diff --git a/imagepicker/src/main/java/com/esafirm/imagepicker/features/fileloader/DefaultImageFileLoader.kt b/imagepicker/src/main/java/com/esafirm/imagepicker/features/fileloader/DefaultImageFileLoader.kt
index bd5ea4d0..89b8c207 100644
--- a/imagepicker/src/main/java/com/esafirm/imagepicker/features/fileloader/DefaultImageFileLoader.kt
+++ b/imagepicker/src/main/java/com/esafirm/imagepicker/features/fileloader/DefaultImageFileLoader.kt
@@ -79,13 +79,14 @@ class DefaultImageFileLoader(private val context: Context) : ImageFileLoader {
             MediaStore.Images.Media._ID,
             MediaStore.Images.Media.DISPLAY_NAME,
             MediaStore.Images.Media.DATA,
-            MediaStore.Images.Media.BUCKET_DISPLAY_NAME
+            MediaStore.Images.Media.BUCKET_DISPLAY_NAME,
+            MediaStore.Images.Media.MIME_TYPE,
         )
 
         @SuppressLint("InlinedApi")
         private fun queryData(limit: Int? = null): Cursor? {
             val useNewApi = Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q
-            val sourceUri = if (limit != null && useNewApi) {
+            val sourceUri = if (limit != null && !useNewApi) {
                 getSourceUri().buildUpon()
                     .appendQueryParameter(QUERY_LIMIT, limit.toString())
                     .build()
@@ -127,9 +128,7 @@ class DefaultImageFileLoader(private val context: Context) : ImageFileLoader {
                 return context.contentResolver.query(sourceUri, projection, args, null)
             }
 
-            val sortOrder = "${MediaStore.Images.Media.DATE_MODIFIED} DESC".let {
-                if (limit != null) "$it LIMIT $limit" else it
-            }
+            val sortOrder = "${MediaStore.Images.Media.DATE_MODIFIED} DESC"
 
             return context.contentResolver.query(
                 sourceUri, projection,
@@ -155,9 +154,10 @@ class DefaultImageFileLoader(private val context: Context) : ImageFileLoader {
 
             val id = cursor.getLong(cursor.getColumnIndex(projection[0]))
             val name = cursor.getString(cursor.getColumnIndex(projection[1]))
+            val mimeType = cursor.getString(cursor.getColumnIndex(projection[4]))
 
             if (name != null) {
-                return Image(id, name, path)
+                return Image(id, name, path, mimeType)
             }
             return null
         }
@@ -201,7 +201,7 @@ class DefaultImageFileLoader(private val context: Context) : ImageFileLoader {
             cursor.close()
 
             val folders = folderMap.values.toList()
-            listener.onImageLoaded(result, folders)
+            listener.onImageLoaded(result, folders.sortedBy { it.folderName })
         }
 
         override fun run() {
@@ -227,4 +227,4 @@ class DefaultImageFileLoader(private val context: Context) : ImageFileLoader {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/imagepicker/src/main/java/com/esafirm/imagepicker/features/recyclers/RecyclerViewManager.kt b/imagepicker/src/main/java/com/esafirm/imagepicker/features/recyclers/RecyclerViewManager.kt
index 94122a74..bdc28611 100644
--- a/imagepicker/src/main/java/com/esafirm/imagepicker/features/recyclers/RecyclerViewManager.kt
+++ b/imagepicker/src/main/java/com/esafirm/imagepicker/features/recyclers/RecyclerViewManager.kt
@@ -21,6 +21,7 @@ import com.esafirm.imagepicker.listeners.OnImageSelectedListener
 import com.esafirm.imagepicker.model.Folder
 import com.esafirm.imagepicker.model.Image
 import com.esafirm.imagepicker.view.GridSpacingItemDecoration
+import java.lang.Integer.min
 
 class RecyclerViewManager(
     private val recyclerView: RecyclerView,
@@ -196,9 +197,19 @@ class RecyclerViewManager(
         return true
     }
 
+    fun selectAllImages() {
+        if (imageAdapter.selectedImages.size == min(config.limit, imageAdapter.itemCount)) {
+            imageAdapter.removeAllSelectedSingleClick()
+        } else {
+            imageAdapter.selectAll(config.limit)
+        }
+    }
+
     val isShowDoneButton: Boolean
         get() = (!isDisplayingFolderView
             && (imageAdapter.selectedImages.isNotEmpty() || config.showDoneButtonAlways)
             && config.returnMode !== ReturnMode.ALL && config.returnMode !== ReturnMode.GALLERY_ONLY)
 
-}
\ No newline at end of file
+    val isShowAllButton: Boolean
+        get() = (!isDisplayingFolderView && config.showAllButton && config.mode == ImagePickerMode.MULTIPLE)
+}
diff --git a/imagepicker/src/main/java/com/esafirm/imagepicker/helper/ConfigUtils.kt b/imagepicker/src/main/java/com/esafirm/imagepicker/helper/ConfigUtils.kt
index fb9c21be..6ac68d56 100644
--- a/imagepicker/src/main/java/com/esafirm/imagepicker/helper/ConfigUtils.kt
+++ b/imagepicker/src/main/java/com/esafirm/imagepicker/helper/ConfigUtils.kt
@@ -40,4 +40,9 @@ object ConfigUtils {
         val doneButtonText = config.doneButtonText
         return if (doneButtonText.isNullOrBlank()) context.getString(R.string.ef_done) else doneButtonText
     }
-}
\ No newline at end of file
+
+    fun getAllButtonText(context: Context, config: ImagePickerConfig): String {
+        val allButtonText = config.allButtonText
+        return if (allButtonText.isNullOrBlank()) context.getString(R.string.ef_all) else allButtonText
+    }
+}
diff --git a/imagepicker/src/main/java/com/esafirm/imagepicker/helper/ImagePickerUtils.kt b/imagepicker/src/main/java/com/esafirm/imagepicker/helper/ImagePickerUtils.kt
index 807585a2..c12da78b 100644
--- a/imagepicker/src/main/java/com/esafirm/imagepicker/helper/ImagePickerUtils.kt
+++ b/imagepicker/src/main/java/com/esafirm/imagepicker/helper/ImagePickerUtils.kt
@@ -97,13 +97,16 @@ object ImagePickerUtils {
     }
 
     fun isVideoFormat(image: Image): Boolean {
-        val extension = getExtension(image.path)
-        val mimeType =
-            if (TextUtils.isEmpty(extension)) URLConnection.guessContentTypeFromName(image.path) else MimeTypeMap.getSingleton()
-                .getMimeTypeFromExtension(extension)
+        val mimeType = getMimeType(image.path)
         return mimeType != null && mimeType.startsWith("video")
     }
 
+    fun getMimeType(path: String): String? {
+        val extension = getExtension(path)
+        return if (TextUtils.isEmpty(extension)) URLConnection.guessContentTypeFromName(path) else MimeTypeMap.getSingleton()
+            .getMimeTypeFromExtension(extension)
+    }
+
     fun getVideoDurationLabel(context: Context?, uri: Uri): String {
         try {
             val retriever = MediaMetadataRetriever()
@@ -145,4 +148,4 @@ object ImagePickerUtils {
         data.putParcelableArrayListExtra(IpCons.EXTRA_SELECTED_IMAGES, imageArrayList)
         return data
     }
-}
\ No newline at end of file
+}
diff --git a/imagepicker/src/main/java/com/esafirm/imagepicker/model/Image.kt b/imagepicker/src/main/java/com/esafirm/imagepicker/model/Image.kt
index 44631615..b2d36b01 100644
--- a/imagepicker/src/main/java/com/esafirm/imagepicker/model/Image.kt
+++ b/imagepicker/src/main/java/com/esafirm/imagepicker/model/Image.kt
@@ -13,6 +13,7 @@ class Image(
     val id: Long,
     val name: String,
     val path: String,
+    val mimeType: String?,
 ) : Parcelable {
 
     @IgnoredOnParcel
@@ -49,6 +50,7 @@ class Image(
         result = 31 * result + name.hashCode()
         result = 31 * result + path.hashCode()
         result = 31 * result + (uriHolder?.hashCode() ?: 0)
+        result = 31 * result + (mimeType?.hashCode() ?: 0)
         return result
     }
-}
\ No newline at end of file
+}
diff --git a/imagepicker/src/main/java/com/esafirm/imagepicker/model/ImageFactory.kt b/imagepicker/src/main/java/com/esafirm/imagepicker/model/ImageFactory.kt
index dbdff603..2d896408 100644
--- a/imagepicker/src/main/java/com/esafirm/imagepicker/model/ImageFactory.kt
+++ b/imagepicker/src/main/java/com/esafirm/imagepicker/model/ImageFactory.kt
@@ -10,7 +10,8 @@ object ImageFactory {
         return listOf(Image(
             id = ContentUris.parseId(uri),
             name = ImagePickerUtils.getNameFromFilePath(path),
-            path = path
+            path = path,
+            mimeType = ImagePickerUtils.getMimeType(path),
         ))
     }
-}
\ No newline at end of file
+}
diff --git a/imagepicker/src/main/res/menu/ef_image_picker_menu_main.xml b/imagepicker/src/main/res/menu/ef_image_picker_menu_main.xml
index a0535829..5d54e70c 100644
--- a/imagepicker/src/main/res/menu/ef_image_picker_menu_main.xml
+++ b/imagepicker/src/main/res/menu/ef_image_picker_menu_main.xml
@@ -9,6 +9,10 @@
         app:showAsAction="always"
         tools:ignore="AlwaysShowAction" />
 
+    <item
+        android:id="@+id/menu_select_all"
+        android:title="@string/ef_all"
+        app:showAsAction="always"/>
     <item
         android:id="@+id/menu_done"
         android:title="@string/ef_done"
diff --git a/imagepicker/src/main/res/values-ar/strings.xml b/imagepicker/src/main/res/values-ar/strings.xml
index f22bb5fb..8e41c61e 100644
--- a/imagepicker/src/main/res/values-ar/strings.xml
+++ b/imagepicker/src/main/res/values-ar/strings.xml
@@ -21,4 +21,5 @@
     <string name="ef_msg_no_write_external_permission">عليك إعطاء التطبيق الصلاحية لاستخدام الصور</string>
     <string name="ef_msg_no_camera_permission">عليك إعطاء التطبيق الصلاحية لاستخدام الكاميرا لتتمكن من التصوير</string>
     <string name="ef_msg_limit_images">تحديد إختيار الصور</string>
+    <string name="ef_all">الجميع</string>
 </resources>
diff --git a/imagepicker/src/main/res/values-ca/strings.xml b/imagepicker/src/main/res/values-ca/strings.xml
index 5dbc994f..d9aa8dd5 100644
--- a/imagepicker/src/main/res/values-ca/strings.xml
+++ b/imagepicker/src/main/res/values-ca/strings.xml
@@ -25,5 +25,6 @@
     <string name="ef_gif" translatable="false">GIF</string>
     <string name="ef_content_desc_folder" translatable="false">Folder</string>
     <string name="ef_content_desc_image" translatable="false">Image</string>
+    <string name="ef_all">Tot</string>
 
 </resources>
diff --git a/imagepicker/src/main/res/values-da/strings.xml b/imagepicker/src/main/res/values-da/strings.xml
index 1955e0fd..b8b6d203 100644
--- a/imagepicker/src/main/res/values-da/strings.xml
+++ b/imagepicker/src/main/res/values-da/strings.xml
@@ -26,5 +26,6 @@
     <string name="ef_gif" translatable="false">GIF</string>
     <string name="ef_content_desc_folder" translatable="false">Folder</string>
     <string name="ef_content_desc_image" translatable="false">Image</string>
+    <string name="ef_all">Alle</string>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/imagepicker/src/main/res/values-de/strings.xml b/imagepicker/src/main/res/values-de/strings.xml
index f3d51ffc..944a3cb1 100644
--- a/imagepicker/src/main/res/values-de/strings.xml
+++ b/imagepicker/src/main/res/values-de/strings.xml
@@ -26,5 +26,6 @@
     <string name="ef_gif" translatable="false">GIF</string>
     <string name="ef_content_desc_folder" translatable="false">Folder</string>
     <string name="ef_content_desc_image" translatable="false">Image</string>
+    <string name="ef_all">Alle</string>
 
 </resources>
diff --git a/imagepicker/src/main/res/values-es-rES/strings.xml b/imagepicker/src/main/res/values-es-rES/strings.xml
index 81f33617..de468779 100644
--- a/imagepicker/src/main/res/values-es-rES/strings.xml
+++ b/imagepicker/src/main/res/values-es-rES/strings.xml
@@ -25,5 +25,6 @@
     <string name="ef_gif" translatable="false">GIF</string>
     <string name="ef_content_desc_folder" translatable="false">Folder</string>
     <string name="ef_content_desc_image" translatable="false">Image</string>
+    <string name="ef_all">Todas</string>
 
 </resources>
diff --git a/imagepicker/src/main/res/values-fr/strings.xml b/imagepicker/src/main/res/values-fr/strings.xml
index 90a7407a..61818ffb 100644
--- a/imagepicker/src/main/res/values-fr/strings.xml
+++ b/imagepicker/src/main/res/values-fr/strings.xml
@@ -24,5 +24,6 @@
 
     <!--Don\'t Translate-->
     <string name="ef_gif">GIF</string>
+    <string name="ef_all">Tout</string>
 
 </resources>
diff --git a/imagepicker/src/main/res/values-in/strings.xml b/imagepicker/src/main/res/values-in/strings.xml
index 5a4806fe..1bcb298e 100644
--- a/imagepicker/src/main/res/values-in/strings.xml
+++ b/imagepicker/src/main/res/values-in/strings.xml
@@ -21,4 +21,5 @@
     <string name="ef_msg_no_write_external_permission">Mohon berikan izin terhadap penyimpanan untuk memilih gambar</string>
     <string name="ef_msg_no_camera_permission">Mohon berikan izin terhadap kamera untuk mengambil gambar</string>
     <string name="ef_msg_limit_images">Gambar yang terpilih sudah mencapai batas maksimal</string>
+    <string name="ef_all">Semua</string>
 </resources>
diff --git a/imagepicker/src/main/res/values-it/strings.xml b/imagepicker/src/main/res/values-it/strings.xml
index 6db39f2a..ae46f361 100644
--- a/imagepicker/src/main/res/values-it/strings.xml
+++ b/imagepicker/src/main/res/values-it/strings.xml
@@ -21,5 +21,6 @@
     <string name="ef_msg_no_camera_permission">Dai il permesso per poter scattare una foto</string>
     <string name="ef_msg_limit_images">Hai raggiunto il limite massimo di selezione</string>
     <string name="ef_ltitle_permission_denied">Permesso negato</string>
+    <string name="ef_all">Tutto</string>
 
 </resources>
diff --git a/imagepicker/src/main/res/values-ja/strings.xml b/imagepicker/src/main/res/values-ja/strings.xml
index c4a31679..e0a1d525 100644
--- a/imagepicker/src/main/res/values-ja/strings.xml
+++ b/imagepicker/src/main/res/values-ja/strings.xml
@@ -20,5 +20,6 @@
     <string name="ef_msg_no_camera_permission">端末のカメラへのアクセスを許可してください</string>
     <string name="ef_msg_limit_images">選択できる画像の上限です</string>
     <string name="ef_ltitle_permission_denied">権限がありません</string>
+    <string name="ef_all">全て</string>
 
 </resources>
diff --git a/imagepicker/src/main/res/values-ko/strings.xml b/imagepicker/src/main/res/values-ko/strings.xml
index db37f48b..594d3c69 100644
--- a/imagepicker/src/main/res/values-ko/strings.xml
+++ b/imagepicker/src/main/res/values-ko/strings.xml
@@ -21,5 +21,6 @@
     <string name="ef_msg_no_write_external_permission">이미지를 불러오기 위해 저장공간 권한을 허용해주세요</string>
     <string name="ef_msg_no_camera_permission">사진을 찍기위해 카메라 권한을 허용해주세요</string>
     <string name="ef_msg_limit_images">이미지 선택 제한 초과</string>
+    <string name="ef_all">모두</string>
 
 </resources>
diff --git a/imagepicker/src/main/res/values-nl/strings.xml b/imagepicker/src/main/res/values-nl/strings.xml
new file mode 100644
index 00000000..57e8125d
--- /dev/null
+++ b/imagepicker/src/main/res/values-nl/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="ef_permission_write_external_rationale">Geef toegang tot externe opslag om afbeeldingen te
+        selecteren
+    </string>
+
+    <string name="ef_ok">OK</string>
+    <string name="ef_done">KLAAR</string>
+    <string name="ef_camera">CAMERA</string>
+
+    <string name="ef_title_folder">Album</string>
+    <string name="ef_title_select_image">Tik om afbeeldingen te selecteren</string>
+    <string name="ef_ltitle_permission_denied">Geen toestemming</string>
+
+    <string name="ef_selected">%d geselecteerd</string>
+    <string name="ef_selected_with_limit">%1$d/%2$d geselecteerd</string>
+
+    <string name="ef_error_create_image_file">Kan afbeeldingsbestand niet maken</string>
+    <string name="ef_error_no_camera">Geen camera gevonden</string>
+    <string name="ef_error_null_cursor">Oeps! Er is iets misgegaan!</string>
+
+    <string name="ef_msg_empty_images">Geen afbeeldingen gevonden</string>
+    <string name="ef_msg_no_write_external_permission">Geef toestemming voor opslag om afbeeldingen te selecteren</string>
+    <string name="ef_msg_no_camera_permission">Bitte erlaube Zugriff auf die Kamera um Bilder aufzunehmen</string>
+    <string name="ef_msg_limit_images">Limiet afbeeldingsselectie</string>
+
+    <!--Don't Translate-->
+    <string name="ef_gif" translatable="false">GIF</string>
+    <string name="ef_content_desc_folder" translatable="false">Folder</string>
+    <string name="ef_content_desc_image" translatable="false">Image</string>
+    <string name="ef_all">Alle</string>
+
+</resources>
diff --git a/imagepicker/src/main/res/values-pl/strings.xml b/imagepicker/src/main/res/values-pl/strings.xml
new file mode 100644
index 00000000..61bdd614
--- /dev/null
+++ b/imagepicker/src/main/res/values-pl/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="ef_permission_write_external_rationale">Zezwól na dostęp do pamięci wybranych obrazów</string>
+    <string name="ef_ok">ОК</string>
+    <string name="ef_done">OK</string>
+    <string name="ef_camera">APARAT</string>
+    <string name="ef_title_folder">Album</string>
+    <string name="ef_title_select_image">Dotknij, aby wybrać obrazy</string>
+    <string name="ef_ltitle_permission_denied">Nie ma dostępu</string>
+    <string name="ef_selected">%d wybrane</string>
+    <string name="ef_selected_with_limit">%1$d/%2$d wybrane</string>
+    <string name="ef_error_create_image_file">Nie udało się utworzyć plik</string>
+    <string name="ef_error_no_camera">Aparat nie jest dostępny</string>
+    <string name="ef_error_null_cursor">Coś nie działa!</string>
+    <string name="ef_msg_empty_images">Brak zdjęć</string>
+    <string name="ef_msg_no_write_external_permission">Zezwól na przechowywanie wybranych obrazów</string>
+    <string name="ef_msg_no_camera_permission">Aby móc robić zdjęcia, musisz zezwolić aplikacji na korzystanie z
+        aparatu
+    </string>
+    <string name="ef_msg_limit_images">Limit wyboru obrazu</string>
+    <string name="ef_all">Wszystkie</string>
+</resources>
diff --git a/imagepicker/src/main/res/values-pt-rBR/strings.xml b/imagepicker/src/main/res/values-pt-rBR/strings.xml
index 02860b5c..79c04fa1 100644
--- a/imagepicker/src/main/res/values-pt-rBR/strings.xml
+++ b/imagepicker/src/main/res/values-pt-rBR/strings.xml
@@ -21,5 +21,6 @@
     <string name="ef_msg_no_write_external_permission">Por favor dê permissão ao armazenamento para selecionar as imagens</string>
     <string name="ef_msg_no_camera_permission">Por favor dê permissão à câmera para tirar fotos</string>
     <string name="ef_msg_limit_images">Limite de imagens atingido</string>
+    <string name="ef_all">Tudo</string>
 
 </resources>
diff --git a/imagepicker/src/main/res/values-ro/strings.xml b/imagepicker/src/main/res/values-ro/strings.xml
index 65a4e439..7bf3f09c 100644
--- a/imagepicker/src/main/res/values-ro/strings.xml
+++ b/imagepicker/src/main/res/values-ro/strings.xml
@@ -21,5 +21,6 @@
     <string name="ef_msg_no_camera_permission">Vă rugăm să acordați permisiunea fotocamerei pentru a captura imagini</string>
     <string name="ef_msg_limit_images">Limita de selecție a imaginii depăşită</string>
     <string name="ef_ltitle_permission_denied">Acces refuzat</string>
+    <string name="ef_all">Tot</string>
 
 </resources>
diff --git a/imagepicker/src/main/res/values-ru/strings.xml b/imagepicker/src/main/res/values-ru/strings.xml
index c8039f46..d5224e8b 100644
--- a/imagepicker/src/main/res/values-ru/strings.xml
+++ b/imagepicker/src/main/res/values-ru/strings.xml
@@ -16,4 +16,5 @@
     <string name="ef_msg_no_write_external_permission">Пожалуйста, разрешите доступ к хранилищу, чтобы выбрать изображения</string>
     <string name="ef_msg_no_camera_permission">Пожалуйста, разрешите доступ к камере, чтобы сделать снимок</string>
     <string name="ef_msg_limit_images">Лимит выбора изображений</string>
+    <string name="ef_all">Все</string>
 </resources>
diff --git a/imagepicker/src/main/res/values-sv-rSE/strings.xml b/imagepicker/src/main/res/values-sv-rSE/strings.xml
index 3ff8482b..7be551fe 100644
--- a/imagepicker/src/main/res/values-sv-rSE/strings.xml
+++ b/imagepicker/src/main/res/values-sv-rSE/strings.xml
@@ -20,4 +20,5 @@
     <string name="ef_msg_empty_images">Inga bilder hittades</string>
     <string name="ef_msg_no_write_external_permission">Vänligen bevilja lagringsbehörighet för att välja bilder</string>
     <string name="ef_msg_limit_images">Bildvalsgräns</string>
-</resources>
\ No newline at end of file
+    <string name="ef_all">Allt</string>
+</resources>
diff --git a/imagepicker/src/main/res/values-tr/strings.xml b/imagepicker/src/main/res/values-tr/strings.xml
index ae9aa89c..09453c58 100644
--- a/imagepicker/src/main/res/values-tr/strings.xml
+++ b/imagepicker/src/main/res/values-tr/strings.xml
@@ -20,4 +20,5 @@
     <string name="ef_msg_no_write_external_permission">Lütfen resim seçmek için depolama iznini verin</string>
     <string name="ef_msg_no_camera_permission">Resim çekmek için lütfen kamera iznini verin</string>
     <string name="ef_msg_limit_images">Resim seçimi sınırı</string>
+    <string name="ef_all">Tüm</string>
 </resources>
diff --git a/imagepicker/src/main/res/values-uk/strings.xml b/imagepicker/src/main/res/values-uk/strings.xml
index a2a84e6c..91133822 100644
--- a/imagepicker/src/main/res/values-uk/strings.xml
+++ b/imagepicker/src/main/res/values-uk/strings.xml
@@ -16,4 +16,5 @@
     <string name="ef_msg_no_write_external_permission">Будь ласка, дозвольте доступ до сховища, щоб обрати зображення</string>
     <string name="ef_msg_no_camera_permission">Будь ласка, дозвольте доступ до камери, щоб зробити знімок</string>
     <string name="ef_msg_limit_images">Ліміт вибору зображень</string>
+    <string name="ef_all">Все</string>
 </resources>
diff --git a/imagepicker/src/main/res/values-vi/strings.xml b/imagepicker/src/main/res/values-vi/strings.xml
index acdad396..1e242f8e 100644
--- a/imagepicker/src/main/res/values-vi/strings.xml
+++ b/imagepicker/src/main/res/values-vi/strings.xml
@@ -22,4 +22,5 @@
     <string name="ef_msg_limit_images">Giới hạn chọn hình ảnh</string>
 
     <string name = "ef_msg_no_camera_permission">Vui lòng cấp quyền cho máy ảnh để chụp ảnh </string>
+    <string name="ef_all">Tất cả</string>
 </resources>
diff --git a/imagepicker/src/main/res/values-zh-rCN/strings.xml b/imagepicker/src/main/res/values-zh-rCN/strings.xml
index 950a7999..4d2481bf 100644
--- a/imagepicker/src/main/res/values-zh-rCN/strings.xml
+++ b/imagepicker/src/main/res/values-zh-rCN/strings.xml
@@ -20,5 +20,6 @@
     <string name="ef_msg_no_camera_permission">请给予获取相机权限以拍摄照片</string>
     <string name="ef_msg_limit_images">已达到最多选择照片数量</string>
     <string name="ef_ltitle_permission_denied">没有权限</string>
+    <string name="ef_all">全选</string>
 
 </resources>
diff --git a/imagepicker/src/main/res/values-zh-rTW/strings.xml b/imagepicker/src/main/res/values-zh-rTW/strings.xml
index 2392a5ef..ca89d6f9 100644
--- a/imagepicker/src/main/res/values-zh-rTW/strings.xml
+++ b/imagepicker/src/main/res/values-zh-rTW/strings.xml
@@ -20,5 +20,6 @@
     <string name="ef_msg_no_camera_permission">請允許存取相機以拍攝相片</string>
     <string name="ef_msg_limit_images">已達到最多選擇相片數量</string>
     <string name="ef_ltitle_permission_denied">沒有權限</string>
+    <string name="ef_all">全選</string>
 
 </resources>
diff --git a/imagepicker/src/main/res/values/strings.xml b/imagepicker/src/main/res/values/strings.xml
index 4f33fbad..97aac74c 100644
--- a/imagepicker/src/main/res/values/strings.xml
+++ b/imagepicker/src/main/res/values/strings.xml
@@ -26,5 +26,6 @@
     <string name="ef_gif" translatable="false">GIF</string>
     <string name="ef_content_desc_folder" translatable="false">Folder</string>
     <string name="ef_content_desc_image" translatable="false">Image</string>
+    <string name="ef_all">All</string>
 
 </resources>
diff --git a/sample/src/androidTest/java/com/esafirm/sample/PickImageFolderMode.kt b/sample/src/androidTest/java/com/esafirm/sample/PickImageFolderMode.kt
index 1018a561..a325a089 100644
--- a/sample/src/androidTest/java/com/esafirm/sample/PickImageFolderMode.kt
+++ b/sample/src/androidTest/java/com/esafirm/sample/PickImageFolderMode.kt
@@ -1,16 +1,25 @@
 package com.esafirm.sample
 
 
+import android.view.View
+import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView.ViewHolder
+import androidx.test.espresso.Espresso
 import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.contrib.RecyclerViewActions.actionOnItemAtPosition
+import androidx.test.espresso.matcher.ViewMatchers
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
 import com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn
+import com.adevinta.android.barista.internal.util.resourceMatcher
 import com.esafirm.sample.utils.Rules
 import com.esafirm.sample.utils.ViewAsserts
 import com.esafirm.sample.utils.Views
+import com.esafirm.sample.utils.withViewCount
+import org.hamcrest.Description
+import org.hamcrest.TypeSafeMatcher
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -52,4 +61,33 @@ class PickImageFolderMode {
         ViewAsserts.imagePicked(imageView)
     }
 
+    @Test
+    fun selectAll() {
+        // Activate switch
+        clickOn(R.id.switch_select_all)
+
+        Views.pickImageButton().perform(click())
+
+        val recyclerView = Views.recyclersView()
+        // Click folder
+        recyclerView.perform(actionOnItemAtPosition<ViewHolder>(0, click()))
+
+        // Click all button
+        clickOn(R.id.menu_select_all)
+        clickOn(R.id.menu_done)
+
+        // Check image is picked
+        Views.waitFor(1_000)
+        Espresso.onView(R.id.text_view.resourceMatcher())
+            .check(matches(object : TypeSafeMatcher<View?>() {
+                override fun matchesSafely(item: View?): Boolean {
+                    if (item !is TextView) return false
+                    return item.text.toString().count { it == '\n' } == 9
+                }
+
+                override fun describeTo(description: Description) {
+                    description.appendText("10 selected images expected")
+                }
+            }))
+    }
 }
diff --git a/sample/src/androidTest/java/com/esafirm/sample/utils/Views.kt b/sample/src/androidTest/java/com/esafirm/sample/utils/Views.kt
index 7709ad57..e06b3e10 100644
--- a/sample/src/androidTest/java/com/esafirm/sample/utils/Views.kt
+++ b/sample/src/androidTest/java/com/esafirm/sample/utils/Views.kt
@@ -4,13 +4,12 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.ScrollView
+import android.widget.TextView
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.ViewInteraction
 import androidx.test.espresso.matcher.ViewMatchers
-import androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom
-import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
-import androidx.test.espresso.matcher.ViewMatchers.withId
-import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.espresso.matcher.ViewMatchers.*
+import androidx.test.espresso.util.TreeIterables
 import com.esafirm.sample.R
 import org.hamcrest.Description
 import org.hamcrest.Matcher
@@ -19,6 +18,7 @@ import org.hamcrest.Matchers.allOf
 import org.hamcrest.TypeSafeMatcher
 import org.hamcrest.core.IsInstanceOf
 
+
 object Views {
     fun waitFor(timeInMs: Long) {
         Thread.sleep(timeInMs)
@@ -30,45 +30,59 @@ object Views {
 
     fun pickImageButton(): ViewInteraction {
         return onView(
-            allOf(withId(R.id.button_pick_image), withText("PICK IMAGE"),
+            allOf(
+                withId(R.id.button_pick_image), withText("PICK IMAGE"),
                 childAtPosition(
                     childAtPosition(
                         withId(R.id.bottom_container),
-                        0),
-                    0),
-                isDisplayed()))
+                        0
+                    ),
+                    0
+                ),
+                isDisplayed()
+            )
+        )
     }
 
     fun recyclersView(): ViewInteraction {
         return onView(
-            allOf(withId(R.id.recyclerView),
+            allOf(
+                withId(R.id.recyclerView),
                 childAtPosition(
                     ViewMatchers.withClassName(Matchers.`is`("android.widget.RelativeLayout")),
-                    2)))
+                    2
+                )
+            )
+        )
     }
 
     fun pickerDoneButton(): ViewInteraction {
         return onView(
-            allOf(withId(R.id.menu_done), withText("DONE"),
-                childAtPosition(
-                    childAtPosition(
-                        withId(R.id.toolbar),
-                        2),
-                    1),
-                isDisplayed()))
+            allOf(
+                withId(R.id.menu_done),
+                isDisplayed()
+            )
+        )
     }
 
     fun imageDetail(): ViewInteraction {
         return onView(
-            allOf(ViewMatchers.withParent(allOf(withId(R.id.container),
-                ViewMatchers.withParent(IsInstanceOf.instanceOf(ScrollView::class.java)))),
+            allOf(
+                ViewMatchers.withParent(
+                    allOf(
+                        withId(R.id.container),
+                        ViewMatchers.withParent(IsInstanceOf.instanceOf(ScrollView::class.java))
+                    )
+                ),
                 isDisplayed(),
                 isAssignableFrom(ImageView::class.java)
-            ))
+            )
+        )
     }
 
     private fun childAtPosition(
-        parentMatcher: Matcher<View>, position: Int): Matcher<View> {
+        parentMatcher: Matcher<View>, position: Int
+    ): Matcher<View> {
 
         return object : TypeSafeMatcher<View>() {
             override fun describeTo(description: Description) {
@@ -79,8 +93,28 @@ object Views {
             public override fun matchesSafely(view: View): Boolean {
                 val parent = view.parent
                 return parent is ViewGroup && parentMatcher.matches(parent)
-                    && view == parent.getChildAt(position)
+                        && view == parent.getChildAt(position)
+            }
+        }
+    }
+}
+
+fun withViewCount(viewMatcher: Matcher<View>, expectedCount: Int): Matcher<View?> {
+    return object : TypeSafeMatcher<View?>() {
+        private var actualCount = -1
+        override fun describeTo(description: Description) {
+            when {
+                actualCount >= 0 -> description.also {
+                    it.appendText("Expected items count: $expectedCount, but got: $actualCount")
+                }
+            }
+        }
+
+        override fun matchesSafely(root: View?): Boolean {
+            actualCount = TreeIterables.breadthFirstViewTraversal(root).count {
+                viewMatcher.matches(it)
             }
+            return expectedCount == actualCount
         }
     }
-}
\ No newline at end of file
+}
diff --git a/sample/src/main/java/com/esafirm/sample/MainActivity.kt b/sample/src/main/java/com/esafirm/sample/MainActivity.kt
index 300f04fe..75a80d9d 100644
--- a/sample/src/main/java/com/esafirm/sample/MainActivity.kt
+++ b/sample/src/main/java/com/esafirm/sample/MainActivity.kt
@@ -56,6 +56,7 @@ class MainActivity : AppCompatActivity() {
         val includeVideo = binding.switchIncludeVideo.isChecked
         val onlyVideo = binding.switchOnlyVideo.isChecked
         val isExclude = binding.switchIncludeExclude.isChecked
+        val allButtonVisible = binding.switchSelectAll.isChecked
 
         ImagePickerComponentsHolder.setInternalComponent(
             CustomImagePickerComponents(this, useCustomImageLoader)
@@ -69,7 +70,7 @@ class MainActivity : AppCompatActivity() {
                 ImagePickerMode.MULTIPLE // multi mode (default mode)
             }
 
-            language = "in" // Set image picker language
+//            language = "in" // Set image picker language
             theme = R.style.ImagePickerTheme
 
             // set whether pick action or camera action should return immediate result or not. Only works in single mode for image picker
@@ -93,6 +94,8 @@ class MainActivity : AppCompatActivity() {
             } else {
                 selectedImages = images  // original selected images, used in multi mode
             }
+
+            showAllButton = allButtonVisible
         }
     }
 
@@ -128,4 +131,4 @@ class MainActivity : AppCompatActivity() {
             ImageViewerActivity.start(this@MainActivity, images)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml
index 68c828b7..855bb530 100644
--- a/sample/src/main/res/layout/activity_main.xml
+++ b/sample/src/main/res/layout/activity_main.xml
@@ -54,6 +54,11 @@
                 style="@style/SampleSwitch"
                 android:text="Exclude" />
 
+            <androidx.appcompat.widget.SwitchCompat
+                android:id="@+id/switch_select_all"
+                style="@style/SampleSwitch"
+                android:text="Select All Visible" />
+
             <TextView
                 android:id="@+id/text_view"
                 android:layout_width="wrap_content"