diff --git a/app/build.gradle b/app/build.gradle
index 3a01cb69c..c0a2230b3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -142,7 +142,7 @@ dependencies {
     implementation "androidx.window:window:1.2.0"
     implementation 'androidx.gridlayout:gridlayout:1.0.0'
 
-    def nav_version = "2.7.6"
+    def nav_version = "2.7.7"
     implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
     implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
 
@@ -169,7 +169,7 @@ dependencies {
     // https://github.com/Baseflow/PhotoView/blob/master/LICENSE Apache v2.0
     implementation 'com.github.chrisbanes:PhotoView:2.3.0'
 
-    implementation platform('com.google.firebase:firebase-bom:32.7.0')
+    implementation platform('com.google.firebase:firebase-bom:32.7.2')
     implementation 'com.google.firebase:firebase-messaging'
     implementation 'com.google.firebase:firebase-crashlytics-ndk'
 
diff --git a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationMediaListFragment.kt b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationMediaListFragment.kt
index 0ada714d1..6ae387fc7 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationMediaListFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationMediaListFragment.kt
@@ -97,6 +97,7 @@ class ConversationMediaListFragment : SlidingPaneChildFragment() {
         val layoutManager = object : GridLayoutManager(requireContext(), 4) {
             override fun checkLayoutParams(lp: RecyclerView.LayoutParams): Boolean {
                 lp.width = width / spanCount
+                lp.height = lp.width
                 return true
             }
         }
diff --git a/app/src/main/res/layout/chat_media_content_grid_cell.xml b/app/src/main/res/layout/chat_media_content_grid_cell.xml
index 9ea703131..4004c6bea 100644
--- a/app/src/main/res/layout/chat_media_content_grid_cell.xml
+++ b/app/src/main/res/layout/chat_media_content_grid_cell.xml
@@ -17,15 +17,17 @@
         <ImageView
             android:id="@+id/image"
             android:onClick="@{() -> model.onClick()}"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
             android:layout_margin="1dp"
             android:adjustViewBounds="true"
             android:scaleType="centerCrop"
             coilBubbleGrid="@{model.file}"
             app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"/>
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"/>
 
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style_600"