diff --git a/features/messages/src/main/java/io/element/android/x/features/messages/MessagesScreen.kt b/features/messages/src/main/java/io/element/android/x/features/messages/MessagesScreen.kt
index 7663cba89c..883f9981b0 100644
--- a/features/messages/src/main/java/io/element/android/x/features/messages/MessagesScreen.kt
+++ b/features/messages/src/main/java/io/element/android/x/features/messages/MessagesScreen.kt
@@ -6,7 +6,6 @@
 
 package io.element.android.x.features.messages
 
-import Avatar
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -75,6 +74,7 @@ import com.airbnb.mvrx.compose.mavericksViewModel
 import io.element.android.x.core.compose.LogCompositions
 import io.element.android.x.core.compose.PairCombinedPreviewParameter
 import io.element.android.x.core.data.StableCharSequence
+import io.element.android.x.designsystem.components.avatar.Avatar
 import io.element.android.x.designsystem.components.avatar.AvatarData
 import io.element.android.x.features.messages.components.MessageEventBubble
 import io.element.android.x.features.messages.components.MessagesReactionsView
diff --git a/features/roomlist/src/main/java/io/element/android/x/features/roomlist/components/RoomListTopBar.kt b/features/roomlist/src/main/java/io/element/android/x/features/roomlist/components/RoomListTopBar.kt
index 2c1f9eb54d..9c6f1ee515 100644
--- a/features/roomlist/src/main/java/io/element/android/x/features/roomlist/components/RoomListTopBar.kt
+++ b/features/roomlist/src/main/java/io/element/android/x/features/roomlist/components/RoomListTopBar.kt
@@ -2,7 +2,6 @@
 
 package io.element.android.x.features.roomlist.components
 
-import Avatar
 import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.material.ContentAlpha
@@ -38,6 +37,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.sp
 import io.element.android.x.core.compose.LogCompositions
 import io.element.android.x.core.compose.textFieldState
+import io.element.android.x.designsystem.components.avatar.Avatar
 import io.element.android.x.designsystem.components.dialogs.ConfirmationDialog
 import io.element.android.x.features.roomlist.model.MatrixUser
 
diff --git a/features/roomlist/src/main/java/io/element/android/x/features/roomlist/components/RoomSummaryRow.kt b/features/roomlist/src/main/java/io/element/android/x/features/roomlist/components/RoomSummaryRow.kt
index 5b5486c8a4..025b070c5c 100644
--- a/features/roomlist/src/main/java/io/element/android/x/features/roomlist/components/RoomSummaryRow.kt
+++ b/features/roomlist/src/main/java/io/element/android/x/features/roomlist/components/RoomSummaryRow.kt
@@ -1,6 +1,5 @@
 package io.element.android.x.features.roomlist.components
 
-import Avatar
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
@@ -37,6 +36,7 @@ import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.google.accompanist.placeholder.material.placeholder
+import io.element.android.x.designsystem.components.avatar.Avatar
 import io.element.android.x.features.roomlist.model.RoomListRoomSummary
 
 private val minHeight = 72.dp
diff --git a/libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/avatar/Avatar.kt b/libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/avatar/Avatar.kt
index 115fbb4dac..248c0c2158 100644
--- a/libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/avatar/Avatar.kt
+++ b/libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/avatar/Avatar.kt
@@ -1,3 +1,5 @@
+package io.element.android.x.designsystem.components.avatar
+
 import android.util.Log
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
@@ -16,7 +18,6 @@ import androidx.compose.ui.unit.sp
 import coil.compose.AsyncImage
 import io.element.android.x.designsystem.AvatarGradientEnd
 import io.element.android.x.designsystem.AvatarGradientStart
-import io.element.android.x.designsystem.components.avatar.AvatarData
 
 @Composable
 fun Avatar(avatarData: AvatarData, modifier: Modifier = Modifier) {
@@ -76,5 +77,3 @@ private fun InitialsAvatar(
         )
     }
 }
-
-
diff --git a/libraries/matrix/src/main/java/io/element/android/x/matrix/sync/SlidingSyncViewFlows.kt b/libraries/matrix/src/main/java/io/element/android/x/matrix/sync/SlidingSyncViewFlows.kt
index 3e814877e8..7cf137c063 100644
--- a/libraries/matrix/src/main/java/io/element/android/x/matrix/sync/SlidingSyncViewFlows.kt
+++ b/libraries/matrix/src/main/java/io/element/android/x/matrix/sync/SlidingSyncViewFlows.kt
@@ -1,9 +1,9 @@
 package io.element.android.x.matrix.sync
 
+import io.element.android.x.matrix.util.mxCallbackFlow
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.launch
-import mxCallbackFlow
 import org.matrix.rustcomponents.sdk.SlidingSyncState
 import org.matrix.rustcomponents.sdk.SlidingSyncView
 import org.matrix.rustcomponents.sdk.SlidingSyncViewRoomListObserver
diff --git a/libraries/matrix/src/main/java/io/element/android/x/matrix/util/CallbackFlow.kt b/libraries/matrix/src/main/java/io/element/android/x/matrix/util/CallbackFlow.kt
index 0970cf97f9..842da90e3e 100644
--- a/libraries/matrix/src/main/java/io/element/android/x/matrix/util/CallbackFlow.kt
+++ b/libraries/matrix/src/main/java/io/element/android/x/matrix/util/CallbackFlow.kt
@@ -1,3 +1,5 @@
+package io.element.android.x.matrix.util
+
 import kotlinx.coroutines.channels.ProducerScope
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.callbackFlow
diff --git a/tools/lint/lint.xml b/tools/lint/lint.xml
index ddb2e1b0c5..ca41d7312d 100644
--- a/tools/lint/lint.xml
+++ b/tools/lint/lint.xml
@@ -27,7 +27,7 @@
         <ignore path="**/src/debug/**" />
     </issue>
 
-    <issue id="UnusedResources" severity="error">
+    <issue id="UnusedResources" severity="warning">
         <!-- Ignore unused resource in debug build type -->
         <ignore path="**/src/debug/**" />
 
@@ -112,6 +112,10 @@
     <!-- Notification -->
     <issue id="LaunchActivityFromNotification" severity="error" />
 
+    <!-- Compose -->
+    <issue id="ComposableLambdaParameterNaming" severity="error" />
+    <issue id="ComposableLambdaParameterPosition" severity="error" />
+
     <!-- DI -->
     <!-- issue id="JvmStaticProvidesInObjectDetector" severity="error" /-->
 </lint>