diff --git a/CHANGELOG.md b/CHANGELOG.md
index a15ade565..c63eabc11 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,13 @@
 Changelog
 ==========
 
+Version 3.0.0 *(2017-12-04)*
+----------------------------
+
+ * Improved primary color customization
+ * Allow setting home and lock screen wallpapers separately on Android 7+
+ * Many smaller performance and stability improvements
+
 Version 2.19.0 *(2017-11-23)*
 ----------------------------
 
diff --git a/app/build.gradle b/app/build.gradle
index 6c2af3e29..d54939b3c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "com.simplemobiletools.gallery"
         minSdkVersion 16
         targetSdkVersion 27
-        versionCode 145
-        versionName "2.19.0"
+        versionCode 146
+        versionName "3.0.0"
         multiDexEnabled true
         setProperty("archivesBaseName", "gallery")
     }
@@ -21,14 +21,10 @@ android {
     }
 
     buildTypes {
-        debug {
-            buildConfigField "boolean", "USE_LEAK_CANARY", "true"
-        }
         release {
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.release
-            buildConfigField "boolean", "USE_LEAK_CANARY", "false"
         }
     }
 
@@ -47,7 +43,7 @@ ext {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:3.0.20'
+    implementation 'com.simplemobiletools:commons:3.1.4'
     implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.8.0'
     implementation 'com.theartofdev.edmodo:android-image-cropper:2.4.0'
     implementation 'com.android.support:multidex:1.0.2'
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/App.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/App.kt
index 2099d83cc..665817fb5 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/App.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/App.kt
@@ -3,13 +3,12 @@ package com.simplemobiletools.gallery
 import android.support.multidex.MultiDexApplication
 import com.github.ajalt.reprint.core.Reprint
 import com.simplemobiletools.commons.extensions.checkUseEnglish
-import com.simplemobiletools.gallery.BuildConfig.USE_LEAK_CANARY
 import com.squareup.leakcanary.LeakCanary
 
 class App : MultiDexApplication() {
     override fun onCreate() {
         super.onCreate()
-        if (USE_LEAK_CANARY) {
+        if (BuildConfig.DEBUG) {
             if (LeakCanary.isInAnalyzerProcess(this)) {
                 return
             }
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 b8d3cfc77..aca94dfc4 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt
@@ -93,38 +93,6 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
         mIsPasswordProtectionPending = config.appPasswordProtectionOn
     }
 
-    override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        if (mIsThirdPartyIntent) {
-            menuInflater.inflate(R.menu.menu_main_intent, menu)
-        } else {
-            menuInflater.inflate(R.menu.menu_main, menu)
-            menu.findItem(R.id.increase_column_count).isVisible = config.viewTypeFolders == VIEW_TYPE_GRID && config.dirColumnCnt < MAX_COLUMN_COUNT
-            menu.findItem(R.id.reduce_column_count).isVisible = config.viewTypeFolders == VIEW_TYPE_GRID && config.dirColumnCnt > 1
-        }
-        menu.findItem(R.id.temporarily_show_hidden).isVisible = !config.shouldShowHidden
-        menu.findItem(R.id.stop_showing_hidden).isVisible = config.temporarilyShowHidden
-        return true
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            R.id.sort -> showSortingDialog()
-            R.id.filter -> showFilterMediaDialog()
-            R.id.open_camera -> launchCamera()
-            R.id.show_all -> showAllMedia()
-            R.id.change_view_type -> changeViewType()
-            R.id.temporarily_show_hidden -> tryToggleTemporarilyShowHidden()
-            R.id.stop_showing_hidden -> tryToggleTemporarilyShowHidden()
-            R.id.create_new_folder -> createNewFolder()
-            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
-    }
-
     override fun onResume() {
         super.onResume()
         config.isThirdPartyIntent = false
@@ -191,6 +159,38 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
         removeTempFolder()
     }
 
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+        if (mIsThirdPartyIntent) {
+            menuInflater.inflate(R.menu.menu_main_intent, menu)
+        } else {
+            menuInflater.inflate(R.menu.menu_main, menu)
+            menu.findItem(R.id.increase_column_count).isVisible = config.viewTypeFolders == VIEW_TYPE_GRID && config.dirColumnCnt < MAX_COLUMN_COUNT
+            menu.findItem(R.id.reduce_column_count).isVisible = config.viewTypeFolders == VIEW_TYPE_GRID && config.dirColumnCnt > 1
+        }
+        menu.findItem(R.id.temporarily_show_hidden).isVisible = !config.shouldShowHidden
+        menu.findItem(R.id.stop_showing_hidden).isVisible = config.temporarilyShowHidden
+        return true
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
+            R.id.sort -> showSortingDialog()
+            R.id.filter -> showFilterMediaDialog()
+            R.id.open_camera -> launchCamera()
+            R.id.show_all -> showAllMedia()
+            R.id.change_view_type -> changeViewType()
+            R.id.temporarily_show_hidden -> tryToggleTemporarilyShowHidden()
+            R.id.stop_showing_hidden -> tryToggleTemporarilyShowHidden()
+            R.id.create_new_folder -> createNewFolder()
+            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 getDirectoryAdapter() = directories_grid.adapter as? DirectoryAdapter
 
     private fun storeStateVariables() {
@@ -319,8 +319,8 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
     private fun checkIfColorChanged() {
         if (directories_grid.adapter != null && getRecyclerAdapter().primaryColor != config.primaryColor) {
             getRecyclerAdapter().primaryColor = config.primaryColor
-            directories_vertical_fastscroller.updateHandleColor()
-            directories_horizontal_fastscroller.updateHandleColor()
+            directories_vertical_fastscroller.updatePrimaryColor()
+            directories_horizontal_fastscroller.updatePrimaryColor()
         }
     }
 
@@ -583,7 +583,9 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
         if (allowHorizontalScroll) {
             directories_horizontal_fastscroller.setViews(directories_grid, directories_refresh_layout)
         } else {
-            directories_vertical_fastscroller.setViews(directories_grid, directories_refresh_layout)
+            directories_vertical_fastscroller.setViews(directories_grid, directories_refresh_layout) {
+                directories_vertical_fastscroller.updateBubbleText(mDirs[it].getBubbleText())
+            }
         }
     }
 
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 0b5622186..4f231fd42 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt
@@ -165,8 +165,8 @@ class MediaActivity : SimpleActivity(), MediaAdapter.MediaOperationsListener {
     private fun checkIfColorChanged() {
         if (media_grid.adapter != null && getRecyclerAdapter().primaryColor != config.primaryColor) {
             getRecyclerAdapter().primaryColor = config.primaryColor
-            media_horizontal_fastscroller.updateHandleColor()
-            media_vertical_fastscroller.updateHandleColor()
+            media_horizontal_fastscroller.updatePrimaryColor()
+            media_vertical_fastscroller.updatePrimaryColor()
         }
     }
 
@@ -203,7 +203,9 @@ class MediaActivity : SimpleActivity(), MediaAdapter.MediaOperationsListener {
         if (allowHorizontalScroll) {
             media_horizontal_fastscroller.setViews(media_grid, media_refresh_layout)
         } else {
-            media_vertical_fastscroller.setViews(media_grid, media_refresh_layout)
+            media_vertical_fastscroller.setViews(media_grid, media_refresh_layout) {
+                media_vertical_fastscroller.updateBubbleText(mMedia[it].getBubbleText())
+            }
         }
     }
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SetWallpaperActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SetWallpaperActivity.kt
index 07a493239..559d06452 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SetWallpaperActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SetWallpaperActivity.kt
@@ -1,5 +1,6 @@
 package com.simplemobiletools.gallery.activities
 
+import android.annotation.SuppressLint
 import android.app.Activity
 import android.app.WallpaperManager
 import android.content.Intent
@@ -8,8 +9,11 @@ import android.net.Uri
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
+import com.simplemobiletools.commons.dialogs.RadioGroupDialog
 import com.simplemobiletools.commons.extensions.isActivityDestroyed
+import com.simplemobiletools.commons.extensions.isNougatPlus
 import com.simplemobiletools.commons.extensions.toast
+import com.simplemobiletools.commons.models.RadioItem
 import com.simplemobiletools.gallery.R
 import com.theartofdev.edmodo.cropper.CropImageView
 import kotlinx.android.synthetic.main.view_crop_image.*
@@ -17,6 +21,7 @@ import kotlinx.android.synthetic.main.view_crop_image.*
 class SetWallpaperActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener {
     private val PICK_IMAGE = 1
     private var isLandscapeRatio = true
+    private var wallpaperFlag = -1
 
     lateinit var uri: Uri
     lateinit var wallpaperManager: WallpaperManager
@@ -70,7 +75,7 @@ class SetWallpaperActivity : SimpleActivity(), CropImageView.OnCropImageComplete
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
-            R.id.save -> crop_image_view.getCroppedImageAsync()
+            R.id.save -> confirmWallpaper()
             R.id.rotate -> crop_image_view.rotateImage(90)
             R.id.portrait_aspect_ratio -> changeAspectRatio(false)
             R.id.landscape_aspect_ratio -> changeAspectRatio(true)
@@ -85,6 +90,24 @@ class SetWallpaperActivity : SimpleActivity(), CropImageView.OnCropImageComplete
         invalidateOptionsMenu()
     }
 
+    @SuppressLint("InlinedApi")
+    private fun confirmWallpaper() {
+        if (isNougatPlus()) {
+            val items = arrayListOf(
+                    RadioItem(WallpaperManager.FLAG_SYSTEM, getString(R.string.home_screen)),
+                    RadioItem(WallpaperManager.FLAG_LOCK, getString(R.string.lock_screen)),
+                    RadioItem(WallpaperManager.FLAG_SYSTEM or WallpaperManager.FLAG_LOCK, getString(R.string.home_and_lock_screen)))
+
+            RadioGroupDialog(this, items) {
+                wallpaperFlag = it as Int
+                crop_image_view.getCroppedImageAsync()
+            }
+        } else {
+            crop_image_view.getCroppedImageAsync()
+        }
+    }
+
+    @SuppressLint("NewApi")
     override fun onCropImageComplete(view: CropImageView?, result: CropImageView.CropResult) {
         if (isActivityDestroyed())
             return
@@ -97,7 +120,12 @@ class SetWallpaperActivity : SimpleActivity(), CropImageView.OnCropImageComplete
                 val ratio = wantedHeight / bitmap.height.toFloat()
                 val wantedWidth = (bitmap.width * ratio).toInt()
                 try {
-                    wallpaperManager.setBitmap(Bitmap.createScaledBitmap(bitmap, wantedWidth, wantedHeight, true))
+                    val scaledBitmap = Bitmap.createScaledBitmap(bitmap, wantedWidth, wantedHeight, true)
+                    if (isNougatPlus()) {
+                        wallpaperManager.setBitmap(scaledBitmap, null, true, wallpaperFlag)
+                    } else {
+                        wallpaperManager.setBitmap(scaledBitmap)
+                    }
                     setResult(Activity.RESULT_OK)
                 } catch (e: OutOfMemoryError) {
                     toast(R.string.out_of_memory_error)
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/activity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/Activity.kt
similarity index 100%
rename from app/src/main/kotlin/com/simplemobiletools/gallery/extensions/activity.kt
rename to app/src/main/kotlin/com/simplemobiletools/gallery/extensions/Activity.kt
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/arrayList.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/ArrayList.kt
similarity index 100%
rename from app/src/main/kotlin/com/simplemobiletools/gallery/extensions/arrayList.kt
rename to app/src/main/kotlin/com/simplemobiletools/gallery/extensions/ArrayList.kt
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/context.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/Context.kt
similarity index 100%
rename from app/src/main/kotlin/com/simplemobiletools/gallery/extensions/context.kt
rename to app/src/main/kotlin/com/simplemobiletools/gallery/extensions/Context.kt
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/file.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/File.kt
similarity index 100%
rename from app/src/main/kotlin/com/simplemobiletools/gallery/extensions/file.kt
rename to app/src/main/kotlin/com/simplemobiletools/gallery/extensions/File.kt
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/resources.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/Resources.kt
similarity index 100%
rename from app/src/main/kotlin/com/simplemobiletools/gallery/extensions/resources.kt
rename to app/src/main/kotlin/com/simplemobiletools/gallery/extensions/Resources.kt
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/string.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/String.kt
similarity index 100%
rename from app/src/main/kotlin/com/simplemobiletools/gallery/extensions/string.kt
rename to app/src/main/kotlin/com/simplemobiletools/gallery/extensions/String.kt
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/ViewPagerFragment.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/ViewPagerFragment.kt
index 7ccb83d45..d4ddfa698 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/ViewPagerFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/ViewPagerFragment.kt
@@ -45,7 +45,7 @@ abstract class ViewPagerFragment : Fragment() {
         }
 
         if (detailsFlag and EXT_LAST_MODIFIED != 0) {
-            file.lastModified().formatLastModified().let { if (it.isNotEmpty()) details.appendln(it) }
+            file.lastModified().formatDate().let { if (it.isNotEmpty()) details.appendln(it) }
         }
 
         if (detailsFlag and EXT_DATE_TAKEN != 0) {
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/models/Directory.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/models/Directory.kt
index d03b4d1be..e545ff080 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/models/Directory.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/models/Directory.kt
@@ -1,5 +1,7 @@
 package com.simplemobiletools.gallery.models
 
+import com.simplemobiletools.commons.extensions.formatDate
+import com.simplemobiletools.commons.extensions.formatSize
 import com.simplemobiletools.commons.helpers.*
 import java.io.Serializable
 
@@ -37,4 +39,11 @@ data class Directory(val path: String, val tmb: String, val name: String, var me
         }
         return result
     }
+
+    fun getBubbleText() = when {
+        sorting and SORT_BY_SIZE != 0 -> size.formatSize()
+        sorting and SORT_BY_DATE_MODIFIED != 0 -> modified.formatDate()
+        sorting and SORT_BY_DATE_TAKEN != 0 -> taken.formatDate()
+        else -> name
+    }
 }
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/models/Medium.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/models/Medium.kt
index bf15cd20c..638dc3f9b 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/models/Medium.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/models/Medium.kt
@@ -1,8 +1,6 @@
 package com.simplemobiletools.gallery.models
 
-import com.simplemobiletools.commons.extensions.getMimeTypeFromPath
-import com.simplemobiletools.commons.extensions.isGif
-import com.simplemobiletools.commons.extensions.isPng
+import com.simplemobiletools.commons.extensions.*
 import com.simplemobiletools.commons.helpers.*
 import java.io.Serializable
 
@@ -48,4 +46,11 @@ data class Medium(var name: String, var path: String, val video: Boolean, val mo
         }
         return result
     }
+
+    fun getBubbleText() = when {
+        sorting and SORT_BY_SIZE != 0 -> size.formatSize()
+        sorting and SORT_BY_DATE_MODIFIED != 0 -> modified.formatDate()
+        sorting and SORT_BY_DATE_TAKEN != 0 -> taken.formatDate()
+        else -> name
+    }
 }
diff --git a/app/src/main/res/drawable-v26/ic_launcher_foreground.xml b/app/src/main/res/drawable-v26/ic_launcher_foreground.xml
index 4a7af2a01..5f01b3af0 100644
--- a/app/src/main/res/drawable-v26/ic_launcher_foreground.xml
+++ b/app/src/main/res/drawable-v26/ic_launcher_foreground.xml
@@ -5,11 +5,9 @@
     android:viewportHeight="108"
     android:viewportWidth="108">
     <path
-        android:fillAlpha="1"
-        android:fillColor="#fff"
-        android:pathData="M63.8,39.95m-5.85,0a5.85,5.85 0,1 1,11.71 0a5.85,5.85 0,1 1,-11.71 0"/>
+        android:fillColor="#FFFFFF"
+        android:pathData="M63.58,40.16m-5.73,0a5.73,5.73 0,1 1,11.47 0a5.73,5.73 0,1 1,-11.47 0"/>
     <path
-        android:fillAlpha="1"
-        android:fillColor="#fff"
-        android:pathData="M29.52,72.4l46.27,0l-10.05,-16.51l0,0l-6.01,8.57l-12.43,-17.93z"/>
+        android:fillColor="#FFFFFF"
+        android:pathData="M47.37,46.64l-17.45,25.43l45.46,0l-9.89,-16.21l-5.9,8.39z"/>
 </vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 073f3fd19..828d2689b 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -50,13 +50,7 @@
             android:paddingLeft="@dimen/normal_margin"
             android:paddingStart="@dimen/normal_margin">
 
-            <ImageView
-                android:id="@+id/fastscroller_handle_vertical"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end"
-                android:alpha="0"
-                android:background="@drawable/fastscroller_handle_vertical"/>
+            <include layout="@layout/fastscroller_handle_vertical"/>
 
         </com.simplemobiletools.commons.views.FastScroller>
 
diff --git a/app/src/main/res/layout/activity_media.xml b/app/src/main/res/layout/activity_media.xml
index 95bc05417..6741e00fe 100644
--- a/app/src/main/res/layout/activity_media.xml
+++ b/app/src/main/res/layout/activity_media.xml
@@ -50,13 +50,7 @@
             android:paddingLeft="@dimen/normal_margin"
             android:paddingStart="@dimen/normal_margin">
 
-            <ImageView
-                android:id="@+id/fastscroller_handle_vertical"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end"
-                android:alpha="0"
-                android:background="@drawable/fastscroller_handle_vertical"/>
+            <include layout="@layout/fastscroller_handle_vertical"/>
 
         </com.simplemobiletools.commons.views.FastScroller>
 
diff --git a/app/src/main/res/layout/dialog_directory_picker.xml b/app/src/main/res/layout/dialog_directory_picker.xml
index 6265d6d8b..824e8db82 100644
--- a/app/src/main/res/layout/dialog_directory_picker.xml
+++ b/app/src/main/res/layout/dialog_directory_picker.xml
@@ -24,13 +24,7 @@
         android:paddingLeft="@dimen/normal_margin"
         android:paddingStart="@dimen/normal_margin">
 
-        <ImageView
-            android:id="@+id/fastscroller_handle_vertical"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end"
-            android:alpha="0"
-            android:background="@drawable/fastscroller_handle_vertical"/>
+        <include layout="@layout/fastscroller_handle_vertical"/>
 
     </com.simplemobiletools.commons.views.FastScroller>
 
diff --git a/app/src/main/res/layout/dialog_medium_picker.xml b/app/src/main/res/layout/dialog_medium_picker.xml
index 07e7f7678..01b630a1d 100644
--- a/app/src/main/res/layout/dialog_medium_picker.xml
+++ b/app/src/main/res/layout/dialog_medium_picker.xml
@@ -23,13 +23,7 @@
         android:paddingLeft="@dimen/normal_margin"
         android:paddingStart="@dimen/normal_margin">
 
-        <ImageView
-            android:id="@+id/fastscroller_handle_vertical"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end"
-            android:alpha="0"
-            android:background="@drawable/fastscroller_handle_vertical"/>
+        <include layout="@layout/fastscroller_handle_vertical"/>
 
     </com.simplemobiletools.commons.views.FastScroller>
 
diff --git a/app/src/main/res/mipmap-anydpi-v21/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v21/ic_launcher.xml
index b50665400..7a579a35d 100644
--- a/app/src/main/res/mipmap-anydpi-v21/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v21/ic_launcher.xml
@@ -5,15 +5,12 @@
     android:viewportHeight="108"
     android:viewportWidth="108">
     <path
-        android:fillAlpha="1"
-        android:fillColor="#f57c00"
-        android:pathData="M54.31,5.43L54.31,5.43A48.88,48.88 0,0 1,103.18 54.31L103.18,54.31A48.88,48.88 0,0 1,54.31 103.18L54.31,103.18A48.88,48.88 0,0 1,5.43 54.31L5.43,54.31A48.88,48.88 0,0 1,54.31 5.43z"/>
+        android:fillColor="#F57C00"
+        android:pathData="M54.3,103.2L54.3,103.2c-27,0 -48.9,-21.9 -48.9,-48.9v0c0,-27 21.9,-48.9 48.9,-48.9h0c27,0 48.9,21.9 48.9,48.9v0C103.2,81.3 81.3,103.2 54.3,103.2z"/>
     <path
-        android:fillAlpha="1"
-        android:fillColor="#fff"
-        android:pathData="M65.83,37.53m-6.92,0a6.92,6.92 0,1 1,13.84 0a6.92,6.92 0,1 1,-13.84 0"/>
+        android:fillColor="#FFFFFF"
+        android:pathData="M65.8,37.5m-6.9,0a6.9,6.9 0,1 1,13.8 0a6.9,6.9 0,1 1,-13.8 0"/>
     <path
-        android:fillAlpha="1"
-        android:fillColor="#fff"
-        android:pathData="M68.13,56.37l-7.11,10.13l-14.7,-21.2l-21.02,30.59l54.71,0l-11.88,-19.52z"/>
+        android:fillColor="#FFFFFF"
+        android:pathData="M68.1,56.4l-7.1,10.1l-14.7,-21.2l-21,30.6l54.7,0z"/>
 </vector>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
deleted file mode 100644
index e15f4800d..000000000
--- a/app/src/main/res/values-ca/strings.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">Simple Gallery</string>
-    <string name="app_launcher_name">Gallery</string>
-    <string name="edit">Edit</string>
-    <string name="open_camera">Open camera</string>
-    <string name="hidden">(hidden)</string>
-    <string name="pin_folder">Pin folder</string>
-    <string name="unpin_folder">Unpin folder</string>
-    <string name="show_all">Show all folders content</string>
-    <string name="all_folders">All folders</string>
-    <string name="folder_view">Switch to folder view</string>
-    <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>
-    <string name="select_photo">Select photo</string>
-    <string name="use_default">Use default</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>
-
-    <!-- Filter -->
-    <string name="filter_media">Filter media</string>
-    <string name="images">Images</string>
-    <string name="videos">Videos</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>
-
-    <!-- Hide / Exclude -->
-    <string name="hide_folder_description">This function hides the folder by adding a \'.nomedia\' file into it, it will hide all subfolders too. You can see them by toggling the \'Show hidden folders\' option in Settings. Continue?</string>
-    <string name="exclude">Exclude</string>
-    <string name="excluded_folders">Excluded folders</string>
-    <string name="manage_excluded_folders">Manage excluded folders</string>
-    <string name="exclude_folder_description">This will exclude the selection together with its subfolders from Simple Gallery only. You can manage excluded folders in Settings.</string>
-    <string name="exclude_folder_parent">Exclude a parent instead?</string>
-    <string name="excluded_activity_placeholder">Excluding folders will make them together with their subfolders hidden just in Simple Gallery, they will still be visible in other applications.\n\nIf you want to hide them from other apps too, use the Hide function.</string>
-    <string name="remove_all">Remove all</string>
-    <string name="remove_all_description">Remove all folders from the list of excluded? This will not delete the folders.</string>
-
-    <!-- Include folders -->
-    <string name="include_folders">Included folders</string>
-    <string name="manage_included_folders">Manage included folders</string>
-    <string name="add_folder">Add folder</string>
-    <string name="included_activity_placeholder">If you have some folders which contain media, but were not recognized by the app, you can add them manually here.\n\nAdding some items here will not exclude any other folder.</string>
-
-    <!-- Resizing -->
-    <string name="resize">Resize</string>
-    <string name="resize_and_save">Resize selection and save</string>
-    <string name="width">Width</string>
-    <string name="height">Height</string>
-    <string name="keep_aspect_ratio">Keep aspect ratio</string>
-    <string name="invalid_values">Please enter a valid resolution</string>
-
-    <!-- Editor -->
-    <string name="editor">Editor</string>
-    <string name="save">Save</string>
-    <string name="rotate">Rotate</string>
-    <string name="path">Path</string>
-    <string name="invalid_image_path">Invalid image path</string>
-    <string name="image_editing_failed">Image editing failed</string>
-    <string name="edit_image_with">Edit image with:</string>
-    <string name="no_editor_found">No image editor found</string>
-    <string name="unknown_file_location">Unknown file location</string>
-    <string name="error_saving_file">Could not overwrite the source file</string>
-    <string name="rotate_left">Rotate left</string>
-    <string name="rotate_right">Rotate right</string>
-    <string name="rotate_one_eighty">Rotate by 180º</string>
-    <string name="flip">Flip</string>
-    <string name="flip_horizontally">Flip horizontally</string>
-    <string name="flip_vertically">Flip vertically</string>
-    <string name="edit_with">Edit with</string>
-
-    <!-- Set wallpaper -->
-    <string name="simple_wallpaper">Simple Wallpaper</string>
-    <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>
-    <string name="landscape_aspect_ratio">Landscape aspect ratio</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>
-
-    <!-- View types -->
-    <string name="change_view_type">Change view type</string>
-    <string name="grid">Grid</string>
-    <string name="list">List</string>
-
-    <!-- Settings -->
-    <string name="show_hidden_media">Show hidden media</string>
-    <string name="autoplay_videos">Play videos automatically</string>
-    <string name="toggle_filename">Toggle filename visibility</string>
-    <string name="loop_videos">Loop videos</string>
-    <string name="animate_gifs">Animate GIFs at thumbnails</string>
-    <string name="max_brightness">Max brightness when viewing media</string>
-    <string name="crop_thumbnails">Crop thumbnails into squares</string>
-    <string name="screen_rotation_by">Rotate fullscreen media by</string>
-    <string name="screen_rotation_system_setting">System setting</string>
-    <string name="screen_rotation_device_rotation">Device rotation</string>
-    <string name="screen_rotation_aspect_ratio">Aspect ratio</string>
-    <string name="dark_background_at_fullscreen">Dark background at fullscreen media</string>
-    <string name="scroll_thumbnails_horizontally">Scroll thumbnails horizontally</string>
-    <string name="hide_system_ui_at_fullscreen">Automatically hide system UI at fullscreen media</string>
-    <string name="delete_empty_folders">Delete empty folders after deleting their content</string>
-    <string name="allow_video_gestures">Allow controlling video volume and brightness with vertical gestures</string>
-    <string name="show_media_count">Show folder media count on the main view</string>
-    <string name="replace_share_with_rotate">Replace Share with Rotate at fullscreen menu</string>
-    <string name="show_extended_details">Show extended details over fullscreen media</string>
-    <string name="manage_extended_details">Manage extended details</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">A gallery for viewing photos and videos without ads.</string>
-    <string name="app_long_description">
-        A simple tool usable for viewing photos and videos. Items can be sorted by date, size, name both ascending or descending, photos can be zoomed in. Media files are shown in multiple columns depending on the size of the display, you can change the column count by pinch gestures. They can be renamed, shared, deleted, copied, moved. Images can also be cropped, rotated, flipped or set as Wallpaper directly from the app.
-
-        The Gallery is also offered for third party usage for previewing images / videos, adding attachments at email clients etc. It\'s perfect for everyday usage.
-
-        Contains no ads or unnecessary permissions. It is fully opensource, provides customizable colors.
-
-        This app is just one piece of a bigger series of apps. You can find the rest of them at 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 4252e7953..0c6d1748f 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -88,6 +88,9 @@
     <string name="wallpaper_set_successfully">Tapeta byla úspěšně změněna</string>
     <string name="portrait_aspect_ratio">Portrait aspect ratio</string>
     <string name="landscape_aspect_ratio">Landscape aspect ratio</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>
 
     <!-- Slideshow -->
     <string name="slideshow">Slideshow</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 9676c7754..bff9ec074 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -88,6 +88,9 @@
     <string name="wallpaper_set_successfully">Hintergrundbild erfolgreich festgelegt</string>
     <string name="portrait_aspect_ratio">Hochformat</string>
     <string name="landscape_aspect_ratio">Querformat</string>
+    <string name="home_screen">Home-Screen</string>
+    <string name="lock_screen">Sperrbildschirm</string>
+    <string name="home_and_lock_screen">Home- und Sperrbildschirm</string>
 
     <!-- Slideshow -->
     <string name="slideshow">Diashow</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 5cb108458..c5c899c29 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -27,7 +27,7 @@
     <string name="unlock_orientation">Unlock orientation</string>
 
     <!-- Filter -->
-    <string name="filter_media">Filter media</string>
+    <string name="filter_media">Filtro de medios</string>
     <string name="images">Images</string>
     <string name="videos">Videos</string>
     <string name="gifs">GIFs</string>
@@ -88,6 +88,9 @@
     <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>
 
     <!-- Slideshow -->
     <string name="slideshow">Slideshow</string>
@@ -103,7 +106,7 @@
     <string name="no_media_for_slideshow">No media for the slideshow have been found</string>
 
     <!-- View types -->
-    <string name="change_view_type">Change view type</string>
+    <string name="change_view_type">Cambiar tipo de vista</string>
     <string name="grid">Grid</string>
     <string name="list">List</string>
 
@@ -122,11 +125,11 @@
     <string name="dark_background_at_fullscreen">Utilizar siempre fondo oscuro en 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">Delete empty folders after deleting their content</string>
-    <string name="allow_video_gestures">Allow controlling video volume and brightness with vertical gestures</string>
-    <string name="show_media_count">Show folder media count on the main view</string>
+    <string name="delete_empty_folders">Eliminar carpetas vacias despues de borrar su contenido</string>
+    <string name="allow_video_gestures">Permite controlar el volumen y el brillo del video con gestos verticales</string>
+    <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">Show extended details over fullscreen media</string>
+    <string name="show_extended_details">Mostrar detalles extendidos sobre medios en pantalla completa</string>
     <string name="manage_extended_details">Manage extended details</string>
 
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 39a1625af..a49f2e548 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -88,6 +88,9 @@
     <string name="wallpaper_set_successfully">Taustakuva asetettu onnistuneesti</string>
     <string name="portrait_aspect_ratio">Kuvasuhde pystyssä</string>
     <string name="landscape_aspect_ratio">Kuvasuhde vaakatasossa</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>
 
     <!-- Slideshow -->
     <string name="slideshow">Diaesitys</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 4029cf872..feeaa6c03 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -88,6 +88,9 @@
     <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>
 
     <!-- Slideshow -->
     <string name="slideshow">Diaporama</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 7ab987bca..1fe7dc1a2 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -88,6 +88,9 @@
     <string name="wallpaper_set_successfully">Uspješno postavljanje pozadine</string>
     <string name="portrait_aspect_ratio">Portretni omjer slike</string>
     <string name="landscape_aspect_ratio">Pejzažni omjer slike</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>
 
     <!-- Slideshow -->
     <string name="slideshow">Dijaprojekcija</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 8b1a9efc7..5a6ef0917 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -88,6 +88,9 @@
     <string name="wallpaper_set_successfully">Wallpaper set successfully</string>
     <string name="portrait_aspect_ratio">Portrait aspect ratio</string>
     <string name="landscape_aspect_ratio">Landscape aspect ratio</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>
 
     <!-- Slideshow -->
     <string name="slideshow">Slideshow</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 3498ff272..ae49dd641 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -88,6 +88,9 @@
     <string name="wallpaper_set_successfully">Sfondo impostato correttamente</string>
     <string name="portrait_aspect_ratio">Proporzioni ritratto</string>
     <string name="landscape_aspect_ratio">Proporzioni panorama</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>
 
     <!-- Slideshow -->
     <string name="slideshow">Presentazione</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 8ab7eebc6..b09569ba5 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -88,6 +88,9 @@
     <string name="wallpaper_set_successfully">壁紙を正常に設定しました</string>
     <string name="portrait_aspect_ratio">縦向きの縦横比</string>
     <string name="landscape_aspect_ratio">横向きの縦横比</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>
 
     <!-- Slideshow -->
     <string name="slideshow">スライドショー</string>
diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml
deleted file mode 100644
index e15f4800d..000000000
--- a/app/src/main/res/values-ms/strings.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">Simple Gallery</string>
-    <string name="app_launcher_name">Gallery</string>
-    <string name="edit">Edit</string>
-    <string name="open_camera">Open camera</string>
-    <string name="hidden">(hidden)</string>
-    <string name="pin_folder">Pin folder</string>
-    <string name="unpin_folder">Unpin folder</string>
-    <string name="show_all">Show all folders content</string>
-    <string name="all_folders">All folders</string>
-    <string name="folder_view">Switch to folder view</string>
-    <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>
-    <string name="select_photo">Select photo</string>
-    <string name="use_default">Use default</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>
-
-    <!-- Filter -->
-    <string name="filter_media">Filter media</string>
-    <string name="images">Images</string>
-    <string name="videos">Videos</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>
-
-    <!-- Hide / Exclude -->
-    <string name="hide_folder_description">This function hides the folder by adding a \'.nomedia\' file into it, it will hide all subfolders too. You can see them by toggling the \'Show hidden folders\' option in Settings. Continue?</string>
-    <string name="exclude">Exclude</string>
-    <string name="excluded_folders">Excluded folders</string>
-    <string name="manage_excluded_folders">Manage excluded folders</string>
-    <string name="exclude_folder_description">This will exclude the selection together with its subfolders from Simple Gallery only. You can manage excluded folders in Settings.</string>
-    <string name="exclude_folder_parent">Exclude a parent instead?</string>
-    <string name="excluded_activity_placeholder">Excluding folders will make them together with their subfolders hidden just in Simple Gallery, they will still be visible in other applications.\n\nIf you want to hide them from other apps too, use the Hide function.</string>
-    <string name="remove_all">Remove all</string>
-    <string name="remove_all_description">Remove all folders from the list of excluded? This will not delete the folders.</string>
-
-    <!-- Include folders -->
-    <string name="include_folders">Included folders</string>
-    <string name="manage_included_folders">Manage included folders</string>
-    <string name="add_folder">Add folder</string>
-    <string name="included_activity_placeholder">If you have some folders which contain media, but were not recognized by the app, you can add them manually here.\n\nAdding some items here will not exclude any other folder.</string>
-
-    <!-- Resizing -->
-    <string name="resize">Resize</string>
-    <string name="resize_and_save">Resize selection and save</string>
-    <string name="width">Width</string>
-    <string name="height">Height</string>
-    <string name="keep_aspect_ratio">Keep aspect ratio</string>
-    <string name="invalid_values">Please enter a valid resolution</string>
-
-    <!-- Editor -->
-    <string name="editor">Editor</string>
-    <string name="save">Save</string>
-    <string name="rotate">Rotate</string>
-    <string name="path">Path</string>
-    <string name="invalid_image_path">Invalid image path</string>
-    <string name="image_editing_failed">Image editing failed</string>
-    <string name="edit_image_with">Edit image with:</string>
-    <string name="no_editor_found">No image editor found</string>
-    <string name="unknown_file_location">Unknown file location</string>
-    <string name="error_saving_file">Could not overwrite the source file</string>
-    <string name="rotate_left">Rotate left</string>
-    <string name="rotate_right">Rotate right</string>
-    <string name="rotate_one_eighty">Rotate by 180º</string>
-    <string name="flip">Flip</string>
-    <string name="flip_horizontally">Flip horizontally</string>
-    <string name="flip_vertically">Flip vertically</string>
-    <string name="edit_with">Edit with</string>
-
-    <!-- Set wallpaper -->
-    <string name="simple_wallpaper">Simple Wallpaper</string>
-    <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>
-    <string name="landscape_aspect_ratio">Landscape aspect ratio</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>
-
-    <!-- View types -->
-    <string name="change_view_type">Change view type</string>
-    <string name="grid">Grid</string>
-    <string name="list">List</string>
-
-    <!-- Settings -->
-    <string name="show_hidden_media">Show hidden media</string>
-    <string name="autoplay_videos">Play videos automatically</string>
-    <string name="toggle_filename">Toggle filename visibility</string>
-    <string name="loop_videos">Loop videos</string>
-    <string name="animate_gifs">Animate GIFs at thumbnails</string>
-    <string name="max_brightness">Max brightness when viewing media</string>
-    <string name="crop_thumbnails">Crop thumbnails into squares</string>
-    <string name="screen_rotation_by">Rotate fullscreen media by</string>
-    <string name="screen_rotation_system_setting">System setting</string>
-    <string name="screen_rotation_device_rotation">Device rotation</string>
-    <string name="screen_rotation_aspect_ratio">Aspect ratio</string>
-    <string name="dark_background_at_fullscreen">Dark background at fullscreen media</string>
-    <string name="scroll_thumbnails_horizontally">Scroll thumbnails horizontally</string>
-    <string name="hide_system_ui_at_fullscreen">Automatically hide system UI at fullscreen media</string>
-    <string name="delete_empty_folders">Delete empty folders after deleting their content</string>
-    <string name="allow_video_gestures">Allow controlling video volume and brightness with vertical gestures</string>
-    <string name="show_media_count">Show folder media count on the main view</string>
-    <string name="replace_share_with_rotate">Replace Share with Rotate at fullscreen menu</string>
-    <string name="show_extended_details">Show extended details over fullscreen media</string>
-    <string name="manage_extended_details">Manage extended details</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">A gallery for viewing photos and videos without ads.</string>
-    <string name="app_long_description">
-        A simple tool usable for viewing photos and videos. Items can be sorted by date, size, name both ascending or descending, photos can be zoomed in. Media files are shown in multiple columns depending on the size of the display, you can change the column count by pinch gestures. They can be renamed, shared, deleted, copied, moved. Images can also be cropped, rotated, flipped or set as Wallpaper directly from the app.
-
-        The Gallery is also offered for third party usage for previewing images / videos, adding attachments at email clients etc. It\'s perfect for everyday usage.
-
-        Contains no ads or unnecessary permissions. It is fully opensource, provides customizable colors.
-
-        This app is just one piece of a bigger series of apps. You can find the rest of them at 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-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index bbd0a82dd..188e0c7bf 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -88,6 +88,9 @@
     <string name="wallpaper_set_successfully">Achtergrond is ingesteld</string>
     <string name="portrait_aspect_ratio">Verhouding in portretmodus</string>
     <string name="landscape_aspect_ratio">Verhouding in landschapsmodus</string>
+    <string name="home_screen">Startscherm</string>
+    <string name="lock_screen">Vergrendelingsscherm</string>
+    <string name="home_and_lock_screen">Start- en vergrendelingsscherm</string>
 
     <!-- Slideshow -->
     <string name="slideshow">Diavoorstelling</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index eb749c168..e19311773 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -88,6 +88,9 @@
     <string name="wallpaper_set_successfully">Tapeta została ustawiona</string>
     <string name="portrait_aspect_ratio">Proporcje ekranu w trybie pionowym</string>
     <string name="landscape_aspect_ratio">Proporcje ekranu w trybie poziomym</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>
 
     <!-- Slideshow -->
     <string name="slideshow">Pokaz slajdów</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index a4c29aca1..d63e956f6 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -88,6 +88,9 @@
     <string name="wallpaper_set_successfully">Papel de parede com sucesso</string>
     <string name="portrait_aspect_ratio">Retrato</string>
     <string name="landscape_aspect_ratio">Paisagem</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>
 
     <!-- Slideshow -->
     <string name="slideshow">Slideshow</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 40ec56b98..6db9b5657 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -88,6 +88,9 @@
     <string name="wallpaper_set_successfully">Fundo definido com sucesso</string>
     <string name="portrait_aspect_ratio">Proporção na vertical</string>
     <string name="landscape_aspect_ratio">Proporção na horizontal</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>
 
     <!-- Slideshow -->
     <string name="slideshow">Apresentação</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index e975f4888..134d082ac 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -88,6 +88,9 @@
     <string name="wallpaper_set_successfully">Обои успешно установлены</string>
     <string name="portrait_aspect_ratio">Портрет</string>
     <string name="landscape_aspect_ratio">Ландшафт</string>
+    <string name="home_screen">Домашний экран</string>
+    <string name="lock_screen">Экран блокировки</string>
+    <string name="home_and_lock_screen">Домашний экран и экран блокировки</string>
 
     <!-- Slideshow -->
     <string name="slideshow">Слайдшоу</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index fbc43e87d..dd75e136d 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -88,6 +88,9 @@
     <string name="wallpaper_set_successfully">Tapeta bola úspešne zmenená</string>
     <string name="portrait_aspect_ratio">Orientácia nastojato</string>
     <string name="landscape_aspect_ratio">Orientácia naležato</string>
+    <string name="home_screen">Plocha</string>
+    <string name="lock_screen">Obrazovka uzamknutia</string>
+    <string name="home_and_lock_screen">Plocha a obrazovka uzamknutia</string>
 
     <!-- Slideshow -->
     <string name="slideshow">Prezentácia</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index dbdf99823..a91d2b9d6 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -88,6 +88,9 @@
     <string name="wallpaper_set_successfully">Bakgrundsbilden är ändrad</string>
     <string name="portrait_aspect_ratio">Stående bildförhållande</string>
     <string name="landscape_aspect_ratio">Liggande bildförhållande</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>
 
     <!-- Slideshow -->
     <string name="slideshow">Bildspel</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index a93d22dcf..cc051c267 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -88,6 +88,9 @@
     <string name="wallpaper_set_successfully">Duvar kağıdı başarıyla ayarlandı</string>
     <string name="portrait_aspect_ratio">Portrait aspect ratio</string>
     <string name="landscape_aspect_ratio">Landscape aspect ratio</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>
 
     <!-- Slideshow -->
     <string name="slideshow">Slideshow</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 072ef4393..f6107fd68 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -88,6 +88,9 @@
     <string name="wallpaper_set_successfully">壁纸设置成功</string>
     <string name="portrait_aspect_ratio">纵向长宽比</string>
     <string name="landscape_aspect_ratio">横向长宽比</string>
+    <string name="home_screen">主屏幕壁纸</string>
+    <string name="lock_screen">锁屏壁纸</string>
+    <string name="home_and_lock_screen">主屏幕和锁屏壁纸</string>
 
     <!-- Slideshow -->
     <string name="slideshow">幻灯片</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 0e6fe6ec4..f7a152dce 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -88,6 +88,9 @@
     <string name="wallpaper_set_successfully">成功設為桌布</string>
     <string name="portrait_aspect_ratio">直向長寬比</string>
     <string name="landscape_aspect_ratio">橫向長寬比</string>
+    <string name="home_screen">主頁螢幕</string>
+    <string name="lock_screen">鎖定螢幕</string>
+    <string name="home_and_lock_screen">主頁和鎖定螢幕</string>
 
     <!-- Slideshow -->
     <string name="slideshow">投影片</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e15f4800d..618f119c5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -88,6 +88,9 @@
     <string name="wallpaper_set_successfully">Wallpaper set successfully</string>
     <string name="portrait_aspect_ratio">Portrait aspect ratio</string>
     <string name="landscape_aspect_ratio">Landscape aspect ratio</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>
 
     <!-- Slideshow -->
     <string name="slideshow">Slideshow</string>