diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/activity/MainActivity.kt b/app/src/main/java/gq/kirmanak/mealient/ui/activity/MainActivity.kt
index 0224640..8345867 100644
--- a/app/src/main/java/gq/kirmanak/mealient/ui/activity/MainActivity.kt
+++ b/app/src/main/java/gq/kirmanak/mealient/ui/activity/MainActivity.kt
@@ -8,7 +8,7 @@ import androidx.appcompat.widget.SearchView
 import androidx.appcompat.widget.SearchView.OnQueryTextListener
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.core.view.WindowInsetsControllerCompat
-import androidx.core.view.isVisible
+import androidx.drawerlayout.widget.DrawerLayout
 import androidx.navigation.NavController
 import androidx.navigation.NavDirections
 import androidx.navigation.fragment.NavHostFragment
@@ -91,10 +91,19 @@ class MainActivity : AppCompatActivity(R.layout.main_activity) {
     private fun onUiStateChange(uiState: MainActivityUiState) {
         logger.v { "onUiStateChange() called with: uiState = $uiState" }
         with(binding.navigationView) {
-            isVisible = uiState.navigationVisible
             menu.findItem(R.id.logout).isVisible = uiState.canShowLogout
             menu.findItem(R.id.login).isVisible = uiState.canShowLogin
         }
+
+        if (uiState.navigationVisible) {
+            binding.root.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED)
+            binding.toolbar.setNavigationIcon(R.drawable.ic_menu)
+        } else {
+            binding.root.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED)
+            binding.toolbar.navigationIcon = null
+        }
+
+
         binding.toolbar.menu.findItem(R.id.search_recipe_action).apply {
             isVisible = uiState.searchVisible
             setupSearchItem(this)
diff --git a/app/src/main/res/layout/main_activity.xml b/app/src/main/res/layout/main_activity.xml
index ad7eae4..6b18902 100644
--- a/app/src/main/res/layout/main_activity.xml
+++ b/app/src/main/res/layout/main_activity.xml
@@ -3,6 +3,7 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:id="@+id/drawer"
+	style="?drawerLayoutStyle"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	tools:context=".ui.activity.MainActivity"
@@ -20,7 +21,7 @@
 
 			<com.google.android.material.appbar.MaterialToolbar
 				android:id="@+id/toolbar"
-				style="@style/Widget.Material3.Toolbar.Surface"
+				style="?toolbarSurfaceStyle"
 				android:layout_width="match_parent"
 				android:layout_height="?actionBarSize"
 				app:layout_scrollFlags="scroll|snap|enterAlways"