diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemFileView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemFileView.kt
index a8fb3e1fcc..8d7ffa4ca7 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemFileView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemFileView.kt
@@ -60,7 +60,7 @@ fun TimelineItemFileView(
         ) {
             Icon(
                 resourceId = CommonDrawables.ic_attachment,
-                contentDescription = "OpenFile",
+                contentDescription = null,
                 tint = ElementTheme.materialColors.primary,
                 modifier = Modifier
                     .size(16.dp)
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemVideoView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemVideoView.kt
index f666a29ac9..87685e432c 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemVideoView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemVideoView.kt
@@ -26,6 +26,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemVideoContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemVideoContentProvider
@@ -34,6 +35,7 @@ import io.element.android.libraries.designsystem.modifiers.roundedBackground
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.matrix.ui.media.MediaRequestData
+import io.element.android.libraries.ui.strings.CommonStrings
 
 @Composable
 fun TimelineItemVideoView(
@@ -56,7 +58,7 @@ fun TimelineItemVideoView(
         ) {
             Image(
                 Icons.Default.PlayArrow,
-                contentDescription = "Play",
+                contentDescription = stringResource(id = CommonStrings.a11y_play),
                 colorFilter = ColorFilter.tint(Color.White),
             )
         }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/virtual/TimelineEncryptedHistoryBannerView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/virtual/TimelineEncryptedHistoryBannerView.kt
index 241f98c141..b70514a8e0 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/virtual/TimelineEncryptedHistoryBannerView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/virtual/TimelineEncryptedHistoryBannerView.kt
@@ -39,6 +39,7 @@ import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.components.Icon
 import io.element.android.libraries.designsystem.utils.CommonDrawables
 import io.element.android.libraries.theme.ElementTheme
+import io.element.android.libraries.ui.strings.CommonStrings
 
 @Composable
 fun TimelineEncryptedHistoryBannerView(
@@ -57,7 +58,7 @@ fun TimelineEncryptedHistoryBannerView(
         Icon(
             modifier = Modifier.size(20.dp),
             resourceId = CommonDrawables.ic_compound_info_solid,
-            contentDescription = "Info",
+            contentDescription = null,
             tint = ElementTheme.colors.iconInfoPrimary
         )
         Text(
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/button/BackButton.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/button/BackButton.kt
index 30c8b95d74..44388ec812 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/button/BackButton.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/button/BackButton.kt
@@ -51,7 +51,7 @@ fun BackButton(
 @Composable
 internal fun BackButtonPreview() = ElementThemedPreview {
     Column {
-        BackButton(onClick = { }, enabled = true, contentDescription = "Back")
-        BackButton(onClick = { }, enabled = false, contentDescription = "Back")
+        BackButton(onClick = { }, enabled = true)
+        BackButton(onClick = { }, enabled = false)
     }
 }
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/IconToggleButton.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/IconToggleButton.kt
index fd355d3860..92bc5c7605 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/IconToggleButton.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/IconToggleButton.kt
@@ -69,7 +69,7 @@ private fun ContentToPreview() {
             val icon: @Composable () -> Unit = {
                 Icon(
                     imageVector = if (checked) Icons.Default.CheckCircle else Icons.Default.RadioButtonUnchecked,
-                    contentDescription = "IconToggleButton"
+                    contentDescription = null
                 )
             }
             IconToggleButton(checked = checked, enabled = true, onCheckedChange = { checked = !checked }, content = icon)
@@ -79,7 +79,7 @@ private fun ContentToPreview() {
             val icon: @Composable () -> Unit = {
                 Icon(
                     imageVector = if (!checked) Icons.Default.CheckCircle else Icons.Default.RadioButtonUnchecked,
-                    contentDescription = "IconToggleButton"
+                    contentDescription = null
                 )
             }
             IconToggleButton(checked = !checked, enabled = true, onCheckedChange = { checked = !checked }, content = icon)
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/previews/MenuPreview.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/previews/MenuPreview.kt
index 4bbb20b6a2..67da422d5b 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/previews/MenuPreview.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/previews/MenuPreview.kt
@@ -43,7 +43,10 @@ internal fun MenuPreview() {
             for (i in 0..5) {
                 val leadingIcon: @Composable (() -> Unit)? = if (i in 2..3) {
                     @Composable {
-                        Icon(Icons.Filled.Favorite, contentDescription = "Favorite")
+                        Icon(
+                            imageVector = Icons.Filled.Favorite,
+                            contentDescription = null
+                        )
                     }
                 } else {
                     null
@@ -53,7 +56,7 @@ internal fun MenuPreview() {
                     @Composable {
                         Icon(
                             resourceId = CommonDrawables.ic_compound_chevron_right,
-                            contentDescription = "Favorite",
+                            contentDescription = null,
                         )
                     }
                 } else {