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 dbf1365bb2..fd355d3860 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
@@ -17,7 +17,9 @@
 package io.element.android.libraries.designsystem.theme.components
 
 import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.CheckCircle
 import androidx.compose.material.icons.filled.RadioButtonUnchecked
@@ -30,6 +32,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
 import io.element.android.libraries.designsystem.preview.ElementThemedPreview
 import io.element.android.libraries.designsystem.preview.PreviewGroup
 
@@ -56,23 +59,31 @@ fun IconToggleButton(
 
 @Preview(group = PreviewGroup.Toggles)
 @Composable
-internal fun IconToggleButtonCheckedPreview() = ElementThemedPreview(vertical = false) { ContentToPreview(true) }
-
-@Preview(group = PreviewGroup.Toggles)
-@Composable
-internal fun IconToggleButtonUncheckedPreview() = ElementThemedPreview(vertical = false) { ContentToPreview(false) }
+internal fun IconToggleButtonPreview() = ElementThemedPreview(vertical = false) { ContentToPreview() }
 
 @Composable
-private fun ContentToPreview(defaultCheck: Boolean) {
-    var checked by remember { mutableStateOf(defaultCheck) }
-    val icon: @Composable () -> Unit = {
-        Icon(
-            imageVector = if (checked) Icons.Default.CheckCircle else Icons.Default.RadioButtonUnchecked,
-            contentDescription = "IconToggleButton"
-        )
-    }
+private fun ContentToPreview() {
+    var checked by remember { mutableStateOf(false) }
     Column {
-        IconToggleButton(checked = checked, enabled = true, onCheckedChange = { checked = !checked }, content = icon)
-        IconToggleButton(checked = checked, enabled = false, onCheckedChange = { checked = !checked }, content = icon)
+        Row(horizontalArrangement = Arrangement.spacedBy(6.dp)) {
+            val icon: @Composable () -> Unit = {
+                Icon(
+                    imageVector = if (checked) Icons.Default.CheckCircle else Icons.Default.RadioButtonUnchecked,
+                    contentDescription = "IconToggleButton"
+                )
+            }
+            IconToggleButton(checked = checked, enabled = true, onCheckedChange = { checked = !checked }, content = icon)
+            IconToggleButton(checked = checked, enabled = false, onCheckedChange = { checked = !checked }, content = icon)
+        }
+        Row(horizontalArrangement = Arrangement.spacedBy(6.dp)) {
+            val icon: @Composable () -> Unit = {
+                Icon(
+                    imageVector = if (!checked) Icons.Default.CheckCircle else Icons.Default.RadioButtonUnchecked,
+                    contentDescription = "IconToggleButton"
+                )
+            }
+            IconToggleButton(checked = !checked, enabled = true, onCheckedChange = { checked = !checked }, content = icon)
+            IconToggleButton(checked = !checked, enabled = false, onCheckedChange = { checked = !checked }, content = icon)
+        }
     }
 }
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/RadioButton.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/RadioButton.kt
index 9d85cf8d87..9f373d1b71 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/RadioButton.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/RadioButton.kt
@@ -17,7 +17,9 @@
 package io.element.android.libraries.designsystem.theme.components
 
 import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
 import androidx.compose.material3.RadioButtonColors
 import androidx.compose.material3.RadioButtonDefaults
 import androidx.compose.runtime.Composable
@@ -27,6 +29,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
 import io.element.android.libraries.designsystem.preview.ElementThemedPreview
 import io.element.android.libraries.designsystem.preview.PreviewGroup
 import io.element.android.libraries.theme.ElementTheme
@@ -63,17 +66,19 @@ internal fun compoundRadioButtonColors(): RadioButtonColors {
 
 @Preview(group = PreviewGroup.Toggles)
 @Composable
-internal fun RadioButtonCheckedPreview() = ElementThemedPreview(vertical = false) { ContentToPreview(true) }
-
-@Preview(group = PreviewGroup.Toggles)
-@Composable
-internal fun RadioButtonUncheckedPreview() = ElementThemedPreview(vertical = false) { ContentToPreview(false) }
+internal fun RadioButtonPreview() = ElementThemedPreview(vertical = false) { ContentToPreview() }
 
 @Composable
-private fun ContentToPreview(defaultCheck: Boolean) {
-    var checked by remember { mutableStateOf(defaultCheck) }
+private fun ContentToPreview() {
+    var checked by remember { mutableStateOf(false) }
     Column {
-        RadioButton(selected = checked, enabled = true, onClick = { checked = !checked })
-        RadioButton(selected = checked, enabled = false, onClick = { checked = !checked })
+        Row(horizontalArrangement = Arrangement.spacedBy(6.dp)) {
+            RadioButton(selected = checked, enabled = true, onClick = { checked = !checked })
+            RadioButton(selected = checked, enabled = false, onClick = { checked = !checked })
+        }
+        Row(horizontalArrangement = Arrangement.spacedBy(6.dp)) {
+            RadioButton(selected = !checked, enabled = true, onClick = { checked = !checked })
+            RadioButton(selected = !checked, enabled = false, onClick = { checked = !checked })
+        }
     }
 }