diff --git a/CHANGELOG.md b/CHANGELOG.md
index f1484fbfc..f789d7bb4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,28 @@
 Changelog
 ==========
 
+Version 3.2.2 *(2018-01-09)*
+----------------------------
+
+ * Some scrolling issues fixed
+ * Improve new media file discovery
+
+Version 3.2.1 *(2018-01-08)*
+----------------------------
+
+ * Adding a crashfix
+ * Couple scrollbar glitch fixes
+
+Version 3.2.0 *(2018-01-07)*
+----------------------------
+
+ * Rewrote scrolling to improve the performance
+ * Disable "Delete empty folders" by default
+ * Added initial Search to media thumbnails screen
+ * Apply the hidden folder password protection to "Manage hidden folders"
+ * Replace Move with Copy/Delete on Android 7+
+ * Improve SD card file support
+
 Version 3.1.2 *(2017-12-30)*
 ----------------------------
 
diff --git a/app/build.gradle b/app/build.gradle
index 3c49e690e..f27660636 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "com.simplemobiletools.gallery"
         minSdkVersion 16
         targetSdkVersion 27
-        versionCode 152
-        versionName "3.1.2"
+        versionCode 155
+        versionName "3.2.2"
         multiDexEnabled true
         setProperty("archivesBaseName", "gallery")
     }
