diff --git a/app/build.gradle b/app/build.gradle
index d0459fe6..a94e34c7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -58,7 +58,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.github.SimpleMobileTools:Simple-Commons:5079455be9'
+    implementation 'com.github.SimpleMobileTools:Simple-Commons:c184f98ca8'
     implementation 'com.github.Stericson:RootTools:df729dcb13'
     implementation 'com.github.Stericson:RootShell:1.6'
     implementation 'com.alexvasilkov:gesture-views:2.5.2'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3f67a418..83eadc0a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -113,21 +113,11 @@
             android:label="@string/about"
             android:parentActivityName=".activities.MainActivity"/>
 
-        <activity
-            android:name="com.simplemobiletools.commons.activities.LicenseActivity"
-            android:label="@string/third_party_licences"
-            android:parentActivityName="com.simplemobiletools.commons.activities.AboutActivity"/>
-
         <activity
             android:name="com.simplemobiletools.commons.activities.CustomizationActivity"
             android:label="@string/customize_colors"
             android:parentActivityName=".activities.SettingsActivity"/>
 
-        <activity
-            android:name="com.simplemobiletools.commons.activities.FAQActivity"
-            android:label="@string/frequently_asked_questions"
-            android:parentActivityName="com.simplemobiletools.commons.activities.AboutActivity"/>
-
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.provider"
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/MainActivity.kt
index bbe10230..4f676092 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/MainActivity.kt
@@ -132,11 +132,11 @@ class MainActivity : SimpleActivity() {
     override fun onPause() {
         super.onPause()
         storeStateVariables()
+        config.lastUsedViewPagerPage = main_view_pager.currentItem
     }
 
     override fun onDestroy() {
         super.onDestroy()
-        config.lastUsedViewPagerPage = main_view_pager.currentItem
         config.temporarilyShowHidden = false
     }
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/ItemsFragment.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/ItemsFragment.kt
index 008576da..4f766373 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/ItemsFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/ItemsFragment.kt
@@ -221,7 +221,7 @@ class ItemsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerF
 
         var lastModified = lastModifieds.remove(curPath)
         val isDirectory = if (lastModified != null) false else file.isDirectory
-        val children = if (isDirectory && getProperChildCount) file.getDirectChildrenCount(showHidden) else 0
+        val children = if (isDirectory && getProperChildCount) file.getDirectChildrenCount(context, showHidden) else 0
         val size = if (isDirectory) {
             if (isSortingBySize) {
                 file.getProperSize(showHidden)
diff --git a/app/src/main/res/drawable/ic_decompress_vector.xml b/app/src/main/res/drawable/ic_decompress_vector.xml
index dbc02d31..c4411729 100644
--- a/app/src/main/res/drawable/ic_decompress_vector.xml
+++ b/app/src/main/res/drawable/ic_decompress_vector.xml
@@ -1,9 +1,3 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M19,12v7L5,19v-7L3,12v7c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2v-7h-2zM13,12.67l2.59,-2.58L17,11.5l-5,5 -5,-5 1.41,-1.41L11,12.67L11,3h2z" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M16.3 10.3c-0.39-0.39-1.01-0.39-1.4 0L13 12.2V3c0-0.55-0.45-1-1-1s-1 0.45-1 1v9.2l-1.9-1.9c-0.39-0.39-1.01-0.39-1.4 0-0.39 0.39-0.39 1.01 0 1.4l3.59 3.59c0.39 0.39 1.02 0.39 1.41 0l3.6-3.59c0.39-0.39 0.39-1.01 0-1.4zM5 20v-7c0-0.55-0.45-1-1-1s-1 0.45-1 1v7c0 1.1 0.9 2 2 2h14c1.1 0 2-0.9 2-2v-7c0-0.55-0.45-1-1-1s-1 0.45-1 1v7z" android:fillColor="#FFFFFFFF"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_home_vector.xml b/app/src/main/res/drawable/ic_home_vector.xml
index df0f6832..d409807a 100644
--- a/app/src/main/res/drawable/ic_home_vector.xml
+++ b/app/src/main/res/drawable/ic_home_vector.xml
@@ -1,9 +1,3 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M10 19v-5h4v5c0 0.55 0.45 1 1 1h3c0.55 0 1-0.45 1-1v-7h1.7c0.46 0 0.68-0.57 0.33-0.87L12.67 3.6c-0.38-0.34-0.96-0.34-1.34 0l-8.36 7.53C2.63 11.43 2.84 12 3.3 12H5v7c0 0.55 0.45 1 1 1h3c0.55 0 1-0.45 1-1z" android:fillColor="#FFFFFFFF"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_storage_vector.xml b/app/src/main/res/drawable/ic_storage_vector.xml
index 80565aae..d620cacb 100644
--- a/app/src/main/res/drawable/ic_storage_vector.xml
+++ b/app/src/main/res/drawable/ic_storage_vector.xml
@@ -1,9 +1,3 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M2,20h20v-4L2,16v4zM4,17h2v2L4,19v-2zM2,4v4h20L22,4L2,4zM6,7L4,7L4,5h2v2zM2,14h20v-4L2,10v4zM4,11h2v2L4,13v-2z" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M4 20h16c1.1 0 2-0.9 2-2s-0.9-2-2-2H4c-1.1 0-2 0.9-2 2s0.9 2 2 2zm0-3h2v2H4v-2zM2 6c0 1.1 0.9 2 2 2h16c1.1 0 2-0.9 2-2s-0.9-2-2-2H4C2.9 4 2 4.9 2 6zm4 1H4V5h2v2zm-2 7h16c1.1 0 2-0.9 2-2s-0.9-2-2-2H4c-1.1 0-2 0.9-2 2s0.9 2 2 2zm0-3h2v2H4v-2z" android:fillColor="#FFFFFFFF"/>
 </vector>
diff --git a/app/src/main/res/menu/cab.xml b/app/src/main/res/menu/cab.xml
index b179b77b..050c0845 100644
--- a/app/src/main/res/menu/cab.xml
+++ b/app/src/main/res/menu/cab.xml
@@ -13,12 +13,12 @@
         app:showAsAction="always"/>
     <item
         android:id="@+id/cab_properties"
-        android:icon="@drawable/ic_info"
+        android:icon="@drawable/ic_info_vector"
         android:title="@string/properties"
         app:showAsAction="always"/>
     <item
         android:id="@+id/cab_rename"
-        android:icon="@drawable/ic_rename_new"
+        android:icon="@drawable/ic_rename_vector"
         android:title="@string/rename"
         app:showAsAction="always"/>
     <item
@@ -28,7 +28,7 @@
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/cab_hide"
-        android:icon="@drawable/ic_hide"
+        android:icon="@drawable/ic_hide_vector"
         android:title="@string/hide"
         app:showAsAction="ifRoom"/>
     <item
diff --git a/app/src/main/res/menu/menu.xml b/app/src/main/res/menu/menu.xml
index 73ae07aa..fc29ae3c 100644
--- a/app/src/main/res/menu/menu.xml
+++ b/app/src/main/res/menu/menu.xml
@@ -24,12 +24,12 @@
         app:showAsAction="ifRoom" />
     <item
         android:id="@+id/add_favorite"
-        android:icon="@drawable/ic_star_off_vector"
+        android:icon="@drawable/ic_star_outline_vector"
         android:title="@string/add_to_favorites"
         app:showAsAction="ifRoom" />
     <item
         android:id="@+id/remove_favorite"
-        android:icon="@drawable/ic_star_on_vector"
+        android:icon="@drawable/ic_star_vector"
         android:title="@string/remove_from_favorites"
         app:showAsAction="ifRoom" />
     <item
@@ -64,10 +64,12 @@
         app:showAsAction="never" />
     <item
         android:id="@+id/settings"
+        android:icon="@drawable/ic_settings_cog_vector"
         android:title="@string/settings"
-        app:showAsAction="never" />
+        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/about"
+        android:icon="@drawable/ic_info_vector"
         android:title="@string/about"
-        app:showAsAction="never" />
+        app:showAsAction="ifRoom" />
 </menu>
diff --git a/build.gradle b/build.gradle
index 9b82dbc6..87eca93f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.5.31'
+    ext.kotlin_version = '1.6.0'
 
     repositories {
         google()