diff --git a/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/components/attachments/files/FilesPicker.kt b/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/components/attachments/files/FilesPicker.kt
index 784d3730319..b61253a2a73 100644
--- a/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/components/attachments/files/FilesPicker.kt
+++ b/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/components/attachments/files/FilesPicker.kt
@@ -21,12 +21,14 @@ import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.defaultMinSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material3.Icon
+import androidx.compose.material3.LocalMinimumInteractiveComponentSize
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
@@ -92,6 +94,7 @@ public fun FilesPicker(
             modifier = Modifier
                 .testTag("Stream_FindFilesButton")
                 .fillMaxWidth()
+                .defaultMinSize(minHeight = LocalMinimumInteractiveComponentSize.current)
                 .clickable { fileSelectContract.launch(allowMultipleSelection) }
                 .padding(StreamTokens.spacingSm),
             verticalAlignment = Alignment.CenterVertically,
diff --git a/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/messages/attachments/AttachmentCameraPicker.kt b/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/messages/attachments/AttachmentCameraPicker.kt
index 9fb2c796c16..6bf5a9f76ed 100644
--- a/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/messages/attachments/AttachmentCameraPicker.kt
+++ b/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/messages/attachments/AttachmentCameraPicker.kt
@@ -132,7 +132,7 @@ private fun AttachmentCameraPickerContent(
         Spacer(modifier = Modifier.height(StreamTokens.spacingMd))
         StreamTextButton(
             style = StreamButtonStyleDefaults.secondaryOutline,
-            text = stringResource(id = R.string.stream_compose_attachment_camera_picker),
+            text = stringResource(id = R.string.stream_compose_attachment_camera_picker_cta),
             onClick = onCaptureClick,
         )
     }
diff --git a/stream-chat-android-compose/src/main/res/values-es/strings.xml b/stream-chat-android-compose/src/main/res/values-es/strings.xml
index 583506bb733..c5d3e361ee7 100644
--- a/stream-chat-android-compose/src/main/res/values-es/strings.xml
+++ b/stream-chat-android-compose/src/main/res/values-es/strings.xml
@@ -25,8 +25,9 @@
   <string name="stream_compose_attachment_added_file">"Archivo adjuntado"</string>
   <string name="stream_compose_attachment_added_photo">"Foto adjuntada"</string>
   <string name="stream_compose_attachment_added_video">"Vídeo adjuntado"</string>
-  <string name="stream_compose_attachment_camera_picker">"Abrir cámara"</string>
+  <string name="stream_compose_attachment_camera_picker">"Cámara"</string>
   <string name="stream_compose_attachment_camera_picker_content">"Tomar una foto y compartir"</string>
+  <string name="stream_compose_attachment_camera_picker_cta">"Abrir cámara"</string>
   <string name="stream_compose_attachment_commands_picker">"Comandos"</string>
   <string name="stream_compose_attachment_file_picker">"Archivos"</string>
   <string name="stream_compose_attachment_media_picker">"Multimedia"</string>
diff --git a/stream-chat-android-compose/src/main/res/values-fr/strings.xml b/stream-chat-android-compose/src/main/res/values-fr/strings.xml
index 166533c2038..e7f26ca07ab 100644
--- a/stream-chat-android-compose/src/main/res/values-fr/strings.xml
+++ b/stream-chat-android-compose/src/main/res/values-fr/strings.xml
@@ -25,8 +25,9 @@
   <string name="stream_compose_attachment_added_file">"Fichier joint"</string>
   <string name="stream_compose_attachment_added_photo">"Photo jointe"</string>
   <string name="stream_compose_attachment_added_video">"Vidéo jointe"</string>
-  <string name="stream_compose_attachment_camera_picker">"Ouvrir la caméra"</string>
+  <string name="stream_compose_attachment_camera_picker">"Caméra"</string>
   <string name="stream_compose_attachment_camera_picker_content">"Prendre une photo et la partager"</string>
+  <string name="stream_compose_attachment_camera_picker_cta">"Ouvrir la caméra"</string>
   <string name="stream_compose_attachment_commands_picker">"Commandes"</string>
   <string name="stream_compose_attachment_file_picker">"Fichiers"</string>
   <string name="stream_compose_attachment_media_picker">"Médias"</string>
diff --git a/stream-chat-android-compose/src/main/res/values-hi/strings.xml b/stream-chat-android-compose/src/main/res/values-hi/strings.xml
index 06feb0d75d1..9e888c81e6e 100644
--- a/stream-chat-android-compose/src/main/res/values-hi/strings.xml
+++ b/stream-chat-android-compose/src/main/res/values-hi/strings.xml
@@ -85,8 +85,9 @@
   <string name="stream_compose_attachment_added_file">"फ़ाइल संलग्न की गई"</string>
   <string name="stream_compose_attachment_added_photo">"फ़ोटो संलग्न की गई"</string>
   <string name="stream_compose_attachment_added_video">"वीडियो संलग्न किया गया"</string>
-  <string name="stream_compose_attachment_camera_picker">"कैमरा खोलें"</string>
+  <string name="stream_compose_attachment_camera_picker">"कैमरा"</string>
   <string name="stream_compose_attachment_camera_picker_content">"फ़ोटो लें और साझा करें"</string>
+  <string name="stream_compose_attachment_camera_picker_cta">"कैमरा खोलें"</string>
   <string name="stream_compose_attachment_commands_picker">"कमांड्स"</string>
   <string name="stream_compose_attachment_file_picker">"फ़ाइलें"</string>
   <string name="stream_compose_attachment_media_picker">"मीडिया"</string>
diff --git a/stream-chat-android-compose/src/main/res/values-in/strings.xml b/stream-chat-android-compose/src/main/res/values-in/strings.xml
index e6761d4c916..343bb2a008b 100644
--- a/stream-chat-android-compose/src/main/res/values-in/strings.xml
+++ b/stream-chat-android-compose/src/main/res/values-in/strings.xml
@@ -25,8 +25,9 @@
   <string name="stream_compose_attachment_added_file">"File dilampirkan"</string>
   <string name="stream_compose_attachment_added_photo">"Foto dilampirkan"</string>
   <string name="stream_compose_attachment_added_video">"Video dilampirkan"</string>
-  <string name="stream_compose_attachment_camera_picker">"Buka Kamera"</string>
+  <string name="stream_compose_attachment_camera_picker">"Kamera"</string>
   <string name="stream_compose_attachment_camera_picker_content">"Ambil foto dan bagikan"</string>
+  <string name="stream_compose_attachment_camera_picker_cta">"Buka Kamera"</string>
   <string name="stream_compose_attachment_commands_picker">"Perintah"</string>
   <string name="stream_compose_attachment_file_picker">"File"</string>
   <string name="stream_compose_attachment_media_picker">"Media"</string>
diff --git a/stream-chat-android-compose/src/main/res/values-it/strings.xml b/stream-chat-android-compose/src/main/res/values-it/strings.xml
index 745853a71ed..74cca0d7c83 100644
--- a/stream-chat-android-compose/src/main/res/values-it/strings.xml
+++ b/stream-chat-android-compose/src/main/res/values-it/strings.xml
@@ -85,8 +85,9 @@
   <string name="stream_compose_attachment_added_file">"File allegato"</string>
   <string name="stream_compose_attachment_added_photo">"Foto allegata"</string>
   <string name="stream_compose_attachment_added_video">"Video allegato"</string>
-  <string name="stream_compose_attachment_camera_picker">"Apri fotocamera"</string>
+  <string name="stream_compose_attachment_camera_picker">"Fotocamera"</string>
   <string name="stream_compose_attachment_camera_picker_content">"Scatta una foto e condividila"</string>
+  <string name="stream_compose_attachment_camera_picker_cta">"Apri fotocamera"</string>
   <string name="stream_compose_attachment_commands_picker">"Comandi"</string>
   <string name="stream_compose_attachment_file_picker">"File"</string>
   <string name="stream_compose_attachment_media_picker">"Media"</string>
diff --git a/stream-chat-android-compose/src/main/res/values-ja/strings.xml b/stream-chat-android-compose/src/main/res/values-ja/strings.xml
index 684598109c5..3ff7c7a1cf0 100644
--- a/stream-chat-android-compose/src/main/res/values-ja/strings.xml
+++ b/stream-chat-android-compose/src/main/res/values-ja/strings.xml
@@ -25,8 +25,9 @@
   <string name="stream_compose_attachment_added_file">"ファイルを添付しました"</string>
   <string name="stream_compose_attachment_added_photo">"写真を添付しました"</string>
   <string name="stream_compose_attachment_added_video">"動画を添付しました"</string>
-  <string name="stream_compose_attachment_camera_picker">"カメラを開く"</string>
+  <string name="stream_compose_attachment_camera_picker">"カメラ"</string>
   <string name="stream_compose_attachment_camera_picker_content">"写真を撮って共有"</string>
+  <string name="stream_compose_attachment_camera_picker_cta">"カメラを開く"</string>
   <string name="stream_compose_attachment_commands_picker">"コマンド"</string>
   <string name="stream_compose_attachment_file_picker">"ファイル"</string>
   <string name="stream_compose_attachment_media_picker">"メディア"</string>
diff --git a/stream-chat-android-compose/src/main/res/values-ko/strings.xml b/stream-chat-android-compose/src/main/res/values-ko/strings.xml
index 43a5c27df6f..2d349e53878 100644
--- a/stream-chat-android-compose/src/main/res/values-ko/strings.xml
+++ b/stream-chat-android-compose/src/main/res/values-ko/strings.xml
@@ -25,8 +25,9 @@
   <string name="stream_compose_attachment_added_file">"파일 첨부됨"</string>
   <string name="stream_compose_attachment_added_photo">"사진 첨부됨"</string>
   <string name="stream_compose_attachment_added_video">"동영상 첨부됨"</string>
-  <string name="stream_compose_attachment_camera_picker">"카메라 열기"</string>
+  <string name="stream_compose_attachment_camera_picker">"카메라"</string>
   <string name="stream_compose_attachment_camera_picker_content">"사진을 찍어 공유하세요"</string>
+  <string name="stream_compose_attachment_camera_picker_cta">"카메라 열기"</string>
   <string name="stream_compose_attachment_commands_picker">"명령어"</string>
   <string name="stream_compose_attachment_file_picker">"파일"</string>
   <string name="stream_compose_attachment_media_picker">"미디어"</string>
diff --git a/stream-chat-android-compose/src/main/res/values/strings.xml b/stream-chat-android-compose/src/main/res/values/strings.xml
index e9d2c1be3a0..fb55bb76e25 100644
--- a/stream-chat-android-compose/src/main/res/values/strings.xml
+++ b/stream-chat-android-compose/src/main/res/values/strings.xml
@@ -227,8 +227,9 @@
     <!-- Attachment Picker -->
     <string name="stream_compose_attachment_media_picker">Media</string>
     <string name="stream_compose_attachment_file_picker">Files</string>
-    <string name="stream_compose_attachment_camera_picker">Open Camera</string>
+    <string name="stream_compose_attachment_camera_picker">Camera</string>
     <string name="stream_compose_attachment_camera_picker_content">Take a photo and share</string>
+    <string name="stream_compose_attachment_camera_picker_cta">Open Camera</string>
     <string name="stream_compose_attachment_polls_picker">Polls</string>
     <string name="stream_compose_attachment_poll_picker_content">Create a poll and let everyone vote</string>
     <string name="stream_compose_attachment_poll_picker_cta">Create Poll</string>
diff --git a/stream-chat-android-compose/src/test/snapshots/images/io.getstream.chat.android.compose.ui.components.attachments.files_FilesPickerTest_multiple_selection.png b/stream-chat-android-compose/src/test/snapshots/images/io.getstream.chat.android.compose.ui.components.attachments.files_FilesPickerTest_multiple_selection.png
index 833dd4776db..cd9ffa62493 100644
Binary files a/stream-chat-android-compose/src/test/snapshots/images/io.getstream.chat.android.compose.ui.components.attachments.files_FilesPickerTest_multiple_selection.png and b/stream-chat-android-compose/src/test/snapshots/images/io.getstream.chat.android.compose.ui.components.attachments.files_FilesPickerTest_multiple_selection.png differ
diff --git a/stream-chat-android-compose/src/test/snapshots/images/io.getstream.chat.android.compose.ui.components.attachments.files_FilesPickerTest_single_selection.png b/stream-chat-android-compose/src/test/snapshots/images/io.getstream.chat.android.compose.ui.components.attachments.files_FilesPickerTest_single_selection.png
index 0a97a6e9f31..3c02d47cbb9 100644
Binary files a/stream-chat-android-compose/src/test/snapshots/images/io.getstream.chat.android.compose.ui.components.attachments.files_FilesPickerTest_single_selection.png and b/stream-chat-android-compose/src/test/snapshots/images/io.getstream.chat.android.compose.ui.components.attachments.files_FilesPickerTest_single_selection.png differ
diff --git a/stream-chat-android-compose/src/test/snapshots/images/io.getstream.chat.android.compose.ui.messages.attachments_AttachmentFilePickerTest_multiple_selection.png b/stream-chat-android-compose/src/test/snapshots/images/io.getstream.chat.android.compose.ui.messages.attachments_AttachmentFilePickerTest_multiple_selection.png
index 9f369422fb5..32c3d47de26 100644
Binary files a/stream-chat-android-compose/src/test/snapshots/images/io.getstream.chat.android.compose.ui.messages.attachments_AttachmentFilePickerTest_multiple_selection.png and b/stream-chat-android-compose/src/test/snapshots/images/io.getstream.chat.android.compose.ui.messages.attachments_AttachmentFilePickerTest_multiple_selection.png differ
diff --git a/stream-chat-android-compose/src/test/snapshots/images/io.getstream.chat.android.compose.ui.messages.attachments_AttachmentFilePickerTest_single_selection.png b/stream-chat-android-compose/src/test/snapshots/images/io.getstream.chat.android.compose.ui.messages.attachments_AttachmentFilePickerTest_single_selection.png
index 523c1e79ecb..34d8a11290b 100644
Binary files a/stream-chat-android-compose/src/test/snapshots/images/io.getstream.chat.android.compose.ui.messages.attachments_AttachmentFilePickerTest_single_selection.png and b/stream-chat-android-compose/src/test/snapshots/images/io.getstream.chat.android.compose.ui.messages.attachments_AttachmentFilePickerTest_single_selection.png differ