diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/debug/EventDebugInfoView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/debug/EventDebugInfoView.kt
index 5074913dd7..03ba2d6eb9 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/debug/EventDebugInfoView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/debug/EventDebugInfoView.kt
@@ -18,7 +18,6 @@ package io.element.android.features.messages.impl.timeline.debug
 
 import android.content.ClipData
 import android.content.ClipboardManager
-import android.content.Context
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.expandVertically
 import androidx.compose.animation.shrinkVertically
@@ -94,11 +93,12 @@ fun EventDebugInfoView(
         },
         modifier = modifier
     ) { padding ->
-        LazyColumn(modifier = Modifier
-            .fillMaxWidth()
-            .padding(padding) // Window insets
-            .consumeWindowInsets(padding)
-            .padding(horizontal = 16.dp) // Internal padding
+        LazyColumn(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(padding) // Window insets
+                .consumeWindowInsets(padding)
+                .padding(horizontal = 16.dp) // Internal padding
         ) {
             item {
                 Column(Modifier.padding(vertical = 10.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) {
@@ -165,7 +165,11 @@ private fun CopyableText(
             .padding(6.dp)
             .clickable { clipboardManager.setPrimaryClip(ClipData.newPlainText("JSON", text)) }
     ) {
-        Text(text = text, fontFamily = FontFamily.Monospace, fontSize = 14.sp, modifier = Modifier.padding(8.dp))
+        Text(
+            text = text,
+            style = ElementTheme.typography.fontBodyMdRegular.copy(fontFamily = FontFamily.Monospace),
+            modifier = Modifier.padding(8.dp),
+        )
     }
 }
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Text.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Text.kt
index d9d2847bcf..d473fac5d6 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Text.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Text.kt
@@ -60,8 +60,6 @@ fun Text(
     fontSize: TextUnit = TextUnit.Unspecified,
     fontStyle: FontStyle? = null,
     // Will be removed, only style should be used
-    fontFamily: FontFamily? = null,
-    // Will be removed, only style should be used
     letterSpacing: TextUnit = TextUnit.Unspecified,
     textDecoration: TextDecoration? = null,
     textAlign: TextAlign? = null,
@@ -80,7 +78,6 @@ fun Text(
         color = color,
         fontSize = fontSize,
         fontStyle = fontStyle,
-        fontFamily = fontFamily,
         letterSpacing = letterSpacing,
         textDecoration = textDecoration,
         textAlign = textAlign,