diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/UserPicker.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/UserPicker.kt
index b716ae60ec..ba9686f624 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/UserPicker.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/UserPicker.kt
@@ -143,7 +143,7 @@ private fun ActiveUserSection(
   val stopped = chatModel.chatRunning.value == false
 
   if (currentUser != null) {
-    Spacer(Modifier.height(if (appPlatform.isAndroid) DEFAULT_PADDING_HALF else 0.dp))
+    Spacer(Modifier.height(DEFAULT_PADDING))
     SectionView(
       title = stringResource(MR.strings.settings_section_title_you),
       ) {
@@ -545,7 +545,7 @@ fun UserPicker(
           val currentRemoteHost = remember { chatModel.currentRemoteHost }.value
           Column(
             Modifier
-              .padding(vertical = DEFAULT_PADDING_HALF)
+              .padding(vertical = DEFAULT_PADDING)
           ) {
             if (remoteHosts.isNotEmpty()) {
               val localDeviceActive = currentRemoteHost == null && chatModel.localUserCreated.value == true
@@ -717,7 +717,7 @@ private fun DevicePickerRow(
     Modifier
       .fillMaxWidth()
       .sizeIn(minHeight = DEFAULT_MIN_SECTION_ITEM_HEIGHT)
-      .padding(start = DEFAULT_PADDING, end = DEFAULT_PADDING),
+      .padding(start = DEFAULT_PADDING, end = DEFAULT_PADDING, bottom = DEFAULT_PADDING),
     horizontalArrangement = Arrangement.spacedBy(12.dp),
     verticalAlignment = Alignment.CenterVertically
   ) {