diff --git a/imagepicker/build.gradle b/imagepicker/build.gradle
index 1921b3c9..e261a21a 100644
--- a/imagepicker/build.gradle
+++ b/imagepicker/build.gradle
@@ -56,8 +56,9 @@ artifacts {
 dependencies {
     implementation "com.github.bumptech.glide:glide:4.14.2"
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 
-    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
 
     implementation "androidx.core:core-ktx:$core_ktx_version"
 
diff --git a/imagepicker/src/main/java/com/esafirm/imagepicker/adapter/FolderPickerAdapter.kt b/imagepicker/src/main/java/com/esafirm/imagepicker/adapter/FolderPickerAdapter.kt
index faef0af2..6541adb9 100644
--- a/imagepicker/src/main/java/com/esafirm/imagepicker/adapter/FolderPickerAdapter.kt
+++ b/imagepicker/src/main/java/com/esafirm/imagepicker/adapter/FolderPickerAdapter.kt
@@ -52,7 +52,7 @@ class FolderPickerAdapter(
     override fun getItemCount() = folders.size
 
     class FolderViewHolder(binding: EfImagepickerItemFolderBinding) : ViewHolder(binding.root) {
-        val image = binding.image
+        val image = binding.imageView
         val name = binding.tvName
         val number = binding.tvNumber
     }
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..e0a8d477 100644
--- a/imagepicker/src/main/java/com/esafirm/imagepicker/adapter/ImagePickerAdapter.kt
+++ b/imagepicker/src/main/java/com/esafirm/imagepicker/adapter/ImagePickerAdapter.kt
@@ -6,8 +6,6 @@ import android.provider.MediaStore
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.FrameLayout
-import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.AsyncListDiffer
 import androidx.recyclerview.widget.RecyclerView.ViewHolder
 import com.esafirm.imagepicker.R
@@ -25,6 +23,7 @@ class ImagePickerAdapter(
     context: Context,
     imageLoader: ImageLoader,
     selectedImages: List<Image>,
+    private val isShowImageNames: Boolean,
     private val itemClickListener: OnImageClickListener
 ) : BaseListAdapter<ImageViewHolder>(context, imageLoader) {
 
@@ -68,10 +67,9 @@ class ImagePickerAdapter(
 
         if (ImagePickerUtils.isVideoFormat(image)) {
             if (!videoDurationHolder.containsKey(image.id)) {
-                val uri =
-                    Uri.withAppendedPath(MediaStore.Files.getContentUri("external"), "" + image.id)
                 videoDurationHolder[image.id] = ImagePickerUtils.getVideoDurationLabel(
-                    context, uri
+                    context = context,
+                    uri = Uri.withAppendedPath(MediaStore.Files.getContentUri("external"), "" + image.id)
                 )
             }
 
@@ -80,9 +78,15 @@ class ImagePickerAdapter(
         }
 
         viewHolder.apply {
+            if (isShowImageNames) {
+                nameView.text = image.name
+                bottomView.visibility = View.VISIBLE
+            } else {
+                bottomView.visibility = View.GONE
+            }
             fileTypeIndicator.text = fileTypeLabel
             fileTypeIndicator.visibility = if (showFileTypeIndicator) View.VISIBLE else View.GONE
-            alphaView.alpha = if (isSelected) 0.5f else 0f
+            selectedView.visibility = if (isSelected) View.VISIBLE else View.GONE
             itemView.setOnClickListener {
                 val shouldSelect = itemClickListener(isSelected)
 
@@ -92,21 +96,27 @@ class ImagePickerAdapter(
                     addSelected(image, position)
                 }
             }
-            container.foreground = if (isSelected) ContextCompat.getDrawable(
-                context,
-                R.drawable.ef_ic_done_white
-            ) else null
         }
     }
 
-    private fun isSelected(image: Image): Boolean {
-        return selectedImages.any { it.path == image.path }
+    override fun getItemCount() = listDiffer.currentList.size
+
+    override fun getItemViewType(position: Int): Int {
+        return position
     }
 
-    override fun getItemCount() = listDiffer.currentList.size
+    override fun getItemId(position: Int): Long {
+        return position.toLong()
+    }
+
+    fun setData(images: List<Image>, commitCallback: (() -> Unit)? = null) {
+        listDiffer.submitList(images) {
+            commitCallback?.invoke()
+        }
+    }
 
-    fun setData(images: List<Image>) {
-        listDiffer.submitList(images)
+    private fun isSelected(image: Image): Boolean {
+        return selectedImages.any { it.path == image.path }
     }
 
     private fun addSelected(image: Image, position: Int) {
@@ -143,8 +153,9 @@ class ImagePickerAdapter(
 
     class ImageViewHolder(binding: EfImagepickerItemImageBinding) : ViewHolder(binding.root) {
         val imageView = binding.imageView
-        val alphaView = binding.viewAlpha
+        val nameView = binding.tvImageName
         val fileTypeIndicator = binding.efItemFileTypeIndicator
-        val container = binding.root as FrameLayout
+        val bottomView = binding.efBottomView
+        val selectedView = binding.viewSelected
     }
 }
\ No newline at end of file
diff --git a/imagepicker/src/main/java/com/esafirm/imagepicker/features/ImagePickerAction.kt b/imagepicker/src/main/java/com/esafirm/imagepicker/features/ImagePickerAction.kt
index 074a9b40..c5161795 100644
--- a/imagepicker/src/main/java/com/esafirm/imagepicker/features/ImagePickerAction.kt
+++ b/imagepicker/src/main/java/com/esafirm/imagepicker/features/ImagePickerAction.kt
@@ -2,15 +2,14 @@ package com.esafirm.imagepicker.features
 
 import com.esafirm.imagepicker.helper.state.ObservableState
 import com.esafirm.imagepicker.helper.state.SingleEvent
-import com.esafirm.imagepicker.helper.state.asSingleEvent
 import com.esafirm.imagepicker.model.Folder
 import com.esafirm.imagepicker.model.Image
 
 data class ImagePickerState(
     val images: List<Image> = emptyList(),
     val folders: List<Folder> = emptyList(),
-    // TODO: handle the transitions between folder and images in the view state as well
-    val isFolder: SingleEvent<Boolean>? = null,
+    val isFoldersMode: SingleEvent<Boolean>? = null,
+    val currentFolder: Folder? = null,
     val isLoading: Boolean = false,
     val error: SingleEvent<Throwable>? = null,
     val finishPickImage: SingleEvent<List<Image>>? = null,
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..536bb88d 100644
--- a/imagepicker/src/main/java/com/esafirm/imagepicker/features/ImagePickerActivity.kt
+++ b/imagepicker/src/main/java/com/esafirm/imagepicker/features/ImagePickerActivity.kt
@@ -9,8 +9,10 @@ import android.view.Menu
 import android.view.MenuItem
 import androidx.activity.result.ActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
+import android.view.View
 import androidx.appcompat.app.ActionBar
 import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.SearchView
 import androidx.appcompat.widget.Toolbar
 import com.esafirm.imagepicker.R
 import com.esafirm.imagepicker.features.cameraonly.CameraOnlyConfig
@@ -26,6 +28,9 @@ class ImagePickerActivity : AppCompatActivity(), ImagePickerInteractionListener
     private val cameraModule = ImagePickerComponentsHolder.cameraModule
 
     private var actionBar: ActionBar? = null
+    private var optionsMenu: Menu? = null
+    private var searchView: SearchView? = null
+    private var isNeedSearch = true
     private lateinit var imagePickerFragment: ImagePickerFragment
 
     private val config: ImagePickerConfig? by lazy {
@@ -98,6 +103,8 @@ class ImagePickerActivity : AppCompatActivity(), ImagePickerInteractionListener
      */
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.ef_image_picker_menu_main, menu)
+        this.optionsMenu = menu
+        initSearchView(menu)
         return true
     }
 
@@ -129,6 +136,10 @@ class ImagePickerActivity : AppCompatActivity(), ImagePickerInteractionListener
             imagePickerFragment.captureImage()
             return true
         }
+        if (id == R.id.menu_sort) {
+            imagePickerFragment.showSortPopupMenu(item)
+            return true
+        }
         return super.onOptionsItemSelected(item)
     }
 
@@ -158,13 +169,57 @@ class ImagePickerActivity : AppCompatActivity(), ImagePickerInteractionListener
         }
     }
 
+    //region Search
+
+    private fun initSearchView(menu: Menu) {
+        searchView = menu.findItem(R.id.menu_search).actionView as? SearchView
+        if (config?.isShowSearch == true) {
+            searchView?.setIconifiedByDefault(true)
+            searchView?.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
+                override fun onQueryTextSubmit(query: String): Boolean {
+                    search(query)
+                    return true
+                }
+
+                override fun onQueryTextChange(newText: String): Boolean {
+                    search(newText)
+                    return true
+                }
+            })
+            searchView?.setOnCloseListener {
+                search(null)
+                false
+            }
+        } else {
+            searchView?.visibility = View.GONE
+        }
+    }
+
+    private fun search(query: String?) {
+        if (isNeedSearch) {
+            imagePickerFragment.search(query)
+        }
+    }
+
+    private fun closeSearchView() {
+        // at the same time the onClose event is triggered, so isNeedSearch must be avoided reloading
+        isNeedSearch = false
+        searchView?.setQuery(null, false)
+        searchView?.isIconified = true
+        isNeedSearch = true
+    }
+
+    //endregion Search
+
     /* --------------------------------------------------- */
     /* > ImagePickerInteractionListener Methods  */
     /* --------------------------------------------------- */
 
     override fun setTitle(title: String?) {
         actionBar?.title = title
-        invalidateOptionsMenu()
+        if (optionsMenu != null) {
+            onPrepareOptionsMenu(optionsMenu!!)
+        }
     }
 
     override fun cancel() {
@@ -179,4 +234,8 @@ class ImagePickerActivity : AppCompatActivity(), ImagePickerInteractionListener
         setResult(RESULT_OK, result)
         finish()
     }
-}
+
+    override fun isFolderModeChanged() {
+        closeSearchView()
+    }
+}
\ No newline at end of file
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..1b4d4f0a 100644
--- a/imagepicker/src/main/java/com/esafirm/imagepicker/features/ImagePickerConfig.kt
+++ b/imagepicker/src/main/java/com/esafirm/imagepicker/features/ImagePickerConfig.kt
@@ -28,7 +28,12 @@ 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 isShowSearch: Boolean = false,
+    var searchQuery: String? = null,
+    var isShowImageNames: Boolean = false,
+    var foldersSortMode: FolderSortMode = FolderSortMode.NONE,
+    var imagesSortMode: ImageSortMode = ImageSortMode.NONE
 ) : BaseConfig(), Parcelable {
 
     @IgnoredOnParcel
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..37dbe835 100644
--- a/imagepicker/src/main/java/com/esafirm/imagepicker/features/ImagePickerFragment.kt
+++ b/imagepicker/src/main/java/com/esafirm/imagepicker/features/ImagePickerFragment.kt
@@ -1,6 +1,7 @@
 package com.esafirm.imagepicker.features
 
 import android.Manifest
+import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
@@ -13,11 +14,15 @@ import android.os.Environment
 import android.os.Parcelable
 import android.provider.Settings
 import android.view.LayoutInflater
+import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts.RequestMultiplePermissions
 import androidx.appcompat.view.ContextThemeWrapper
+import androidx.appcompat.view.menu.MenuBuilder
+import androidx.appcompat.view.menu.MenuPopupHelper
+import androidx.appcompat.widget.PopupMenu
 import androidx.core.app.ActivityCompat
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.RecyclerView
@@ -31,8 +36,11 @@ import com.esafirm.imagepicker.helper.ImagePickerPreferences
 import com.esafirm.imagepicker.helper.ImagePickerUtils
 import com.esafirm.imagepicker.helper.IpLogger
 import com.esafirm.imagepicker.helper.state.fetch
+import com.esafirm.imagepicker.model.BaseItem
 import com.esafirm.imagepicker.model.Folder
 import com.esafirm.imagepicker.model.Image
+import java.util.ArrayList
+import java.util.regex.Pattern
 
 class ImagePickerFragment : Fragment() {
 
@@ -141,7 +149,7 @@ class ImagePickerFragment : Fragment() {
     }
 
     private fun subscribeToUiState() = presenter.getUiState().observe(this) { state ->
-        showLoading(state.isLoading)
+        showLoading(state.isLoading, hideRecyclerView = true)
 
         state.error.fetch {
             showError(this)
@@ -153,13 +161,15 @@ class ImagePickerFragment : Fragment() {
             return@observe
         }
 
-        state.isFolder.fetch {
+        state.isFoldersMode.fetch {
+            config.searchQuery = null
             val isFolderMode = this
             if (isFolderMode) {
                 setFolderAdapter(state.folders)
             } else {
-                setImageAdapter(state.images)
+                setImageAdapter(state.currentFolder?.images ?: emptyList())
             }
+            interactionListener.isFolderModeChanged()
         }
 
         state.finishPickImage.fetch {
@@ -174,6 +184,41 @@ class ImagePickerFragment : Fragment() {
         }
     }
 
+    private fun <T : BaseItem> filter(list: List<T>): List<T> {
+        val regex = config.searchQuery?.let {
+            if (it.isNotBlank()) buildRegex(it) else null
+        }
+        return if (regex != null) {
+            list.filter { it.getItemName().matches(regex) }
+        } else {
+            list
+        }
+    }
+
+    private fun sortFolders(list: List<Folder>): List<Folder> {
+        return when (config.foldersSortMode) {
+            FolderSortMode.NAME_ASC -> list.sortedBy { it.folderName }
+            FolderSortMode.NAME_DESC -> list.sortedByDescending { it.folderName }
+            FolderSortMode.NUMBER_ASC -> list.sortedBy { it.images.size }
+            FolderSortMode.NUMBER_DESC -> list.sortedByDescending { it.images.size }
+            else -> list
+        }
+    }
+
+    private fun sortImages(list: List<Image>): List<Image> {
+        return when (config.imagesSortMode) {
+            ImageSortMode.NAME_ASC -> list.sortedBy { it.name }
+            ImageSortMode.NAME_DESC -> list.sortedByDescending { it.name }
+            ImageSortMode.TYPE_ASC -> list.sortedBy { it.type }
+            ImageSortMode.TYPE_DESC -> list.sortedByDescending { it.type }
+            ImageSortMode.DATE_MODIFIED_ASC -> list.sortedBy { it.dateModified }
+            ImageSortMode.DATE_MODIFIED_DESC -> list.sortedByDescending { it.dateModified }
+            ImageSortMode.SIZE_ASC -> list.sortedBy { it.size }
+            ImageSortMode.SIZE_DESC -> list.sortedByDescending { it.size }
+            else -> list
+        }
+    }
+
     override fun onDestroyView() {
         super.onDestroyView()
         binding = null
@@ -191,7 +236,7 @@ class ImagePickerFragment : Fragment() {
     ).apply {
         val selectListener = { isSelected: Boolean -> selectImage(isSelected) }
         val folderClick = { bucket: Folder ->
-            setImageAdapter(bucket.images)
+            presenter.setFolder(bucket)
             updateTitle()
         }
 
@@ -226,17 +271,38 @@ class ImagePickerFragment : Fragment() {
      * 3. Update title
      */
     private fun setImageAdapter(images: List<Image>) {
-        recyclerViewManager.setImageAdapter(images)
-        updateTitle()
+        filter(images)
+            .let { sortImages(it) }
+            .let {
+                showLoading(true)
+                recyclerViewManager.setImageAdapter(it) {
+                    showLoading(false)
+                }
+                checkDataIsEmpty(it)
+                updateTitle()
+            }
     }
 
     private fun setFolderAdapter(folders: List<Folder>) {
-        recyclerViewManager.setFolderAdapter(folders)
-        updateTitle()
+        filter(folders)
+            .let { sortFolders(it) }
+            .let {
+                showLoading(true)
+                recyclerViewManager.setFolderAdapter(it) {
+                    showLoading(false)
+                }
+                checkDataIsEmpty(it)
+                updateTitle()
+            }
+    }
+
+    private fun checkDataIsEmpty(data: List<*>) {
+        binding?.tvEmptyImages?.visibility = if (data.isEmpty()) View.VISIBLE else View.GONE
     }
 
     private fun updateTitle() {
-        interactionListener.setTitle(recyclerViewManager.title)
+        val state = presenter.getUiState().get()
+        interactionListener.setTitle(recyclerViewManager.getTitle(state.currentFolder?.folderName))
     }
 
     /**
@@ -273,6 +339,138 @@ class ImagePickerFragment : Fragment() {
 
     private fun loadData() = presenter.loadData(config)
 
+    fun search(searchQuery: String?) {
+        config.searchQuery = searchQuery
+        val state = presenter.getUiState().get()
+        if (state.currentFolder == null) {
+            setFolderAdapter(state.folders)
+        } else {
+            setImageAdapter(state.currentFolder.images)
+        }
+    }
+
+    fun sortFolders(sortMode: FolderSortMode) {
+        config.foldersSortMode = sortMode
+        val state = presenter.getUiState().get()
+        setFolderAdapter(state.folders)
+    }
+
+    fun sortImages(sortMode: ImageSortMode) {
+        config.imagesSortMode = sortMode
+        val state = presenter.getUiState().get()
+        setImageAdapter(state.currentFolder?.images ?: emptyList())
+    }
+
+    //region Sort
+
+    @SuppressLint("NonConstantResourceId")
+    fun showSortPopupMenu(menuItem: MenuItem) {
+        val view: View = requireActivity().findViewById(menuItem.itemId)
+        val popupMenu = PopupMenu(requireContext(), view)
+        val isFoldersMode = isFoldersMode
+        popupMenu.inflate(if (isFoldersMode) R.menu.ef_sort_folders else R.menu.ef_sort_images)
+
+        // select the current sort mode
+        val selectedMenuItemId = if (isFoldersMode) {
+            when (config.foldersSortMode) {
+                FolderSortMode.NAME_ASC -> R.id.action_sort_folder_name_asc
+                FolderSortMode.NAME_DESC -> R.id.action_sort_folder_name_desc
+                FolderSortMode.NUMBER_ASC -> R.id.action_sort_num_asc
+                FolderSortMode.NUMBER_DESC -> R.id.action_sort_num_desc
+                else -> R.id.action_sort_num_desc
+            }
+        } else {
+            when (config.imagesSortMode) {
+                ImageSortMode.NAME_ASC -> R.id.action_sort_name_asc
+                ImageSortMode.NAME_DESC -> R.id.action_sort_name_desc
+                ImageSortMode.TYPE_ASC -> R.id.action_sort_type_asc
+                ImageSortMode.TYPE_DESC -> R.id.action_sort_type_desc
+                ImageSortMode.DATE_MODIFIED_ASC -> R.id.action_sort_date_asc
+                ImageSortMode.DATE_MODIFIED_DESC -> R.id.action_sort_date_desc
+                ImageSortMode.SIZE_ASC -> R.id.action_sort_size_asc
+                ImageSortMode.SIZE_DESC -> R.id.action_sort_size_desc
+                else -> R.id.action_sort_date_desc
+            }
+        }
+
+        val selectedItem = popupMenu.menu.findItem(selectedMenuItemId)
+        selectedItem.isChecked = true
+
+        popupMenu.setOnMenuItemClickListener { item: MenuItem ->
+            val result = when (item.itemId) {
+                // folders
+                R.id.action_sort_folder_name_asc -> {
+                    sortFolders(FolderSortMode.NAME_ASC)
+                    true
+                }
+                R.id.action_sort_folder_name_desc -> {
+                    sortFolders(FolderSortMode.NAME_DESC)
+                    true
+                }
+                R.id.action_sort_num_asc -> {
+                    sortFolders(FolderSortMode.NUMBER_ASC)
+                    true
+                }
+                R.id.action_sort_num_desc -> {
+                    sortFolders(FolderSortMode.NUMBER_DESC)
+                    true
+                }
+                // images
+                R.id.action_sort_name_asc -> {
+                    sortImages(ImageSortMode.NAME_ASC)
+                    true
+                }
+                R.id.action_sort_name_desc -> {
+                    sortImages(ImageSortMode.NAME_DESC)
+                    true
+                }
+                R.id.action_sort_type_asc -> {
+                    sortImages(ImageSortMode.TYPE_ASC)
+                    true
+                }
+                R.id.action_sort_type_desc -> {
+                    sortImages(ImageSortMode.TYPE_DESC)
+                    true
+                }
+                R.id.action_sort_date_asc -> {
+                    sortImages(ImageSortMode.DATE_MODIFIED_ASC)
+                    true
+                }
+                R.id.action_sort_date_desc -> {
+                    sortImages(ImageSortMode.DATE_MODIFIED_DESC)
+                    true
+                }
+                R.id.action_sort_size_asc -> {
+                    sortImages(ImageSortMode.SIZE_ASC)
+                    true
+                }
+                R.id.action_sort_size_desc -> {
+                    sortImages(ImageSortMode.SIZE_DESC)
+                    true
+                }
+                else -> false
+            }
+            if (result) {
+                selectedItem.isChecked = false
+                item.isChecked = true
+            }
+            return@setOnMenuItemClickListener result
+        }
+
+        (popupMenu.menu as? MenuBuilder)?.let {
+            setForceShowMenuIcons(view, it)
+        }
+    }
+
+    @SuppressLint("RestrictedApi")
+    private fun setForceShowMenuIcons(v: View, menu: MenuBuilder) {
+        val menuHelper = MenuPopupHelper(requireContext(), menu, v)
+        menuHelper.setForceShowIcon(true)
+        menuHelper.show()
+    }
+
+    //endregion Sort
+
     /**
      * Request for permission
      * If permission denied or app is first launched, request for permission
@@ -345,8 +543,8 @@ class ImagePickerFragment : Fragment() {
      */
     fun handleBack(): Boolean {
         if (recyclerViewManager.handleBack()) {
+            presenter.setFolder(null)
             // Handled.
-            updateTitle()
             return true
         }
         return false
@@ -355,6 +553,9 @@ class ImagePickerFragment : Fragment() {
     val isShowDoneButton: Boolean
         get() = recyclerViewManager.isShowDoneButton
 
+    val isFoldersMode: Boolean
+        get() = presenter.getUiState().get().currentFolder == null
+
     override fun onAttach(context: Context) {
         super.onAttach(context)
         if (context is ImagePickerInteractionListener) {
@@ -374,10 +575,12 @@ class ImagePickerFragment : Fragment() {
         Toast.makeText(activity, message, Toast.LENGTH_SHORT).show()
     }
 
-    private fun showLoading(isLoading: Boolean) {
+    private fun showLoading(isLoading: Boolean, hideRecyclerView: Boolean = false) {
         binding?.run {
             progressBar.visibility = if (isLoading) View.VISIBLE else View.GONE
-            recyclerView.visibility = if (isLoading) View.GONE else View.VISIBLE
+            if (hideRecyclerView) {
+                recyclerView.visibility = if (isLoading) View.GONE else View.VISIBLE
+            }
             tvEmptyImages.visibility = View.GONE
         }
     }
@@ -404,5 +607,9 @@ class ImagePickerFragment : Fragment() {
                 arguments = args
             }
         }
+
+        private fun buildRegex(query: String): Regex {
+            return Regex("(?is)" + ".*" + Pattern.quote(query) + ".*")
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/imagepicker/src/main/java/com/esafirm/imagepicker/features/ImagePickerInteractionListener.kt b/imagepicker/src/main/java/com/esafirm/imagepicker/features/ImagePickerInteractionListener.kt
index a3e427ac..ba9214e5 100644
--- a/imagepicker/src/main/java/com/esafirm/imagepicker/features/ImagePickerInteractionListener.kt
+++ b/imagepicker/src/main/java/com/esafirm/imagepicker/features/ImagePickerInteractionListener.kt
@@ -16,4 +16,9 @@ interface ImagePickerInteractionListener {
      * May include Images whose files no longer exist.
      */
     fun selectionChanged(imageList: List<Image>?)
+
+    /**
+     * Called when the user select the bucket or move back to list of buckets.
+     */
+    fun isFolderModeChanged()
 }
\ No newline at end of file
diff --git a/imagepicker/src/main/java/com/esafirm/imagepicker/features/ImagePickerPresenter.kt b/imagepicker/src/main/java/com/esafirm/imagepicker/features/ImagePickerPresenter.kt
index f62e005e..cb394002 100644
--- a/imagepicker/src/main/java/com/esafirm/imagepicker/features/ImagePickerPresenter.kt
+++ b/imagepicker/src/main/java/com/esafirm/imagepicker/features/ImagePickerPresenter.kt
@@ -32,6 +32,13 @@ internal class ImagePickerPresenter(
         stateObs.set(newState(stateObs.get()))
     }
 
+    fun setFolder(folder: Folder?) {
+        setState { copy(
+                isFoldersMode = (folder == null).asSingleEvent(),
+                currentFolder = folder
+            ) }
+    }
+
     fun abortLoad() {
         imageLoader.abortLoadImages()
     }
@@ -47,7 +54,7 @@ internal class ImagePickerPresenter(
                         images = images,
                         folders = folders,
                         isLoading = false,
-                        isFolder = config.isFolderMode.asSingleEvent()
+                        isFoldersMode = config.isFolderMode.asSingleEvent()
                     )
                 }
             }
diff --git a/imagepicker/src/main/java/com/esafirm/imagepicker/features/SortMode.kt b/imagepicker/src/main/java/com/esafirm/imagepicker/features/SortMode.kt
new file mode 100644
index 00000000..78a81bf3
--- /dev/null
+++ b/imagepicker/src/main/java/com/esafirm/imagepicker/features/SortMode.kt
@@ -0,0 +1,21 @@
+package com.esafirm.imagepicker.features
+
+enum class FolderSortMode {
+    NONE,
+    NAME_ASC,
+    NAME_DESC,
+    NUMBER_ASC,
+    NUMBER_DESC
+}
+
+enum class ImageSortMode {
+    NONE,
+    NAME_ASC,
+    NAME_DESC,
+    TYPE_ASC,
+    TYPE_DESC,
+    DATE_MODIFIED_ASC,
+    DATE_MODIFIED_DESC,
+    SIZE_ASC,
+    SIZE_DESC
+}
\ No newline at end of file
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..1866442a 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
@@ -9,12 +9,13 @@ import android.os.Build
 import android.os.Bundle
 import android.provider.MediaStore
 import com.esafirm.imagepicker.features.ImagePickerConfig
+import com.esafirm.imagepicker.features.ImageSortMode
 import com.esafirm.imagepicker.features.common.ImageLoaderListener
 import com.esafirm.imagepicker.helper.ImagePickerUtils
 import com.esafirm.imagepicker.model.Folder
 import com.esafirm.imagepicker.model.Image
 import java.io.File
-import java.util.ArrayList
+import java.util.*
 import java.util.concurrent.ExecutorService
 import java.util.concurrent.Executors
 
@@ -27,21 +28,17 @@ class DefaultImageFileLoader(private val context: Context) : ImageFileLoader {
         config: ImagePickerConfig,
         listener: ImageLoaderListener
     ) {
-        val isFolderMode = config.isFolderMode
-        val includeVideo = config.isIncludeVideo
-        val onlyVideo = config.isOnlyVideo
-        val includeAnimation = config.isIncludeAnimation
-        val excludedImages = config.excludedImages
 
         getExecutorService().execute(
             ImageLoadRunnable(
-                context.applicationContext,
-                isFolderMode,
-                onlyVideo,
-                includeVideo,
-                includeAnimation,
-                excludedImages,
-                listener
+                context = context.applicationContext,
+                isFolderMode = config.isFolderMode,
+                onlyVideo = config.isOnlyVideo,
+                includeVideo = config.isIncludeVideo,
+                includeAnimation = config.isIncludeAnimation,
+                excludedImages = config.excludedImages,
+                sortMode = config.imagesSortMode,
+                listener = listener
             )
         )
     }
@@ -65,6 +62,7 @@ class DefaultImageFileLoader(private val context: Context) : ImageFileLoader {
         private val includeVideo: Boolean,
         private val includeAnimation: Boolean,
         private val excludedImages: List<File>?,
+        private val sortMode: ImageSortMode,
         private val listener: ImageLoaderListener
     ) : Runnable {
 
@@ -75,12 +73,19 @@ class DefaultImageFileLoader(private val context: Context) : ImageFileLoader {
             private const val QUERY_LIMIT = "limit"
         }
 
-        private val projection = arrayOf(
-            MediaStore.Images.Media._ID,
-            MediaStore.Images.Media.DISPLAY_NAME,
-            MediaStore.Images.Media.DATA,
-            MediaStore.Images.Media.BUCKET_DISPLAY_NAME
-        )
+        enum class Projection(val column: String) {
+            ID(MediaStore.Images.Media._ID),
+            DISPLAY_NAME(MediaStore.Images.Media.DISPLAY_NAME),
+            DATA(MediaStore.Images.Media.DATA),
+            BUCKET_DISPLAY_NAME(MediaStore.Images.Media.BUCKET_DISPLAY_NAME),
+            MIME_TYPE(MediaStore.Images.Media.MIME_TYPE),
+            DATE_MODIFIED(MediaStore.Images.Media.DATE_MODIFIED),
+            SIZE(MediaStore.Images.Media.SIZE);
+
+            companion object {
+                fun columns() = values().map { it.column }.toTypedArray()
+            }
+        }
 
         @SuppressLint("InlinedApi")
         private fun queryData(limit: Int? = null): Cursor? {
@@ -102,39 +107,55 @@ class DefaultImageFileLoader(private val context: Context) : ImageFileLoader {
                 else -> ""
             }
 
-            if (useNewApi) {
+            val sortColumn = when (sortMode) {
+                ImageSortMode.NAME_ASC,
+                ImageSortMode.NAME_DESC -> MediaStore.Files.FileColumns.DISPLAY_NAME
+                ImageSortMode.TYPE_ASC,
+                ImageSortMode.TYPE_DESC -> MediaStore.Files.FileColumns.MIME_TYPE
+                ImageSortMode.DATE_MODIFIED_ASC,
+                ImageSortMode.DATE_MODIFIED_DESC -> MediaStore.Files.FileColumns.DATE_MODIFIED
+                ImageSortMode.SIZE_ASC,
+                ImageSortMode.SIZE_DESC -> MediaStore.Files.FileColumns.SIZE
+                else -> MediaStore.Files.FileColumns.DATE_MODIFIED
+            }
+            val sortDirection = when (sortMode) {
+                ImageSortMode.NAME_ASC,
+                ImageSortMode.TYPE_ASC,
+                ImageSortMode.DATE_MODIFIED_ASC,
+                ImageSortMode.SIZE_ASC -> ContentResolver.QUERY_SORT_DIRECTION_ASCENDING
+                ImageSortMode.NAME_DESC,
+                ImageSortMode.TYPE_DESC,
+                ImageSortMode.DATE_MODIFIED_DESC,
+                ImageSortMode.SIZE_DESC -> ContentResolver.QUERY_SORT_DIRECTION_DESCENDING
+                else -> ContentResolver.QUERY_SORT_DIRECTION_DESCENDING
+            }
+
+            return if (useNewApi) {
                 val args = Bundle().apply {
                     // Sort function
-                    putStringArray(
-                        ContentResolver.QUERY_ARG_SORT_COLUMNS,
-                        arrayOf(MediaStore.Files.FileColumns.DATE_MODIFIED)
-                    )
-                    putInt(
-                        ContentResolver.QUERY_ARG_SORT_DIRECTION,
-                        ContentResolver.QUERY_SORT_DIRECTION_DESCENDING
-                    )
+                    putStringArray(ContentResolver.QUERY_ARG_SORT_COLUMNS, arrayOf(sortColumn))
+                    putInt(ContentResolver.QUERY_ARG_SORT_DIRECTION, sortDirection)
                     // Selection
-                    putString(
-                        ContentResolver.QUERY_ARG_SQL_SELECTION,
-                        selection
-                    )
+                    putString(ContentResolver.QUERY_ARG_SQL_SELECTION, selection)
                     // Limit
                     if (limit != null) {
                         putInt(ContentResolver.QUERY_ARG_LIMIT, limit)
                     }
                 }
 
-                return context.contentResolver.query(sourceUri, projection, args, null)
-            }
+                context.contentResolver.query(sourceUri, Projection.columns(), args, null)
+            } else {
+                val oldSortDirection = if (sortDirection == ContentResolver.QUERY_SORT_DIRECTION_ASCENDING) "ASC" else "DESC"
 
-            val sortOrder = "${MediaStore.Images.Media.DATE_MODIFIED} DESC".let {
-                if (limit != null) "$it LIMIT $limit" else it
-            }
+                val sortOrder = "$sortColumn $oldSortDirection".let {
+                    if (limit != null) "$it LIMIT $limit" else it
+                }
 
-            return context.contentResolver.query(
-                sourceUri, projection,
-                selection, null, sortOrder
-            )
+                context.contentResolver.query(
+                    sourceUri, Projection.columns(),
+                    selection, null, sortOrder
+                )
+            }
         }
 
         private fun getSourceUri(): Uri {
@@ -144,7 +165,7 @@ class DefaultImageFileLoader(private val context: Context) : ImageFileLoader {
         }
 
         private fun cursorToImage(cursor: Cursor): Image? {
-            val path = cursor.getString(cursor.getColumnIndex(projection[2]))
+            val path = cursor.getString(cursor.getColumnIndex(Projection.DATA.column))
             val file = makeSafeFile(path) ?: return null
             if (excludedImages != null && excludedImages.contains(file)) return null
 
@@ -153,13 +174,16 @@ class DefaultImageFileLoader(private val context: Context) : ImageFileLoader {
                 if (ImagePickerUtils.isGifFormat(path)) return null
             }
 
-            val id = cursor.getLong(cursor.getColumnIndex(projection[0]))
-            val name = cursor.getString(cursor.getColumnIndex(projection[1]))
+            val id = cursor.getLong(cursor.getColumnIndex(Projection.ID.column))
+            val name = cursor.getString(cursor.getColumnIndex(Projection.DISPLAY_NAME.column))
+            val type = cursor.getString(cursor.getColumnIndex(Projection.MIME_TYPE.column))
+            val dateString = cursor.getString(cursor.getColumnIndex(Projection.DATE_MODIFIED.column))
+            val date = Date(dateString.toLong())
+            val size = cursor.getLong(cursor.getColumnIndex(Projection.SIZE.column))
 
-            if (name != null) {
-                return Image(id, name, path)
-            }
-            return null
+            return if (name != null) {
+                return Image(id, name, path, type, date, size)
+            } else null
         }
 
         private fun processData(cursor: Cursor?) {
@@ -180,7 +204,7 @@ class DefaultImageFileLoader(private val context: Context) : ImageFileLoader {
 
                         // Load folders
                         if (!isFolderMode) continue
-                        var bucket = cursor.getString(cursor.getColumnIndex(projection[3]))
+                        var bucket = cursor.getString(cursor.getColumnIndex(Projection.BUCKET_DISPLAY_NAME.column))
                         if (bucket == null) {
                             val parent = File(image.path).parentFile
                             bucket = if (parent != null) parent.name else DEFAULT_FOLDER_NAME
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..35bfead8 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
@@ -37,6 +37,7 @@ class RecyclerViewManager(
     private lateinit var folderAdapter: FolderPickerAdapter
 
     private var foldersState: Parcelable? = null
+    private var imagesState: Parcelable? = null
 
     private var imageColumns = 0
     private var folderColumns = 0
@@ -82,8 +83,11 @@ class RecyclerViewManager(
         /* Init folder and image adapter */
         val imageLoader = ImagePickerComponentsHolder.imageLoader
         imageAdapter = ImagePickerAdapter(
-            context, imageLoader, selectedImages
-                ?: emptyList(), onImageClick
+            context = context,
+            imageLoader = imageLoader,
+            selectedImages = selectedImages ?: emptyList(),
+            isShowImageNames = config.isShowImageNames,
+            itemClickListener = onImageClick
         )
         folderAdapter = FolderPickerAdapter(context, imageLoader) {
             foldersState = recyclerView.layoutManager?.onSaveInstanceState()
@@ -111,7 +115,6 @@ class RecyclerViewManager(
     // Returns true if a back action was handled by going back a folder; false otherwise.
     fun handleBack(): Boolean {
         if (config.isFolderMode && !isDisplayingFolderView) {
-            setFolderAdapter(null)
             imageAdapter.setData(emptyList())
             return true
         }
@@ -121,44 +124,51 @@ class RecyclerViewManager(
     private val isDisplayingFolderView: Boolean
         get() = recyclerView.adapter == null || recyclerView.adapter is FolderPickerAdapter
 
-    val title: String
-        get() {
-            if (isDisplayingFolderView) {
-                return ConfigUtils.getFolderTitle(context, config)
+    fun getTitle(currentFolderName: String?): String {
+        val selectedNum = imageAdapter.selectedImages.size
+        return when {
+            isDisplayingFolderView -> {
+                ConfigUtils.getFolderTitle(context, config)
+            }
+            config.mode == ImagePickerMode.SINGLE -> {
+                ConfigUtils.getImageTitle(context, config)
+            }
+            selectedNum == 0 && config.imageTitle?.isNotBlank() == true -> {
+                ConfigUtils.getImageTitle(context, config)
             }
-            if (config.mode == ImagePickerMode.SINGLE) {
-                return ConfigUtils.getImageTitle(context, config)
+            selectedNum == 0 && currentFolderName != null -> {
+                currentFolderName
             }
-            val imageSize = imageAdapter.selectedImages.size
-            val useDefaultTitle = config.imageTitle.isNullOrBlank().not() && imageSize == 0
-            if (useDefaultTitle) {
-                return ConfigUtils.getImageTitle(context, config)
+            config.limit == IpCons.MAX_LIMIT -> {
+                context.getString(R.string.ef_selected, selectedNum)
             }
-            return if (config.limit == IpCons.MAX_LIMIT) {
-                String.format(context.getString(R.string.ef_selected), imageSize)
-            } else {
-                String.format(
-                    context.getString(R.string.ef_selected_with_limit),
-                    imageSize,
-                    config.limit
-                )
+            else -> {
+                context.getString(R.string.ef_selected_with_limit, selectedNum, config.limit)
             }
         }
+    }
 
-    fun setImageAdapter(images: List<Image> = emptyList()) {
-        imageAdapter.setData(images)
+    fun setImageAdapter(images: List<Image> = emptyList(), commitCallback: (() -> Unit)? = null) {
+        imagesState = recyclerView.layoutManager?.onSaveInstanceState()
+        imageAdapter.setData(images) {
+            imagesState?.let {
+                recyclerView.layoutManager!!.onRestoreInstanceState(it)
+            }
+            commitCallback?.invoke()
+        }
         setItemDecoration(imageColumns)
         recyclerView.adapter = imageAdapter
     }
 
-    fun setFolderAdapter(folders: List<Folder>?) {
+    fun setFolderAdapter(folders: List<Folder>?, commitCallback: (() -> Unit)? = null) {
         folderAdapter.setData(folders)
         setItemDecoration(folderColumns)
         recyclerView.adapter = folderAdapter
-        if (foldersState != null) {
+        foldersState?.let {
             layoutManager!!.spanCount = folderColumns
-            recyclerView.layoutManager!!.onRestoreInstanceState(foldersState)
+            recyclerView.layoutManager!!.onRestoreInstanceState(it)
         }
+        commitCallback?.invoke()
     }
 
     /* --------------------------------------------------- */
@@ -197,8 +207,7 @@ class RecyclerViewManager(
     }
 
     val isShowDoneButton: Boolean
-        get() = (!isDisplayingFolderView
-            && (imageAdapter.selectedImages.isNotEmpty() || config.showDoneButtonAlways)
+        get() = ((imageAdapter.selectedImages.isNotEmpty() || config.showDoneButtonAlways)
             && config.returnMode !== ReturnMode.ALL && config.returnMode !== ReturnMode.GALLERY_ONLY)
 
 }
\ No newline at end of file
diff --git a/imagepicker/src/main/java/com/esafirm/imagepicker/model/BaseItem.kt b/imagepicker/src/main/java/com/esafirm/imagepicker/model/BaseItem.kt
new file mode 100644
index 00000000..a420642f
--- /dev/null
+++ b/imagepicker/src/main/java/com/esafirm/imagepicker/model/BaseItem.kt
@@ -0,0 +1,5 @@
+package com.esafirm.imagepicker.model
+
+interface BaseItem {
+    fun getItemName(): String
+}
\ No newline at end of file
diff --git a/imagepicker/src/main/java/com/esafirm/imagepicker/model/Folder.kt b/imagepicker/src/main/java/com/esafirm/imagepicker/model/Folder.kt
index 640e8067..0c146d0c 100644
--- a/imagepicker/src/main/java/com/esafirm/imagepicker/model/Folder.kt
+++ b/imagepicker/src/main/java/com/esafirm/imagepicker/model/Folder.kt
@@ -1,5 +1,11 @@
 package com.esafirm.imagepicker.model
 
-class Folder(var folderName: String) {
+class Folder(
+    var folderName: String
+) : BaseItem {
+
     var images: MutableList<Image> = mutableListOf()
+
+    override fun getItemName() = folderName
+
 }
\ 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..a0d7ce66 100644
--- a/imagepicker/src/main/java/com/esafirm/imagepicker/model/Image.kt
+++ b/imagepicker/src/main/java/com/esafirm/imagepicker/model/Image.kt
@@ -7,13 +7,17 @@ import android.provider.MediaStore
 import com.esafirm.imagepicker.helper.ImagePickerUtils
 import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
+import java.util.*
 
 @Parcelize
 class Image(
     val id: Long,
     val name: String,
     val path: String,
-) : Parcelable {
+    val type: String? = null,
+    val dateModified: Date? = null,
+    val size: Long? = null
+) : Parcelable, BaseItem {
 
     @IgnoredOnParcel
     private var uriHolder: Uri? = null
@@ -33,6 +37,8 @@ class Image(
             }
         }
 
+    override fun getItemName() = name
+
     override fun equals(other: Any?): Boolean {
         return when {
             this === other -> true
@@ -49,6 +55,9 @@ class Image(
         result = 31 * result + name.hashCode()
         result = 31 * result + path.hashCode()
         result = 31 * result + (uriHolder?.hashCode() ?: 0)
+        result = 31 * result + (type?.hashCode() ?: 0)
+        result = 31 * result + (dateModified?.hashCode() ?: 0)
+        result = 31 * result + (size?.hashCode() ?: 0)
         return result
     }
 }
\ No newline at end of file
diff --git a/imagepicker/src/main/res/drawable-anydpi/ef_ic_arrow_down_gray.xml b/imagepicker/src/main/res/drawable-anydpi/ef_ic_arrow_down_gray.xml
new file mode 100644
index 00000000..856e1d1e
--- /dev/null
+++ b/imagepicker/src/main/res/drawable-anydpi/ef_ic_arrow_down_gray.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#333333"
+    android:alpha="0.6">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M20,12l-1.41,-1.41L13,16.17V4h-2v12.17l-5.58,-5.59L4,12l8,8 8,-8z"/>
+</vector>
diff --git a/imagepicker/src/main/res/drawable-anydpi/ef_ic_arrow_up_gray.xml b/imagepicker/src/main/res/drawable-anydpi/ef_ic_arrow_up_gray.xml
new file mode 100644
index 00000000..5703c0c9
--- /dev/null
+++ b/imagepicker/src/main/res/drawable-anydpi/ef_ic_arrow_up_gray.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#333333"
+    android:alpha="0.6">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M4,12l1.41,1.41L11,7.83V20h2V7.83l5.58,5.59L20,12l-8,-8 -8,8z"/>
+</vector>
diff --git a/imagepicker/src/main/res/drawable-anydpi/ef_ic_search_white.xml b/imagepicker/src/main/res/drawable-anydpi/ef_ic_search_white.xml
new file mode 100644
index 00000000..44dcb4af
--- /dev/null
+++ b/imagepicker/src/main/res/drawable-anydpi/ef_ic_search_white.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#FFFFFF"
+    android:alpha="0.8">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
+</vector>
diff --git a/imagepicker/src/main/res/drawable-anydpi/ef_ic_sort_white.xml b/imagepicker/src/main/res/drawable-anydpi/ef_ic_sort_white.xml
new file mode 100644
index 00000000..76f52184
--- /dev/null
+++ b/imagepicker/src/main/res/drawable-anydpi/ef_ic_sort_white.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#FFFFFF"
+    android:alpha="0.8">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M3,18h6v-2L3,16v2zM3,6v2h18L21,6L3,6zM3,13h12v-2L3,11v2z"/>
+</vector>
diff --git a/imagepicker/src/main/res/drawable-hdpi/ef_ic_arrow_down_gray.png b/imagepicker/src/main/res/drawable-hdpi/ef_ic_arrow_down_gray.png
new file mode 100644
index 00000000..3eee8170
Binary files /dev/null and b/imagepicker/src/main/res/drawable-hdpi/ef_ic_arrow_down_gray.png differ
diff --git a/imagepicker/src/main/res/drawable-hdpi/ef_ic_arrow_up_gray.png b/imagepicker/src/main/res/drawable-hdpi/ef_ic_arrow_up_gray.png
new file mode 100644
index 00000000..a7f677ab
Binary files /dev/null and b/imagepicker/src/main/res/drawable-hdpi/ef_ic_arrow_up_gray.png differ
diff --git a/imagepicker/src/main/res/drawable-hdpi/ef_ic_search_white.png b/imagepicker/src/main/res/drawable-hdpi/ef_ic_search_white.png
new file mode 100644
index 00000000..98c47378
Binary files /dev/null and b/imagepicker/src/main/res/drawable-hdpi/ef_ic_search_white.png differ
diff --git a/imagepicker/src/main/res/drawable-hdpi/ef_ic_sort_white.png b/imagepicker/src/main/res/drawable-hdpi/ef_ic_sort_white.png
new file mode 100644
index 00000000..2b60141d
Binary files /dev/null and b/imagepicker/src/main/res/drawable-hdpi/ef_ic_sort_white.png differ
diff --git a/imagepicker/src/main/res/drawable-mdpi/ef_ic_arrow_down_gray.png b/imagepicker/src/main/res/drawable-mdpi/ef_ic_arrow_down_gray.png
new file mode 100644
index 00000000..16535149
Binary files /dev/null and b/imagepicker/src/main/res/drawable-mdpi/ef_ic_arrow_down_gray.png differ
diff --git a/imagepicker/src/main/res/drawable-mdpi/ef_ic_arrow_up_gray.png b/imagepicker/src/main/res/drawable-mdpi/ef_ic_arrow_up_gray.png
new file mode 100644
index 00000000..9b95c85b
Binary files /dev/null and b/imagepicker/src/main/res/drawable-mdpi/ef_ic_arrow_up_gray.png differ
diff --git a/imagepicker/src/main/res/drawable-mdpi/ef_ic_search_white.png b/imagepicker/src/main/res/drawable-mdpi/ef_ic_search_white.png
new file mode 100644
index 00000000..25e1bf8c
Binary files /dev/null and b/imagepicker/src/main/res/drawable-mdpi/ef_ic_search_white.png differ
diff --git a/imagepicker/src/main/res/drawable-mdpi/ef_ic_sort_white.png b/imagepicker/src/main/res/drawable-mdpi/ef_ic_sort_white.png
new file mode 100644
index 00000000..1c8dfe00
Binary files /dev/null and b/imagepicker/src/main/res/drawable-mdpi/ef_ic_sort_white.png differ
diff --git a/imagepicker/src/main/res/drawable-xhdpi/ef_ic_arrow_down_gray.png b/imagepicker/src/main/res/drawable-xhdpi/ef_ic_arrow_down_gray.png
new file mode 100644
index 00000000..e9253415
Binary files /dev/null and b/imagepicker/src/main/res/drawable-xhdpi/ef_ic_arrow_down_gray.png differ
diff --git a/imagepicker/src/main/res/drawable-xhdpi/ef_ic_arrow_up_gray.png b/imagepicker/src/main/res/drawable-xhdpi/ef_ic_arrow_up_gray.png
new file mode 100644
index 00000000..277b1e6f
Binary files /dev/null and b/imagepicker/src/main/res/drawable-xhdpi/ef_ic_arrow_up_gray.png differ
diff --git a/imagepicker/src/main/res/drawable-xhdpi/ef_ic_search_white.png b/imagepicker/src/main/res/drawable-xhdpi/ef_ic_search_white.png
new file mode 100644
index 00000000..8b62340f
Binary files /dev/null and b/imagepicker/src/main/res/drawable-xhdpi/ef_ic_search_white.png differ
diff --git a/imagepicker/src/main/res/drawable-xhdpi/ef_ic_sort_white.png b/imagepicker/src/main/res/drawable-xhdpi/ef_ic_sort_white.png
new file mode 100644
index 00000000..0df02af8
Binary files /dev/null and b/imagepicker/src/main/res/drawable-xhdpi/ef_ic_sort_white.png differ
diff --git a/imagepicker/src/main/res/drawable-xxhdpi/ef_ic_arrow_down_gray.png b/imagepicker/src/main/res/drawable-xxhdpi/ef_ic_arrow_down_gray.png
new file mode 100644
index 00000000..6bf11714
Binary files /dev/null and b/imagepicker/src/main/res/drawable-xxhdpi/ef_ic_arrow_down_gray.png differ
diff --git a/imagepicker/src/main/res/drawable-xxhdpi/ef_ic_arrow_up_gray.png b/imagepicker/src/main/res/drawable-xxhdpi/ef_ic_arrow_up_gray.png
new file mode 100644
index 00000000..dd4a46c6
Binary files /dev/null and b/imagepicker/src/main/res/drawable-xxhdpi/ef_ic_arrow_up_gray.png differ
diff --git a/imagepicker/src/main/res/drawable-xxhdpi/ef_ic_search_white.png b/imagepicker/src/main/res/drawable-xxhdpi/ef_ic_search_white.png
new file mode 100644
index 00000000..f8a2af50
Binary files /dev/null and b/imagepicker/src/main/res/drawable-xxhdpi/ef_ic_search_white.png differ
diff --git a/imagepicker/src/main/res/drawable-xxhdpi/ef_ic_sort_white.png b/imagepicker/src/main/res/drawable-xxhdpi/ef_ic_sort_white.png
new file mode 100644
index 00000000..4e944a9d
Binary files /dev/null and b/imagepicker/src/main/res/drawable-xxhdpi/ef_ic_sort_white.png differ
diff --git a/imagepicker/src/main/res/layout/ef_fragment_image_picker.xml b/imagepicker/src/main/res/layout/ef_fragment_image_picker.xml
index 980b26d7..f8edc1bd 100644
--- a/imagepicker/src/main/res/layout/ef_fragment_image_picker.xml
+++ b/imagepicker/src/main/res/layout/ef_fragment_image_picker.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -11,19 +13,21 @@
         android:padding="@dimen/ef_spacing_double"
         android:text="@string/ef_msg_empty_images"
         android:textSize="@dimen/ef_font_medium"
-        android:visibility="gone" />
+        android:visibility="gone"
+        tools:visibility="visible" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recyclerView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
 
     <ProgressBar
         android:id="@+id/progress_bar"
         android:layout_width="100dp"
         android:layout_height="100dp"
         android:layout_centerInParent="true"
-        android:visibility="gone" />
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recyclerView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:visibility="gone"
+        tools:visibility="visible" />
 
     <com.esafirm.imagepicker.view.SnackBarView
         android:id="@+id/ef_snackbar"
diff --git a/imagepicker/src/main/res/layout/ef_imagepicker_item_folder.xml b/imagepicker/src/main/res/layout/ef_imagepicker_item_folder.xml
index 46334cbc..e767f55a 100644
--- a/imagepicker/src/main/res/layout/ef_imagepicker_item_folder.xml
+++ b/imagepicker/src/main/res/layout/ef_imagepicker_item_folder.xml
@@ -1,26 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.esafirm.imagepicker.view.SquareFrameLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <ImageView
-        android:id="@+id/image"
+        android:id="@+id/image_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_gravity="center"
         android:adjustViewBounds="true"
         android:background="@drawable/ef_folder_placeholder"
         android:contentDescription="@string/ef_content_desc_folder"
-        android:scaleType="centerCrop"/>
+        android:scaleType="centerCrop"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:src="@tools:sample/avatars" />
 
     <LinearLayout
+        android:id="@+id/ef_bottom_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
         android:background="@color/ef_black_alpha_50"
         android:orientation="vertical"
-        android:padding="@dimen/ef_padding_small">
+        android:padding="@dimen/ef_padding_small"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
 
         <TextView
             android:id="@+id/tv_name"
@@ -30,7 +39,8 @@
             android:includeFontPadding="false"
             android:maxLines="3"
             android:textColor="@color/ef_white"
-            android:textSize="@dimen/ef_font_small"/>
+            android:textSize="@dimen/ef_font_small"
+            tools:text="@tools:sample/full_names" />
 
         <TextView
             android:id="@+id/tv_number"
@@ -38,7 +48,8 @@
             android:layout_height="wrap_content"
             android:includeFontPadding="false"
             android:textColor="@color/ef_grey"
-            android:textSize="@dimen/ef_font_small"/>
+            android:textSize="@dimen/ef_font_small"
+            tools:text="@tools:sample/us_zipcodes" />
     </LinearLayout>
 
-</com.esafirm.imagepicker.view.SquareFrameLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/imagepicker/src/main/res/layout/ef_imagepicker_item_image.xml b/imagepicker/src/main/res/layout/ef_imagepicker_item_image.xml
index 73458b80..1b51128a 100644
--- a/imagepicker/src/main/res/layout/ef_imagepicker_item_image.xml
+++ b/imagepicker/src/main/res/layout/ef_imagepicker_item_image.xml
@@ -1,38 +1,83 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.esafirm.imagepicker.view.SquareFrameLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:foregroundGravity="center">
+    android:layout_height="wrap_content">
 
     <ImageView
         android:id="@+id/image_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:adjustViewBounds="true"
         android:contentDescription="@string/ef_content_desc_image"
-        android:scaleType="centerCrop"/>
+        android:scaleType="centerCrop"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:src="@tools:sample/avatars" />
 
-    <View
-        android:id="@+id/view_alpha"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@android:color/white"/>
+    <LinearLayout
+        android:id="@+id/ef_bottom_view"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:background="@color/ef_black_alpha_50"
+        android:orientation="vertical"
+        android:padding="@dimen/ef_padding_small"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/ef_item_file_type_indicator"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintHorizontal_bias="0"
+        tools:visibility="visible">
+
+        <TextView
+            android:id="@+id/tv_image_name"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:includeFontPadding="false"
+            android:maxLines="3"
+            android:textColor="@color/ef_white"
+            android:textSize="@dimen/ef_font_small"
+            tools:text="@tools:sample/full_names" />
+    </LinearLayout>
 
     <TextView
         android:id="@+id/ef_item_file_type_indicator"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
         android:background="@color/ef_black_alpha_aa"
-        android:paddingBottom="@dimen/ef_spacing_half"
         android:paddingLeft="@dimen/ef_spacing_double"
-        android:paddingRight="@dimen/ef_spacing_double"
         android:paddingTop="@dimen/ef_spacing_half"
+        android:paddingRight="@dimen/ef_spacing_double"
+        android:paddingBottom="@dimen/ef_spacing_half"
         android:text="@string/ef_gif"
         android:textColor="@color/ef_white"
         android:textSize="@dimen/ef_font_small"
         android:visibility="gone"
-        tools:visibility="visible"/>
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/ef_bottom_view"
+        tools:visibility="visible" />
+
+    <ImageView
+        android:id="@+id/view_selected"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/ef_white_alpha_50"
+        android:src="@drawable/ef_ic_done_white"
+        android:adjustViewBounds="true"
+        android:contentDescription="@string/ef_content_desc_image"
+        android:scaleType="center"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:visibility="gone"
+        tools:visibility="visible" />
 
-</com.esafirm.imagepicker.view.SquareFrameLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
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..d1f4d7b6 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
@@ -2,6 +2,19 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
+    <item
+        android:id="@+id/menu_search"
+        android:title="@string/ef_search_query"
+        android:icon="@drawable/ef_ic_search_white"
+        app:showAsAction="always"
+        app:actionViewClass="androidx.appcompat.widget.SearchView"/>
+
+    <item
+        android:id="@+id/menu_sort"
+        android:title="@string/ef_title_sort"
+        android:icon="@drawable/ef_ic_sort_white"
+        app:showAsAction="always"/>
+
     <item
         android:id="@+id/menu_camera"
         android:icon="@drawable/ef_ic_camera_white"
diff --git a/imagepicker/src/main/res/menu/ef_sort_folders.xml b/imagepicker/src/main/res/menu/ef_sort_folders.xml
new file mode 100644
index 00000000..304ec1dc
--- /dev/null
+++ b/imagepicker/src/main/res/menu/ef_sort_folders.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/action_sort_folder_name_asc"
+        android:orderInCategory="10"
+        android:title="@string/ef_title_sort_name"
+        android:icon="@drawable/ef_ic_arrow_down_gray"
+        android:checkable="true"
+        app:showAsAction="never" />
+    <item
+        android:id="@+id/action_sort_folder_name_desc"
+        android:orderInCategory="20"
+        android:title="@string/ef_title_sort_name"
+        android:icon="@drawable/ef_ic_arrow_up_gray"
+        android:checkable="true"
+        app:showAsAction="never" />
+    <item
+        android:id="@+id/action_sort_num_asc"
+        android:orderInCategory="30"
+        android:title="@string/ef_title_sort_num"
+        android:icon="@drawable/ef_ic_arrow_down_gray"
+        android:checkable="true"
+        app:showAsAction="never" />
+    <item
+        android:id="@+id/action_sort_num_desc"
+        android:orderInCategory="40"
+        android:title="@string/ef_title_sort_num"
+        android:icon="@drawable/ef_ic_arrow_up_gray"
+        android:checkable="true"
+        app:showAsAction="never" />
+</menu>
diff --git a/imagepicker/src/main/res/menu/ef_sort_images.xml b/imagepicker/src/main/res/menu/ef_sort_images.xml
new file mode 100644
index 00000000..d2c68fb9
--- /dev/null
+++ b/imagepicker/src/main/res/menu/ef_sort_images.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/action_sort_name_asc"
+        android:orderInCategory="10"
+        android:title="@string/ef_title_sort_name"
+        android:icon="@drawable/ef_ic_arrow_down_gray"
+        android:checkable="true"
+        app:showAsAction="never" />
+    <item
+        android:id="@+id/action_sort_name_desc"
+        android:orderInCategory="20"
+        android:title="@string/ef_title_sort_name"
+        android:icon="@drawable/ef_ic_arrow_up_gray"
+        android:checkable="true"
+        app:showAsAction="never" />
+    <item
+        android:id="@+id/action_sort_type_asc"
+        android:orderInCategory="30"
+        android:title="@string/ef_title_sort_type"
+        android:icon="@drawable/ef_ic_arrow_down_gray"
+        android:checkable="true"
+        app:showAsAction="never" />
+    <item
+        android:id="@+id/action_sort_type_desc"
+        android:orderInCategory="40"
+        android:title="@string/ef_title_sort_type"
+        android:icon="@drawable/ef_ic_arrow_up_gray"
+        android:checkable="true"
+        app:showAsAction="never" />
+    <item
+        android:id="@+id/action_sort_date_asc"
+        android:orderInCategory="50"
+        android:title="@string/ef_title_sort_date"
+        android:icon="@drawable/ef_ic_arrow_down_gray"
+        android:checkable="true"
+        app:showAsAction="never" />
+    <item
+        android:id="@+id/action_sort_date_desc"
+        android:orderInCategory="60"
+        android:title="@string/ef_title_sort_date"
+        android:icon="@drawable/ef_ic_arrow_up_gray"
+        android:checkable="true"
+        app:showAsAction="never" />
+    <item
+        android:id="@+id/action_sort_size_asc"
+        android:orderInCategory="70"
+        android:title="@string/ef_title_sort_size"
+        android:icon="@drawable/ef_ic_arrow_down_gray"
+        android:checkable="true"
+        app:showAsAction="never" />
+    <item
+        android:id="@+id/action_sort_size_desc"
+        android:orderInCategory="80"
+        android:title="@string/ef_title_sort_size"
+        android:icon="@drawable/ef_ic_arrow_up_gray"
+        android:checkable="true"
+        app:showAsAction="never" />
+</menu>
diff --git a/imagepicker/src/main/res/values-ar/strings.xml b/imagepicker/src/main/res/values-ar/strings.xml
index f22bb5fb..a58cd873 100644
--- a/imagepicker/src/main/res/values-ar/strings.xml
+++ b/imagepicker/src/main/res/values-ar/strings.xml
@@ -9,6 +9,15 @@
     <string name="ef_title_folder">دليل</string>
     <string name="ef_title_select_image">أنقر لإختيار الصور</string>
     <string name="ef_ltitle_permission_denied">طلب الاذن مرفوض</string>
+    <string name="ef_search_query">بحث</string>
+    <string name="ef_nothing_found">لم يتم العثور على شيء</string>
+
+    <string name="ef_title_sort">نوع</string>
+    <string name="ef_title_sort_size">مقاس</string>
+    <string name="ef_title_sort_date">تاريخ</string>
+    <string name="ef_title_sort_type">نوع</string>
+    <string name="ef_title_sort_num">عدد</string>
+    <string name="ef_title_sort_name">اسم</string>
 
     <string name="ef_selected">إخترت %d</string>
     <string name="ef_selected_with_limit">إخترت %1$d/%2$d</string>
diff --git a/imagepicker/src/main/res/values-da/strings.xml b/imagepicker/src/main/res/values-da/strings.xml
index 1955e0fd..51d83ab5 100644
--- a/imagepicker/src/main/res/values-da/strings.xml
+++ b/imagepicker/src/main/res/values-da/strings.xml
@@ -9,6 +9,15 @@
     <string name="ef_title_folder">Mappe</string>
     <string name="ef_title_select_image">Tryk for at vælge billeder</string>
     <string name="ef_ltitle_permission_denied">Adgang nægtet</string>
+    <string name="ef_search_query">Søg</string>
+    <string name="ef_nothing_found">Intet fundet</string>
+
+    <string name="ef_title_sort">Sortere</string>
+    <string name="ef_title_sort_name">Navn</string>
+    <string name="ef_title_sort_num">Nummer</string>
+    <string name="ef_title_sort_type">Type</string>
+    <string name="ef_title_sort_date">Dato</string>
+    <string name="ef_title_sort_size">Størrelse</string>
 
     <string name="ef_selected">%d valgt</string>
     <string name="ef_selected_with_limit">%1$d/%2$d valgt</string>
diff --git a/imagepicker/src/main/res/values-de/strings.xml b/imagepicker/src/main/res/values-de/strings.xml
index f3d51ffc..aa27d184 100644
--- a/imagepicker/src/main/res/values-de/strings.xml
+++ b/imagepicker/src/main/res/values-de/strings.xml
@@ -9,6 +9,15 @@
     <string name="ef_title_folder">Verzeichnis</string>
     <string name="ef_title_select_image">Tippen um Bilder auszuwählen</string>
     <string name="ef_ltitle_permission_denied">Erlaubnis verweigert</string>
+    <string name="ef_search_query">Suche</string>
+    <string name="ef_nothing_found">Nichts gefunden</string>
+
+    <string name="ef_title_sort">Sortieren</string>
+    <string name="ef_title_sort_name">Name</string>
+    <string name="ef_title_sort_num">Nummer</string>
+    <string name="ef_title_sort_type">Typ</string>
+    <string name="ef_title_sort_date">Datum</string>
+    <string name="ef_title_sort_size">Größe</string>
 
     <string name="ef_selected">%d ausgewählt</string>
     <string name="ef_selected_with_limit">%1$d/%2$d ausgewählt</string>
diff --git a/imagepicker/src/main/res/values-fr/strings.xml b/imagepicker/src/main/res/values-fr/strings.xml
index 90a7407a..94b73400 100644
--- a/imagepicker/src/main/res/values-fr/strings.xml
+++ b/imagepicker/src/main/res/values-fr/strings.xml
@@ -9,6 +9,15 @@
     <string name="ef_title_folder">Dossier</string>
     <string name="ef_title_select_image">Toucher pour sélectionner des images</string>
     <string name="ef_ltitle_permission_denied">Permission refusée</string>
+    <string name="ef_search_query">Chercher</string>
+    <string name="ef_nothing_found">Rien n\'a été trouvé</string>
+
+    <string name="ef_title_sort">Sorte</string>
+    <string name="ef_title_sort_size">Taille</string>
+    <string name="ef_title_sort_date">Date</string>
+    <string name="ef_title_sort_type">Taper</string>
+    <string name="ef_title_sort_num">Nombre</string>
+    <string name="ef_title_sort_name">Nom</string>
 
     <string name="ef_selected">%d sélectionnées</string>
     <string name="ef_selected_with_limit">%1$d/%2$d sélectionnées</string>
diff --git a/imagepicker/src/main/res/values-in/strings.xml b/imagepicker/src/main/res/values-in/strings.xml
index 5a4806fe..49bfba91 100644
--- a/imagepicker/src/main/res/values-in/strings.xml
+++ b/imagepicker/src/main/res/values-in/strings.xml
@@ -9,6 +9,15 @@
     <string name="ef_title_folder">Folder</string>
     <string name="ef_title_select_image">Ketuk untuk memilih gambar</string>
     <string name="ef_ltitle_permission_denied">Izin ditolak</string>
+    <string name="ef_search_query">Cari</string>
+    <string name="ef_nothing_found">Tidak ada yang ditemukan</string>
+
+    <string name="ef_title_sort">Menyortir</string>
+    <string name="ef_title_sort_size">Ukuran</string>
+    <string name="ef_title_sort_date">Tanggal</string>
+    <string name="ef_title_sort_type">Jenis</string>
+    <string name="ef_title_sort_num">Nomor</string>
+    <string name="ef_title_sort_name">Nama</string>
 
     <string name="ef_selected">%d terpilih</string>
     <string name="ef_selected_with_limit">%1$d/%2$d terpilih</string>
diff --git a/imagepicker/src/main/res/values-it/strings.xml b/imagepicker/src/main/res/values-it/strings.xml
index 6db39f2a..ca1daae9 100644
--- a/imagepicker/src/main/res/values-it/strings.xml
+++ b/imagepicker/src/main/res/values-it/strings.xml
@@ -8,6 +8,15 @@
 
     <string name="ef_title_folder">Cartella</string>
     <string name="ef_title_select_image">Premi per selezionare l\'immagine</string>
+    <string name="ef_search_query">Ricerca</string>
+    <string name="ef_nothing_found">Non abbiamo trovato nulla</string>
+
+    <string name="ef_title_sort">Ordinare</string>
+    <string name="ef_title_sort_name">Nome</string>
+    <string name="ef_title_sort_num">Numero</string>
+    <string name="ef_title_sort_type">Tipo</string>
+    <string name="ef_title_sort_date">Data</string>
+    <string name="ef_title_sort_size">Taglia</string>
 
     <string name="ef_selected">%d selezionate</string>
     <string name="ef_selected_with_limit">%1$d/%2$d selezionate</string>
diff --git a/imagepicker/src/main/res/values-ja/strings.xml b/imagepicker/src/main/res/values-ja/strings.xml
index c4a31679..c8431ee8 100644
--- a/imagepicker/src/main/res/values-ja/strings.xml
+++ b/imagepicker/src/main/res/values-ja/strings.xml
@@ -7,6 +7,15 @@
 
     <string name="ef_title_folder">フォルダ</string>
     <string name="ef_title_select_image">画像を選択</string>
+    <string name="ef_search_query">検索</string>
+    <string name="ef_nothing_found">何も見つかりません</string>
+
+    <string name="ef_title_sort">選別</string>
+    <string name="ef_title_sort_size">サイズ</string>
+    <string name="ef_title_sort_date">日にち</string>
+    <string name="ef_title_sort_type">タイプ</string>
+    <string name="ef_title_sort_num">番号</string>
+    <string name="ef_title_sort_name">名前</string>
 
     <string name="ef_selected">%d 枚を選択済</string>
     <string name="ef_selected_with_limit">%1$d/%2$d 枚を選択済</string>
diff --git a/imagepicker/src/main/res/values-ko/strings.xml b/imagepicker/src/main/res/values-ko/strings.xml
index db37f48b..fe254401 100644
--- a/imagepicker/src/main/res/values-ko/strings.xml
+++ b/imagepicker/src/main/res/values-ko/strings.xml
@@ -9,6 +9,15 @@
     <string name="ef_title_folder">사진첩</string>
     <string name="ef_title_select_image">이미지를 선택하세요</string>
     <string name="ef_ltitle_permission_denied">권한이 없음</string>
+    <string name="ef_search_query">찾다</string>
+    <string name="ef_nothing_found">아무것도 찾을 수 없음何も見つかりません</string>
+
+    <string name="ef_title_sort">종류</string>
+    <string name="ef_title_sort_name">이름</string>
+    <string name="ef_title_sort_num">숫자</string>
+    <string name="ef_title_sort_type">유형</string>
+    <string name="ef_title_sort_date">날짜</string>
+    <string name="ef_title_sort_size">크기</string>
 
     <string name="ef_selected">%d 선택됨</string>
     <string name="ef_selected_with_limit">%1$d/%2$d 선택됨</string>
diff --git a/imagepicker/src/main/res/values-pt-rBR/strings.xml b/imagepicker/src/main/res/values-pt-rBR/strings.xml
index 02860b5c..12c78924 100644
--- a/imagepicker/src/main/res/values-pt-rBR/strings.xml
+++ b/imagepicker/src/main/res/values-pt-rBR/strings.xml
@@ -9,6 +9,15 @@
     <string name="ef_title_folder">Pasta</string>
     <string name="ef_title_select_image">Toque para selecionar as imagens</string>
     <string name="ef_ltitle_permission_denied">Permissão negada</string>
+    <string name="ef_search_query">Procurar</string>
+    <string name="ef_nothing_found">Nada encontrado</string>
+
+    <string name="ef_title_sort">Ordenação</string>
+    <string name="ef_title_sort_size">O tamanho</string>
+    <string name="ef_title_sort_date">Data</string>
+    <string name="ef_title_sort_type">Tipo de</string>
+    <string name="ef_title_sort_num">Cantitar</string>
+    <string name="ef_title_sort_name">Nume</string>
 
     <string name="ef_selected">%d selecionadas</string>
     <string name="ef_selected_with_limit">%1$d/%2$d selecionadas</string>
diff --git a/imagepicker/src/main/res/values-ro/strings.xml b/imagepicker/src/main/res/values-ro/strings.xml
index 65a4e439..ac13a4db 100644
--- a/imagepicker/src/main/res/values-ro/strings.xml
+++ b/imagepicker/src/main/res/values-ro/strings.xml
@@ -8,6 +8,15 @@
 
     <string name="ef_title_folder">Fișier</string>
     <string name="ef_title_select_image">Atingeți pentru a selecta imagini</string>
+    <string name="ef_search_query">Căutare</string>
+    <string name="ef_nothing_found">Nimic gasit</string>
+
+    <string name="ef_title_sort">Triere</string>
+    <string name="ef_title_sort_name">Nume</string>
+    <string name="ef_title_sort_num">Cantitate</string>
+    <string name="ef_title_sort_type">Tip de</string>
+    <string name="ef_title_sort_date">Data</string>
+    <string name="ef_title_sort_size">Marimea</string>
 
     <string name="ef_selected">%d selectate</string>
     <string name="ef_selected_with_limit">%1$d/%2$d selectate</string>
diff --git a/imagepicker/src/main/res/values-ru/strings.xml b/imagepicker/src/main/res/values-ru/strings.xml
index c8039f46..7ecdfc39 100644
--- a/imagepicker/src/main/res/values-ru/strings.xml
+++ b/imagepicker/src/main/res/values-ru/strings.xml
@@ -1,17 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="ef_permission_write_external_rationale">Разрешите доступ к хранилищу, чтобы выбрать изображения</string>
+
     <string name="ef_ok">ОК</string>
     <string name="ef_done">ГОТОВО</string>
     <string name="ef_camera">КАМЕРА</string>
+
     <string name="ef_title_folder">Папка</string>
     <string name="ef_title_select_image">Коснитесь, чтобы выбрать</string>
     <string name="ef_ltitle_permission_denied">Доступ запрещён</string>
+    <string name="ef_search_query">Поиск</string>
+    <string name="ef_nothing_found">Ничего не найдено</string>
+
+    <string name="ef_title_sort">Сортировка</string>
+    <string name="ef_title_sort_name">Имя</string>
+    <string name="ef_title_sort_num">Количество</string>
+    <string name="ef_title_sort_type">Тип</string>
+    <string name="ef_title_sort_date">Дата</string>
+    <string name="ef_title_sort_size">Размер</string>
+
     <string name="ef_selected">%d выбрано</string>
     <string name="ef_selected_with_limit">%1$d/%2$d выбрано</string>
+
     <string name="ef_error_create_image_file">Не удалось создать файл</string>
     <string name="ef_error_no_camera">Камера недоступна</string>
     <string name="ef_error_null_cursor">Ой! Что-то пошло не так!</string>
+
     <string name="ef_msg_empty_images">Изображений не найдено</string>
     <string name="ef_msg_no_write_external_permission">Пожалуйста, разрешите доступ к хранилищу, чтобы выбрать изображения</string>
     <string name="ef_msg_no_camera_permission">Пожалуйста, разрешите доступ к камере, чтобы сделать снимок</string>
diff --git a/imagepicker/src/main/res/values-tr/strings.xml b/imagepicker/src/main/res/values-tr/strings.xml
index ae9aa89c..bffdd684 100644
--- a/imagepicker/src/main/res/values-tr/strings.xml
+++ b/imagepicker/src/main/res/values-tr/strings.xml
@@ -8,6 +8,15 @@
     <string name="ef_title_folder">Klasör</string>
     <string name="ef_title_select_image">Resimleri seçmek için hafifçe dokunun</string>
     <string name="ef_ltitle_permission_denied">İzin reddedildi</string>
+    <string name="ef_search_query">Arama</string>
+    <string name="ef_nothing_found">Hiçbirşey Bulunamadı</string>
+
+    <string name="ef_title_sort">Sıralama</string>
+    <string name="ef_title_sort_size">Boyut</string>
+    <string name="ef_title_sort_date">Tarih</string>
+    <string name="ef_title_sort_type">Bir çeşit</string>
+    <string name="ef_title_sort_num">Miktar</string>
+    <string name="ef_title_sort_name">İsim</string>
 
     <string name="ef_selected">%d seçili</string>
     <string name="ef_selected_with_limit">%1$d/%2$d seçili</string>
diff --git a/imagepicker/src/main/res/values-uk/strings.xml b/imagepicker/src/main/res/values-uk/strings.xml
index a2a84e6c..be7647cc 100644
--- a/imagepicker/src/main/res/values-uk/strings.xml
+++ b/imagepicker/src/main/res/values-uk/strings.xml
@@ -4,14 +4,27 @@
     <string name="ef_ok">ОК</string>
     <string name="ef_done">ГОТОВО</string>
     <string name="ef_camera">КАМЕРА</string>
+
     <string name="ef_title_folder">Папка</string>
     <string name="ef_title_select_image">Торкніться, щоб обрати</string>
     <string name="ef_ltitle_permission_denied">Доступ заборонено</string>
+    <string name="ef_search_query">Пошук</string>
+    <string name="ef_nothing_found">Нічого не знайдено</string>
+
+    <string name="ef_title_sort">Сортування</string>
+    <string name="ef_title_sort_name">Ім\'я</string>
+    <string name="ef_title_sort_num">Кількість</string>
+    <string name="ef_title_sort_type">Тип</string>
+    <string name="ef_title_sort_date">Дата</string>
+    <string name="ef_title_sort_size">Розмір</string>
+
     <string name="ef_selected">%d обрано</string>
     <string name="ef_selected_with_limit">%1$d/%2$d обрано</string>
+
     <string name="ef_error_create_image_file">Не вдалося створити файл</string>
     <string name="ef_error_no_camera">Камера недоступна</string>
     <string name="ef_error_null_cursor">Ой! Щось пішло не так!</string>
+
     <string name="ef_msg_empty_images">Зображень не знайдено</string>
     <string name="ef_msg_no_write_external_permission">Будь ласка, дозвольте доступ до сховища, щоб обрати зображення</string>
     <string name="ef_msg_no_camera_permission">Будь ласка, дозвольте доступ до камери, щоб зробити знімок</string>
diff --git a/imagepicker/src/main/res/values-zh-rCN/strings.xml b/imagepicker/src/main/res/values-zh-rCN/strings.xml
index 950a7999..679f2c1b 100644
--- a/imagepicker/src/main/res/values-zh-rCN/strings.xml
+++ b/imagepicker/src/main/res/values-zh-rCN/strings.xml
@@ -7,6 +7,15 @@
 
     <string name="ef_title_folder">文件夹</string>
     <string name="ef_title_select_image">选择照片</string>
+    <string name="ef_search_query">搜索</string>
+    <string name="ef_nothing_found">沒有發現</string>
+
+    <string name="ef_title_sort">種類</string>
+    <string name="ef_title_sort_name">姓名</string>
+    <string name="ef_title_sort_num">數字</string>
+    <string name="ef_title_sort_type">類型</string>
+    <string name="ef_title_sort_date">日期</string>
+    <string name="ef_title_sort_size">尺寸</string>
 
     <string name="ef_selected">已选择 %d</string>
     <string name="ef_selected_with_limit">已选择 %1$d/%2$d</string>
diff --git a/imagepicker/src/main/res/values-zh-rTW/strings.xml b/imagepicker/src/main/res/values-zh-rTW/strings.xml
index 2392a5ef..94c8a042 100644
--- a/imagepicker/src/main/res/values-zh-rTW/strings.xml
+++ b/imagepicker/src/main/res/values-zh-rTW/strings.xml
@@ -7,6 +7,15 @@
 
     <string name="ef_title_folder">檔案夹</string>
     <string name="ef_title_select_image">選擇相片</string>
+    <string name="ef_search_query">搜索</string>
+    <string name="ef_nothing_found">没有发现</string>
+
+    <string name="ef_title_sort">种类</string>
+    <string name="ef_title_sort_size">尺寸</string>
+    <string name="ef_title_sort_date">日期</string>
+    <string name="ef_title_sort_type">类型</string>
+    <string name="ef_title_sort_num">数字</string>
+    <string name="ef_title_sort_name">姓名</string>
 
     <string name="ef_selected">已選擇 %d</string>
     <string name="ef_selected_with_limit">已選擇 %1$d/%2$d</string>
diff --git a/imagepicker/src/main/res/values/colors.xml b/imagepicker/src/main/res/values/colors.xml
index e8919c4f..a3c0c962 100644
--- a/imagepicker/src/main/res/values/colors.xml
+++ b/imagepicker/src/main/res/values/colors.xml
@@ -6,6 +6,7 @@
     <color name="ef_colorTextPrimary" tools:override="true">#FFFFFF</color>
 
     <color name="ef_white">#FFFFFF</color>
+    <color name="ef_white_alpha_50">#80FFFFFF</color>
     <color name="ef_grey">#9E9E9E</color>
     <color name="ef_black_alpha_50">#80000000</color>
     <color name="ef_black_alpha_aa">#AA000000</color>
diff --git a/imagepicker/src/main/res/values/strings.xml b/imagepicker/src/main/res/values/strings.xml
index 4f33fbad..76c054d1 100644
--- a/imagepicker/src/main/res/values/strings.xml
+++ b/imagepicker/src/main/res/values/strings.xml
@@ -9,6 +9,15 @@
     <string name="ef_title_folder">Folder</string>
     <string name="ef_title_select_image">Tap to select images</string>
     <string name="ef_ltitle_permission_denied">Permission denied</string>
+    <string name="ef_search_query">Search</string>
+    <string name="ef_nothing_found">Nothing found</string>
+
+    <string name="ef_title_sort">Sort</string>
+    <string name="ef_title_sort_name">Name</string>
+    <string name="ef_title_sort_num">Number</string>
+    <string name="ef_title_sort_type">Type</string>
+    <string name="ef_title_sort_date">Date</string>
+    <string name="ef_title_sort_size">Size</string>
 
     <string name="ef_selected">%d selected</string>
     <string name="ef_selected_with_limit">%1$d/%2$d selected</string>