@@ -42,8 +42,7 @@ ext {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:3.5.0'
-    implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.9.0'
+    implementation 'com.simplemobiletools:commons:3.6.15'
     implementation 'com.theartofdev.edmodo:android-image-cropper:2.6.0'
     implementation 'com.android.support:multidex:1.0.2'
     implementation 'com.google.code.gson:gson:2.8.2'
@@ -51,6 +50,9 @@ dependencies {
     implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.8'
     implementation 'com.github.chrisbanes:PhotoView:2.1.3'
 
+    //implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.9.0'
+    implementation 'com.github.tibbi:subsampling-scale-image-view:v3.9.0-fork'
+
     debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakCanaryVersion"
     releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$leakCanaryVersion"
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4c50f0162..c49d7cf4d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -55,7 +55,17 @@
 
         <activity
             android:name=".activities.MediaActivity"
-            android:parentActivityName=".activities.MainActivity"/>
+            android:parentActivityName=".activities.MainActivity">
+
+            <meta-data
+                android:name="android.app.default_searchable"
+                android:resource="@xml/searchable"/>
+
+            <intent-filter>
+                <action android:name="android.intent.action.SEARCH"/>
+            </intent-filter>
+
+        </activity>
 
         <activity
             android:name=".activities.ViewPagerActivity"
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt
index 9694a0348..d8423670e 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt
@@ -402,12 +402,16 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
     }
 
     private fun increaseColumnCount() {
+        directories_vertical_fastscroller.measureRecyclerViewOnRedraw()
+        directories_horizontal_fastscroller.measureRecyclerViewOnRedraw()
         config.dirColumnCnt = ++(directories_grid.layoutManager as GridLayoutManager).spanCount
         invalidateOptionsMenu()
         directories_grid.adapter?.notifyDataSetChanged()
     }
 
     private fun reduceColumnCount() {
+        directories_vertical_fastscroller.measureRecyclerViewOnRedraw()
+        directories_horizontal_fastscroller.measureRecyclerViewOnRedraw()
         config.dirColumnCnt = --(directories_grid.layoutManager as GridLayoutManager).spanCount
         invalidateOptionsMenu()
         directories_grid.adapter?.notifyDataSetChanged()
@@ -472,6 +476,8 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
             inputStream = FileInputStream(File(path))
             outputStream = contentResolver.openOutputStream(output)
             inputStream.copyTo(outputStream)
+        } catch (e: SecurityException) {
+            showErrorToast(e)
         } catch (ignored: FileNotFoundException) {
         } finally {
             inputStream?.close()
@@ -523,9 +529,11 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
     }
 
     private fun gotDirectories(newDirs: ArrayList<Directory>, isFromCache: Boolean) {
-        Thread {
-            mLatestMediaId = getLatestMediaId()
-        }.start()
+        if (!isFromCache) {
+            Thread {
+                mLatestMediaId = getLatestMediaId()
+            }.start()
+        }
 
         val dirs = getSortedDirectories(newDirs)
         directories_refresh_layout.isRefreshing = false
@@ -533,6 +541,11 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
 
         directories_empty_text_label.beVisibleIf(dirs.isEmpty() && !isFromCache)
         directories_empty_text.beVisibleIf(dirs.isEmpty() && !isFromCache)
+        directories_grid.beVisibleIf(directories_empty_text_label.isGone())
+
+        val allowHorizontalScroll = config.scrollHorizontally && config.viewTypeFiles == VIEW_TYPE_GRID
+        directories_vertical_fastscroller.beVisibleIf(directories_grid.isVisible() && !allowHorizontalScroll)
+        directories_horizontal_fastscroller.beVisibleIf(directories_grid.isVisible() && allowHorizontalScroll)
 
         checkLastMediaChanged()
         if (dirs.hashCode() == mDirs.hashCode()) {
@@ -559,7 +572,8 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
         val currAdapter = directories_grid.adapter
         if (currAdapter == null) {
             initZoomListener()
-            DirectoryAdapter(this, mDirs, this, directories_grid, isPickIntent(intent) || isGetAnyContentIntent(intent)) {
+            val fastscroller = if (config.scrollHorizontally) directories_horizontal_fastscroller else directories_vertical_fastscroller
+            DirectoryAdapter(this, mDirs, this, directories_grid, isPickIntent(intent) || isGetAnyContentIntent(intent), fastscroller) {
                 itemClicked((it as Directory).path)
             }.apply {
                 setupZoomListener(mZoomListener)
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt
index 5f0ab42fa..e4aaa8ad2 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt
@@ -1,13 +1,17 @@
 package com.simplemobiletools.gallery.activities
 
 import android.app.Activity
+import android.app.SearchManager
 import android.app.WallpaperManager
+import android.content.Context
 import android.content.Intent
 import android.graphics.Bitmap
 import android.net.Uri
 import android.os.Bundle
 import android.os.Handler
+import android.support.v4.view.MenuItemCompat
 import android.support.v7.widget.GridLayoutManager
+import android.support.v7.widget.SearchView
 import android.view.Menu
 import android.view.MenuItem
 import android.view.ViewGroup
@@ -60,6 +64,7 @@ class MediaActivity : SimpleActivity(), MediaAdapter.MediaOperationsListener {
     private var mLastMediaHandler = Handler()
     private var mCurrAsyncTask: GetMediaAsynctask? = null
     private var mZoomListener: MyRecyclerView.MyZoomListener? = null
+    private var mSearchMenuItem: MenuItem? = null
 
     companion object {
         var mMedia = ArrayList<Medium>()
@@ -130,6 +135,13 @@ class MediaActivity : SimpleActivity(), MediaAdapter.MediaOperationsListener {
         }
     }
 
+    override fun onStop() {
+        super.onStop()
+        if (mSearchMenuItem != null) {
+            MenuItemCompat.collapseActionView(mSearchMenuItem)
+        }
+    }
+
     override fun onDestroy() {
         super.onDestroy()
         if (config.showAll)
@@ -138,6 +150,53 @@ class MediaActivity : SimpleActivity(), MediaAdapter.MediaOperationsListener {
         mMedia.clear()
     }
 
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+        menuInflater.inflate(R.menu.menu_media, menu)
+
+        val isFolderHidden = File(mPath).containsNoMedia()
+        menu.apply {
+            findItem(R.id.hide_folder).isVisible = !isFolderHidden && !mShowAll
+            findItem(R.id.unhide_folder).isVisible = isFolderHidden && !mShowAll
+
+            findItem(R.id.folder_view).isVisible = mShowAll
+            findItem(R.id.open_camera).isVisible = mShowAll
+            findItem(R.id.about).isVisible = mShowAll
+
+            findItem(R.id.temporarily_show_hidden).isVisible = !config.shouldShowHidden
+            findItem(R.id.stop_showing_hidden).isVisible = config.temporarilyShowHidden
+
+            findItem(R.id.increase_column_count).isVisible = config.viewTypeFiles == VIEW_TYPE_GRID && config.mediaColumnCnt < MAX_COLUMN_COUNT
+            findItem(R.id.reduce_column_count).isVisible = config.viewTypeFiles == VIEW_TYPE_GRID && config.mediaColumnCnt > 1
+
+            findItem(R.id.toggle_filename).isVisible = config.viewTypeFiles == VIEW_TYPE_GRID
+        }
+
+        setupSearch(menu)
+        return true
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
+            R.id.sort -> showSortingDialog()
+            R.id.filter -> showFilterMediaDialog()
+            R.id.toggle_filename -> toggleFilenameVisibility()
+            R.id.open_camera -> launchCamera()
+            R.id.folder_view -> switchToFolderView()
+            R.id.change_view_type -> changeViewType()
+            R.id.hide_folder -> tryHideFolder()
+            R.id.unhide_folder -> unhideFolder()
+            R.id.exclude_folder -> tryExcludeFolder()
+            R.id.temporarily_show_hidden -> tryToggleTemporarilyShowHidden()
+            R.id.stop_showing_hidden -> tryToggleTemporarilyShowHidden()
+            R.id.increase_column_count -> increaseColumnCount()
+            R.id.reduce_column_count -> reduceColumnCount()
+            R.id.settings -> launchSettings()
+            R.id.about -> launchAbout()
+            else -> return super.onOptionsItemSelected(item)
+        }
+        return true
+    }
+
     private fun storeStateVariables() {
         config.apply {
             mStoredUseEnglish = useEnglish
@@ -150,6 +209,33 @@ class MediaActivity : SimpleActivity(), MediaAdapter.MediaOperationsListener {
         }
     }
 
+    private fun setupSearch(menu: Menu) {
+        val searchManager = getSystemService(Context.SEARCH_SERVICE) as SearchManager
+        mSearchMenuItem = menu.findItem(R.id.search)
+        (mSearchMenuItem!!.actionView as SearchView).apply {
+            setSearchableInfo(searchManager.getSearchableInfo(componentName))
+            isSubmitButtonEnabled = false
+            setOnQueryTextListener(object : SearchView.OnQueryTextListener {
+                override fun onQueryTextSubmit(query: String) = false
+
+                override fun onQueryTextChange(newText: String): Boolean {
+                    searchQueryChanged(newText)
+                    return true
+                }
+            })
+        }
+    }
+
+    private fun searchQueryChanged(text: String) {
+        Thread {
+            val filtered = mMedia.filter { it.name.contains(text, true) } as ArrayList
+            filtered.sortBy { !it.name.startsWith(text, true) }
+            runOnUiThread {
+                (media_grid.adapter as? MediaAdapter)?.updateMedia(filtered)
+            }
+        }.start()
+    }
+
     private fun tryloadGallery() {
         handlePermission(PERMISSION_WRITE_STORAGE) {
             if (it) {
@@ -176,13 +262,15 @@ class MediaActivity : SimpleActivity(), MediaAdapter.MediaOperationsListener {
     }
 
     private fun setupAdapter() {
-        if (isDirEmpty())
+        if (isDirEmpty()) {
             return
+        }
 
         val currAdapter = media_grid.adapter
         if (currAdapter == null) {
             initZoomListener()
-            MediaAdapter(this, mMedia, this, mIsGetImageIntent || mIsGetVideoIntent || mIsGetAnyIntent, mAllowPickingMultiple, media_grid) {
+            val fastscroller = if (config.scrollHorizontally) media_horizontal_fastscroller else media_vertical_fastscroller
+            MediaAdapter(this, mMedia, this, mIsGetImageIntent || mIsGetVideoIntent || mIsGetAnyIntent, mAllowPickingMultiple, media_grid, fastscroller) {
                 itemClicked((it as Medium).path)
             }.apply {
                 setupZoomListener(mZoomListener)
@@ -238,52 +326,6 @@ class MediaActivity : SimpleActivity(), MediaAdapter.MediaOperationsListener {
         }, LAST_MEDIA_CHECK_PERIOD)
     }
 
-    override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        menuInflater.inflate(R.menu.menu_media, menu)
-
-        val isFolderHidden = File(mPath).containsNoMedia()
-        menu.apply {
-            findItem(R.id.hide_folder).isVisible = !isFolderHidden && !mShowAll
-            findItem(R.id.unhide_folder).isVisible = isFolderHidden && !mShowAll
-
-            findItem(R.id.folder_view).isVisible = mShowAll
-            findItem(R.id.open_camera).isVisible = mShowAll
-            findItem(R.id.about).isVisible = mShowAll
-
-            findItem(R.id.temporarily_show_hidden).isVisible = !config.shouldShowHidden
-            findItem(R.id.stop_showing_hidden).isVisible = config.temporarilyShowHidden
-
-            findItem(R.id.increase_column_count).isVisible = config.viewTypeFiles == VIEW_TYPE_GRID && config.mediaColumnCnt < MAX_COLUMN_COUNT
-            findItem(R.id.reduce_column_count).isVisible = config.viewTypeFiles == VIEW_TYPE_GRID && config.mediaColumnCnt > 1
-
-            findItem(R.id.toggle_filename).isVisible = config.viewTypeFiles == VIEW_TYPE_GRID
-        }
-
-        return true
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            R.id.sort -> showSortingDialog()
-            R.id.filter -> showFilterMediaDialog()
-            R.id.toggle_filename -> toggleFilenameVisibility()
-            R.id.open_camera -> launchCamera()
-            R.id.folder_view -> switchToFolderView()
-            R.id.change_view_type -> changeViewType()
-            R.id.hide_folder -> tryHideFolder()
-            R.id.unhide_folder -> unhideFolder()
-            R.id.exclude_folder -> tryExcludeFolder()
-            R.id.temporarily_show_hidden -> tryToggleTemporarilyShowHidden()
-            R.id.stop_showing_hidden -> tryToggleTemporarilyShowHidden()
-            R.id.increase_column_count -> increaseColumnCount()
-            R.id.reduce_column_count -> reduceColumnCount()
-            R.id.settings -> launchSettings()
-            R.id.about -> launchAbout()
-            else -> return super.onOptionsItemSelected(item)
-        }
-        return true
-    }
-
     private fun showSortingDialog() {
         ChangeSortingDialog(this, false, !config.showAll, mPath) {
             getMedia()
@@ -367,8 +409,9 @@ class MediaActivity : SimpleActivity(), MediaAdapter.MediaOperationsListener {
     }
 
     private fun getMedia() {
-        if (mIsGettingMedia)
+        if (mIsGettingMedia) {
             return
+        }
 
         mIsGettingMedia = true
         val media = getCachedMedia(mPath)
@@ -466,12 +509,16 @@ class MediaActivity : SimpleActivity(), MediaAdapter.MediaOperationsListener {
     }
 
     private fun increaseColumnCount() {
+        media_vertical_fastscroller.measureRecyclerViewOnRedraw()
+        media_horizontal_fastscroller.measureRecyclerViewOnRedraw()
         config.mediaColumnCnt = ++(media_grid.layoutManager as GridLayoutManager).spanCount
         invalidateOptionsMenu()
         media_grid.adapter?.notifyDataSetChanged()
     }
 
     private fun reduceColumnCount() {
+        media_vertical_fastscroller.measureRecyclerViewOnRedraw()
+        media_horizontal_fastscroller.measureRecyclerViewOnRedraw()
         config.mediaColumnCnt = --(media_grid.layoutManager as GridLayoutManager).spanCount
         invalidateOptionsMenu()
         media_grid.adapter?.notifyDataSetChanged()
@@ -506,12 +553,11 @@ class MediaActivity : SimpleActivity(), MediaAdapter.MediaOperationsListener {
                     .load(File(path))
                     .apply(options)
                     .into(object : SimpleTarget<Bitmap>() {
-                        override fun onResourceReady(resource: Bitmap?, transition: Transition<in Bitmap>?) {
+                        override fun onResourceReady(resource: Bitmap, transition: Transition<in Bitmap>?) {
                             try {
                                 WallpaperManager.getInstance(applicationContext).setBitmap(resource)
                                 setResult(Activity.RESULT_OK)
                             } catch (ignored: IOException) {
-
                             }
 
                             finish()
@@ -548,13 +594,17 @@ class MediaActivity : SimpleActivity(), MediaAdapter.MediaOperationsListener {
 
         media_empty_text_label.beVisibleIf(media.isEmpty() && !isFromCache)
         media_empty_text.beVisibleIf(media.isEmpty() && !isFromCache)
+        media_grid.beVisibleIf(media_empty_text_label.isGone())
+
+        val allowHorizontalScroll = config.scrollHorizontally && config.viewTypeFiles == VIEW_TYPE_GRID
+        media_vertical_fastscroller.beVisibleIf(media_grid.isVisible() && !allowHorizontalScroll)
+        media_horizontal_fastscroller.beVisibleIf(media_grid.isVisible() && allowHorizontalScroll)
 
         checkLastMediaChanged()
-        if (mLastDrawnHashCode == 0)
-            mLastDrawnHashCode = media.hashCode()
 
-        if (media.hashCode() == mMedia.hashCode() && media.hashCode() == mLastDrawnHashCode)
+        if (media.hashCode() == mMedia.hashCode() && media.hashCode() == mLastDrawnHashCode) {
             return
+        }
 
         mLastDrawnHashCode = media.hashCode()
         mMedia = media
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SettingsActivity.kt
index 18cbad383..6a32c732a 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SettingsActivity.kt
@@ -39,7 +39,7 @@ class SettingsActivity : SimpleActivity() {
         setupManageIncludedFolders()
         setupManageExcludedFolders()
         setupManageHiddenFolders()
-        setupShowHiddenFolders()
+        setupShowHiddenItems()
         setupAutoplayVideos()
         setupLoopVideos()
         setupAnimateGifs()
@@ -92,26 +92,28 @@ class SettingsActivity : SimpleActivity() {
 
     private fun setupManageHiddenFolders() {
         settings_manage_hidden_folders_holder.setOnClickListener {
-            startActivity(Intent(this, HiddenFoldersActivity::class.java))
+            handleHiddenFolderPasswordProtection {
+                startActivity(Intent(this, HiddenFoldersActivity::class.java))
+            }
         }
     }
 
-    private fun setupShowHiddenFolders() {
-        settings_show_hidden_folders.isChecked = config.showHiddenMedia
-        settings_show_hidden_folders_holder.setOnClickListener {
+    private fun setupShowHiddenItems() {
+        settings_show_hidden_items.isChecked = config.showHiddenMedia
+        settings_show_hidden_items_holder.setOnClickListener {
             if (config.showHiddenMedia) {
-                toggleHiddenFolders()
+                toggleHiddenItems()
             } else {
                 handleHiddenFolderPasswordProtection {
-                    toggleHiddenFolders()
+                    toggleHiddenItems()
                 }
             }
         }
     }
 
-    private fun toggleHiddenFolders() {
-        settings_show_hidden_folders.toggle()
-        config.showHiddenMedia = settings_show_hidden_folders.isChecked
+    private fun toggleHiddenItems() {
+        settings_show_hidden_items.toggle()
+        config.showHiddenMedia = settings_show_hidden_items.isChecked
     }
 
     private fun setupAutoplayVideos() {
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt
index 84fd594f8..348b78881 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt
@@ -177,6 +177,13 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
             return
         }
 
+        val file = File(mPath)
+        if (!file.exists()) {
+            deleteFromMediaStore(file)
+            finish()
+            return
+        }
+
         if (intent.extras?.containsKey(IS_VIEW_INTENT) == true) {
             if (isShowHiddenFlagNeeded()) {
                 if (!config.isPasswordProtectionOn) {
@@ -189,7 +196,7 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
 
         showSystemUI()
 
-        mDirectory = File(mPath).parent
+        mDirectory = file.parent
         supportActionBar?.title = mPath.getFilenameFromPath()
 
         view_pager.onGlobalLayout {
@@ -679,7 +686,7 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
             if (intent.resolveActivity(packageManager) != null) {
                 startActivity(intent)
             } else {
-                toast(R.string.no_map_application)
+                toast(R.string.no_app_found)
             }
         }
     }
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt
index a8ee3f75f..e1e0def89 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt
@@ -11,6 +11,7 @@ import com.simplemobiletools.commons.dialogs.ConfirmationDialog
 import com.simplemobiletools.commons.dialogs.PropertiesDialog
 import com.simplemobiletools.commons.dialogs.RenameItemDialog
 import com.simplemobiletools.commons.extensions.*
+import com.simplemobiletools.commons.views.FastScroller
 import com.simplemobiletools.commons.views.MyRecyclerView
 import com.simplemobiletools.gallery.R
 import com.simplemobiletools.gallery.dialogs.ExcludeFolderDialog
@@ -24,7 +25,8 @@ import java.io.File
 import java.util.*
 
 class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: MutableList<Directory>, val listener: DirOperationsListener?, recyclerView: MyRecyclerView,
-                       val isPickIntent: Boolean, itemClick: (Any) -> Unit) : MyRecyclerViewAdapter(activity, recyclerView, itemClick) {
+                       val isPickIntent: Boolean, fastScroller: FastScroller? = null, itemClick: (Any) -> Unit) :
+        MyRecyclerViewAdapter(activity, recyclerView, fastScroller, itemClick) {
 
     private val config = activity.config
     private val isListViewType = config.viewTypeFolders == VIEW_TYPE_LIST
@@ -92,7 +94,7 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: MutableList<Direc
     override fun onViewRecycled(holder: ViewHolder?) {
         super.onViewRecycled(holder)
         if (!activity.isActivityDestroyed()) {
-            Glide.with(activity).clear(holder?.itemView?.dir_thumbnail)
+            Glide.with(activity).clear(holder?.itemView?.dir_thumbnail!!)
         }
     }
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/ManageFoldersAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/ManageFoldersAdapter.kt
index 73818a600..e0d8aee5a 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/ManageFoldersAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/ManageFoldersAdapter.kt
@@ -5,7 +5,6 @@ import android.view.View
 import android.view.ViewGroup
 import com.simplemobiletools.commons.activities.BaseSimpleActivity
 import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter
-import com.simplemobiletools.commons.dialogs.ConfirmationDialog
 import com.simplemobiletools.commons.interfaces.RefreshRecyclerViewListener
 import com.simplemobiletools.commons.views.MyRecyclerView
 import com.simplemobiletools.gallery.R
@@ -14,11 +13,11 @@ import kotlinx.android.synthetic.main.item_manage_folder.view.*
 import java.util.*
 
 class ManageFoldersAdapter(activity: BaseSimpleActivity, var folders: ArrayList<String>, val isShowingExcludedFolders: Boolean, val listener: RefreshRecyclerViewListener?,
-                           recyclerView: MyRecyclerView, itemClick: (Any) -> Unit) : MyRecyclerViewAdapter(activity, recyclerView, itemClick) {
+                           recyclerView: MyRecyclerView, itemClick: (Any) -> Unit) : MyRecyclerViewAdapter(activity, recyclerView, null, itemClick) {
 
     private val config = activity.config
 
-    override fun getActionMenuId() = R.menu.cab_delete_only
+    override fun getActionMenuId() = R.menu.cab_remove_only
 
     override fun prepareActionMode(menu: Menu) {}
 
@@ -30,7 +29,7 @@ class ManageFoldersAdapter(activity: BaseSimpleActivity, var folders: ArrayList<
 
     override fun actionItemPressed(id: Int) {
         when (id) {
-            R.id.cab_delete -> askConfirmDelete()
+            R.id.cab_remove -> removeSelection()
         }
     }
 
@@ -57,13 +56,7 @@ class ManageFoldersAdapter(activity: BaseSimpleActivity, var folders: ArrayList<
         }
     }
 
-    private fun askConfirmDelete() {
-        ConfirmationDialog(activity) {
-            deleteSelection()
-        }
-    }
-
-    private fun deleteSelection() {
+    private fun removeSelection() {
         val removeFolders = ArrayList<String>(selectedPositions.size)
 
         selectedPositions.sortedDescending().forEach {
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/ManageHiddenFoldersAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/ManageHiddenFoldersAdapter.kt
index 4126a5c21..8bc51ea3a 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/ManageHiddenFoldersAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/ManageHiddenFoldersAdapter.kt
@@ -16,7 +16,7 @@ import java.io.File
 import java.util.*
 
 class ManageHiddenFoldersAdapter(activity: BaseSimpleActivity, var folders: ArrayList<String>, val listener: RefreshRecyclerViewListener?,
-                                 recyclerView: MyRecyclerView, itemClick: (Any) -> Unit) : MyRecyclerViewAdapter(activity, recyclerView, itemClick) {
+                                 recyclerView: MyRecyclerView, itemClick: (Any) -> Unit) : MyRecyclerViewAdapter(activity, recyclerView, null, itemClick) {
 
     private val config = activity.config
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt
index f2c3dfb17..66df85b70 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt
@@ -1,6 +1,8 @@
 package com.simplemobiletools.gallery.adapters
 
 import android.net.Uri
+import android.os.Handler
+import android.os.Looper
 import android.view.Menu
 import android.view.View
 import android.view.ViewGroup
@@ -12,28 +14,40 @@ import com.simplemobiletools.commons.dialogs.RenameItemDialog
 import com.simplemobiletools.commons.extensions.applyColorFilter
 import com.simplemobiletools.commons.extensions.beVisibleIf
 import com.simplemobiletools.commons.extensions.isActivityDestroyed
+import com.simplemobiletools.commons.views.FastScroller
 import com.simplemobiletools.commons.views.MyRecyclerView
 import com.simplemobiletools.gallery.R
 import com.simplemobiletools.gallery.dialogs.DeleteWithRememberDialog
 import com.simplemobiletools.gallery.extensions.*
 import com.simplemobiletools.gallery.helpers.VIEW_TYPE_LIST
 import com.simplemobiletools.gallery.models.Medium
-import kotlinx.android.synthetic.main.photo_video_item_list.view.*
+import kotlinx.android.synthetic.main.photo_video_item_grid.view.*
 import java.io.File
 import java.util.*
 
 class MediaAdapter(activity: BaseSimpleActivity, var media: MutableList<Medium>, val listener: MediaOperationsListener?, val isAGetIntent: Boolean,
-                   val allowMultiplePicks: Boolean, recyclerView: MyRecyclerView, itemClick: (Any) -> Unit) : MyRecyclerViewAdapter(activity, recyclerView, itemClick) {
+                   val allowMultiplePicks: Boolean, recyclerView: MyRecyclerView, fastScroller: FastScroller? = null,
+                   itemClick: (Any) -> Unit) : MyRecyclerViewAdapter(activity, recyclerView, fastScroller, itemClick) {
+
+    private val INSTANT_LOAD_DURATION = 2000L
+    private val IMAGE_LOAD_DELAY = 100L
 
     private val config = activity.config
     private val isListViewType = config.viewTypeFiles == VIEW_TYPE_LIST
     private var skipConfirmationDialog = false
+    private var visibleItemPaths = ArrayList<String>()
+    private var loadImageInstantly = false
+    private var delayHandler = Handler(Looper.getMainLooper())
 
     private var scrollHorizontally = config.scrollHorizontally
     private var animateGifs = config.animateGifs
     private var cropThumbnails = config.cropThumbnails
     private var displayFilenames = config.displayFileNames
 
+    init {
+        enableInstantLoad()
+    }
+
     override fun getActionMenuId() = R.menu.cab_media
 
     override fun prepareItemSelection(view: View) {
@@ -51,6 +65,7 @@ class MediaAdapter(activity: BaseSimpleActivity, var media: MutableList<Medium>,
 
     override fun onBindViewHolder(holder: MyRecyclerViewAdapter.ViewHolder, position: Int) {
         val medium = media[position]
+        visibleItemPaths.add(medium.path)
         val view = holder.bindView(medium, !allowMultiplePicks) { itemView, layoutPosition ->
             setupView(itemView, medium)
         }
@@ -92,7 +107,9 @@ class MediaAdapter(activity: BaseSimpleActivity, var media: MutableList<Medium>,
     override fun onViewRecycled(holder: ViewHolder?) {
         super.onViewRecycled(holder)
         if (!activity.isActivityDestroyed()) {
-            Glide.with(activity).clear(holder?.itemView?.medium_thumbnail)
+            val itemView = holder?.itemView
+            visibleItemPaths.remove(itemView?.photo_name?.tag)
+            Glide.with(activity).clear(itemView?.medium_thumbnail!!)
         }
     }
 
@@ -230,12 +247,14 @@ class MediaAdapter(activity: BaseSimpleActivity, var media: MutableList<Medium>,
 
     fun updateMedia(newMedia: ArrayList<Medium>) {
         media = newMedia
+        enableInstantLoad()
         notifyDataSetChanged()
         finishActMode()
     }
 
     fun updateDisplayFilenames(displayFilenames: Boolean) {
         this.displayFilenames = displayFilenames
+        enableInstantLoad()
         notifyDataSetChanged()
     }
 
@@ -254,12 +273,32 @@ class MediaAdapter(activity: BaseSimpleActivity, var media: MutableList<Medium>,
         notifyDataSetChanged()
     }
 
+    private fun enableInstantLoad() {
+        loadImageInstantly = true
+        delayHandler.postDelayed({
+            loadImageInstantly = false
+        }, INSTANT_LOAD_DURATION)
+    }
+
     private fun setupView(view: View, medium: Medium) {
         view.apply {
             play_outline.beVisibleIf(medium.video)
             photo_name.beVisibleIf(displayFilenames || isListViewType)
             photo_name.text = medium.name
-            activity.loadImage(medium.path, medium_thumbnail, scrollHorizontally, animateGifs, cropThumbnails)
+            photo_name.tag = medium.path
+
+            if (loadImageInstantly) {
+                activity.loadImage(medium.path, medium_thumbnail, scrollHorizontally, animateGifs, cropThumbnails)
+            } else {
+                medium_thumbnail.setImageDrawable(null)
+                medium_thumbnail.isHorizontalScrolling = scrollHorizontally
+                delayHandler.postDelayed({
+                    val isVisible = visibleItemPaths.contains(medium.path)
+                    if (isVisible) {
+                        activity.loadImage(medium.path, medium_thumbnail, scrollHorizontally, animateGifs, cropThumbnails)
+                    }
+                }, IMAGE_LOAD_DELAY)
+            }
 
             if (isListViewType) {
                 photo_name.setTextColor(textColor)
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/Activity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/Activity.kt
index ec99f9352..9d3cd9335 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/Activity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/Activity.kt
@@ -64,7 +64,7 @@ fun Activity.launchCamera() {
     if (intent.resolveActivity(packageManager) != null) {
         startActivity(intent)
     } else {
-        toast(R.string.no_camera_app_found)
+        toast(R.string.no_app_found)
     }
 }
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/PhotoFragment.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/PhotoFragment.kt
index b99ac8867..eecaff05c 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/PhotoFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/PhotoFragment.kt
@@ -246,6 +246,7 @@ class PhotoFragment : ViewPagerFragment() {
             view.subsampling_view.apply {
                 maxScale = 10f
                 beVisible()
+                isQuickScaleEnabled = false
                 setImage(ImageSource.uri(medium.path))
                 orientation = if (orient == -1) SubsamplingScaleImageView.ORIENTATION_USE_EXIF else degreesForRotation(orient)
                 setOnImageEventListener(object : SubsamplingScaleImageView.OnImageEventListener {
@@ -325,7 +326,7 @@ class PhotoFragment : ViewPagerFragment() {
     override fun onDestroyView() {
         super.onDestroyView()
         if (activity?.isActivityDestroyed() == false) {
-            Glide.with(context).clear(view.gif_view)
+            Glide.with(context!!).clear(view.gif_view)
             view.subsampling_view.recycle()
         }
     }
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/GlideRotateTransformation.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/GlideRotateTransformation.kt
index 8a48b23f4..aae7d66ca 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/GlideRotateTransformation.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/GlideRotateTransformation.kt
@@ -17,6 +17,6 @@ class GlideRotateTransformation(context: Context, val rotateRotationAngle: Float
         return Bitmap.createBitmap(bitmap, 0, 0, bitmap.width, bitmap.height, matrix, true)
     }
 
-    override fun updateDiskCacheKey(messageDigest: MessageDigest?) {
+    override fun updateDiskCacheKey(messageDigest: MessageDigest) {
     }
 }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index a01449b1a..033563bb1 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -36,7 +36,7 @@
         <com.simplemobiletools.commons.views.MyRecyclerView
             android:id="@+id/directories_grid"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:scrollbars="none"
             app:layoutManager="android.support.v7.widget.GridLayoutManager"
             app:spanCount="@integer/directory_columns_vertical_scroll"/>
@@ -48,7 +48,8 @@
             android:layout_alignParentEnd="true"
             android:layout_alignParentRight="true"
             android:paddingLeft="@dimen/normal_margin"
-            android:paddingStart="@dimen/normal_margin">
+            android:paddingStart="@dimen/normal_margin"
+            android:visibility="gone">
 
             <include layout="@layout/fastscroller_handle_vertical"/>
 
@@ -61,7 +62,8 @@
             android:layout_alignParentBottom="true"
             android:layout_alignParentLeft="true"
             android:layout_alignParentStart="true"
-            android:paddingTop="@dimen/normal_margin">
+            android:paddingTop="@dimen/normal_margin"
+            android:visibility="gone">
 
             <include layout="@layout/fastscroller_handle_horizontal"/>
 
diff --git a/app/src/main/res/layout/activity_media.xml b/app/src/main/res/layout/activity_media.xml
index 918e39428..b4bcb9c16 100644
--- a/app/src/main/res/layout/activity_media.xml
+++ b/app/src/main/res/layout/activity_media.xml
@@ -36,7 +36,7 @@
         <com.simplemobiletools.commons.views.MyRecyclerView
             android:id="@+id/media_grid"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:scrollbars="none"
             app:layoutManager="android.support.v7.widget.GridLayoutManager"
             app:spanCount="@integer/media_columns_vertical_scroll"/>
@@ -48,7 +48,8 @@
             android:layout_alignParentEnd="true"
             android:layout_alignParentRight="true"
             android:paddingLeft="@dimen/normal_margin"
-            android:paddingStart="@dimen/normal_margin">
+            android:paddingStart="@dimen/normal_margin"
+            android:visibility="gone">
 
             <include layout="@layout/fastscroller_handle_vertical"/>
 
@@ -61,7 +62,8 @@
             android:layout_alignParentBottom="true"
             android:layout_alignParentLeft="true"
             android:layout_alignParentStart="true"
-            android:paddingTop="@dimen/normal_margin">
+            android:paddingTop="@dimen/normal_margin"
+            android:visibility="gone">
 
             <include layout="@layout/fastscroller_handle_horizontal"/>
 
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 7e96f52dd..8ec33b33f 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -68,6 +68,25 @@
 
         </RelativeLayout>
 
+        <RelativeLayout
+            android:id="@+id/settings_manage_hidden_folders_holder"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/medium_margin"
+            android:background="?attr/selectableItemBackground"
+            android:padding="@dimen/activity_margin">
+
+            <com.simplemobiletools.commons.views.MyTextView
+                android:id="@+id/settings_manage_hidden_folders"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:paddingLeft="@dimen/medium_margin"
+                android:paddingStart="@dimen/medium_margin"
+                android:text="@string/manage_hidden_folders"/>
+
+        </RelativeLayout>
+
         <RelativeLayout
             android:id="@+id/settings_use_english_holder"
             android:layout_width="match_parent"
@@ -89,26 +108,7 @@
         </RelativeLayout>
 
         <RelativeLayout
-            android:id="@+id/settings_manage_hidden_folders_holder"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/medium_margin"
-            android:background="?attr/selectableItemBackground"
-            android:padding="@dimen/activity_margin">
-
-            <com.simplemobiletools.commons.views.MyTextView
-                android:id="@+id/settings_manage_hidden_folders"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:paddingLeft="@dimen/medium_margin"
-                android:paddingStart="@dimen/medium_margin"
-                android:text="@string/manage_hidden_folders"/>
-
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:id="@+id/settings_show_hidden_folders_holder"
+            android:id="@+id/settings_show_hidden_items_holder"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/medium_margin"
@@ -116,7 +116,7 @@
             android:padding="@dimen/activity_margin">
 
             <com.simplemobiletools.commons.views.MySwitchCompat
-                android:id="@+id/settings_show_hidden_folders"
+                android:id="@+id/settings_show_hidden_items"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="@null"
diff --git a/app/src/main/res/menu/cab_directories.xml b/app/src/main/res/menu/cab_directories.xml
index ec47b283d..9da9b584f 100644
--- a/app/src/main/res/menu/cab_directories.xml
+++ b/app/src/main/res/menu/cab_directories.xml
@@ -9,7 +9,7 @@
     <item
         android:id="@+id/cab_pin"
         android:icon="@drawable/ic_pin"
-        android:title="@string/pin_folder"
+        android:title="@string/pin_to_the_top"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/cab_unpin"
diff --git a/app/src/main/res/menu/menu_media.xml b/app/src/main/res/menu/menu_media.xml
index 978c684c0..de3b01776 100644
--- a/app/src/main/res/menu/menu_media.xml
+++ b/app/src/main/res/menu/menu_media.xml
@@ -2,15 +2,21 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
-        android:id="@+id/sort"
-        android:icon="@drawable/ic_sort"
-        android:title="@string/sort_by"
-        app:showAsAction="ifRoom"/>
+        android:id="@+id/search"
+        android:icon="@drawable/ic_search"
+        android:title="@string/search"
+        app:actionViewClass="android.support.v7.widget.SearchView"
+        app:showAsAction="collapseActionView|ifRoom"/>
     <item
         android:id="@+id/toggle_filename"
         android:icon="@drawable/ic_label"
         android:title="@string/toggle_filename"
         app:showAsAction="ifRoom"/>
+    <item
+        android:id="@+id/sort"
+        android:icon="@drawable/ic_sort"
+        android:title="@string/sort_by"
+        app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/filter"
         android:icon="@drawable/ic_filter"
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 3886399e9..7107c4421 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -14,8 +14,6 @@
     <string name="other_folder">مجلد آخر</string>
     <string name="show_on_map">عرض على الخريطة</string>
     <string name="unknown_location">موقع غير معروف</string>
-    <string name="no_map_application">لم يتم العثور على أي تطبيق مع الخرائط</string>
-    <string name="no_camera_app_found">لم يتم العثور على تطبيق كاميرا</string>
     <string name="increase_column_count">زيادة عدد الأعمدة</string>
     <string name="reduce_column_count">تقليل عدد الأعمدة</string>
     <string name="change_cover_image">تغيير صورة الغلاف</string>
@@ -91,7 +89,6 @@
     <string name="set_as_wallpaper">تعيين كخلفية الشاشة</string>
     <string name="set_as_wallpaper_failed">فشل الإعداد كخلفية</string>
     <string name="set_as_wallpaper_with">تعيين كخلفية بواسطة:</string>
-    <string name="no_capable_app_found">لم يتم العثور على أي تطبيق لأداء المهمة</string>
     <string name="setting_wallpaper">... جار تعيين الخلفية ...</string>
     <string name="wallpaper_set_successfully">تم تعيبن الخلفية بنجاح</string>
     <string name="portrait_aspect_ratio">صورة نسبة العرض إلى الارتفاع</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
new file mode 100644
index 000000000..6fbfd736d
--- /dev/null
+++ b/app/src/main/res/values-ca/strings.xml
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Simple Gallery</string>
+    <string name="app_launcher_name">Galeria</string>
+    <string name="edit">Editar</string>
+    <string name="open_camera">Obrir càmera</string>
+    <string name="hidden">(ocult)</string>
+    <string name="pin_folder">Fixar carpeta</string>
+    <string name="unpin_folder">No fixar carpeta</string>
+    <string name="pin_to_the_top">Ancorar a l\'inici</string>
+    <string name="show_all">Mostrar el contingut de totes les carpetes</string>
+    <string name="all_folders">Tots els mitjans</string>
+    <string name="folder_view">Canviar a vista de carpeta</string>
+    <string name="other_folder">Un altre carpeta</string>
+    <string name="show_on_map">Mostrar al mapa</string>
+    <string name="unknown_location">Ubicació desconeguda</string>
+    <string name="increase_column_count">Augmentar el número de columnes</string>
+    <string name="reduce_column_count">Reduir el número de columnes</string>
+    <string name="change_cover_image">Canviar imatge de portada</string>
+    <string name="select_photo">Sel·leccionar imatge</string>
+    <string name="use_default">Us per defecte</string>
+    <string name="volume">Volum</string>
+    <string name="brightness">Brillantor</string>
+    <string name="do_not_ask_again">No tornar a preguntar en aquesta sessió</string>
+    <string name="lock_orientation">Bloquejar orientació</string>
+    <string name="unlock_orientation">Desbloquejar orientació</string>
+
+    <!-- Filter -->
+    <string name="filter_media">Filtre d\'arxius</string>
+    <string name="images">Imatges</string>
+    <string name="videos">Vídeos</string>
+    <string name="gifs">GIFs</string>
+    <string name="no_media_with_filters">No s\'han tronat arxius amb els filtres seleccionats.</string>
+    <string name="change_filters_underlined"><u>Canviar filtres</u></string>
+
+    <!-- Hide / Exclude -->
+    <string name="hide_folder_description">Aquesta funció oculta les carpetes agregant un arxiu \'.nomedia\' dins d\'ella. També ocultarà les subcarpetes. Pots mostrar-les canviant la opció \'Mostrar carpetes ocultes\' als ajustaments. Continuar?</string>
+    <string name="exclude">Excloure</string>
+    <string name="excluded_folders">Carpetes excloses</string>
+    <string name="manage_excluded_folders">Gestionar carpetes excloses</string>
+    <string name="exclude_folder_description">Això exclou la selecció juntament amb les carpetes, només de Simple Gallery. Pots gestionar les carpetes excloses en els Ajustaments.</string>
+    <string name="exclude_folder_parent">Excloure millor la carpeta superior?</string>
+    <string name="excluded_activity_placeholder">Excloure les carpetes les ocultarà junt amb les seves subcarpetes, però només a Simple Gallery. Seguirant sent visibles a altres aplicacions.\\n\\nSi vols ocultar-les d'altres aplicacions fes servir la opció Ocultar.</string>
+    <string name="remove_all">Eliminar tot</string>
+    <string name="remove_all_description">Eliminar totes les carpetes de la llista d\'excloses? Això no eliminarà les carpetes.</string>
+    <string name="hidden_folders">Carpetes ocultes</string>
+    <string name="manage_hidden_folders">Gestionar carpetes ocultes</string>
+    <string name="hidden_folders_placeholder">Sembla que no tens cap carpeta amb l\'arxiu \".nomedia\".</string>
+
+    <!-- Include folders -->
+    <string name="include_folders">Carpetes incloses</string>
+    <string name="manage_included_folders">Gestionar carpetes incloses</string>
+    <string name="add_folder">Agregar carpeta</string>
+    <string name="included_activity_placeholder">Si tens alguna carpeta que contingui multimèdia però no ha estat reconeguda per la aplicació, pots agregar-les manualment aquí.</string>
+
+    <!-- Resizing -->
+    <string name="resize">Redimensionar</string>
+    <string name="resize_and_save">Redimensionar la selecció i desar</string>
+    <string name="width">Ample</string>
+    <string name="height">Alt</string>
+    <string name="keep_aspect_ratio">Mantenir proporcions</string>
+    <string name="invalid_values">Si us plau, introdueix una resolució vàlida</string>
+
+    <!-- Editor -->
+    <string name="editor">Editor</string>
+    <string name="save">Guardar</string>
+    <string name="rotate">Rotar</string>
+    <string name="path">Ruta</string>
+    <string name="invalid_image_path">Ruta de imatge no vàlida</string>
+    <string name="image_editing_failed">Ha fallat la edició de la imatge</string>
+    <string name="edit_image_with">Editar imatge utilitzant:</string>
+    <string name="no_editor_found">No s\'ha trobat cap editor d\'imatges</string>
+    <string name="unknown_file_location">Ubicació de l\'arxiu desconeguda</string>
+    <string name="error_saving_file">No s\'ha pogut sobreescriure l\'arxiu d\'origen</string>
+    <string name="rotate_left">Rotar a l\'esquerra</string>
+    <string name="rotate_right">Rotar a la dreta</string>
+    <string name="rotate_one_eighty">Rotar 180º</string>
+    <string name="flip">Girar</string>
+    <string name="flip_horizontally">Horizontalment</string>
+    <string name="flip_vertically">Verticalment</string>
+    <string name="edit_with">Editar amb</string>
+
+    <!-- Set wallpaper -->
+    <string name="simple_wallpaper">Fons de pantalla de Simple Gallery</string>
+    <string name="set_as_wallpaper">Establir com a fons de pantalla</string>
+    <string name="set_as_wallpaper_failed">Error a l\'establir com fons de pantalla</string>
+    <string name="set_as_wallpaper_with">Establir com fons de pantalla amb:</string>
+    <string name="setting_wallpaper">Establint fons de pantalla&#8230;</string>
+    <string name="wallpaper_set_successfully">Fons de pantalla establert correctament</string>
+    <string name="portrait_aspect_ratio">Relació d\'aspecte tipus retrat</string>
+    <string name="landscape_aspect_ratio">Relació d\'aspecte tipus paisatge</string>
+    <string name="home_screen">Pantalla principal</string>
+    <string name="lock_screen">Pantalla de bloqueig</string>
+    <string name="home_and_lock_screen">Pantalla principal i de bloqueig</string>
+
+    <!-- Slideshow -->
+    <string name="slideshow">Presentació de diapositives</string>
+    <string name="interval">Interval (segons):</string>
+    <string name="include_photos">Inclou imatges</string>
+    <string name="include_videos">Inclou vídeos</string>
+    <string name="include_gifs">Inclou GIFs</string>
+    <string name="random_order">Ordre aleatori</string>
+    <string name="use_fade">Utilitza animacions de desaparició</string>
+    <string name="move_backwards">Moure cap enrere</string>
+    <string name="loop_slideshow">Presentació de diapositives</string>
+    <string name="slideshow_ended">S\'ha acabat la presentació de diapositives</string>
+    <string name="no_media_for_slideshow">No s\'han trobat mitjans per a la presentació de diapositives</string>
+
+    <!-- View types -->
+    <string name="change_view_type">Canviar el tipus de vista</string>
+    <string name="grid">Reixeta</string>
+    <string name="list">Llista</string>
+
+    <!-- Settings -->
+    <string name="autoplay_videos">Reproduir vídeos automàticament</string>
+    <string name="toggle_filename">Canviar la visibilitat del nom d\'arxiu</string>
+    <string name="loop_videos">Reproducció continua de vídeos</string>
+    <string name="animate_gifs">Animar les miniatures dels GIFs</string>
+    <string name="max_brightness">Brillantor màxima quan es mostra multimèdia</string>
+    <string name="crop_thumbnails">Retallar miniatures en quadrats</string>
+    <string name="screen_rotation_by">Gira els mitjans a pantalla completa segons</string>
+    <string name="screen_rotation_system_setting">Configuració del sistema</string>
+    <string name="screen_rotation_device_rotation">Rotació del dispositiu</string>
+    <string name="screen_rotation_aspect_ratio">Relació d\'aspecte</string>
+    <string name="black_background_at_fullscreen">Fons i barra d\'estat negre als mitjans de pantalla completa</string>
+    <string name="scroll_thumbnails_horizontally">Desplaçar miniatures horizontalment</string>
+    <string name="hide_system_ui_at_fullscreen">Ocultar automàticament la interficie de usuari del sistema a pantalla complerta</string>
+    <string name="delete_empty_folders">Eliminar carpetes buides després d\'esborrar el seu contingut</string>
+    <string name="allow_video_gestures">Permet controlar el volum i la brillantor del vídeo amb gestos verticals</string>
+    <string name="show_media_count">Mostrar el número de mitjans de les carpetes a la vista principal</string>
+    <string name="replace_share_with_rotate">Reemplaçar Compartir per Girar al menú de pantalla complerta</string>
+    <string name="show_extended_details">Mostrar detalls estesos sobre mitjans a pantalla complerta</string>
+    <string name="manage_extended_details">Gestioneu els detalls ampliats</string>
+
+    <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
+    <!-- Short description has to have less than 80 chars -->
+    <string name="app_short_description">Una galeria per veure imatges i vídeos sense publicitat.</string>
+    <string name="app_long_description">
+        Una eina senzilla que es pot fer servir per veure imatges i vídeos. Els elements es poden ordenar per data, mida o nom, tant ascendent com descendent. Es pot fer zoom a les imatges. Els arxius de mitjans es mostren en múltiples columnes depenent de la mida de la pantalla i es pot canviar el número de columnes mitjançant gestos. Permet canviar el nom, compartir, esborrar, i moure. Les imatges també es poden retalla, rotar o utilitzar com a fons de pantalla directament des de l\'aplicació.
+
+        Gallery també s'ofereix per us de tercers, per visualitzar imatges/vídeos, agregar adjunts a clients de correu, etc. Es perfecta per l\'ús diari.
+
+        El permís d\'empremtes dactilars és necessari per bloquejar la visibilitat d'elements ocults o tota l\'aplicació.
+
+        No conté ni publicitat ni permisos innecessaris. Es totalment Lliure i proporciona colors personalitzables.
+
+        Aquesta aplicació es només una peça d'una sèrie més gran d'aplicacions. Pots trobar la resta a http://www.simplemobiletools.com
+    </string>
+
+    <!--
+        Haven't found some strings? There's more at
+        https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
+    -->
+</resources>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index d3409cad7..e81d248ca 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -14,8 +14,6 @@
     <string name="other_folder">Jiná složka</string>
     <string name="show_on_map">Zobrazit na mapě</string>
     <string name="unknown_location">Neznámá poloha</string>
-    <string name="no_map_application">Nebyla nalezena žádná mapová aplikace</string>
-    <string name="no_camera_app_found">Nebyla nalezena žádná fotografická aplikace</string>
     <string name="increase_column_count">Zvýšit počet sloupců</string>
     <string name="reduce_column_count">Snížit počet sloupců</string>
     <string name="change_cover_image">Change cover image</string>
@@ -87,7 +85,6 @@
     <string name="set_as_wallpaper">Nastavit jako tapetu</string>
     <string name="set_as_wallpaper_failed">Nastavení tapety selhalo</string>
     <string name="set_as_wallpaper_with">Nastavit jako tapetu pomocí:</string>
-    <string name="no_capable_app_found">Nebyla nalezena žádná vhodná aplikace</string>
     <string name="setting_wallpaper">Nastavuje se tapeta&#8230;</string>
     <string name="wallpaper_set_successfully">Tapeta byla úspěšně změněna</string>
     <string name="portrait_aspect_ratio">Portrait aspect ratio</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 7bc1848a5..565eb25c2 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -14,8 +14,6 @@
     <string name="other_folder">Ordner wählen</string>
     <string name="show_on_map">Auf Karte zeigen</string>
     <string name="unknown_location">Unbekannter Pfad</string>
-    <string name="no_map_application">Keine Karten-App gefunden</string>
-    <string name="no_camera_app_found">Keine Kamera-App gefunden</string>
     <string name="increase_column_count">Kacheln verkleinern</string>
     <string name="reduce_column_count">Kacheln vergrößern</string>
     <string name="change_cover_image">Coverbild ändern</string>
@@ -37,12 +35,12 @@
 
     <!-- Hide / Exclude -->
     <string name="hide_folder_description">Diese Funktion versteckt die ausgewählten Ordner (auch für andere Apps), indem dort im Dateisystem eine \'.nomedia\'-Datei abgelegt wird. Dadurch werden auch deren Unterordner versteckt. Solche Ordner werden nur gezeigt, wenn die Einstellung \'Versteckte Ordner zeigen\' aktiv ist (auch andere Apps bieten üblicherweise eine solche Option). Fortfahren?</string>
-    <string name="exclude">Ordner ausblenden</string>
-    <string name="excluded_folders">Ausgeblendete Ordner</string>
-    <string name="manage_excluded_folders">Ausgeblendete Ordner verwalten</string>
-    <string name="exclude_folder_description">Diese Funktion blendet die ausgewählten Ordner und deren Unterordner aus (nur in dieser App). Ausgeblendete Ordner können in den Einstellungen verwaltet werden.</string>
-    <string name="exclude_folder_parent">Möchten Sie stattdessen einen höherliegenden Ordner ausblenden?</string>
-    <string name="excluded_activity_placeholder">\'Ordner ausblenden\' wird ausgewählte Ordner und deren Unterordner nur in dieser App ausblenden. Andere Apps werden solche Ordner weiterhin anzeigen.\\n\\nWenn Sie Ordner auch für andere Apps verstecken wollen, verwenden Sie dafür die Funktion \'Ordner verstecken\'.</string>
+    <string name="exclude">Ordner ausschließen</string>
+    <string name="excluded_folders">Ausgeschlossene Ordner</string>
+    <string name="manage_excluded_folders">Ausgeschlossene Ordner verwalten</string>
+    <string name="exclude_folder_description">Diese Funktion blendet die ausgewählten Ordner und deren Unterordner nur in dieser App aus. Ausgeschlossene Ordner können in den Einstellungen verwaltet werden.</string>
+    <string name="exclude_folder_parent">Möchtest du stattdessen einen höherliegenden Ordner ausschließen?</string>
+    <string name="excluded_activity_placeholder">\'Ordner ausschließen\' wird ausgewählte Ordner und deren Unterordner nur in dieser App ausblenden. Andere Apps werden solche Ordner weiterhin anzeigen.\\n\\nWenn du Ordner auch für andere Apps verstecken willst, verwende dafür die Funktion \'Ordner verstecken\'.</string>
     <string name="remove_all">Alle entfernen</string>
     <string name="remove_all_description">Alle Ordner aus der Ausgeblendet-Liste entfernen? Die Ordner selbst werden nicht gelöscht.</string>
     <string name="hidden_folders">Versteckte Ordner</string>
@@ -53,7 +51,7 @@
     <string name="include_folders">Einbezogene Ordner</string>
     <string name="manage_included_folders">Einbezogene Ordner verwalten</string>
     <string name="add_folder">Ordner hinzufügen</string>
-    <string name="included_activity_placeholder">Sollten Sie weitere Medienordner haben, die von der App nicht erkannt wurden, können Sie diese hier manuell hinzufügen.</string>
+    <string name="included_activity_placeholder">Solltest du weitere Medienordner haben, die von der App nicht erkannt wurden, kannst du diese hier manuell hinzufügen.</string>
 
     <!-- Resizing -->
     <string name="resize">Größe ändern</string>
@@ -87,7 +85,6 @@
     <string name="set_as_wallpaper">Als Hintergrund festlegen</string>
     <string name="set_as_wallpaper_failed">Hintergrundbild festlegen fehlgeschlagen</string>
     <string name="set_as_wallpaper_with">Als Hintergrund festlegen mit</string>
-    <string name="no_capable_app_found">Keine Hintergrundbild-App gefunden</string>
     <string name="setting_wallpaper">Hintergrund festlegen&#8230;</string>
     <string name="wallpaper_set_successfully">Hintergrundbild erfolgreich festgelegt</string>
     <string name="portrait_aspect_ratio">Hochformat</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index f0e42eb02..ff2b8cc85 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -7,33 +7,31 @@
     <string name="hidden">(oculto)</string>
     <string name="pin_folder">Fijar carpeta</string>
     <string name="unpin_folder">No fijar carpeta</string>
-    <string name="pin_to_the_top">Pin to the top</string>
+    <string name="pin_to_the_top">Anclar arriba</string>
     <string name="show_all">Mostrar el contenido de todas las carpetas</string>
     <string name="all_folders">Todos los medios</string>
     <string name="folder_view">Cambiar a vista de carpeta</string>
     <string name="other_folder">Otra carpeta</string>
     <string name="show_on_map">Mostrar en el mapa</string>
     <string name="unknown_location">Ubicación desconocida</string>
-    <string name="no_map_application">No se encontró aplicación de mapas</string>
-    <string name="no_camera_app_found">No se encontró aplicación de cámara</string>
     <string name="increase_column_count">Aumentar el número de columnas</string>
     <string name="reduce_column_count">Reducir el número de columnas</string>
     <string name="change_cover_image">Cambiar imagen de portada</string>
     <string name="select_photo">Seleccionar imagen</string>
     <string name="use_default">Uso por defecto</string>
-    <string name="volume">Volume</string>
-    <string name="brightness">Brightness</string>
-    <string name="do_not_ask_again">Do not ask again in this session</string>
-    <string name="lock_orientation">Lock orientation</string>
-    <string name="unlock_orientation">Unlock orientation</string>
+    <string name="volume">Volumen</string>
+    <string name="brightness">Brillo</string>
+    <string name="do_not_ask_again">No volver a preguntar en esta sesión</string>
+    <string name="lock_orientation">Bloquear orientación</string>
+    <string name="unlock_orientation">Desbloquear orientación</string>
 
     <!-- Filter -->
     <string name="filter_media">Filtro de medios</string>
-    <string name="images">Images</string>
-    <string name="videos">Videos</string>
+    <string name="images">Imágenes</string>
+    <string name="videos">Vídeos</string>
     <string name="gifs">GIFs</string>
-    <string name="no_media_with_filters">No media files have been found with the selected filters.</string>
-    <string name="change_filters_underlined"><u>Change filters</u></string>
+    <string name="no_media_with_filters">No se han encontrado ficheros con los filtros seleccionados.</string>
+    <string name="change_filters_underlined"><u>Ccambiar flitros</u></string>
 
     <!-- Hide / Exclude -->
     <string name="hide_folder_description">Esta función oculta la carpeta agregando un archivo \'.nomedia\' en ella, y ocultará también las subcarpetas. Puede mostrarlas cambiando la opción \'Mostrar carpetas ocultas\' en los Ajustes. ¿Continuar?</string>
@@ -45,9 +43,9 @@
     <string name="excluded_activity_placeholder">Excluir las carpetas las hará junto a sus subcarpetas ocultas sólo en Simple Gallery, estas seguirán siendo visibles en otras aplicaciones.\\n\\nSi desea ocultarlo de otras aplicaciones, utilice la función de Ocultar.</string>
     <string name="remove_all">Eliminar todo</string>
     <string name="remove_all_description">¿Eliminar todas las carpetas de la lista de excluidas? Esto no borrará las carpetas.</string>
-    <string name="hidden_folders">Hidden folders</string>
-    <string name="manage_hidden_folders">Manage hidden folders</string>
-    <string name="hidden_folders_placeholder">Seems like you don\'t have any folders hidden with a \".nomedia\" file.</string>
+    <string name="hidden_folders">Carpetas ocultas</string>
+    <string name="manage_hidden_folders">Gestionar carpetas ocultas</string>
+    <string name="hidden_folders_placeholder">Parece que no tienes carpetas ocultas con \".nomedia\" ficheros.</string>
 
     <!-- Include folders -->
     <string name="include_folders">Carpetas incluidas</string>
@@ -87,32 +85,31 @@
     <string name="set_as_wallpaper">Establecer como fondo de pantalla</string>
     <string name="set_as_wallpaper_failed">Error al establecer fondo de pantalla</string>
     <string name="set_as_wallpaper_with">Establecer como fondo de pantalla con:</string>
-    <string name="no_capable_app_found">No se encontró aplicación para ello</string>
     <string name="setting_wallpaper">Estableciendo fondo de pantalla&#8230;</string>
     <string name="wallpaper_set_successfully">Fondo de pantalla establecido correctamente</string>
     <string name="portrait_aspect_ratio">Relación de aspecto tipo retrato</string>
     <string name="landscape_aspect_ratio">Relación de aspecto tipo paisaje</string>
-    <string name="home_screen">Home screen</string>
-    <string name="lock_screen">Lock screen</string>
-    <string name="home_and_lock_screen">Home and lock screen</string>
+    <string name="home_screen">Pantalla de inicio</string>
+    <string name="lock_screen">Pantalla de bloqueo</string>
+    <string name="home_and_lock_screen">Pantalla de inicio y de bloqueo</string>
 
     <!-- Slideshow -->
-    <string name="slideshow">Slideshow</string>
-    <string name="interval">Interval (seconds):</string>
-    <string name="include_photos">Include photos</string>
-    <string name="include_videos">Include videos</string>
-    <string name="include_gifs">Include GIFs</string>
-    <string name="random_order">Random order</string>
-    <string name="use_fade">Use fade animations</string>
-    <string name="move_backwards">Move backwards</string>
-    <string name="loop_slideshow">Loop slideshow</string>
-    <string name="slideshow_ended">The slideshow ended</string>
-    <string name="no_media_for_slideshow">No media for the slideshow have been found</string>
+    <string name="slideshow">Diapositivas</string>
+    <string name="interval">Intervalo (segundos):</string>
+    <string name="include_photos">Incluir fotos</string>
+    <string name="include_videos">Incluir vídeos</string>
+    <string name="include_gifs">Incluir GIFs</string>
+    <string name="random_order">Orden aleatorio</string>
+    <string name="use_fade">Usar animaciones de desvanecimiento</string>
+    <string name="move_backwards">Mover hacia atrás</string>
+    <string name="loop_slideshow">Presentación de diapositivas</string>
+    <string name="slideshow_ended">La diapositiva terminó</string>
+    <string name="no_media_for_slideshow">No se han encontrado medios para la presentación de diapositivas</string>
 
     <!-- View types -->
     <string name="change_view_type">Cambiar tipo de vista</string>
-    <string name="grid">Grid</string>
-    <string name="list">List</string>
+    <string name="grid">Cuadrícula</string>
+    <string name="list">Lista</string>
 
     <!-- Settings -->
     <string name="autoplay_videos">Reproducir vídeos automáticamente</string>
@@ -125,7 +122,7 @@
     <string name="screen_rotation_system_setting">Configuración del sistema</string>
     <string name="screen_rotation_device_rotation">Rotación del dispositivo</string>
     <string name="screen_rotation_aspect_ratio">Relación de aspecto</string>
-    <string name="black_background_at_fullscreen">Black background and status bar at fullscreen media</string>
+    <string name="black_background_at_fullscreen">Fondo y barra de estado negra en medios de pantalla completa</string>
     <string name="scroll_thumbnails_horizontally">Desplazar miniaturas horizontalmente</string>
     <string name="hide_system_ui_at_fullscreen">Ocultar automáticamente la interfaz de usuario del sistema en medios de pantalla completa</string>
     <string name="delete_empty_folders">Eliminar carpetas vacias despues de borrar su contenido</string>
@@ -133,7 +130,7 @@
     <string name="show_media_count">Mostrar el conteo de medios de las carpetas en la vista principal</string>
     <string name="replace_share_with_rotate">Reemplazar Compartir con Girar en el menú de pantalla completa</string>
     <string name="show_extended_details">Mostrar detalles extendidos sobre medios en pantalla completa</string>
-    <string name="manage_extended_details">Manage extended details</string>
+    <string name="manage_extended_details">Administrar detalles ampliados</string>
 
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
     <!-- Short description has to have less than 80 chars -->
@@ -143,7 +140,7 @@
 
         Gallery también se ofrece para uso de terceros para previsualizar imágenes/vídeos, agregar adjuntos en clientes de correo, etc. Es perfecta para uso diario.
 
-        The fingerprint permission is needed for locking either hidden item visibility, or the whole app.
+        El permiso de huella digital es necesario para bloquear la visibilidad de elementos ocultos o toda la aplicación.
 
         No contiene publicidad ni permisos innecesarios. Es totalmente libre, proporciona colores personalizables.
 
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 5ffb8ac09..85e95f0bc 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -14,8 +14,6 @@
     <string name="other_folder">Muu kansio</string>
     <string name="show_on_map">Näytä kartalla</string>
     <string name="unknown_location">Tuntematon sijainti</string>
-    <string name="no_map_application">Karttasovellusta ei löytynyt</string>
-    <string name="no_camera_app_found">Kamerasovellusta ei löytynyt</string>
     <string name="increase_column_count">Increase column count</string>
     <string name="reduce_column_count">Reduce column count</string>
     <string name="change_cover_image">Vaihda kansikuva</string>
@@ -87,7 +85,6 @@
     <string name="set_as_wallpaper">Aseta taustakuvaksi</string>
     <string name="set_as_wallpaper_failed">Taustakuvan asetus epäonnistui</string>
     <string name="set_as_wallpaper_with">Aseta taustakuvaksi sovelluksella:</string>
-    <string name="no_capable_app_found">Toimivaa sovellusta ei löydetty</string>
     <string name="setting_wallpaper">Asetetaan taustakuvaa&#8230;</string>
     <string name="wallpaper_set_successfully">Taustakuva asetettu onnistuneesti</string>
     <string name="portrait_aspect_ratio">Kuvasuhde pystyssä</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 348478ac1..752ad5b36 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -7,15 +7,13 @@
     <string name="hidden">(caché)</string>
     <string name="pin_folder">Épingler le dossier</string>
     <string name="unpin_folder">Désépingler le dossier</string>
-    <string name="pin_to_the_top">Pin to the top</string>
+    <string name="pin_to_the_top">Épingler en haut</string>
     <string name="show_all">Afficher le contenu de tous les dossiers</string>
     <string name="all_folders">Tous les dossiers</string>
     <string name="folder_view">Permuter vers la vue du dossier</string>
     <string name="other_folder">Autre dossier</string>
     <string name="show_on_map">Afficher sur la carte</string>
     <string name="unknown_location">Position inconnue</string>
-    <string name="no_map_application">Aucune application de carte n\'a été trouvée</string>
-    <string name="no_camera_app_found">Aucune application d\'appareil photo n\'a été trouvée</string>
     <string name="increase_column_count">Augmenter le nombre de colonnes</string>
     <string name="reduce_column_count">Réduire le nombre de colonnes</string>
     <string name="change_cover_image">Changer l\'image de couverture</string>
@@ -24,8 +22,8 @@
     <string name="volume">Volume</string>
     <string name="brightness">Luminosité</string>
     <string name="do_not_ask_again">Ne pas redemander pour cette session</string>
-    <string name="lock_orientation">Lock orientation</string>
-    <string name="unlock_orientation">Unlock orientation</string>
+    <string name="lock_orientation">Verrouiller la rotation</string>
+    <string name="unlock_orientation">Déverrouiller la rotation</string>
 
     <!-- Filter -->
     <string name="filter_media">Filtrer les médias</string>
@@ -41,13 +39,13 @@
     <string name="excluded_folders">Dossiers exclus</string>
     <string name="manage_excluded_folders">Gérer les dossiers exclus</string>
     <string name="exclude_folder_description">Cela va exclure la sélection ainsi que ses sous-dossiers depuis Simple Galerie uniquement. Vous pouvez gérer les dossiers exclus depuis les Paramètres.</string>
-    <string name="exclude_folder_parent">Exclure un parent plutôt ?</string>
+    <string name="exclude_folder_parent">Exclure un dossier parent ?</string>
     <string name="excluded_activity_placeholder">Exclure des dossiers les masquera ainsi que leurs sous-dossiers uniquement dans Simple Galerie, ils seront toujours visibles depuis d\'autres applications.\\n\\nSi vous voulez aussi les masquer ailleurs, utilisez la fonction Masquer.</string>
     <string name="remove_all">Tout supprimer</string>
     <string name="remove_all_description">Supprimer tous les dossiers de la liste des exclusions ? Ceci n\'effacera pas les dossiers.</string>
-    <string name="hidden_folders">Hidden folders</string>
-    <string name="manage_hidden_folders">Manage hidden folders</string>
-    <string name="hidden_folders_placeholder">Seems like you don\'t have any folders hidden with a \".nomedia\" file.</string>
+    <string name="hidden_folders">Dossiers masqués</string>
+    <string name="manage_hidden_folders">Gérer les dossiers masqués</string>
+    <string name="hidden_folders_placeholder">Il semblerait que vous n\'ayez pas de dossier cachés avec un fichier \".nomedia\".</string>
 
     <!-- Include folders -->
     <string name="include_folders">Dossiers inclus</string>
@@ -87,14 +85,13 @@
     <string name="set_as_wallpaper">Définir comme fond d\'écran</string>
     <string name="set_as_wallpaper_failed">Échec de la définition en tant que fond d\'écran.</string>
     <string name="set_as_wallpaper_with">Définir comme fond d\'écran avec :</string>
-    <string name="no_capable_app_found">Aucune application trouvée pour continuer cette action</string>
     <string name="setting_wallpaper">Paramètres de fond d\'écran…</string>
     <string name="wallpaper_set_successfully">Fond d\'écran défini avec succès</string>
     <string name="portrait_aspect_ratio">Ratio d\'aspect portrait</string>
     <string name="landscape_aspect_ratio">Ratio d\'aspect paysage</string>
-    <string name="home_screen">Home screen</string>
-    <string name="lock_screen">Lock screen</string>
-    <string name="home_and_lock_screen">Home and lock screen</string>
+    <string name="home_screen">Page d\'accueil</string>
+    <string name="lock_screen">Écran de verouillage</string>
+    <string name="home_and_lock_screen">Page d\'accueil et écran de verrouillage</string>
 
     <!-- Slideshow -->
     <string name="slideshow">Diaporama</string>
@@ -125,7 +122,7 @@
     <string name="screen_rotation_system_setting">Paramètres système</string>
     <string name="screen_rotation_device_rotation">Rotation de l\'appareil</string>
     <string name="screen_rotation_aspect_ratio">Ratio d\'aspect</string>
-    <string name="black_background_at_fullscreen">Black background and status bar at fullscreen media</string>
+    <string name="black_background_at_fullscreen">Fond et barre de statur noir en plein écran</string>
     <string name="scroll_thumbnails_horizontally">Défilement des miniatures horizontalement</string>
     <string name="hide_system_ui_at_fullscreen">Masquer automatiquement l\'interface utilisateur si média plein écran</string>
     <string name="delete_empty_folders">Supprimer les dossiers vides après avoir supprimé leur contenu</string>
@@ -143,11 +140,11 @@
 
         La galerie est également proposée pour une utilisation comme tierce partie pour la prévisualisation des images/vidéos, ajouter des pièces jointes aux clients email etc. C\'est parfait pour un usage au quotidien.
 
-        The fingerprint permission is needed for locking either hidden item visibility, or the whole app.
+        L\'autorisation d\'empreinte digitale est nécessaire pour verrouiller les dossiers cachés et/ou l\'application.
 
         L\'application ne contient ni publicité ni autorisation inutile. Elle est totalement opensource et est aussi fournie avec des couleurs personnalisables.
 
-        Cette application est juste l\'une des applications d\'une plus grande suite. Vous pouvez trouver les autres sur http://www.simplemobiletools.com
+        Cette application fait partie d\'une plus grande suite. Vous pouvez trouver les autres applications sur http://www.simplemobiletools.com
     </string>
 
     <!--
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 39785c647..495ef8805 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -14,8 +14,6 @@
     <string name="other_folder">Outro cartafol</string>
     <string name="show_on_map">Mostrar no mapa</string>
     <string name="unknown_location">Localización descoñecida</string>
-    <string name="no_map_application">Non se atopou ningún aplicativo con mapas</string>
-    <string name="no_camera_app_found">Non se atopou ningún aplicativo Cámara</string>
     <string name="increase_column_count">Aumente o número de columnas</string>
     <string name="reduce_column_count">Reduza o número de columnas</string>
     <string name="change_cover_image">Cambiar a imaxe de portada</string>
@@ -87,7 +85,6 @@
     <string name="set_as_wallpaper">Establecer como fondo de pantalla</string>
     <string name="set_as_wallpaper_failed">Fallou establecer fondo de pantalla</string>
     <string name="set_as_wallpaper_with">Establecer fondo de pantalla con:</string>
-    <string name="no_capable_app_found">Non se atopou ningún applicativo válido</string>
     <string name="setting_wallpaper">Establecendo fondo de pantalla&#8230;</string>
     <string name="wallpaper_set_successfully">fondo de pantalla establecido con éxito</string>
     <string name="portrait_aspect_ratio">Proporción de Retrato</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 4310fa5a6..1daa0f95c 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -14,8 +14,6 @@
     <string name="other_folder">Ostali direktoriji</string>
     <string name="show_on_map">Prikaži na karti</string>
     <string name="unknown_location">Nepoznata lokacija</string>
-    <string name="no_map_application">Nije pronađena aplikacija za kartame</string>
-    <string name="no_camera_app_found">Nije pronađena aplikacija za kameru</string>
     <string name="increase_column_count">Povećaj broj stupaca</string>
     <string name="reduce_column_count">Smanji broj stupaca</string>
     <string name="change_cover_image">Promjeni naslovnu sliku</string>
@@ -87,7 +85,6 @@
     <string name="set_as_wallpaper">Postavi kao pozadinu</string>
     <string name="set_as_wallpaper_failed">Neuspješno postavljanje pozadine</string>
     <string name="set_as_wallpaper_with">Postavi kao pozadinu s:</string>
-    <string name="no_capable_app_found">Nije pronađena aplikacija s ovim mogućnostima</string>
     <string name="setting_wallpaper">Postavljanje pozadine&#8230;</string>
     <string name="wallpaper_set_successfully">Uspješno postavljanje pozadine</string>
     <string name="portrait_aspect_ratio">Portretni omjer slike</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 8c9caec25..27062d5f2 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -14,8 +14,6 @@
     <string name="other_folder">Other folder</string>
     <string name="show_on_map">Show on map</string>
     <string name="unknown_location">Unknown location</string>
-    <string name="no_map_application">No application with maps has been found</string>
-    <string name="no_camera_app_found">No Camera app has been found</string>
     <string name="increase_column_count">Increase column count</string>
     <string name="reduce_column_count">Reduce column count</string>
     <string name="change_cover_image">Change cover image</string>
@@ -87,7 +85,6 @@
     <string name="set_as_wallpaper">Set as Wallpaper</string>
     <string name="set_as_wallpaper_failed">Setting as Wallpaper failed</string>
     <string name="set_as_wallpaper_with">Set as wallpaper with:</string>
-    <string name="no_capable_app_found">No app capable of it has been found</string>
     <string name="setting_wallpaper">Setting wallpaper&#8230;</string>
     <string name="wallpaper_set_successfully">Wallpaper set successfully</string>
     <string name="portrait_aspect_ratio">Portrait aspect ratio</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 7fe3fefb5..c7c9de3a2 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -14,8 +14,6 @@
     <string name="other_folder">Altra cartella</string>
     <string name="show_on_map">Mostra sulla mappa</string>
     <string name="unknown_location">Posizione sconosciuta</string>
-    <string name="no_map_application">Nessuna app con mappe trovata</string>
-    <string name="no_camera_app_found">Nessuna app fotocamera trovata</string>
     <string name="increase_column_count">Aumenta numero colonne</string>
     <string name="reduce_column_count">Riduci numero colonne</string>
     <string name="change_cover_image">Cambia immagine copertina</string>
@@ -87,7 +85,6 @@
     <string name="set_as_wallpaper">Imposta come sfondo</string>
     <string name="set_as_wallpaper_failed">Impostazione sfondo non riuscita</string>
     <string name="set_as_wallpaper_with">Imposta come sfondo con:</string>
-    <string name="no_capable_app_found">Non sono disponibili app compatibili</string>
     <string name="setting_wallpaper">Impostazione sfondo&#8230;</string>
     <string name="wallpaper_set_successfully">Sfondo impostato correttamente</string>
     <string name="portrait_aspect_ratio">Proporzioni ritratto</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index dec0bcca8..c60664609 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -14,8 +14,6 @@
     <string name="other_folder">その他のフォルダー</string>
     <string name="show_on_map">地図で表示</string>
     <string name="unknown_location">位置情報がありません</string>
-    <string name="no_map_application">地図アプリが見つかりません</string>
-    <string name="no_camera_app_found">カメラアプリが見つかりません</string>
     <string name="increase_column_count">列数を増やす</string>
     <string name="reduce_column_count">列数を減らす</string>
     <string name="change_cover_image">カバー画像を変更</string>
@@ -87,7 +85,6 @@
     <string name="set_as_wallpaper">壁紙に設定</string>
     <string name="set_as_wallpaper_failed">壁紙の設定に失敗しました</string>
     <string name="set_as_wallpaper_with">壁紙に設定:</string>
-    <string name="no_capable_app_found">対応できるアプリが見つかりません</string>
     <string name="setting_wallpaper">壁紙に設定中&#8230;</string>
     <string name="wallpaper_set_successfully">壁紙を正常に設定しました</string>
     <string name="portrait_aspect_ratio">縦向きの縦横比</string>
diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml
index 4dd34185c..234beda2e 100644
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@@ -14,8 +14,6 @@
     <string name="other_folder">다른 폴더</string>
     <string name="show_on_map">지도에서 보기</string>
     <string name="unknown_location">위치정보 없음</string>
-    <string name="no_map_application">연결 가능한 지도 애플리케이션이 없습니다.</string>
-    <string name="no_camera_app_found">연결 가능한 카메라 애플리케이션이 없습니다.</string>
     <string name="increase_column_count">섬네일크기 축소</string>
     <string name="reduce_column_count">섬네일크기 확대</string>
     <string name="change_cover_image">Change cover image</string>
@@ -87,7 +85,6 @@
     <string name="set_as_wallpaper">Set as Wallpaper</string>
     <string name="set_as_wallpaper_failed">Setting as Wallpaper failed</string>
     <string name="set_as_wallpaper_with">Set as wallpaper with:</string>
-    <string name="no_capable_app_found">No app capable of it has been found</string>
     <string name="setting_wallpaper">Setting wallpaper&#8230;</string>
     <string name="wallpaper_set_successfully">Wallpaper set successfully</string>
     <string name="portrait_aspect_ratio">Portrait aspect ratio</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 7c6cd8bb9..1bc8a79e2 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -7,15 +7,13 @@
     <string name="hidden">(skjult)</string>
     <string name="pin_folder">Fest mappe</string>
     <string name="unpin_folder">Løsne mappe</string>
-    <string name="pin_to_the_top">Pin to the top</string>
+    <string name="pin_to_the_top">Fest til toppen</string>
     <string name="show_all">Vis alle mappers innhold</string>
     <string name="all_folders">Alle mapper</string>
     <string name="folder_view">Skift til mappevisning</string>
     <string name="other_folder">Annen mappe</string>
     <string name="show_on_map">Vis på kart</string>
     <string name="unknown_location">Ukjent plassering</string>
-    <string name="no_map_application">Ingen app med kart er funnet</string>
-    <string name="no_camera_app_found">Ingen kamera-app er funnet</string>
     <string name="increase_column_count">Øk antall kolonner</string>
     <string name="reduce_column_count">Reduser antall kolonner</string>
     <string name="change_cover_image">Endre omslagsbilde</string>
@@ -87,7 +85,6 @@
     <string name="set_as_wallpaper">Sett som bakgrunnsbilde</string>
     <string name="set_as_wallpaper_failed">Å sette som bakgrunnsbilde feilet</string>
     <string name="set_as_wallpaper_with">Sett som bakgrunnsbilde med:</string>
-    <string name="no_capable_app_found">Ingen app i stand til det er funnet</string>
     <string name="setting_wallpaper">Stiller inn bakgrunnsbilde&#8230;</string>
     <string name="wallpaper_set_successfully">Bakgrunnsbilde vellykket stilt inn</string>
     <string name="portrait_aspect_ratio">Portrett-sideforhold</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 879242a19..471fbeff0 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -14,8 +14,6 @@
     <string name="other_folder">Andere map</string>
     <string name="show_on_map">Op kaart tonen</string>
     <string name="unknown_location">Locatie onbekend</string>
-    <string name="no_map_application">Geen app voor kaarten gevonden</string>
-    <string name="no_camera_app_found">Geen app voor camera gevonden</string>
     <string name="increase_column_count">Meer kolommen</string>
     <string name="reduce_column_count">Minder kolommen</string>
     <string name="change_cover_image">Afbeelding voor omslag veranderen</string>
@@ -87,7 +85,6 @@
     <string name="set_as_wallpaper">Als achtergrond instellen</string>
     <string name="set_as_wallpaper_failed">Achtergrond instellen mislukt</string>
     <string name="set_as_wallpaper_with">Achtergrond instellen met:</string>
-    <string name="no_capable_app_found">Geen app gevonden voor instellen achtergrond</string>
     <string name="setting_wallpaper">Achtergrond instellen&#8230;</string>
     <string name="wallpaper_set_successfully">Achtergrond is ingesteld</string>
     <string name="portrait_aspect_ratio">Verhouding in portretmodus</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index c990176c6..ff8e14e79 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -14,8 +14,6 @@
     <string name="other_folder">Inny folder</string>
     <string name="show_on_map">Pokaż na mapie</string>
     <string name="unknown_location">Nieznana lokalizacja</string>
-    <string name="no_map_application">Brak aplikacji powiązanej z mapami</string>
-    <string name="no_camera_app_found">Brak aplikacji powiązanej z aparatem</string>
     <string name="increase_column_count">Zwiększ liczbę kolumn</string>
     <string name="reduce_column_count">Zmniejsz liczbę kolumn</string>
     <string name="change_cover_image">Zmień okładkę</string>
@@ -87,7 +85,6 @@
     <string name="set_as_wallpaper">Ustaw jako tapetę</string>
     <string name="set_as_wallpaper_failed">Ustawienie tapety nie powiodło się</string>
     <string name="set_as_wallpaper_with">Ustaw jako tapetę w:</string>
-    <string name="no_capable_app_found">Brak odpowiednich ustawień</string>
     <string name="setting_wallpaper">Ustawiam tapetę&#8230;</string>
     <string name="wallpaper_set_successfully">Tapeta została ustawiona</string>
     <string name="portrait_aspect_ratio">Proporcje ekranu w trybie pionowym</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 792b66d17..fc4889351 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -14,8 +14,6 @@
     <string name="other_folder">Outra pasta</string>
     <string name="show_on_map">Mostrar no mapa</string>
     <string name="unknown_location">Localização desconhecida</string>
-    <string name="no_map_application">Nenhum aplicativo de mapa encontrado</string>
-    <string name="no_camera_app_found">Nenhum aplicativo de câmera encontrado</string>
     <string name="increase_column_count">Aumentar número de colunas</string>
     <string name="reduce_column_count">Reduzir número de colunas</string>
     <string name="change_cover_image">Trocar imagem de capa</string>
@@ -87,7 +85,6 @@
     <string name="set_as_wallpaper">Definir como papel de parede</string>
     <string name="set_as_wallpaper_failed">Falha ao definir como papel de parede</string>
     <string name="set_as_wallpaper_with">Definir papel de parede com:</string>
-    <string name="no_capable_app_found">Aplicativo não encontrado</string>
     <string name="setting_wallpaper">Definindo como papel de parede</string>
     <string name="wallpaper_set_successfully">Papel de parede com sucesso</string>
     <string name="portrait_aspect_ratio">Retrato</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 0a7be9220..539dcfedc 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -7,15 +7,13 @@
     <string name="hidden">(oculta)</string>
     <string name="pin_folder">Fixar pasta</string>
     <string name="unpin_folder">Desafixar pasta</string>
-    <string name="pin_to_the_top">Pin to the top</string>
+    <string name="pin_to_the_top">Fixar no topo</string>
     <string name="show_all">Mostrar conteúdo de todas as pastas</string>
     <string name="all_folders">Todas as pastas</string>
     <string name="folder_view">Alternar para a vista de pastas</string>
     <string name="other_folder">Outra pasta</string>
     <string name="show_on_map">Mostrar no mapa</string>
     <string name="unknown_location">Localização desconhecida</string>
-    <string name="no_map_application">Não existe uma aplicação adequada</string>
-    <string name="no_camera_app_found">Não existe uma aplicação adequeada</string>
     <string name="increase_column_count">Aumentar número de colunas</string>
     <string name="reduce_column_count">Diminuir número de colunas</string>
     <string name="change_cover_image">Alterar imagem de capa</string>
@@ -87,7 +85,6 @@
     <string name="set_as_wallpaper">Definir como fundo do ecrã</string>
     <string name="set_as_wallpaper_failed">Falha ao definir como fundo de ecrã</string>
     <string name="set_as_wallpaper_with">Definir como fundo com:</string>
-    <string name="no_capable_app_found">Aplicação não encontrada</string>
     <string name="setting_wallpaper">A definir como fundo de ecrã&#8230;</string>
     <string name="wallpaper_set_successfully">Fundo definido com sucesso</string>
     <string name="portrait_aspect_ratio">Proporção na vertical</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index b91ce3cc8..f57ab2421 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -14,8 +14,6 @@
     <string name="other_folder">Другая папка</string>
     <string name="show_on_map">Показать место съёмки</string>
     <string name="unknown_location">Место съёмки не указано</string>
-    <string name="no_map_application">Не найдено приложений с картами</string>
-    <string name="no_camera_app_found">Не найдено приложения камеры</string>
     <string name="increase_column_count">Добавить столбец</string>
     <string name="reduce_column_count">Убрать столбец</string>
     <string name="change_cover_image">Изменить обложку</string>
@@ -87,7 +85,6 @@
     <string name="set_as_wallpaper">Установить в качестве обоев</string>
     <string name="set_as_wallpaper_failed">Не удалось установить</string>
     <string name="set_as_wallpaper_with">Установить в качестве обоев в:</string>
-    <string name="no_capable_app_found">Приложение не найдено</string>
     <string name="setting_wallpaper">Установка обоев…</string>
     <string name="wallpaper_set_successfully">Обои успешно установлены</string>
     <string name="portrait_aspect_ratio">Портрет</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 0f7b04b28..585018d33 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -14,8 +14,6 @@
     <string name="other_folder">Iný priečinok</string>
     <string name="show_on_map">Zobraziť na mape</string>
     <string name="unknown_location">Neznáma poloha</string>
-    <string name="no_map_application">Nenašla sa žiadna mapová aplikácia</string>
-    <string name="no_camera_app_found">Nenašla sa žiadna aplikácia pre fotoaparát</string>
     <string name="increase_column_count">Zvýšiť počet stĺpcov</string>
     <string name="reduce_column_count">Znížiť počet stĺpcov</string>
     <string name="change_cover_image">Zmeniť obal albumu</string>
@@ -87,7 +85,6 @@
     <string name="set_as_wallpaper">Nastaviť ako tapetu</string>
     <string name="set_as_wallpaper_failed">Nastavovanie ako tapeta zlyhalo</string>
     <string name="set_as_wallpaper_with">Nastaviť ako tapetu s:</string>
-    <string name="no_capable_app_found">Nenašla sa žiadna vhodná aplikácia</string>
     <string name="setting_wallpaper">Nastavuje sa tapeta&#8230;</string>
     <string name="wallpaper_set_successfully">Tapeta bola úspešne zmenená</string>
     <string name="portrait_aspect_ratio">Orientácia nastojato</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 425685c7c..f6543ede7 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -14,8 +14,6 @@
     <string name="other_folder">Annan mapp</string>
     <string name="show_on_map">Visa på karta</string>
     <string name="unknown_location">Okänd plats</string>
-    <string name="no_map_application">Ingen app med kartor hittades</string>
-    <string name="no_camera_app_found">Ingen Kamera-app hittades</string>
     <string name="increase_column_count">Öka antalet kolumner</string>
     <string name="reduce_column_count">Minska antalet kolumner</string>
     <string name="change_cover_image">Byt omslagsbild</string>
@@ -87,7 +85,6 @@
     <string name="set_as_wallpaper">Ange som bakgrundsbild</string>
     <string name="set_as_wallpaper_failed">Det gick inte att byta bakgrundsbild</string>
     <string name="set_as_wallpaper_with">Ange som bakgrundsbild med:</string>
-    <string name="no_capable_app_found">Hittade ingen app som klarar av detta</string>
     <string name="setting_wallpaper">Inställningar för bakgrundsbild&#8230;</string>
     <string name="wallpaper_set_successfully">Bakgrundsbilden är ändrad</string>
     <string name="portrait_aspect_ratio">Stående bildförhållande</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 0cb4eedc5..d4110b108 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -14,8 +14,6 @@
     <string name="other_folder">Diğer klasör</string>
     <string name="show_on_map">Haritada göster</string>
     <string name="unknown_location">Bilinmeyen konum</string>
-    <string name="no_map_application">Haritalarla hiçbir uygulama bulunamadı</string>
-    <string name="no_camera_app_found">Hiçbir Kamera uygulaması bulunamadı</string>
     <string name="increase_column_count">Sütun sayısını artır</string>
     <string name="reduce_column_count">Sütun sayısını azalt</string>
     <string name="change_cover_image">Change cover image</string>
@@ -87,7 +85,6 @@
     <string name="set_as_wallpaper">Duvar kağıdı olarak ayarla</string>
     <string name="set_as_wallpaper_failed">Duvar Kağıdı Olarak Ayarlanılamıyor</string>
     <string name="set_as_wallpaper_with">İle duvar kağıdı olarak ayarla:</string>
-    <string name="no_capable_app_found">Mümkün olan herhangi bir uygulama bulunamadı</string>
     <string name="setting_wallpaper">Duvar kağıdını ayarlama&#8230;</string>
     <string name="wallpaper_set_successfully">Duvar kağıdı başarıyla ayarlandı</string>
     <string name="portrait_aspect_ratio">Portrait aspect ratio</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 221f91014..941581760 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -14,8 +14,6 @@
     <string name="other_folder">其他目录</string>
     <string name="show_on_map">在地图中显示</string>
     <string name="unknown_location">未知位置</string>
-    <string name="no_map_application">未找到地图应用</string>
-    <string name="no_camera_app_found">未找到相机应用</string>
     <string name="increase_column_count">增加一栏</string>
     <string name="reduce_column_count">减少一栏</string>
     <string name="change_cover_image">更改封面图片</string>
@@ -87,7 +85,6 @@
     <string name="set_as_wallpaper">设为壁纸</string>
     <string name="set_as_wallpaper_failed">壁纸设置失败</string>
     <string name="set_as_wallpaper_with">设为壁纸...</string>
-    <string name="no_capable_app_found">未找到可用应用</string>
     <string name="setting_wallpaper">正在设置壁纸&#8230;</string>
     <string name="wallpaper_set_successfully">壁纸设置成功</string>
     <string name="portrait_aspect_ratio">纵向长宽比</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 545d4bd8d..19550daf9 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -14,8 +14,6 @@
     <string name="other_folder">其他資料夾</string>
     <string name="show_on_map">在地圖上顯示</string>
     <string name="unknown_location">未知的位置</string>
-    <string name="no_map_application">找不到地圖程式</string>
-    <string name="no_camera_app_found">找不到相機程式</string>
     <string name="increase_column_count">增加欄數</string>
     <string name="reduce_column_count">減少欄數</string>
     <string name="change_cover_image">更換封面圖片</string>
@@ -87,7 +85,6 @@
     <string name="set_as_wallpaper">設為桌布</string>
     <string name="set_as_wallpaper_failed">設為桌布失敗</string>
     <string name="set_as_wallpaper_with">用其他程式設為桌布:</string>
-    <string name="no_capable_app_found">找不到可用的應用程式</string>
     <string name="setting_wallpaper">桌布設定中&#8230;</string>
     <string name="wallpaper_set_successfully">成功設為桌布</string>
     <string name="portrait_aspect_ratio">直向長寬比</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8e17186b6..d241e4961 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -14,8 +14,6 @@
     <string name="other_folder">Other folder</string>
     <string name="show_on_map">Show on map</string>
     <string name="unknown_location">Unknown location</string>
-    <string name="no_map_application">No application with maps has been found</string>
-    <string name="no_camera_app_found">No Camera app has been found</string>
     <string name="increase_column_count">Increase column count</string>
     <string name="reduce_column_count">Reduce column count</string>
     <string name="change_cover_image">Change cover image</string>
@@ -87,7 +85,6 @@
     <string name="set_as_wallpaper">Set as Wallpaper</string>
     <string name="set_as_wallpaper_failed">Setting as Wallpaper failed</string>
     <string name="set_as_wallpaper_with">Set as wallpaper with:</string>
-    <string name="no_capable_app_found">No app capable of it has been found</string>
     <string name="setting_wallpaper">Setting wallpaper&#8230;</string>
     <string name="wallpaper_set_successfully">Wallpaper set successfully</string>
     <string name="portrait_aspect_ratio">Portrait aspect ratio</string>
diff --git a/app/src/main/res/xml/searchable.xml b/app/src/main/res/xml/searchable.xml
new file mode 100644
index 000000000..892fa25a7
--- /dev/null
+++ b/app/src/main/res/xml/searchable.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<searchable
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:hint="@string/search"
+    android:label="@string/app_name"/>