diff --git a/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/attachments/content/AudioRecordAttachmentContent.kt b/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/attachments/content/AudioRecordAttachmentContent.kt
index 62ad7c556c7..fb72551c6ca 100644
--- a/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/attachments/content/AudioRecordAttachmentContent.kt
+++ b/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/attachments/content/AudioRecordAttachmentContent.kt
@@ -300,7 +300,6 @@ internal fun PlaybackToggleButton(
     ) {
         Icon(
             painter = icon,
-            modifier = Modifier.size(20.dp),
             contentDescription = label,
         )
     }
diff --git a/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/attachments/content/UnsupportedAttachmentContent.kt b/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/attachments/content/UnsupportedAttachmentContent.kt
index 34ca245a0a7..8998411c0ed 100644
--- a/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/attachments/content/UnsupportedAttachmentContent.kt
+++ b/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/attachments/content/UnsupportedAttachmentContent.kt
@@ -21,7 +21,6 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
@@ -32,7 +31,6 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
 import io.getstream.chat.android.compose.R
 import io.getstream.chat.android.compose.state.messages.attachments.AttachmentState
 import io.getstream.chat.android.compose.ui.theme.ChatTheme
@@ -80,7 +78,6 @@ public fun UnsupportedAttachmentContent(
                         painter = painterResource(R.drawable.stream_design_ic_unsupported_attachment),
                         tint = ChatTheme.colors.textPrimary,
                         contentDescription = null,
-                        modifier = Modifier.size(20.dp),
                     )
 
                     Text(
diff --git a/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/attachments/preview/MediaGalleryPreviewOptionsMenu.kt b/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/attachments/preview/MediaGalleryPreviewOptionsMenu.kt
index 410f123f905..bb60819a272 100644
--- a/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/attachments/preview/MediaGalleryPreviewOptionsMenu.kt
+++ b/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/attachments/preview/MediaGalleryPreviewOptionsMenu.kt
@@ -22,7 +22,6 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
@@ -37,7 +36,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.dp
 import io.getstream.chat.android.compose.R
 import io.getstream.chat.android.compose.state.mediagallerypreview.Delete
 import io.getstream.chat.android.compose.state.mediagallerypreview.MediaGalleryPreviewOption
@@ -132,7 +130,6 @@ internal fun MediaGalleryOptionItem(
         verticalAlignment = Alignment.CenterVertically,
     ) {
         Icon(
-            modifier = Modifier.size(20.dp),
             painter = option.iconPainter,
             tint = option.iconColor,
             contentDescription = option.title,
diff --git a/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/attachments/preview/MediaGalleryPreviewScreen.kt b/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/attachments/preview/MediaGalleryPreviewScreen.kt
index f7b738d772b..481a1a1c624 100644
--- a/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/attachments/preview/MediaGalleryPreviewScreen.kt
+++ b/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/attachments/preview/MediaGalleryPreviewScreen.kt
@@ -873,7 +873,6 @@ internal fun MediaGalleryPreviewShareIcon(
         Icon(
             painter = painterResource(id = painter),
             contentDescription = stringResource(id = description),
-            modifier = Modifier.size(20.dp),
         )
     }
 }
@@ -949,7 +948,6 @@ internal fun MediaGalleryPreviewPhotosIcon(
         Icon(
             painter = painterResource(id = R.drawable.stream_design_ic_gallery),
             contentDescription = stringResource(id = R.string.stream_compose_image_preview_photos),
-            modifier = Modifier.size(20.dp),
         )
     }
 }
diff --git a/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/attachments/preview/internal/VideoPlaybackControls.kt b/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/attachments/preview/internal/VideoPlaybackControls.kt
index 02fa76d1a39..02c2501414b 100644
--- a/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/attachments/preview/internal/VideoPlaybackControls.kt
+++ b/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/attachments/preview/internal/VideoPlaybackControls.kt
@@ -114,7 +114,6 @@ internal fun VideoPlaybackControls(
             Icon(
                 painter = painterResource(icon),
                 contentDescription = stringResource(contentDescription),
-                modifier = Modifier.size(20.dp),
             )
         }
 
diff --git a/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/channel/info/AddMembersScreen.kt b/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/channel/info/AddMembersScreen.kt
index 329deed70af..67608d86ee2 100644
--- a/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/channel/info/AddMembersScreen.kt
+++ b/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/channel/info/AddMembersScreen.kt
@@ -179,7 +179,6 @@ private fun AddMembersHeader(
             style = StreamButtonStyleDefaults.secondaryGhost,
         ) {
             Icon(
-                modifier = Modifier.size(20.dp),
                 painter = painterResource(id = R.drawable.stream_design_ic_arrow_left),
                 contentDescription = stringResource(id = UiCommonR.string.stream_ui_back_button),
             )
diff --git a/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/components/ComposerCancelIcon.kt b/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/components/ComposerCancelIcon.kt
index ad6d44f5111..e0d4f56ebe8 100644
--- a/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/components/ComposerCancelIcon.kt
+++ b/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/components/ComposerCancelIcon.kt
@@ -19,7 +19,6 @@ package io.getstream.chat.android.compose.ui.components
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material3.Icon
 import androidx.compose.runtime.Composable
@@ -52,7 +51,6 @@ public fun ComposerCancelIcon(
             .border(2.dp, colors.controlRemoveBorder, CircleShape)
             .padding(2.dp)
             .background(color = colors.controlRemoveBg, shape = CircleShape)
-            .size(20.dp)
             .clickable(bounded = false, onClick = onClick),
         painter = painterResource(R.drawable.stream_design_ic_xmark_small),
         contentDescription = contentDescription,
diff --git a/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/components/common/ContextualMenu.kt b/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/components/common/ContextualMenu.kt
index 759830104d3..6fcbab2c92c 100644
--- a/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/components/common/ContextualMenu.kt
+++ b/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/components/common/ContextualMenu.kt
@@ -25,7 +25,6 @@ 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.layout.width
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.HorizontalDivider
@@ -96,7 +95,6 @@ internal fun ContextualMenuItem(
                 painter = it,
                 contentDescription = null,
                 tint = iconColor,
-                modifier = Modifier.size(20.dp),
             )
         }
 
@@ -114,7 +112,6 @@ internal fun ContextualMenuItem(
                 painter = it,
                 contentDescription = null,
                 tint = iconColor,
-                modifier = Modifier.size(20.dp),
             )
         }
     }
