diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/components/RoomPrivacyOption.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/components/RoomPrivacyOption.kt
index 00b4206a73..3a570e9e0f 100644
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/components/RoomPrivacyOption.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/components/RoomPrivacyOption.kt
@@ -58,7 +58,7 @@ fun RoomPrivacyOption(
         Icon(
             modifier = Modifier.padding(horizontal = 8.dp),
             resourceId = roomPrivacyItem.icon,
-            contentDescription = "",
+            contentDescription = null,
             tint = MaterialTheme.colorScheme.secondary,
         )
 
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockView.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockView.kt
index fcca4985f5..a40ec08910 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockView.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockView.kt
@@ -300,7 +300,7 @@ private fun PinUnlockHeader(
                     .size(32.dp),
                 tint = ElementTheme.colors.iconPrimary,
                 imageVector = Icons.Filled.Lock,
-                contentDescription = "",
+                contentDescription = null,
             )
         }
         Spacer(modifier = Modifier.height(16.dp))
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/RoundedIconAtom.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/RoundedIconAtom.kt
index 8c8f009618..990e113d75 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/RoundedIconAtom.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/RoundedIconAtom.kt
@@ -70,7 +70,7 @@ fun RoundedIconAtom(
             tint = tint,
             resourceId = resourceId,
             imageVector = imageVector,
-            contentDescription = "",
+            contentDescription = null,
         )
     }
 }
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/components/PreferenceIcon.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/components/PreferenceIcon.kt
index c29b46f3c3..61e8aabdd7 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/components/PreferenceIcon.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/components/PreferenceIcon.kt
@@ -51,7 +51,7 @@ fun PreferenceIcon(
             Icon(
                 imageVector = icon,
                 resourceId = iconResourceId,
-                contentDescription = "",
+                contentDescription = null,
                 tint = tintColor ?: enabled.toSecondaryEnabledColor(),
                 modifier = Modifier
                     .padding(end = 16.dp)
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/FloatingActionButton.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/FloatingActionButton.kt
index ed32018f84..fd6620e356 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/FloatingActionButton.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/FloatingActionButton.kt
@@ -66,7 +66,7 @@ internal fun FloatingActionButtonPreview() =
 private fun ContentToPreview() {
     Box(modifier = Modifier.padding(8.dp)) {
         FloatingActionButton(onClick = {}) {
-            Icon(resourceId = CommonDrawables.ic_compound_close, contentDescription = "")
+            Icon(resourceId = CommonDrawables.ic_compound_close, contentDescription = null)
         }
     }
 }
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Icon.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Icon.kt
index 1813db36f2..299c9991ad 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Icon.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Icon.kt
@@ -145,5 +145,5 @@ internal fun IconImageVectorPreview() =
 
 @Composable
 private fun ContentToPreview() {
-    Icon(resourceId = CommonDrawables.ic_compound_close, contentDescription = "")
+    Icon(resourceId = CommonDrawables.ic_compound_close, contentDescription = null)
 }
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/IconButton.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/IconButton.kt
index fd6d2ed471..5f989d2fb2 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/IconButton.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/IconButton.kt
@@ -67,20 +67,20 @@ private fun ContentToPreview() {
         CompositionLocalProvider(LocalContentColor provides ElementTheme.colors.iconPrimary) {
             Row {
                 IconButton(onClick = {}) {
-                    Icon(resourceId = CommonDrawables.ic_compound_close, contentDescription = "")
+                    Icon(resourceId = CommonDrawables.ic_compound_close, contentDescription = null)
                 }
                 IconButton(enabled = false, onClick = {}) {
-                    Icon(resourceId = CommonDrawables.ic_compound_close, contentDescription = "")
+                    Icon(resourceId = CommonDrawables.ic_compound_close, contentDescription = null)
                 }
             }
         }
         CompositionLocalProvider(LocalContentColor provides ElementTheme.colors.iconSecondary) {
             Row {
                 IconButton(onClick = {}) {
-                    Icon(resourceId = CommonDrawables.ic_compound_close, contentDescription = "")
+                    Icon(resourceId = CommonDrawables.ic_compound_close, contentDescription = null)
                 }
                 IconButton(enabled = false, onClick = {}) {
-                    Icon(resourceId = CommonDrawables.ic_compound_close, contentDescription = "")
+                    Icon(resourceId = CommonDrawables.ic_compound_close, contentDescription = null)
                 }
             }
         }
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/EditableAvatarView.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/EditableAvatarView.kt
index 289c37530a..e28435a243 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/EditableAvatarView.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/EditableAvatarView.kt
@@ -87,7 +87,7 @@ fun EditableAvatarView(
                 Icon(
                     modifier = Modifier.size(16.dp),
                     resourceId = CommonDrawables.ic_edit,
-                    contentDescription = "",
+                    contentDescription = null,
                     tint = MaterialTheme.colorScheme.onPrimary,
                 )
             }
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/UnresolvedUserRow.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/UnresolvedUserRow.kt
index 2916fa7f06..a61378a982 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/UnresolvedUserRow.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/UnresolvedUserRow.kt
@@ -79,7 +79,7 @@ fun UnresolvedUserRow(
             ) {
                 Icon(
                     resourceId = CommonDrawables.ic_compound_error,
-                    contentDescription = "",
+                    contentDescription = null,
                     modifier = Modifier
                         .size(18.dp)
                         .align(Alignment.Top)
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/UnsavedAvatar.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/UnsavedAvatar.kt
index f7852d690e..62481d33c1 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/UnsavedAvatar.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/UnsavedAvatar.kt
@@ -72,7 +72,7 @@ fun UnsavedAvatar(
         Box(modifier = commonModifier.background(ElementTheme.colors.temporaryColorBgSpecial)) {
             Icon(
                 imageVector = Icons.Outlined.AddAPhoto,
-                contentDescription = "",
+                contentDescription = null,
                 modifier = Modifier
                     .align(Alignment.Center)
                     .size(40.dp),
diff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/FormattingOption.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/FormattingOption.kt
index 791bf7cc75..525fdeab43 100644
--- a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/FormattingOption.kt
+++ b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/FormattingOption.kt
@@ -98,19 +98,19 @@ internal fun FormattingButtonPreview() = ElementPreview {
             state = FormattingOptionState.Default,
             onClick = { },
             imageVector = ImageVector.vectorResource(CommonDrawables.ic_bold),
-            contentDescription = "",
+            contentDescription = null,
         )
         FormattingOption(
             state = FormattingOptionState.Selected,
             onClick = { },
             imageVector = ImageVector.vectorResource(CommonDrawables.ic_italic),
-            contentDescription = "",
+            contentDescription = null,
         )
         FormattingOption(
             state = FormattingOptionState.Disabled,
             onClick = { },
             imageVector = ImageVector.vectorResource(CommonDrawables.ic_underline),
-            contentDescription = "",
+            contentDescription = null,
         )
     }
 }
diff --git a/tools/check/forbidden_strings_in_code.txt b/tools/check/forbidden_strings_in_code.txt
index 17f352fca4..37234ac670 100755
--- a/tools/check/forbidden_strings_in_code.txt
+++ b/tools/check/forbidden_strings_in_code.txt
@@ -132,3 +132,7 @@ System\.currentTimeMillis\(\)===1
 
 ### Use `import io.element.android.libraries.ui.strings.CommonStrings` then `CommonStrings.<stringKey>` instead
 import io\.element\.android\.libraries\.ui\.strings\.R
+
+# Accessibility
+### Use string resource for `contentDescription`, or null instead of empty string
+contentDescription = "