diff --git a/vector/src/main/java/im/vector/riotx/features/navigation/DefaultNavigator.kt b/vector/src/main/java/im/vector/riotx/features/navigation/DefaultNavigator.kt
index 8940ac6791..6acd041ecf 100644
--- a/vector/src/main/java/im/vector/riotx/features/navigation/DefaultNavigator.kt
+++ b/vector/src/main/java/im/vector/riotx/features/navigation/DefaultNavigator.kt
@@ -289,7 +289,8 @@ class DefaultNavigator @Inject constructor(
     }
 
     override fun openVideoViewer(activity: Activity,
-                                 roomId: String, mediaData: VideoContentRenderer.Data,
+                                 roomId: String,
+                                 mediaData: AttachmentData,
                                  view: View,
                                  inMemory: List<AttachmentData>?,
                                  options: ((MutableList<Pair<View, String>>) -> Unit)?) {
diff --git a/vector/src/main/java/im/vector/riotx/features/navigation/Navigator.kt b/vector/src/main/java/im/vector/riotx/features/navigation/Navigator.kt
index f925344570..6d036f1468 100644
--- a/vector/src/main/java/im/vector/riotx/features/navigation/Navigator.kt
+++ b/vector/src/main/java/im/vector/riotx/features/navigation/Navigator.kt
@@ -99,7 +99,8 @@ interface Navigator {
                         options: ((MutableList<Pair<View, String>>) -> Unit)?)
 
     fun openVideoViewer(activity: Activity,
-                        roomId: String, mediaData: VideoContentRenderer.Data,
+                        roomId: String,
+                        mediaData: VideoContentRenderer.Data,
                         view: View,
                         inMemory: List<AttachmentData>? = null,
                         options: ((MutableList<Pair<View, String>>) -> Unit)?)
diff --git a/vector/src/main/res/layout/merge_image_attachment_overlay.xml b/vector/src/main/res/layout/merge_image_attachment_overlay.xml
index 6188ad564a..b0e769579c 100644
--- a/vector/src/main/res/layout/merge_image_attachment_overlay.xml
+++ b/vector/src/main/res/layout/merge_image_attachment_overlay.xml
@@ -74,8 +74,8 @@
         android:layout_marginEnd="16dp"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:clickable="true"
-        android:focusable="true"
         android:contentDescription="@string/share"
+        android:focusable="true"
         android:padding="6dp"
         android:tint="@color/white"
         app:layout_constraintBottom_toBottomOf="@id/overlayTopBackground"
@@ -85,12 +85,12 @@
 
 
     <androidx.constraintlayout.widget.Group
+        android:id="@+id/overlayVideoControlsGroup"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:id="@+id/overlayVideoControlsGroup"
         android:visibility="gone"
-        tools:visibility="visible"
-        app:constraint_referenced_ids="overlayBottomBackground,overlayBackButton,overlayPlayPauseButton,overlaySeekBar" />
+        app:constraint_referenced_ids="overlayBottomBackground,overlayBackButton,overlayPlayPauseButton,overlaySeekBar"
+        tools:visibility="visible" />
 
     <View
         android:id="@+id/overlayBottomBackground"
@@ -121,11 +121,11 @@
         android:id="@+id/overlaySeekBar"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
         android:backgroundTint="@color/white"
         android:progressBackgroundTint="@color/white"
         android:thumbTint="@color/white"
-        android:layout_marginStart="8dp"
-        android:layout_marginEnd="8dp"
         app:layout_constraintBottom_toBottomOf="@id/overlayBottomBackground"
         app:layout_constraintEnd_toEndOf="@id/overlayBottomBackground"
         app:layout_constraintStart_toEndOf="@id/overlayPlayPauseButton"