diff --git a/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/components/messages/PollMessageContent.kt b/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/components/messages/PollMessageContent.kt
index db12bb80125..6a5f624ad77 100644
--- a/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/components/messages/PollMessageContent.kt
+++ b/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/components/messages/PollMessageContent.kt
@@ -181,7 +181,6 @@ public fun PollMessageContent(
                 params = MessageFailedIconParams(
                     modifier = Modifier
                         .padding(vertical = StreamTokens.spacingXs)
-                        .size(20.dp)
                         .align(Alignment.TopEnd),
                     message = message,
                 ),
diff --git a/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/components/poll/PollAnswers.kt b/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/components/poll/PollAnswers.kt
index 7ae00621940..2a448ac7d73 100644
--- a/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/components/poll/PollAnswers.kt
+++ b/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/components/poll/PollAnswers.kt
@@ -57,7 +57,6 @@ import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Popup
 import io.getstream.chat.android.compose.R
 import io.getstream.chat.android.compose.ui.components.avatar.AvatarSize
@@ -155,7 +154,6 @@ private fun Content(
                         Icon(
                             painter = painterResource(id = R.drawable.stream_design_ic_edit),
                             contentDescription = stringResource(id = R.string.stream_compose_add_answer),
-                            modifier = Modifier.size(20.dp),
                         )
                     }
                 }
diff --git a/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/messages/attachments/poll/PollOptionList.kt b/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/messages/attachments/poll/PollOptionList.kt
index af94544276d..3d56dd7a426 100644
--- a/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/messages/attachments/poll/PollOptionList.kt
+++ b/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/messages/attachments/poll/PollOptionList.kt
@@ -25,7 +25,6 @@ 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.shape.RoundedCornerShape
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
@@ -187,7 +186,6 @@ private fun ReorderableScope.PollOptionRow(
                     painter = painterResource(R.drawable.stream_design_ic_minus_circle),
                     contentDescription = stringResource(R.string.stream_compose_poll_option_remove, displayName),
                     tint = colors.inputTextIcon,
-                    modifier = Modifier.size(20.dp),
                 )
             }
         }
@@ -217,7 +215,6 @@ private fun PollOptionErrorRow(pollOptionError: PollOptionError) {
             painter = painterResource(R.drawable.stream_design_ic_exclamation_circle),
             contentDescription = null,
             tint = colors.accentError,
-            modifier = Modifier.size(20.dp),
         )
         Text(
             text = pollOptionError.message,
diff --git a/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/messages/attachments/poll/PollSwitchList.kt b/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/messages/attachments/poll/PollSwitchList.kt
index a4de2809193..446d479e4d3 100644
--- a/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/messages/attachments/poll/PollSwitchList.kt
+++ b/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/messages/attachments/poll/PollSwitchList.kt
@@ -339,7 +339,6 @@ private fun StepperButton(
         contentAlignment = Alignment.Center,
     ) {
         Icon(
-            modifier = Modifier.size(20.dp),
             painter = painterResource(id = iconRes),
             contentDescription = contentDescription,
             tint = if (enabled) ChatTheme.colors.buttonSecondaryText else ChatTheme.colors.textDisabled,
diff --git a/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/messages/list/MessageContainer.kt b/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/messages/list/MessageContainer.kt
index adde60842e4..26828e6f9ea 100644
--- a/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/messages/list/MessageContainer.kt
+++ b/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/messages/list/MessageContainer.kt
@@ -705,7 +705,6 @@ public fun EmojiMessageContent(
                 params = MessageFailedIconParams(
                     modifier = Modifier
                         .padding(vertical = StreamTokens.spacingXs)
-                        .size(20.dp)
                         .align(Alignment.TopEnd),
                     message = message,
                 ),
@@ -782,7 +781,6 @@ public fun RegularMessageContent(
                 params = MessageFailedIconParams(
                     modifier = Modifier
                         .padding(vertical = StreamTokens.spacingXs)
-                        .size(20.dp)
                         .align(Alignment.TopEnd)
                         .testTag("Stream_MessageFailedIcon"),
                     message = message,