diff --git a/app/src/main/java/org/linphone/activities/main/conference/fragments/ConferenceWaitingRoomFragment.kt b/app/src/main/java/org/linphone/activities/main/conference/fragments/ConferenceWaitingRoomFragment.kt
index e66a20450..61adc99fe 100644
--- a/app/src/main/java/org/linphone/activities/main/conference/fragments/ConferenceWaitingRoomFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/conference/fragments/ConferenceWaitingRoomFragment.kt
@@ -128,6 +128,7 @@ class ConferenceWaitingRoomFragment : GenericFragment<ConferenceWaitingRoomFragm
         super.onResume()
 
         coreContext.core.nativePreviewWindowId = binding.localPreviewVideoSurface
+        coreContext.core.isVideoPreviewEnabled = viewModel.isVideoEnabled.value == true
     }
 
     override fun onPause() {
diff --git a/app/src/main/res/drawable/button_orange_background.xml b/app/src/main/res/drawable/button_orange_background.xml
new file mode 100644
index 000000000..bff93f486
--- /dev/null
+++ b/app/src/main/res/drawable/button_orange_background.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true"
+        android:drawable="@drawable/shape_rect_green_button" />
+    <item android:state_enabled="false"
+        android:drawable="@drawable/shape_rect_light_gray_button" />
+    <item
+        android:drawable="@drawable/shape_rect_orange_button" />
+</selector>
diff --git a/app/src/main/res/drawable/shape_rect_light_gray_button.xml b/app/src/main/res/drawable/shape_rect_light_gray_button.xml
new file mode 100644
index 000000000..6e2eaa7ba
--- /dev/null
+++ b/app/src/main/res/drawable/shape_rect_light_gray_button.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <corners android:radius="5dp" />
+    <size android:height="20dp" android:width="20dp"/>
+    <solid android:color="@color/voip_light_gray"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/conference_waiting_room_fragment.xml b/app/src/main/res/layout/conference_waiting_room_fragment.xml
index 3925212d5..fef6dda93 100644
--- a/app/src/main/res/layout/conference_waiting_room_fragment.xml
+++ b/app/src/main/res/layout/conference_waiting_room_fragment.xml
@@ -64,6 +64,7 @@
                 android:layout_height="wrap_content"
                 android:layout_margin="5dp"
                 android:contentDescription="@string/content_description_switch_camera"
+                android:enabled="@{!viewModel.joinInProgress}"
                 android:onClick="@{() -> viewModel.switchCamera()}"
                 android:padding="10dp"
                 android:src="@drawable/icon_call_camera_switch"
@@ -104,7 +105,7 @@
                 android:layout_marginStart="10dp"
                 android:layout_marginEnd="20dp"
                 android:layout_weight="1"
-                android:background="@drawable/shape_rect_orange_button"
+                android:background="@drawable/button_orange_background"
                 android:enabled="@{!viewModel.joinInProgress}"
                 android:gravity="center"
                 android:onClick="@{() -> viewModel.start()}"
@@ -220,6 +221,7 @@
                 android:layout_marginEnd="5dp"
                 android:background="@drawable/button_background_reverse"
                 android:contentDescription="@{viewModel.isMicrophoneMuted ? @string/content_description_disable_mic_mute : @string/content_description_enable_mic_mute}"
+                android:enabled="@{!viewModel.joinInProgress}"
                 android:onClick="@{() -> viewModel.toggleMuteMicrophone()}"
                 android:padding="5dp"
                 android:selected="@{viewModel.isMicrophoneMuted}"
@@ -242,6 +244,7 @@
                     android:layout_height="match_parent"
                     android:background="@drawable/button_background_reverse"
                     android:contentDescription="@{viewModel.isSpeakerSelected ? @string/content_description_disable_speaker : @string/content_description_enable_speaker}"
+                    android:enabled="@{!viewModel.joinInProgress}"
                     android:onClick="@{() -> viewModel.toggleSpeaker()}"
                     android:padding="5dp"
                     android:selected="@{viewModel.isSpeakerSelected}"
@@ -253,6 +256,7 @@
                     android:layout_height="match_parent"
                     android:background="@drawable/button_toggle_background_reverse"
                     android:contentDescription="@string/content_description_toggle_audio_menu"
+                    android:enabled="@{!viewModel.joinInProgress}"
                     android:onClick="@{() -> viewModel.toggleAudioRoutesMenu()}"
                     android:padding="5dp"
                     android:selected="@{viewModel.audioRoutesSelected}"
@@ -267,7 +271,7 @@
                 android:layout_marginStart="5dp"
                 android:background="@drawable/button_background_reverse"
                 android:contentDescription="@{viewModel.isVideoEnabled ? @string/content_description_disable_video : @string/content_description_enable_video}"
-                android:enabled="@{viewModel.isVideoAvailable &amp;&amp; !viewModel.isLowBandwidth}"
+                android:enabled="@{!viewModel.joinInProgress &amp;&amp; viewModel.isVideoAvailable &amp;&amp; !viewModel.isLowBandwidth}"
                 android:onClick="@{() -> viewModel.toggleVideo()}"
                 android:padding="5dp"
                 android:selected="@{viewModel.isVideoEnabled}"
@@ -282,7 +286,7 @@
                 android:layout_marginEnd="20dp"
                 android:background="@drawable/button_toggle_background_reverse"
                 android:contentDescription="@string/content_description_toggle_layout_menu"
-                android:enabled="@{!viewModel.isLowBandwidth}"
+                android:enabled="@{!viewModel.joinInProgress &amp;&amp; !viewModel.isLowBandwidth}"
                 android:onClick="@{() -> viewModel.toggleLayoutMenu()}"
                 android:padding="10dp"
                 android:selected="@{viewModel.layoutMenuSelected}"