diff --git a/app/build.gradle b/app/build.gradle
index 4e3d087..7b59336 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -43,5 +43,5 @@ android {
 }
 
 dependencies {
-    implementation 'com.github.SimpleMobileTools:Simple-Commons:edc62ece69'
+    implementation 'com.github.SimpleMobileTools:Simple-Commons:6f922ee918'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a6cd412..6381e77 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -32,7 +32,8 @@
 
         <activity
             android:name=".activities.MainActivity"
-            android:exported="true" />
+            android:exported="true"
+            android:theme="@style/LauncherTheme" />
 
         <activity
             android:name=".activities.SettingsActivity"
diff --git a/app/src/main/kotlin/com/simplemobiletools/launcher/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/launcher/activities/MainActivity.kt
index 2a390d1..20802a5 100644
--- a/app/src/main/kotlin/com/simplemobiletools/launcher/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/launcher/activities/MainActivity.kt
@@ -7,8 +7,10 @@ import android.content.pm.LauncherApps
 import android.content.pm.PackageManager
 import android.graphics.drawable.Drawable
 import android.os.Bundle
+import android.view.Surface
+import android.view.WindowManager
 import com.simplemobiletools.commons.extensions.*
-import com.simplemobiletools.commons.models.FAQItem
+import com.simplemobiletools.commons.helpers.isRPlus
 import com.simplemobiletools.commons.views.MyGridLayoutManager
 import com.simplemobiletools.launcher.BuildConfig
 import com.simplemobiletools.launcher.R
@@ -18,6 +20,8 @@ import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : SimpleActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
+        useDynamicTheme = false
+
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
         appLaunched(BuildConfig.APPLICATION_ID)
@@ -30,6 +34,7 @@ class MainActivity : SimpleActivity() {
         setupToolbar(main_toolbar)
         updateTextColors(main_coordinator)
         launchers_fastscroller.updateColors(getProperPrimaryColor())
+        setupNavigationBar()
     }
 
     private fun setupOptionsMenu() {
@@ -98,6 +103,35 @@ class MainActivity : SimpleActivity() {
         }
     }
 
+    private fun setupNavigationBar() {
+        var bottomListPadding = 0
+        var leftListPadding = 0
+        var rightListPadding = 0
+
+        if (navigationBarOnBottom) {
+            bottomListPadding = navigationBarHeight
+            leftListPadding = 0
+            rightListPadding = 0
+        } else if (navigationBarOnSide) {
+            bottomListPadding = 0
+
+            val display = if (isRPlus()) {
+                display!!
+            } else {
+                (getSystemService(Context.WINDOW_SERVICE) as WindowManager).defaultDisplay
+            }
+
+            if (display.rotation == Surface.ROTATION_90) {
+                rightListPadding = navigationBarWidth
+            } else if (display.rotation == Surface.ROTATION_270) {
+                leftListPadding = navigationBarWidth
+            }
+        }
+
+        launchers_grid.setPadding(0, 0, resources.getDimension(R.dimen.medium_margin).toInt(), bottomListPadding)
+        launchers_fastscroller.setPadding(leftListPadding, 0, rightListPadding, 0)
+    }
+
     private fun launchSettings() {
         hideKeyboard()
         startActivity(Intent(applicationContext, SettingsActivity::class.java))
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 9c3b80f..fd99b3a 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -2,4 +2,11 @@
 
     <style name="AppTheme" parent="AppTheme.Base" />
 
+    <style name="LauncherTheme" parent="Theme.Material3.Dark.NoActionBar">
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowShowWallpaper">true</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowTranslucentNavigation">true</item>
+    </style>
+
 </resources>