diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/video/MediaPlayerControllerView.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/video/MediaPlayerControllerView.kt
index f0c6040412..2a5757aa94 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/video/MediaPlayerControllerView.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/video/MediaPlayerControllerView.kt
@@ -25,6 +25,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
@@ -73,12 +74,13 @@ fun MediaPlayerControllerView(
                 }
                 Box(
                     modifier = Modifier
-                        .clickable { onTogglePlay() }
                         .size(36.dp)
                         .background(
                             color = bgColor,
                             shape = CircleShape,
                         )
+                        .clip(CircleShape)
+                        .clickable { onTogglePlay() }
                         .padding(8.dp),
                     contentAlignment = Alignment.Center,
                 ) {
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerView.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerView.kt
index 96d513458d..cdcc6f9fb2 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerView.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerView.kt
@@ -129,7 +129,7 @@ fun MediaViewerView(
                     canShare = state.canShare,
                     mimeType = state.mediaInfo.mimeType,
                     caption = state.mediaInfo.caption,
-                    onHeightChanged = { bottomPaddingInPixels = it },
+                    onHeightChange = { bottomPaddingInPixels = it },
                     eventSink = state.eventSink
                 )
             }
@@ -325,7 +325,7 @@ private fun MediaViewerBottomBar(
     canShare: Boolean,
     mimeType: String,
     caption: String?,
-    onHeightChanged: (Int) -> Unit,
+    onHeightChange: (Int) -> Unit,
     eventSink: (MediaViewerEvents) -> Unit,
     modifier: Modifier = Modifier,
 ) {
@@ -334,7 +334,7 @@ private fun MediaViewerBottomBar(
             .fillMaxWidth()
             .background(Color(0x99101317))
             .onSizeChanged {
-                onHeightChanged(it.height)
+                onHeightChange(it.height)
             },
     ) {
         HorizontalDivider()