diff --git a/codegen/src/main/kotlin/io/element/android/codegen/ContributesNodeProcessor.kt b/codegen/src/main/kotlin/io/element/android/codegen/ContributesNodeProcessor.kt
index 7ddf80b92c..8b537a53fe 100644
--- a/codegen/src/main/kotlin/io/element/android/codegen/ContributesNodeProcessor.kt
+++ b/codegen/src/main/kotlin/io/element/android/codegen/ContributesNodeProcessor.kt
@@ -91,7 +91,7 @@ class ContributesNodeProcessor(
                             .addAnnotation(Binds::class)
                             .addAnnotation(IntoMap::class)
                             .addAnnotation(
-                                AnnotationSpec.Companion.builder(ClassName.bestGuess(nodeKeyFqName.asString())).addMember(
+                                AnnotationSpec.builder(ClassName.bestGuess(nodeKeyFqName.asString())).addMember(
                                     CLASS_PLACEHOLDER,
                                     ClassName.bestGuess(ksClass.qualifiedName!!.asString())
                                 ).build()
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/group/GroupHeaderView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/group/GroupHeaderView.kt
index 0c13214a7d..883c591fd2 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/group/GroupHeaderView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/group/GroupHeaderView.kt
@@ -49,7 +49,7 @@ fun GroupHeaderView(
     modifier: Modifier = Modifier
 ) {
     // Ignore isHighlighted for now, we need a design decision on it.
-    val backgroundColor = Color.Companion.Transparent
+    val backgroundColor = Color.Transparent
     val shape = RoundedCornerShape(CORNER_RADIUS)
 
     Box(
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt
index 046c64d906..05f26daedb 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt
@@ -404,7 +404,7 @@ private fun RoomHeaderSection(
                 }.toImmutableList(),
                 isTombstoned = isTombstoned,
             ),
-            contentDescription = avatarUrl?.let { stringResource(CommonStrings.a11y_room_avatar) },
+            contentDescription = stringResource(CommonStrings.a11y_room_avatar),
             modifier = Modifier
                 .clickable(
                     enabled = avatarUrl != null,
diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/settings/SpaceSettingsView.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/settings/SpaceSettingsView.kt
index 5a8aac4a30..63b83516ac 100644
--- a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/settings/SpaceSettingsView.kt
+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/settings/SpaceSettingsView.kt
@@ -115,7 +115,7 @@ private fun SpaceInfoSection(
         Avatar(
             avatarData = AvatarData(roomId.value, name, avatarUrl, AvatarSize.SpaceListItem),
             avatarType = AvatarType.Space(),
-            contentDescription = avatarUrl?.let { stringResource(CommonStrings.a11y_avatar) },
+            contentDescription = stringResource(CommonStrings.a11y_avatar),
         )
         Spacer(Modifier.width(16.dp))
         Column {
diff --git a/features/userprofile/shared/src/main/kotlin/io/element/android/features/userprofile/shared/UserProfileHeaderSection.kt b/features/userprofile/shared/src/main/kotlin/io/element/android/features/userprofile/shared/UserProfileHeaderSection.kt
index b27d1ad091..ac146a36a7 100644
--- a/features/userprofile/shared/src/main/kotlin/io/element/android/features/userprofile/shared/UserProfileHeaderSection.kt
+++ b/features/userprofile/shared/src/main/kotlin/io/element/android/features/userprofile/shared/UserProfileHeaderSection.kt
@@ -66,7 +66,7 @@ fun UserProfileHeaderSection(
         Avatar(
             avatarData = AvatarData(userId.value, userName, avatarUrl, AvatarSize.UserHeader),
             avatarType = AvatarType.User,
-            contentDescription = avatarUrl?.let { stringResource(CommonStrings.a11y_user_avatar) },
+            contentDescription = stringResource(CommonStrings.a11y_user_avatar),
             modifier = Modifier
                 .clip(CircleShape)
                 .clickable(
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/SelectedIndicatorAtom.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/SelectedIndicatorAtom.kt
index b2e25af0fb..1a2e60cad5 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/SelectedIndicatorAtom.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/SelectedIndicatorAtom.kt
@@ -34,7 +34,7 @@ fun SelectedIndicatorAtom(
         Icon(
             modifier = modifier.toggleable(
                 value = true,
-                role = Role.Companion.Checkbox,
+                role = Role.Checkbox,
                 enabled = enabled,
                 onValueChange = {},
             ),
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/DmAvatars.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/DmAvatars.kt
index 1cd024542c..c5b870507b 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/DmAvatars.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/DmAvatars.kt
@@ -59,7 +59,7 @@ fun DmAvatars(
         Avatar(
             avatarData = userAvatarData,
             avatarType = AvatarType.User,
-            contentDescription = userAvatarData.url?.let { stringResource(CommonStrings.a11y_your_avatar) },
+            contentDescription = stringResource(CommonStrings.a11y_your_avatar),
             modifier = Modifier
                 .align(Alignment.BottomStart)
                 .graphicsLayer {
@@ -94,7 +94,7 @@ fun DmAvatars(
         Avatar(
             avatarData = otherUserAvatarData,
             avatarType = AvatarType.User,
-            contentDescription = otherUserAvatarData.url?.let { stringResource(CommonStrings.a11y_other_user_avatar) },
+            contentDescription = stringResource(CommonStrings.a11y_other_user_avatar),
             modifier = Modifier
                 .align(Alignment.TopEnd)
                 .clip(CircleShape)
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/internal/ImageAvatar.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/internal/ImageAvatar.kt
index ebd81f61b1..da57fbcbe1 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/internal/ImageAvatar.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/internal/ImageAvatar.kt
@@ -36,7 +36,7 @@ internal fun ImageAvatar(
     SubcomposeAsyncImage(
         model = avatarData,
         contentDescription = contentDescription,
-        contentScale = ContentScale.Companion.Crop,
+        contentScale = ContentScale.Crop,
         modifier = modifier
             .size(size)
             .clip(avatarShape)
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/NavigationBarItem.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/NavigationBarItem.kt
index 40407602a8..7f74944fce 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/NavigationBarItem.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/NavigationBarItem.kt
@@ -50,6 +50,6 @@ object ElementNavigationBarItemDefaults {
         selectedTextColor = ElementTheme.colors.textPrimary,
         unselectedIconColor = ElementTheme.colors.iconTertiary,
         unselectedTextColor = ElementTheme.colors.textDisabled,
-        selectedIndicatorColor = Color.Companion.Transparent,
+        selectedIndicatorColor = Color.Transparent,
     )
 }
diff --git a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/node/TestParentNode.kt b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/node/TestParentNode.kt
index c994733340..3daec9b3b5 100644
--- a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/node/TestParentNode.kt
+++ b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/node/TestParentNode.kt
@@ -27,7 +27,7 @@ class TestParentNode<Child : Node>(
     private val childNodeFactory: (buildContext: BuildContext, plugins: List<Plugin>) -> Child,
 ) : DependencyInjectionGraphOwner,
     Node(
-        buildContext = BuildContext.Companion.root(savedStateMap = null),
+        buildContext = BuildContext.root(savedStateMap = null),
         plugins = emptyList(),
         view = EmptyNodeView,
     ) {