diff --git a/app/src/main/java/org/linphone/ui/call/fragment/ConferenceLayoutMenuDialogFragment.kt b/app/src/main/java/org/linphone/ui/call/fragment/ConferenceLayoutMenuDialogFragment.kt
index 1b3b12e8d..8fd179ac4 100644
--- a/app/src/main/java/org/linphone/ui/call/fragment/ConferenceLayoutMenuDialogFragment.kt
+++ b/app/src/main/java/org/linphone/ui/call/fragment/ConferenceLayoutMenuDialogFragment.kt
@@ -69,8 +69,12 @@ class ConferenceLayoutMenuDialogFragment(
         view.viewModel = conferenceModel
 
         view.setGridClickListener {
-            conferenceModel.changeLayout(ConferenceModel.GRID_LAYOUT)
-            dismiss()
+            if (conferenceModel.participantDevices.value.orEmpty().size < 6) {
+                conferenceModel.changeLayout(ConferenceModel.GRID_LAYOUT)
+                dismiss()
+            } else {
+                // TODO: notify user
+            }
         }
         view.setActiveSpeakerClickListener {
             conferenceModel.changeLayout(ConferenceModel.ACTIVE_SPEAKER_LAYOUT)
diff --git a/app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt b/app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt
index bc00650ed..daead64ed 100644
--- a/app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt
@@ -311,6 +311,8 @@ class CurrentCallViewModel @UiThread constructor() : ViewModel() {
     }
 
     init {
+        fullScreenMode.value = false
+
         coreContext.postOnCoreThread { core ->
             core.addListener(coreListener)
 
@@ -327,13 +329,6 @@ class CurrentCallViewModel @UiThread constructor() : ViewModel() {
             }
         }
 
-        isVideoEnabled.value = false
-        fullScreenMode.value = false
-        isMicrophoneMuted.value = ActivityCompat.checkSelfPermission(
-            coreContext.context,
-            Manifest.permission.RECORD_AUDIO
-        ) != PackageManager.PERMISSION_GRANTED
-
         numpadModel = NumpadModel(
             { digit -> // onDigitClicked
                 appendDigitToSearchBarEvent.value = Event(digit)
@@ -773,7 +768,7 @@ class CurrentCallViewModel @UiThread constructor() : ViewModel() {
             Log.w(
                 "$TAG RECORD_AUDIO permission wasn't granted yet, considering microphone as muted!"
             )
-            isMicrophoneMuted.postValue(false)
+            isMicrophoneMuted.postValue(true)
         } else {
             isMicrophoneMuted.postValue(call.microphoneMuted)
         }
diff --git a/app/src/main/res/layout/chat_conversation_fragment.xml b/app/src/main/res/layout/chat_conversation_fragment.xml
index 16aeb84f3..024df5f93 100644
--- a/app/src/main/res/layout/chat_conversation_fragment.xml
+++ b/app/src/main/res/layout/chat_conversation_fragment.xml
@@ -85,7 +85,7 @@
                 android:layout_marginStart="5dp"
                 coilAvatar="@{viewModel.avatarModel}"
                 app:layout_constraintStart_toEndOf="@id/back"
-                app:layout_constraintTop_toTopOf="@id/back" />
+                app:layout_constraintTop_toTopOf="parent"/>
 
             <ImageView
                 android:id="@+id/presence_badge"
@@ -142,12 +142,11 @@
                 android:id="@+id/show_menu"
                 android:onClick="@{showMenuClickListener}"
                 android:layout_width="wrap_content"
-                android:layout_height="0dp"
+                android:layout_height="@dimen/top_bar_height"
                 android:padding="15dp"
                 android:adjustViewBounds="true"
                 android:src="@drawable/dots_three_vertical"
-                app:layout_constraintTop_toTopOf="@id/avatar"
-                app:layout_constraintBottom_toBottomOf="@id/avatar"
+                app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:tint="?attr/color_main2_500"/>
 
@@ -155,12 +154,11 @@
                 android:id="@+id/start_call"
                 android:onClick="@{() -> viewModel.startCall()}"
                 android:layout_width="wrap_content"
-                android:layout_height="0dp"
+                android:layout_height="@dimen/top_bar_height"
                 android:padding="15dp"
                 android:src="@drawable/phone"
                 android:visibility="@{viewModel.isReadOnly || viewModel.searchBarVisible ? View.GONE : View.VISIBLE}"
-                app:layout_constraintTop_toTopOf="@id/back"
-                app:layout_constraintBottom_toBottomOf="@id/back"
+                app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintEnd_toStartOf="@id/show_menu"
                 app:tint="?attr/color_main2_500" />