diff --git a/app/src/main/res/layout-land/voip_conference_active_speaker.xml b/app/src/main/res/layout-land/voip_conference_active_speaker.xml
index cb9a376a3..b953fe345 100644
--- a/app/src/main/res/layout-land/voip_conference_active_speaker.xml
+++ b/app/src/main/res/layout-land/voip_conference_active_speaker.xml
@@ -303,10 +303,10 @@
 
         <ImageView
             android:id="@+id/switch_camera"
-            android:layout_width="@dimen/conference_miniature_switch_camera_icon_size"
-            android:layout_height="@dimen/conference_miniature_switch_camera_icon_size"
-            android:layout_marginTop="5dp"
-            android:layout_marginEnd="5dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="5dp"
+            android:padding="10dp"
             android:contentDescription="@string/content_description_switch_camera"
             android:onClick="@{() -> controlsViewModel.switchCamera()}"
             android:src="@drawable/icon_call_camera_switch"
@@ -330,7 +330,7 @@
             android:id="@+id/local_participant_muted"
             android:layout_width="@dimen/voip_conference_participant_mic_muted_icon_size_active_speaker"
             android:layout_height="@dimen/voip_conference_participant_mic_muted_icon_size_active_speaker"
-            android:layout_margin="5dp"
+            android:layout_margin="10dp"
             android:background="@drawable/shape_toggle_pressed_background"
             android:contentDescription="@string/content_description_conference_participant_mic_muted"
             android:padding="2dp"
diff --git a/app/src/main/res/layout/voip_conference_active_speaker.xml b/app/src/main/res/layout/voip_conference_active_speaker.xml
index 287054f6e..5f0833e24 100644
--- a/app/src/main/res/layout/voip_conference_active_speaker.xml
+++ b/app/src/main/res/layout/voip_conference_active_speaker.xml
@@ -304,10 +304,10 @@
 
         <ImageView
             android:id="@+id/switch_camera"
-            android:layout_width="@dimen/conference_miniature_switch_camera_icon_size"
-            android:layout_height="@dimen/conference_miniature_switch_camera_icon_size"
-            android:layout_marginTop="5dp"
-            android:layout_marginEnd="5dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="5dp"
+            android:padding="10dp"
             android:contentDescription="@string/content_description_switch_camera"
             android:onClick="@{() -> controlsViewModel.switchCamera()}"
             android:src="@drawable/icon_call_camera_switch"
@@ -331,7 +331,7 @@
             android:id="@+id/local_participant_muted"
             android:layout_width="@dimen/voip_conference_participant_mic_muted_icon_size_active_speaker"
             android:layout_height="@dimen/voip_conference_participant_mic_muted_icon_size_active_speaker"
-            android:layout_margin="5dp"
+            android:layout_margin="10dp"
             android:background="@drawable/shape_toggle_pressed_background"
             android:contentDescription="@string/content_description_conference_participant_mic_muted"
             android:padding="2dp"
diff --git a/app/src/main/res/layout/voip_conference_participant_remote_grid.xml b/app/src/main/res/layout/voip_conference_participant_remote_grid.xml
index 2c0f0c1da..c214a4d8f 100644
--- a/app/src/main/res/layout/voip_conference_participant_remote_grid.xml
+++ b/app/src/main/res/layout/voip_conference_participant_remote_grid.xml
@@ -77,8 +77,8 @@
             android:src="@drawable/shape_conference_active_speaker_border"
             android:visibility="@{data.isSpeaking ? View.VISIBLE : View.GONE, default=gone}"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
@@ -95,13 +95,13 @@
         <ImageView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_margin="10dp"
+            android:layout_margin="5dp"
+            android:padding="10dp"
             android:contentDescription="@string/content_description_switch_camera"
             android:onClick="@{() -> data.switchCamera()}"
-            android:padding="5dp"
             android:src="@drawable/icon_call_camera_switch"
             android:visibility="@{data.videoEnabled &amp;&amp; data.isSwitchCameraAvailable() &amp;&amp; data.isInConference ? View.VISIBLE : View.GONE, default=gone}"
-            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
         <ProgressBar
@@ -112,7 +112,7 @@
             android:indeterminate="true"
             android:indeterminateDrawable="@drawable/icon_spinner_rotating"
             android:visibility="@{data.isJoining ? View.VISIBLE : View.GONE, default=gone}"
-            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
         <ImageView
@@ -124,7 +124,7 @@
             android:padding="2dp"
             android:src="@drawable/icon_mic_muted"
             android:visibility="@{data.isMuted ? View.VISIBLE : View.GONE, default=gone}"
-            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml
index edd606712..08551708d 100644
--- a/app/src/main/res/values/dimen.xml
+++ b/app/src/main/res/values/dimen.xml
@@ -60,7 +60,7 @@
     <dimen name="voip_conference_active_speaker_miniature_avatar_size">50dp</dimen>
     <dimen name="voip_conference_participant_mic_muted_icon_size_grid">30dp</dimen>
     <dimen name="voip_conference_participant_joining_icon_size_grid">30dp</dimen>
-    <dimen name="voip_conference_participant_mic_muted_icon_size_active_speaker">25dp</dimen>
+    <dimen name="voip_conference_participant_mic_muted_icon_size_active_speaker">30dp</dimen>
     <dimen name="voip_conference_participant_joining_icon_size_active_speaker">35dp</dimen>
     <dimen name="voip_dialog_button_max_width">137dp</dimen>
     <dimen name="voip_contact_avatar_max_size">180dp</dimen>
@@ -78,5 +78,4 @@
     <dimen name="chat_message_content_preview_max_width">120dp</dimen>
     <dimen name="voip_conference_active_speaker_dots_margin">5dp</dimen>
     <dimen name="conference_waiting_room_buttons_max_width">250dp</dimen>
-    <dimen name="conference_miniature_switch_camera_icon_size">25dp</dimen>
 </resources>
\ No newline at end of file