diff --git a/app/build.gradle b/app/build.gradle
index 2c504b9d..358c15a2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -45,7 +45,7 @@ ext {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:3.19.1'
+    implementation 'com.simplemobiletools:commons:4.0.13'
 
     implementation files('../libs/RootTools.jar')
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/MainActivity.kt
index d23446db..1210fe30 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/MainActivity.kt
@@ -42,7 +42,7 @@ class MainActivity : SimpleActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
-        appLaunched()
+        appLaunched(BuildConfig.APPLICATION_ID)
 
         fragment = (fragment_holder as ItemsFragment).apply {
             isGetRingtonePicker = intent.action == RingtoneManager.ACTION_RINGTONE_PICKER
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/SimpleActivity.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/SimpleActivity.kt
index 6e635cca..563d1576 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/SimpleActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/SimpleActivity.kt
@@ -1,5 +1,12 @@
 package com.simplemobiletools.filemanager.activities
 
 import com.simplemobiletools.commons.activities.BaseSimpleActivity
+import com.simplemobiletools.filemanager.R
 
-open class SimpleActivity : BaseSimpleActivity()
+open class SimpleActivity : BaseSimpleActivity() {
+    override fun getAppIconIDs() = arrayListOf(
+            R.mipmap.ic_launcher
+    )
+
+    override fun getAppLauncherName() = getString(R.string.app_launcher_name)
+}
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt
index 731c09cb..3b65221e 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt
@@ -48,6 +48,8 @@ class ItemsAdapter(activity: SimpleActivity, var fileDirItems: MutableList<FileD
     private lateinit var fileDrawable: Drawable
     private var currentItemsHash = fileDirItems.hashCode()
     private val hasOTGConnected = activity.hasOTGConnected()
+    private var textToHighlight = ""
+    private var adjustedPrimaryColor = activity.getAdjustedPrimaryColor()
 
     init {
         setupDragListener(true)
@@ -463,14 +465,18 @@ class ItemsAdapter(activity: SimpleActivity, var fileDirItems: MutableList<FileD
         return selectedMedia
     }
 
-    fun updateItems(newItems: ArrayList<FileDirItem>) {
+    fun updateItems(newItems: ArrayList<FileDirItem>, highlightText: String = "") {
         if (newItems.hashCode() != currentItemsHash) {
             currentItemsHash = newItems.hashCode()
+            textToHighlight = highlightText
             fileDirItems = newItems.clone() as ArrayList<FileDirItem>
             notifyDataSetChanged()
             finishActMode()
-            fastScroller?.measureRecyclerView()
+        } else if (textToHighlight != highlightText) {
+            textToHighlight = highlightText
+            notifyDataSetChanged()
         }
+        fastScroller?.measureRecyclerView()
     }
 
     override fun onViewRecycled(holder: ViewHolder) {
@@ -482,7 +488,8 @@ class ItemsAdapter(activity: SimpleActivity, var fileDirItems: MutableList<FileD
 
     private fun setupView(view: View, fileDirItem: FileDirItem) {
         view.apply {
-            item_name.text = fileDirItem.name
+            val fileName = fileDirItem.name
+            item_name.text = if (textToHighlight.isEmpty()) fileName else fileName.highlightTextPart(textToHighlight, adjustedPrimaryColor)
             item_name.setTextColor(textColor)
             item_details.setTextColor(textColor)
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/fragments/ItemsFragment.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/fragments/ItemsFragment.kt
index 06ebe705..8c9bbfde 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/fragments/ItemsFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/fragments/ItemsFragment.kt
@@ -251,7 +251,7 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb
             val filtered = storedItems.filter { it.name.contains(text, true) } as ArrayList
             filtered.sortBy { !it.name.startsWith(text, true) }
             activity?.runOnUiThread {
-                (items_list.adapter as? ItemsAdapter)?.updateItems(filtered)
+                (items_list.adapter as? ItemsAdapter)?.updateItems(filtered, text)
             }
         }.start()
     }