diff --git a/feature/conversations/src/main/kotlin/com/meloda/app/fast/conversations/presentation/ConversationsScreen.kt b/feature/conversations/src/main/kotlin/com/meloda/app/fast/conversations/presentation/ConversationsScreen.kt
index 896ba3d2..85f2fd3e 100644
--- a/feature/conversations/src/main/kotlin/com/meloda/app/fast/conversations/presentation/ConversationsScreen.kt
+++ b/feature/conversations/src/main/kotlin/com/meloda/app/fast/conversations/presentation/ConversationsScreen.kt
@@ -65,7 +65,6 @@ import androidx.compose.ui.unit.DpOffset
 import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.zIndex
 import androidx.core.view.HapticFeedbackConstantsCompat
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import coil.imageLoader
@@ -82,7 +81,6 @@ import com.meloda.app.fast.designsystem.MaterialDialog
 import com.meloda.app.fast.designsystem.components.FullScreenLoader
 import com.meloda.app.fast.model.BaseError
 import com.meloda.app.fast.ui.ErrorView
-import dev.chrisbanes.haze.HazeState
 import dev.chrisbanes.haze.haze
 import dev.chrisbanes.haze.hazeChild
 import dev.chrisbanes.haze.materials.ExperimentalHazeMaterialsApi
@@ -149,7 +147,6 @@ fun ConversationsScreen(
         }
     }
 
-//    val hazeState = remember { HazeState() }
     val hazeState = LocalHazeState.current
 
     var dropDownMenuExpanded by remember {
diff --git a/feature/friends/src/main/kotlin/com/meloda/app/fast/friends/presentation/FriendsList.kt b/feature/friends/src/main/kotlin/com/meloda/app/fast/friends/presentation/FriendsList.kt
index b982ba0f..edb1ac68 100644
--- a/feature/friends/src/main/kotlin/com/meloda/app/fast/friends/presentation/FriendsList.kt
+++ b/feature/friends/src/main/kotlin/com/meloda/app/fast/friends/presentation/FriendsList.kt
@@ -21,6 +21,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import com.meloda.app.fast.designsystem.ImmutableList
+import com.meloda.app.fast.designsystem.LocalBottomPadding
 import com.meloda.app.fast.friends.model.FriendsScreenState
 import com.meloda.app.fast.friends.model.UiFriend
 import kotlinx.coroutines.Dispatchers
@@ -39,6 +40,8 @@ fun FriendsList(
 
     val friends = uiFriends.toList()
 
+    val bottomPadding = LocalBottomPadding.current
+
     LazyColumn(
         modifier = modifier,
         state = listState
@@ -91,5 +94,9 @@ fun FriendsList(
                 }
             }
         }
+
+        item {
+            Spacer(modifier = Modifier.height(bottomPadding))
+        }
     }
 }
diff --git a/feature/friends/src/main/kotlin/com/meloda/app/fast/friends/presentation/FriendsScreen.kt b/feature/friends/src/main/kotlin/com/meloda/app/fast/friends/presentation/FriendsScreen.kt
index fdbb996a..c56be233 100644
--- a/feature/friends/src/main/kotlin/com/meloda/app/fast/friends/presentation/FriendsScreen.kt
+++ b/feature/friends/src/main/kotlin/com/meloda/app/fast/friends/presentation/FriendsScreen.kt
@@ -48,6 +48,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import coil.imageLoader
 import coil.request.ImageRequest
 import com.meloda.app.fast.designsystem.ImmutableList
+import com.meloda.app.fast.designsystem.LocalHazeState
 import com.meloda.app.fast.designsystem.LocalTheme
 import com.meloda.app.fast.designsystem.TabItem
 import com.meloda.app.fast.designsystem.components.BlurrableTopAppBar
@@ -57,7 +58,6 @@ import com.meloda.app.fast.friends.FriendsViewModel
 import com.meloda.app.fast.friends.FriendsViewModelImpl
 import com.meloda.app.fast.model.BaseError
 import com.meloda.app.fast.ui.ErrorView
-import dev.chrisbanes.haze.HazeState
 import dev.chrisbanes.haze.haze
 import dev.chrisbanes.haze.hazeChild
 import dev.chrisbanes.haze.materials.ExperimentalHazeMaterialsApi
@@ -113,7 +113,7 @@ fun FriendsScreen(
         }
     }
 
-    val hazeState = remember { HazeState() }
+    val hazeState = LocalHazeState.current
 
     val pullToRefreshAlpha by animateFloatAsState(
         targetValue = if (!listState.canScrollBackward) 1f else 0f,