diff --git a/app/src/main/java/org/linphone/ui/main/recordings/viewmodel/RecordingsListViewModel.kt b/app/src/main/java/org/linphone/ui/main/recordings/viewmodel/RecordingsListViewModel.kt
index 0b88792df..31373d065 100644
--- a/app/src/main/java/org/linphone/ui/main/recordings/viewmodel/RecordingsListViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/recordings/viewmodel/RecordingsListViewModel.kt
@@ -76,7 +76,12 @@ class RecordingsListViewModel
 
     @UiThread
     fun clearFilter() {
-        searchFilter.value = ""
+        if (searchFilter.value.orEmpty().isEmpty()) {
+            searchBarVisible.value = false
+            focusSearchBarEvent.value = Event(false)
+        } else {
+            searchFilter.value = ""
+        }
     }
 
     @UiThread
diff --git a/app/src/main/res/drawable/account_list_background.xml b/app/src/main/res/drawable/account_list_background.xml
new file mode 100644
index 000000000..af86707b1
--- /dev/null
+++ b/app/src/main/res/drawable/account_list_background.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true"
+        android:drawable="@drawable/shape_rectangle_gray_background" />
+    <item android:state_pressed="true"
+        android:drawable="@drawable/shape_rectangle_gray_background" />
+    <item android:state_hovered="true"
+        android:drawable="@drawable/shape_rectangle_gray_background" />
+    <item
+        android:drawable="@drawable/shape_rectangle_white_background" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/circle_transparent_button_background.xml b/app/src/main/res/drawable/circle_transparent_button_background.xml
new file mode 100644
index 000000000..902014908
--- /dev/null
+++ b/app/src/main/res/drawable/circle_transparent_button_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_circle_light_blue_background" />
+    <item android:state_hovered="true"
+        android:drawable="@drawable/shape_circle_light_blue_background" />
+    <item
+        android:drawable="@drawable/shape_circle_transparent_background" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/circle_transparent_dark_button_background.xml b/app/src/main/res/drawable/circle_transparent_dark_button_background.xml
new file mode 100644
index 000000000..54af3cfe3
--- /dev/null
+++ b/app/src/main/res/drawable/circle_transparent_dark_button_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_circle_dark_pressed_background" />
+    <item android:state_hovered="true"
+        android:drawable="@drawable/shape_circle_dark_pressed_background" />
+    <item
+        android:drawable="@drawable/shape_circle_transparent_background" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_circle_dark_pressed_background.xml b/app/src/main/res/drawable/shape_circle_dark_pressed_background.xml
new file mode 100644
index 000000000..f17492a37
--- /dev/null
+++ b/app/src/main/res/drawable/shape_circle_dark_pressed_background.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
+    <size android:width="44dp" android:height="44dp" />
+    <solid android:color="@color/gray_main2_400"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_circle_transparent_background.xml b/app/src/main/res/drawable/shape_circle_transparent_background.xml
new file mode 100644
index 000000000..74724ad75
--- /dev/null
+++ b/app/src/main/res/drawable/shape_circle_transparent_background.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
+    <size android:width="60dp" android:height="60dp" />
+    <solid android:color="@color/transparent_color"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/call_active_fragment.xml b/app/src/main/res/layout-land/call_active_fragment.xml
index aa8d96528..de73b2185 100644
--- a/app/src/main/res/layout-land/call_active_fragment.xml
+++ b/app/src/main/res/layout-land/call_active_fragment.xml
@@ -135,6 +135,7 @@
                 android:adjustViewBounds="true"
                 android:padding="15dp"
                 android:src="@drawable/caret_left"
+                android:background="@drawable/circle_transparent_dark_button_background"
                 android:contentDescription="@string/content_description_go_back_icon"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/hinge_top"
@@ -203,8 +204,11 @@
                 android:layout_marginStart="5dp"
                 android:layout_marginEnd="5dp"
                 android:src="@drawable/camera_rotate"
+                android:adjustViewBounds="true"
                 android:contentDescription="@string/content_description_change_camera"
+                android:background="@drawable/circle_transparent_dark_button_background"
                 android:visibility="@{!viewModel.fullScreenMode &amp;&amp; !viewModel.pipMode &amp;&amp; viewModel.isSendingVideo &amp;&amp; viewModel.showSwitchCamera ? View.VISIBLE : View.GONE}"
+                app:layout_constraintDimensionRatio="1:1"
                 app:tint="@color/bc_white"
                 app:layout_constraintTop_toTopOf="@id/back"
                 app:layout_constraintBottom_toBottomOf="@id/back"
@@ -230,9 +234,12 @@
                 android:layout_height="0dp"
                 android:padding="10dp"
                 android:src="@{viewModel.qualityIcon, default=@drawable/cell_signal_full}"
+                android:adjustViewBounds="true"
                 android:contentDescription="@string/content_description_show_call_statistics"
+                android:background="@drawable/circle_transparent_dark_button_background"
                 android:visibility="@{!viewModel.fullScreenMode &amp;&amp; !viewModel.pipMode &amp;&amp; !(viewModel.isPaused || viewModel.isPausedByRemote) ? View.VISIBLE : View.GONE}"
                 android:tint="@{viewModel.qualityValue >= 2 ? @color/bc_white : viewModel.qualityValue >= 1 ? @color/orange_warning_600 : @color/red_danger_500, default=@color/bc_white}"
+                app:layout_constraintDimensionRatio="1:1"
                 app:layout_constraintTop_toTopOf="@id/back"
                 app:layout_constraintBottom_toBottomOf="@id/back"
                 app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout-land/contact_new_or_edit_fragment.xml b/app/src/main/res/layout-land/contact_new_or_edit_fragment.xml
index b517e027e..99029e728 100644
--- a/app/src/main/res/layout-land/contact_new_or_edit_fragment.xml
+++ b/app/src/main/res/layout-land/contact_new_or_edit_fragment.xml
@@ -33,7 +33,7 @@
             android:padding="15dp"
             android:src="@drawable/caret_left"
             android:contentDescription="@string/content_description_go_back_icon"
-            android:background="?attr/color_main2_000"
+            android:background="@drawable/circle_transparent_button_background"
             app:tint="?attr/color_main1_500"
             app:layout_constraintBottom_toBottomOf="@id/title"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout-land/main_activity_top_bar.xml b/app/src/main/res/layout-land/main_activity_top_bar.xml
index 324a3344b..a03589f01 100644
--- a/app/src/main/res/layout-land/main_activity_top_bar.xml
+++ b/app/src/main/res/layout-land/main_activity_top_bar.xml
@@ -80,10 +80,12 @@
             android:layout_width="wrap_content"
             android:layout_height="0dp"
             android:layout_marginEnd="5dp"
-            android:paddingStart="15dp"
-            android:paddingEnd="15dp"
+            android:padding="15dp"
             android:src="@drawable/magnifying_glass"
+            android:adjustViewBounds="true"
+            android:background="@drawable/circle_transparent_button_background"
             android:contentDescription="@string/content_description_open_filter"
+            app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintBottom_toBottomOf="@id/title"
             app:layout_constraintEnd_toStartOf="@id/extra_action"
             app:layout_constraintTop_toTopOf="@id/title"
@@ -95,11 +97,13 @@
             android:layout_width="wrap_content"
             android:layout_height="0dp"
             android:layout_marginEnd="5dp"
-            android:paddingStart="15dp"
-            android:paddingEnd="15dp"
+            android:padding="15dp"
             android:src="@{extraActionIcon, default=@drawable/dots_three_vertical}"
+            android:adjustViewBounds="true"
+            android:background="@drawable/circle_transparent_button_background"
             android:contentDescription="@{extraActionContentDescription}"
             android:visibility="@{enableExtraAction ? View.VISIBLE : View.GONE, default=gone}"
+            app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintBottom_toBottomOf="@id/title"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/title"
@@ -111,10 +115,12 @@
             android:layout_width="wrap_content"
             android:layout_height="0dp"
             android:layout_marginStart="5dp"
-            android:paddingStart="15dp"
-            android:paddingEnd="15dp"
+            android:padding="15dp"
             android:src="@drawable/caret_left"
+            android:adjustViewBounds="true"
+            android:background="@drawable/circle_transparent_button_background"
             android:contentDescription="@string/content_description_cancel_filter"
+            app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintBottom_toBottomOf="@id/search"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/search"
@@ -157,10 +163,12 @@
             android:layout_width="wrap_content"
             android:layout_height="0dp"
             android:layout_marginEnd="5dp"
-            android:paddingStart="15dp"
-            android:paddingEnd="15dp"
+            android:padding="15dp"
             android:src="@drawable/x"
+            android:adjustViewBounds="true"
+            android:background="@drawable/circle_transparent_button_background"
             android:contentDescription="@string/content_description_clear_filter"
+            app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintBottom_toBottomOf="@id/search"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/search"
diff --git a/app/src/main/res/layout-land/meeting_waiting_room_fragment.xml b/app/src/main/res/layout-land/meeting_waiting_room_fragment.xml
index f00ec2703..e148e9cc3 100644
--- a/app/src/main/res/layout-land/meeting_waiting_room_fragment.xml
+++ b/app/src/main/res/layout-land/meeting_waiting_room_fragment.xml
@@ -34,6 +34,7 @@
             android:padding="15dp"
             android:src="@drawable/caret_left"
             android:contentDescription="@string/content_description_go_back_icon"
+            android:background="@drawable/circle_transparent_button_background"
             app:tint="?attr/color_main1_500"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout-sw600dp-land/main_activity_top_bar.xml b/app/src/main/res/layout-sw600dp-land/main_activity_top_bar.xml
index a51861e1c..a77a1b5b0 100644
--- a/app/src/main/res/layout-sw600dp-land/main_activity_top_bar.xml
+++ b/app/src/main/res/layout-sw600dp-land/main_activity_top_bar.xml
@@ -50,14 +50,13 @@
             style="@style/default_text_style_800"
             android:id="@+id/title"
             android:layout_width="0dp"
-            android:layout_height="wrap_content"
+            android:layout_height="0dp"
             android:layout_marginStart="15dp"
             android:layout_marginEnd="10dp"
             android:gravity="center_vertical"
             android:text="@{viewModel.title, default=`Title`}"
             android:textColor="?attr/color_text"
             android:textSize="28sp"
-            app:layout_constraintVertical_bias="1"
             app:layout_constraintEnd_toStartOf="@id/search_toggle"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
@@ -69,10 +68,12 @@
             android:layout_width="wrap_content"
             android:layout_height="0dp"
             android:layout_marginEnd="5dp"
-            android:paddingStart="15dp"
-            android:paddingEnd="15dp"
+            android:padding="15dp"
             android:src="@drawable/magnifying_glass"
+            android:adjustViewBounds="true"
+            android:background="@drawable/circle_transparent_button_background"
             android:contentDescription="@string/content_description_open_filter"
+            app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintBottom_toBottomOf="@id/title"
             app:layout_constraintEnd_toStartOf="@id/extra_action"
             app:layout_constraintTop_toTopOf="@id/title"
@@ -84,11 +85,13 @@
             android:layout_width="wrap_content"
             android:layout_height="0dp"
             android:layout_marginEnd="5dp"
-            android:paddingStart="15dp"
-            android:paddingEnd="15dp"
+            android:padding="15dp"
             android:src="@{extraActionIcon, default=@drawable/dots_three_vertical}"
+            android:adjustViewBounds="true"
+            android:background="@drawable/circle_transparent_button_background"
             android:contentDescription="@{extraActionContentDescription}"
             android:visibility="@{enableExtraAction ? View.VISIBLE : View.GONE, default=gone}"
+            app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintBottom_toBottomOf="@id/title"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/title"
@@ -100,10 +103,12 @@
             android:layout_width="wrap_content"
             android:layout_height="0dp"
             android:layout_marginStart="5dp"
-            android:paddingStart="15dp"
-            android:paddingEnd="15dp"
+            android:padding="15dp"
             android:src="@drawable/caret_left"
+            android:adjustViewBounds="true"
+            android:background="@drawable/circle_transparent_button_background"
             android:contentDescription="@string/content_description_cancel_filter"
+            app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintBottom_toBottomOf="@id/search"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/search"
@@ -146,10 +151,12 @@
             android:layout_width="wrap_content"
             android:layout_height="0dp"
             android:layout_marginEnd="5dp"
-            android:paddingStart="15dp"
-            android:paddingEnd="15dp"
+            android:padding="15dp"
             android:src="@drawable/x"
+            android:adjustViewBounds="true"
             android:contentDescription="@string/content_description_clear_filter"
+            android:background="@drawable/circle_transparent_button_background"
+            app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintBottom_toBottomOf="@id/search"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/search"
diff --git a/app/src/main/res/layout-sw600dp/assistant_landing_fragment.xml b/app/src/main/res/layout-sw600dp/assistant_landing_fragment.xml
index c9062028d..80124c8e2 100644
--- a/app/src/main/res/layout-sw600dp/assistant_landing_fragment.xml
+++ b/app/src/main/res/layout-sw600dp/assistant_landing_fragment.xml
@@ -57,6 +57,7 @@
                 android:padding="15dp"
                 android:src="@drawable/caret_left"
                 android:contentDescription="@string/content_description_go_back_icon"
+                android:background="@drawable/circle_transparent_button_background"
                 android:visibility="@{viewModel.showBackButton ? View.VISIBLE : View.INVISIBLE, default=invisible}"
                 app:tint="?attr/color_main2_500"
                 app:layout_constraintTop_toTopOf="@id/title"
diff --git a/app/src/main/res/layout-sw600dp/assistant_permissions_fragment.xml b/app/src/main/res/layout-sw600dp/assistant_permissions_fragment.xml
index 87e0400c7..89425630e 100644
--- a/app/src/main/res/layout-sw600dp/assistant_permissions_fragment.xml
+++ b/app/src/main/res/layout-sw600dp/assistant_permissions_fragment.xml
@@ -47,6 +47,7 @@
                 android:padding="15dp"
                 android:src="@drawable/caret_left"
                 android:contentDescription="@string/content_description_go_back_icon"
+                android:background="@drawable/circle_transparent_button_background"
                 app:tint="?attr/color_main2_500"
                 app:layout_constraintTop_toTopOf="@id/title"
                 app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout-sw600dp/assistant_register_confirm_sms_code_fragment.xml b/app/src/main/res/layout-sw600dp/assistant_register_confirm_sms_code_fragment.xml
index 6f3941395..104d30f0b 100644
--- a/app/src/main/res/layout-sw600dp/assistant_register_confirm_sms_code_fragment.xml
+++ b/app/src/main/res/layout-sw600dp/assistant_register_confirm_sms_code_fragment.xml
@@ -44,6 +44,7 @@
                 android:padding="15dp"
                 android:src="@drawable/caret_left"
                 android:contentDescription="@string/content_description_go_back_icon"
+                android:background="@drawable/circle_transparent_button_background"
                 android:visibility="invisible"
                 app:tint="?attr/color_main2_500"
                 app:layout_constraintTop_toTopOf="@id/title"
diff --git a/app/src/main/res/layout-sw600dp/assistant_register_fragment.xml b/app/src/main/res/layout-sw600dp/assistant_register_fragment.xml
index 9831e522c..b5658c89b 100644
--- a/app/src/main/res/layout-sw600dp/assistant_register_fragment.xml
+++ b/app/src/main/res/layout-sw600dp/assistant_register_fragment.xml
@@ -71,6 +71,7 @@
                     android:padding="15dp"
                     android:src="@drawable/caret_left"
                     android:contentDescription="@string/content_description_go_back_icon"
+                    android:background="@drawable/circle_transparent_button_background"
                     app:tint="?attr/color_main2_500"
                     app:layout_constraintTop_toTopOf="@id/title"
                     app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout-sw600dp/assistant_third_party_sip_account_login_fragment.xml b/app/src/main/res/layout-sw600dp/assistant_third_party_sip_account_login_fragment.xml
index 19598da8d..b7acbf3bd 100644
--- a/app/src/main/res/layout-sw600dp/assistant_third_party_sip_account_login_fragment.xml
+++ b/app/src/main/res/layout-sw600dp/assistant_third_party_sip_account_login_fragment.xml
@@ -45,6 +45,7 @@
                 android:padding="15dp"
                 android:src="@drawable/caret_left"
                 android:contentDescription="@string/content_description_go_back_icon"
+                android:background="@drawable/circle_transparent_button_background"
                 app:tint="?attr/color_main2_500"
                 app:layout_constraintTop_toTopOf="@id/title"
                 app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout-sw600dp/assistant_third_party_sip_account_warning_fragment.xml b/app/src/main/res/layout-sw600dp/assistant_third_party_sip_account_warning_fragment.xml
index 50ccdbef0..e7ee848a2 100644
--- a/app/src/main/res/layout-sw600dp/assistant_third_party_sip_account_warning_fragment.xml
+++ b/app/src/main/res/layout-sw600dp/assistant_third_party_sip_account_warning_fragment.xml
@@ -51,6 +51,7 @@
                 android:padding="15dp"
                 android:src="@drawable/caret_left"
                 android:contentDescription="@string/content_description_go_back_icon"
+                android:background="@drawable/circle_transparent_button_background"
                 app:tint="?attr/color_main2_500"
                 app:layout_constraintTop_toTopOf="@id/title"
                 app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/account_list_cell.xml b/app/src/main/res/layout/account_list_cell.xml
index 5f562216a..d1ce9943b 100644
--- a/app/src/main/res/layout/account_list_cell.xml
+++ b/app/src/main/res/layout/account_list_cell.xml
@@ -15,7 +15,8 @@
         android:onClick="@{() -> model.setAsDefault()}"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@{model.isDefault ? @drawable/color_main2_100 : @drawable/color_main2_000, default=@drawable/color_main2_100}">
+        android:selected="@{model.isDefault}"
+        android:background="@drawable/account_list_background">
 
         <androidx.constraintlayout.widget.Barrier
             android:id="@+id/end_barrier"
@@ -129,7 +130,9 @@
             android:padding="15dp"
             android:adjustViewBounds="true"
             android:contentDescription="@string/content_description_open_drawer_menu_icon"
+            android:background="@drawable/circle_transparent_button_background"
             android:src="@drawable/dots_three_vertical"
+            app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/name"
             app:layout_constraintBottom_toBottomOf="@id/register_status"
diff --git a/app/src/main/res/layout/account_profile_fragment.xml b/app/src/main/res/layout/account_profile_fragment.xml
index 6d23845d3..da89b35f6 100644
--- a/app/src/main/res/layout/account_profile_fragment.xml
+++ b/app/src/main/res/layout/account_profile_fragment.xml
@@ -51,6 +51,7 @@
                 android:padding="15dp"
                 android:src="@drawable/caret_left"
                 android:contentDescription="@string/content_description_go_back_icon"
+                android:background="@drawable/circle_transparent_button_background"
                 app:tint="?attr/color_main1_500"
                 app:layout_constraintBottom_toBottomOf="@id/title"
                 app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/account_profile_secure_mode_fragment.xml b/app/src/main/res/layout/account_profile_secure_mode_fragment.xml
index 31e509773..ae35b2fb1 100644
--- a/app/src/main/res/layout/account_profile_secure_mode_fragment.xml
+++ b/app/src/main/res/layout/account_profile_secure_mode_fragment.xml
@@ -36,6 +36,7 @@
             android:padding="15dp"
             android:src="@drawable/caret_left"
             android:contentDescription="@string/content_description_go_back_icon"
+            android:background="@drawable/circle_transparent_button_background"
             app:tint="?attr/color_main1_500"
             app:layout_constraintBottom_toBottomOf="@id/title"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/account_settings_fragment.xml b/app/src/main/res/layout/account_settings_fragment.xml
index 759350c24..e5f0731f1 100644
--- a/app/src/main/res/layout/account_settings_fragment.xml
+++ b/app/src/main/res/layout/account_settings_fragment.xml
@@ -30,6 +30,7 @@
                 android:padding="15dp"
                 android:src="@drawable/caret_left"
                 android:contentDescription="@string/content_description_go_back_icon"
+                android:background="@drawable/circle_transparent_button_background"
                 app:tint="?attr/color_main1_500"
                 app:layout_constraintBottom_toBottomOf="@id/title"
                 app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/assistant_landing_fragment.xml b/app/src/main/res/layout/assistant_landing_fragment.xml
index fad8a01ed..d94d2af2c 100644
--- a/app/src/main/res/layout/assistant_landing_fragment.xml
+++ b/app/src/main/res/layout/assistant_landing_fragment.xml
@@ -43,6 +43,7 @@
                 android:padding="15dp"
                 android:src="@drawable/caret_left"
                 android:contentDescription="@string/content_description_go_back_icon"
+                android:background="@drawable/circle_transparent_button_background"
                 android:visibility="@{viewModel.showBackButton ? View.VISIBLE : View.INVISIBLE, default=invisible}"
                 app:tint="?attr/color_main2_500"
                 app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/layout/assistant_permissions_fragment.xml b/app/src/main/res/layout/assistant_permissions_fragment.xml
index af5d54c6d..9a8d079db 100644
--- a/app/src/main/res/layout/assistant_permissions_fragment.xml
+++ b/app/src/main/res/layout/assistant_permissions_fragment.xml
@@ -46,6 +46,7 @@
                 android:padding="15dp"
                 android:src="@drawable/caret_left"
                 android:contentDescription="@string/content_description_go_back_icon"
+                android:background="@drawable/circle_transparent_button_background"
                 app:tint="?attr/color_main2_500"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintStart_toStartOf="parent"/>
diff --git a/app/src/main/res/layout/assistant_qr_code_scanner_fragment.xml b/app/src/main/res/layout/assistant_qr_code_scanner_fragment.xml
index 195abe961..81af2ba80 100644
--- a/app/src/main/res/layout/assistant_qr_code_scanner_fragment.xml
+++ b/app/src/main/res/layout/assistant_qr_code_scanner_fragment.xml
@@ -37,6 +37,7 @@
             android:padding="15dp"
             android:src="@drawable/caret_left"
             android:contentDescription="@string/content_description_go_back_icon"
+            android:background="@drawable/circle_transparent_button_background"
             app:tint="@color/bc_white"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintStart_toStartOf="parent"/>
diff --git a/app/src/main/res/layout/assistant_register_confirm_sms_code_fragment.xml b/app/src/main/res/layout/assistant_register_confirm_sms_code_fragment.xml
index 1f50cc150..d35e302e3 100644
--- a/app/src/main/res/layout/assistant_register_confirm_sms_code_fragment.xml
+++ b/app/src/main/res/layout/assistant_register_confirm_sms_code_fragment.xml
@@ -30,6 +30,7 @@
                 android:padding="15dp"
                 android:src="@drawable/caret_left"
                 android:contentDescription="@string/content_description_go_back_icon"
+                android:background="@drawable/circle_transparent_button_background"
                 app:tint="?attr/color_main2_500"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintStart_toStartOf="parent"/>
diff --git a/app/src/main/res/layout/assistant_register_fragment.xml b/app/src/main/res/layout/assistant_register_fragment.xml
index 7e840a0e0..641fffd23 100644
--- a/app/src/main/res/layout/assistant_register_fragment.xml
+++ b/app/src/main/res/layout/assistant_register_fragment.xml
@@ -64,6 +64,7 @@
                     android:padding="15dp"
                     android:src="@drawable/caret_left"
                     android:contentDescription="@string/content_description_go_back_icon"
+                    android:background="@drawable/circle_transparent_button_background"
                     app:tint="?attr/color_main2_500"
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintStart_toStartOf="parent"/>
diff --git a/app/src/main/res/layout/assistant_third_party_sip_account_login_fragment.xml b/app/src/main/res/layout/assistant_third_party_sip_account_login_fragment.xml
index 224bb3f38..d425236da 100644
--- a/app/src/main/res/layout/assistant_third_party_sip_account_login_fragment.xml
+++ b/app/src/main/res/layout/assistant_third_party_sip_account_login_fragment.xml
@@ -31,6 +31,7 @@
                 android:padding="15dp"
                 android:src="@drawable/caret_left"
                 android:contentDescription="@string/content_description_go_back_icon"
+                android:background="@drawable/circle_transparent_button_background"
                 app:tint="?attr/color_main2_500"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintStart_toStartOf="parent"/>
diff --git a/app/src/main/res/layout/assistant_third_party_sip_account_warning_fragment.xml b/app/src/main/res/layout/assistant_third_party_sip_account_warning_fragment.xml
index b9256979e..b44deeaf0 100644
--- a/app/src/main/res/layout/assistant_third_party_sip_account_warning_fragment.xml
+++ b/app/src/main/res/layout/assistant_third_party_sip_account_warning_fragment.xml
@@ -37,6 +37,7 @@
                 android:padding="15dp"
                 android:src="@drawable/caret_left"
                 android:contentDescription="@string/content_description_go_back_icon"
+                android:background="@drawable/circle_transparent_button_background"
                 app:tint="?attr/color_main2_500"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintStart_toStartOf="parent"/>
diff --git a/app/src/main/res/layout/call_active_conference_fragment.xml b/app/src/main/res/layout/call_active_conference_fragment.xml
index 6db1e84d0..67ea01ee8 100644
--- a/app/src/main/res/layout/call_active_conference_fragment.xml
+++ b/app/src/main/res/layout/call_active_conference_fragment.xml
@@ -79,6 +79,7 @@
                 android:padding="15dp"
                 android:src="@drawable/caret_left"
                 android:contentDescription="@string/content_description_go_back_icon"
+                android:background="@drawable/circle_transparent_dark_button_background"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="@id/hinge_top"
                 app:tint="@color/bc_white" />
@@ -143,8 +144,11 @@
                 android:layout_marginStart="5dp"
                 android:layout_marginEnd="5dp"
                 android:src="@drawable/camera_rotate"
+                android:adjustViewBounds="true"
                 android:contentDescription="@string/content_description_change_camera"
+                android:background="@drawable/circle_transparent_dark_button_background"
                 android:visibility="@{!viewModel.fullScreenMode &amp;&amp; !viewModel.pipMode &amp;&amp; viewModel.showSwitchCamera &amp;&amp; conferenceViewModel.isMeParticipantSendingVideo ? View.VISIBLE : View.GONE}"
+                app:layout_constraintDimensionRatio="1:1"
                 app:tint="@color/bc_white"
                 app:layout_constraintTop_toTopOf="@id/back"
                 app:layout_constraintBottom_toBottomOf="@id/back"
@@ -170,9 +174,12 @@
                 android:layout_height="0dp"
                 android:padding="10dp"
                 android:src="@{viewModel.qualityIcon, default=@drawable/cell_signal_full}"
+                android:adjustViewBounds="true"
                 android:contentDescription="@string/content_description_show_call_statistics"
+                android:background="@drawable/circle_transparent_dark_button_background"
                 android:visibility="@{!viewModel.fullScreenMode &amp;&amp; !viewModel.pipMode &amp;&amp; !conferenceViewModel.isPaused ? View.VISIBLE : View.GONE}"
                 android:tint="@{viewModel.qualityValue >= 2 ? @color/bc_white : viewModel.qualityValue >= 1 ? @color/orange_warning_600 : @color/red_danger_500, default=@color/bc_white}"
+                app:layout_constraintDimensionRatio="1:1"
                 app:layout_constraintTop_toTopOf="@id/back"
                 app:layout_constraintBottom_toBottomOf="@id/back"
                 app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/call_active_fragment.xml b/app/src/main/res/layout/call_active_fragment.xml
index 0e638cfe1..72fbf50cb 100644
--- a/app/src/main/res/layout/call_active_fragment.xml
+++ b/app/src/main/res/layout/call_active_fragment.xml
@@ -132,6 +132,7 @@
                 android:adjustViewBounds="true"
                 android:padding="15dp"
                 android:src="@drawable/caret_left"
+                android:background="@drawable/circle_transparent_dark_button_background"
                 android:contentDescription="@string/content_description_go_back_icon"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/hinge_top"
@@ -200,8 +201,11 @@
                 android:layout_marginStart="5dp"
                 android:layout_marginEnd="5dp"
                 android:src="@drawable/camera_rotate"
+                android:adjustViewBounds="true"
+                android:background="@drawable/circle_transparent_dark_button_background"
                 android:contentDescription="@string/content_description_change_camera"
                 android:visibility="@{!viewModel.fullScreenMode &amp;&amp; !viewModel.pipMode &amp;&amp; viewModel.isSendingVideo &amp;&amp; viewModel.showSwitchCamera ? View.VISIBLE : View.GONE}"
+                app:layout_constraintDimensionRatio="1:1"
                 app:tint="@color/bc_white"
                 app:layout_constraintTop_toTopOf="@id/back"
                 app:layout_constraintBottom_toBottomOf="@id/back"
@@ -227,9 +231,12 @@
                 android:layout_height="0dp"
                 android:padding="10dp"
                 android:src="@{viewModel.qualityIcon, default=@drawable/cell_signal_full}"
+                android:adjustViewBounds="true"
                 android:contentDescription="@string/content_description_show_call_statistics"
+                android:background="@drawable/circle_transparent_dark_button_background"
                 android:visibility="@{!viewModel.fullScreenMode &amp;&amp; !viewModel.pipMode &amp;&amp; !(viewModel.isPaused || viewModel.isPausedByRemote) ? View.VISIBLE : View.GONE}"
                 android:tint="@{viewModel.qualityValue >= 2 ? @color/bc_white : viewModel.qualityValue >= 1 ? @color/orange_warning_600 : @color/red_danger_500, default=@color/bc_white}"
+                app:layout_constraintDimensionRatio="1:1"
                 app:layout_constraintTop_toTopOf="@id/back"
                 app:layout_constraintBottom_toBottomOf="@id/back"
                 app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/call_conference_participants_list_fragment.xml b/app/src/main/res/layout/call_conference_participants_list_fragment.xml
index bd4736758..bfd143345 100644
--- a/app/src/main/res/layout/call_conference_participants_list_fragment.xml
+++ b/app/src/main/res/layout/call_conference_participants_list_fragment.xml
@@ -32,6 +32,7 @@
             android:onClick="@{backClickListener}"
             android:src="@drawable/caret_left"
             android:contentDescription="@string/content_description_go_back_icon"
+            android:background="@drawable/circle_transparent_button_background"
             app:tint="?attr/color_main1_500"
             app:layout_constraintBottom_toBottomOf="@id/title"
             app:layout_constraintStart_toStartOf="parent"
@@ -57,6 +58,7 @@
             android:padding="15dp"
             android:adjustViewBounds="true"
             android:src="@drawable/dots_three_vertical"
+            android:background="@drawable/circle_transparent_button_background"
             android:contentDescription="@string/content_description_show_popup_menu"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/call_outgoing_actions.xml b/app/src/main/res/layout/call_outgoing_actions.xml
index b5cd2ab96..c116ed19d 100644
--- a/app/src/main/res/layout/call_outgoing_actions.xml
+++ b/app/src/main/res/layout/call_outgoing_actions.xml
@@ -65,27 +65,16 @@
             app:layout_constraintStart_toEndOf="@id/hang_up"
             app:layout_constraintEnd_toStartOf="@id/toggle_mute_mic" />
 
-        <ImageView
-            android:id="@+id/toggle_mute_mic_background"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:selected="@{viewModel.isMicrophoneMuted}"
-            android:background="@drawable/in_call_button_background_red"
-            android:contentDescription="@null"
-            app:layout_constraintTop_toTopOf="@id/toggle_mute_mic"
-            app:layout_constraintBottom_toBottomOf="@id/toggle_mute_mic"
-            app:layout_constraintStart_toStartOf="@id/toggle_mute_mic"
-            app:layout_constraintEnd_toEndOf="@id/toggle_mute_mic" />
-
         <org.linphone.ui.call.view.VuMeterView
             android:id="@+id/record_volume_vu_meter"
             android:layout_width="0dp"
             android:layout_height="0dp"
+            android:background="@drawable/in_call_button_background_red"
             vuMeterPercentage="@{viewModel.microphoneRecordingVolume}"
-            app:layout_constraintTop_toTopOf="@id/toggle_mute_mic_background"
-            app:layout_constraintBottom_toBottomOf="@id/toggle_mute_mic_background"
-            app:layout_constraintStart_toStartOf="@id/toggle_mute_mic_background"
-            app:layout_constraintEnd_toEndOf="@id/toggle_mute_mic_background" />
+            app:layout_constraintTop_toTopOf="@id/toggle_mute_mic"
+            app:layout_constraintBottom_toBottomOf="@id/toggle_mute_mic"
+            app:layout_constraintStart_toStartOf="@id/toggle_mute_mic"
+            app:layout_constraintEnd_toEndOf="@id/toggle_mute_mic" />
 
         <ImageView
             android:onClick="@{() -> viewModel.toggleMuteMicrophone()}"
@@ -96,12 +85,24 @@
             android:padding="@dimen/call_button_icon_padding"
             android:src="@{viewModel.isMicrophoneMuted ? @drawable/microphone_slash : @drawable/microphone, default=@drawable/microphone}"
             android:contentDescription="@string/content_description_toggle_microphone"
+            android:background="@drawable/in_call_button_background_transparent"
             app:tint="@color/in_call_button_tint_color"
             app:layout_constraintTop_toBottomOf="@id/call_actions_handle"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toEndOf="@id/toggle_video"
             app:layout_constraintEnd_toStartOf="@id/change_audio_output" />
 
+        <org.linphone.ui.call.view.VuMeterView
+            android:id="@+id/playback_volume_vu_meter"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:background="@drawable/in_call_button_background_red"
+            vuMeterPercentage="@{viewModel.playbackVolume}"
+            app:layout_constraintTop_toTopOf="@id/change_audio_output"
+            app:layout_constraintBottom_toBottomOf="@id/change_audio_output"
+            app:layout_constraintStart_toStartOf="@id/change_audio_output"
+            app:layout_constraintEnd_toEndOf="@id/change_audio_output" />
+
         <ImageView
             android:onClick="@{() -> viewModel.changeAudioOutputDevice()}"
             android:id="@+id/change_audio_output"
@@ -112,7 +113,7 @@
             android:enabled="@{viewModel.isOutgoingRinging}"
             android:contentDescription="@string/content_description_change_output_audio_device"
             android:src="@{viewModel.isHeadsetEnabled ? @drawable/headset : viewModel.isBluetoothEnabled ? @drawable/bluetooth : viewModel.isSpeakerEnabled ? @drawable/speaker_high : @drawable/speaker_slash, default=@drawable/speaker_slash}"
-            android:background="@drawable/in_call_button_background_red"
+            android:background="@drawable/in_call_button_background_transparent"
             app:tint="@color/in_call_button_tint_color"
             app:layout_constraintTop_toBottomOf="@id/call_actions_handle"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/call_transfer_fragment.xml b/app/src/main/res/layout/call_transfer_fragment.xml
index 4b5392950..638c8c72a 100644
--- a/app/src/main/res/layout/call_transfer_fragment.xml
+++ b/app/src/main/res/layout/call_transfer_fragment.xml
@@ -40,6 +40,7 @@
                 android:padding="15dp"
                 android:src="@drawable/caret_left"
                 android:contentDescription="@string/content_description_go_back_icon"
+                android:background="@drawable/circle_transparent_button_background"
                 app:tint="?attr/color_main1_500"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/calls_list_fragment.xml b/app/src/main/res/layout/calls_list_fragment.xml
index 88bcc5d13..796142fd3 100644
--- a/app/src/main/res/layout/calls_list_fragment.xml
+++ b/app/src/main/res/layout/calls_list_fragment.xml
@@ -29,6 +29,7 @@
             android:onClick="@{backClickListener}"
             android:src="@drawable/caret_left"
             android:contentDescription="@string/content_description_go_back_icon"
+            android:background="@drawable/circle_transparent_button_background"
             app:tint="?attr/color_main1_500"
             app:layout_constraintBottom_toBottomOf="@id/title"
             app:layout_constraintStart_toStartOf="parent"
@@ -55,6 +56,7 @@
             android:adjustViewBounds="true"
             android:src="@drawable/arrows_merge"
             android:contentDescription="@string/content_description_merge_calls_into_conference"
+            android:background="@drawable/circle_transparent_button_background"
             android:visibility="@{viewModel.callsCount > 1 ? View.VISIBLE : View.GONE}"
             app:tint="?attr/color_main1_500"
             app:layout_constraintBottom_toBottomOf="@id/title"
diff --git a/app/src/main/res/layout/chat_conversation_fragment.xml b/app/src/main/res/layout/chat_conversation_fragment.xml
index eda6ea147..04780e676 100644
--- a/app/src/main/res/layout/chat_conversation_fragment.xml
+++ b/app/src/main/res/layout/chat_conversation_fragment.xml
@@ -79,6 +79,7 @@
                     android:visibility="@{viewModel.isCallConversation || viewModel.showBackButton &amp;&amp; !viewModel.searchBarVisible ? View.VISIBLE : View.GONE}"
                     android:src="@drawable/caret_left"
                     android:contentDescription="@string/content_description_go_back_icon"
+                    android:background="@drawable/circle_transparent_button_background"
                     app:tint="?attr/color_main1_500"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"/>
@@ -174,6 +175,7 @@
                     android:adjustViewBounds="true"
                     android:src="@drawable/dots_three_vertical"
                     android:contentDescription="@string/content_description_show_popup_menu"
+                    android:background="@drawable/circle_transparent_button_background"
                     android:visibility="@{viewModel.isCallConversation ? View.GONE : View.VISIBLE}"
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
@@ -188,6 +190,7 @@
                     android:src="@drawable/phone"
                     android:contentDescription="@string/content_description_call_start"
                     android:visibility="@{viewModel.isCallConversation || viewModel.isReadOnly || viewModel.searchBarVisible ? View.GONE : View.VISIBLE}"
+                    android:background="@drawable/circle_transparent_button_background"
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintEnd_toStartOf="@id/show_menu"
                     app:tint="?attr/color_main2_500" />
@@ -200,6 +203,7 @@
                     android:padding="15dp"
                     android:src="@drawable/caret_left"
                     android:contentDescription="@string/content_description_cancel_filter"
+                    android:background="@drawable/circle_transparent_button_background"
                     app:layout_constraintBottom_toBottomOf="@id/search"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="@id/search"
@@ -244,6 +248,7 @@
                     android:padding="15dp"
                     android:src="@drawable/caret_up"
                     android:contentDescription="@string/content_description_chat_search_message_up"
+                    android:background="@drawable/circle_transparent_button_background"
                     app:layout_constraintBottom_toBottomOf="@id/search"
                     app:layout_constraintEnd_toStartOf="@id/search_down"
                     app:layout_constraintTop_toTopOf="@id/search"
@@ -258,6 +263,7 @@
                     android:padding="15dp"
                     android:src="@drawable/caret_down"
                     android:contentDescription="@string/content_description_chat_search_message_down"
+                    android:background="@drawable/circle_transparent_button_background"
                     app:layout_constraintBottom_toBottomOf="@id/search"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toTopOf="@id/search"
diff --git a/app/src/main/res/layout/chat_conversation_send_area.xml b/app/src/main/res/layout/chat_conversation_send_area.xml
index 13339b0c4..ea6500ae3 100644
--- a/app/src/main/res/layout/chat_conversation_send_area.xml
+++ b/app/src/main/res/layout/chat_conversation_send_area.xml
@@ -188,7 +188,7 @@
             app:layout_constraintBottom_toBottomOf="@id/message_area_background"
             app:layout_constraintEnd_toEndOf="@id/message_area_background"
             app:layout_constraintTop_toTopOf="@id/message_area_background"
-            app:tint="?attr/color_main2_500" />
+            app:tint="@color/icon_primary_color_selector" />
 
         <include
             android:id="@+id/voice_recording_area"
diff --git a/app/src/main/res/layout/chat_documents_fragment.xml b/app/src/main/res/layout/chat_documents_fragment.xml
index 13e63aafe..d3a9b9180 100644
--- a/app/src/main/res/layout/chat_documents_fragment.xml
+++ b/app/src/main/res/layout/chat_documents_fragment.xml
@@ -31,6 +31,7 @@
                 android:onClick="@{backClickListener}"
                 android:src="@drawable/caret_left"
                 android:contentDescription="@string/content_description_go_back_icon"
+                android:background="@drawable/circle_transparent_button_background"
                 app:tint="?attr/color_main1_500"
                 app:layout_constraintBottom_toBottomOf="@id/title"
                 app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/chat_ephemeral_lifetime_fragment.xml b/app/src/main/res/layout/chat_ephemeral_lifetime_fragment.xml
index a04d4f9f6..1441ce43d 100644
--- a/app/src/main/res/layout/chat_ephemeral_lifetime_fragment.xml
+++ b/app/src/main/res/layout/chat_ephemeral_lifetime_fragment.xml
@@ -26,6 +26,7 @@
             android:onClick="@{backClickListener}"
             android:src="@drawable/caret_left"
             android:contentDescription="@string/content_description_go_back_icon"
+            android:background="@drawable/circle_transparent_button_background"
             app:tint="?attr/color_main1_500"
             app:layout_constraintBottom_toBottomOf="@id/title"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/chat_info_fragment.xml b/app/src/main/res/layout/chat_info_fragment.xml
index f63d9dfec..c5b287e5f 100644
--- a/app/src/main/res/layout/chat_info_fragment.xml
+++ b/app/src/main/res/layout/chat_info_fragment.xml
@@ -58,6 +58,7 @@
             android:onClick="@{backClickListener}"
             android:src="@drawable/caret_left"
             android:contentDescription="@string/content_description_go_back_icon"
+            android:background="@drawable/circle_transparent_button_background"
             app:tint="?attr/color_main1_500"
             app:layout_constraintBottom_toBottomOf="@id/invisible_title"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/chat_media_fragment.xml b/app/src/main/res/layout/chat_media_fragment.xml
index 6afb7e345..bd3b56dbc 100644
--- a/app/src/main/res/layout/chat_media_fragment.xml
+++ b/app/src/main/res/layout/chat_media_fragment.xml
@@ -31,6 +31,7 @@
                 android:onClick="@{backClickListener}"
                 android:src="@drawable/caret_left"
                 android:contentDescription="@string/content_description_go_back_icon"
+                android:background="@drawable/circle_transparent_button_background"
                 app:tint="?attr/color_main1_500"
                 app:layout_constraintBottom_toBottomOf="@id/title"
                 app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/chat_message_forward_fragment.xml b/app/src/main/res/layout/chat_message_forward_fragment.xml
index 3ae1ff54c..d3eb801bc 100644
--- a/app/src/main/res/layout/chat_message_forward_fragment.xml
+++ b/app/src/main/res/layout/chat_message_forward_fragment.xml
@@ -31,6 +31,7 @@
                 android:onClick="@{backClickListener}"
                 android:src="@drawable/caret_left"
                 android:contentDescription="@string/content_description_go_back_icon"
+                android:background="@drawable/circle_transparent_button_background"
                 app:tint="?attr/color_main1_500"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"/>
diff --git a/app/src/main/res/layout/chat_participant_list_cell.xml b/app/src/main/res/layout/chat_participant_list_cell.xml
index 033d4c5eb..70649b09c 100644
--- a/app/src/main/res/layout/chat_participant_list_cell.xml
+++ b/app/src/main/res/layout/chat_participant_list_cell.xml
@@ -36,6 +36,7 @@
             android:id="@+id/name"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginEnd="5dp"
             android:text="@{model.avatarModel.name, default=`John Doe`}"
             android:textSize="14sp"
             android:textColor="?attr/color_main2_800"
@@ -68,7 +69,7 @@
             android:text="@string/conversation_info_participant_is_admin_label"
             android:textColor="?attr/color_main2_500"
             android:textSize="12sp"
-            android:visibility="@{model.isParticipantAdmin ? View.VISIBLE : View.GONE}"
+            android:visibility="@{model.isParticipantAdmin ? View.VISIBLE : View.GONE, default=gone}"
             app:layout_constraintTop_toBottomOf="@id/sip_address"
             app:layout_constraintStart_toStartOf="@id/name"
             app:layout_constraintEnd_toEndOf="@id/name"
@@ -77,10 +78,13 @@
         <ImageView
             android:id="@+id/participant_menu"
             android:onClick="@{() -> model.openMenu(participantMenu)}"
-            android:layout_width="@dimen/icon_size"
-            android:layout_height="@dimen/icon_size"
+            android:layout_width="@dimen/big_icon_size"
+            android:layout_height="@dimen/big_icon_size"
             android:src="@drawable/dots_three_vertical"
+            android:padding="10dp"
+            android:adjustViewBounds="true"
             android:contentDescription="@string/content_description_show_popup_menu"
+            android:background="@drawable/circle_transparent_button_background"
             android:visibility="@{model.showMenu ? View.VISIBLE : View.GONE}"
             app:tint="?attr/color_grey_800"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/contact_fragment.xml b/app/src/main/res/layout/contact_fragment.xml
index 98a38352b..501e1f7c6 100644
--- a/app/src/main/res/layout/contact_fragment.xml
+++ b/app/src/main/res/layout/contact_fragment.xml
@@ -39,6 +39,7 @@
                 android:visibility="@{viewModel.showBackButton ? View.VISIBLE : View.GONE}"
                 android:src="@drawable/caret_left"
                 android:contentDescription="@string/content_description_go_back_icon"
+                android:background="@drawable/circle_transparent_button_background"
                 app:tint="?attr/color_main1_500"
                 app:layout_constraintBottom_toBottomOf="@id/invisible_title"
                 app:layout_constraintStart_toStartOf="parent"
@@ -65,6 +66,7 @@
                 android:adjustViewBounds="true"
                 android:src="@drawable/pencil_simple"
                 android:contentDescription="@string/content_description_contact_edit"
+                android:background="@drawable/circle_transparent_button_background"
                 android:visibility="@{viewModel.isStored ? View.VISIBLE : View.GONE}"
                 app:tint="?attr/color_main2_500"
                 app:layout_constraintBottom_toBottomOf="@id/invisible_title"
diff --git a/app/src/main/res/layout/contact_new_or_edit_fragment.xml b/app/src/main/res/layout/contact_new_or_edit_fragment.xml
index 24f148d56..5f9387e90 100644
--- a/app/src/main/res/layout/contact_new_or_edit_fragment.xml
+++ b/app/src/main/res/layout/contact_new_or_edit_fragment.xml
@@ -33,6 +33,7 @@
             android:padding="15dp"
             android:src="@drawable/caret_left"
             android:contentDescription="@string/content_description_go_back_icon"
+            android:background="@drawable/circle_transparent_button_background"
             app:tint="?attr/color_main1_500"
             app:layout_constraintBottom_toBottomOf="@id/title"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/drawer_menu.xml b/app/src/main/res/layout/drawer_menu.xml
index f8630b1ca..68c2890c4 100644
--- a/app/src/main/res/layout/drawer_menu.xml
+++ b/app/src/main/res/layout/drawer_menu.xml
@@ -51,13 +51,26 @@
             android:layout_marginEnd="16dp"
             android:text="@string/app_name"
             android:gravity="center_vertical"
-            android:drawableEnd="@drawable/x"
-            android:drawablePadding="15dp"
-            app:drawableTint="?attr/color_main2_600"
             app:layout_constraintTop_toTopOf="@id/brand_icon"
             app:layout_constraintStart_toEndOf="@id/brand_icon"
             app:layout_constraintBottom_toBottomOf="@id/brand_icon"
-            app:layout_constraintEnd_toEndOf="parent" />
+            app:layout_constraintEnd_toStartOf="@id/close_drawer" />
+
+        <ImageView
+            android:id="@+id/close_drawer"
+            android:onClick="@{() -> viewModel.closeDrawerMenu()}"
+            android:layout_width="@dimen/icon_size"
+            android:layout_height="@dimen/icon_size"
+            android:layout_marginEnd="16dp"
+            android:src="@drawable/x"
+            android:adjustViewBounds="true"
+            android:contentDescription="@string/content_description_close_drawer_menu"
+            android:background="@drawable/circle_transparent_button_background"
+            app:drawableTint="?attr/color_main2_600"
+            app:layout_constraintTop_toTopOf="@id/brand_name"
+            app:layout_constraintStart_toEndOf="@id/brand_name"
+            app:layout_constraintBottom_toBottomOf="@id/brand_name"
+            app:layout_constraintEnd_toEndOf="parent"/>
 
         <ScrollView
             android:layout_width="0dp"
diff --git a/app/src/main/res/layout/file_media_viewer_activity.xml b/app/src/main/res/layout/file_media_viewer_activity.xml
index c0fde0e67..912fabb16 100644
--- a/app/src/main/res/layout/file_media_viewer_activity.xml
+++ b/app/src/main/res/layout/file_media_viewer_activity.xml
@@ -64,6 +64,7 @@
             android:padding="15dp"
             android:src="@drawable/caret_left"
             android:contentDescription="@string/content_description_go_back_icon"
+            android:background="@drawable/circle_transparent_button_background"
             app:tint="?attr/color_main1_500"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -73,6 +74,8 @@
             android:id="@+id/file_name"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:text="@{viewModel.currentlyDisplayedFileName, default=`nomdufichier.jpg`}"
             android:textSize="13sp"
             android:textColor="@color/gray_main2_600"
@@ -89,6 +92,8 @@
             android:id="@+id/date_time"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:text="@{viewModel.currentlyDisplayedFileDateTime, default=`envoyé le 02/05/2023 à 11h05`}"
             android:textSize="12sp"
             android:textColor="@color/gray_main2_500"
@@ -108,6 +113,7 @@
             android:padding="15dp"
             android:src="@drawable/share_network"
             android:contentDescription="@string/content_description_share_file"
+            android:background="@drawable/circle_transparent_button_background"
             android:visibility="@{sharedViewModel.mediaViewerFullScreenMode || viewModel.isCurrentlyDisplayedFileFromEphemeralMessage ? View.GONE : View.VISIBLE}"
             app:tint="@color/gray_main2_500"
             app:layout_constraintEnd_toStartOf="@id/save"
@@ -122,6 +128,7 @@
             android:padding="15dp"
             android:src="@drawable/download_simple"
             android:contentDescription="@string/content_description_save_file"
+            android:background="@drawable/circle_transparent_button_background"
             android:visibility="@{sharedViewModel.mediaViewerFullScreenMode || viewModel.isCurrentlyDisplayedFileFromEphemeralMessage ? View.GONE : View.VISIBLE}"
             app:tint="@color/gray_main2_500"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/file_media_viewer_child_fragment.xml b/app/src/main/res/layout/file_media_viewer_child_fragment.xml
index ceec211ef..4941c83ce 100644
--- a/app/src/main/res/layout/file_media_viewer_child_fragment.xml
+++ b/app/src/main/res/layout/file_media_viewer_child_fragment.xml
@@ -62,13 +62,15 @@
         <ImageView
             android:id="@+id/play_pause_audio_playback"
             android:onClick="@{() -> viewModel.togglePlayPause()}"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="@dimen/big_icon_size"
+            android:layout_height="@dimen/big_icon_size"
             android:layout_marginStart="16dp"
             android:layout_marginBottom="@dimen/screen_bottom_margin"
-            android:padding="8dp"
-            android:contentDescription="@string/content_description_play_pause_video_playback"
+            android:padding="10dp"
             android:src="@{viewModel.isMediaPlaying ? @drawable/pause_fill : @drawable/play_fill, default=@drawable/play_fill}"
+            android:adjustViewBounds="true"
+            android:contentDescription="@string/content_description_play_pause_audio_playback"
+            android:background="@drawable/circle_transparent_dark_button_background"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:tint="@color/bc_white"/>
diff --git a/app/src/main/res/layout/file_viewer_activity.xml b/app/src/main/res/layout/file_viewer_activity.xml
index cc24247b4..5c85c81be 100644
--- a/app/src/main/res/layout/file_viewer_activity.xml
+++ b/app/src/main/res/layout/file_viewer_activity.xml
@@ -102,6 +102,7 @@
             android:padding="15dp"
             android:src="@drawable/caret_left"
             android:contentDescription="@string/content_description_go_back_icon"
+            android:background="@drawable/circle_transparent_button_background"
             app:tint="?attr/color_main1_500"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -111,6 +112,8 @@
             android:id="@+id/file_name"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:text="@{viewModel.fileName, default=`nomdufichier.jpg`}"
             android:textSize="13sp"
             android:textColor="@color/gray_main2_600"
@@ -127,6 +130,8 @@
             android:id="@+id/date_time"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:text="@{viewModel.dateTime, default=`envoyé le 02/05/2023 à 11h05`}"
             android:textSize="12sp"
             android:textColor="@color/gray_main2_500"
@@ -146,6 +151,7 @@
             android:padding="15dp"
             android:src="@drawable/share_network"
             android:contentDescription="@string/content_description_share_file"
+            android:background="@drawable/circle_transparent_button_background"
             android:visibility="@{viewModel.fullScreenMode || viewModel.isFromEphemeralMessage ? View.GONE : View.VISIBLE}"
             app:tint="@color/gray_main2_500"
             app:layout_constraintEnd_toStartOf="@id/save"
@@ -160,6 +166,7 @@
             android:padding="15dp"
             android:src="@drawable/download_simple"
             android:contentDescription="@string/content_description_save_file"
+            android:background="@drawable/circle_transparent_button_background"
             android:visibility="@{viewModel.fullScreenMode || viewModel.isFromEphemeralMessage ? View.GONE : View.VISIBLE}"
             app:tint="@color/gray_main2_500"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/generic_add_participants_fragment.xml b/app/src/main/res/layout/generic_add_participants_fragment.xml
index 3f910f7c8..bc8c93891 100644
--- a/app/src/main/res/layout/generic_add_participants_fragment.xml
+++ b/app/src/main/res/layout/generic_add_participants_fragment.xml
@@ -30,6 +30,7 @@
                 android:padding="15dp"
                 android:src="@drawable/caret_left"
                 android:contentDescription="@string/content_description_go_back_icon"
+                android:background="@drawable/circle_transparent_button_background"
                 app:tint="?attr/color_main1_500"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/help_debug_fragment.xml b/app/src/main/res/layout/help_debug_fragment.xml
index 9d38cae41..ec24c5840 100644
--- a/app/src/main/res/layout/help_debug_fragment.xml
+++ b/app/src/main/res/layout/help_debug_fragment.xml
@@ -37,6 +37,7 @@
                 android:padding="15dp"
                 android:src="@drawable/caret_left"
                 android:contentDescription="@string/content_description_go_back_icon"
+                android:background="@drawable/circle_transparent_button_background"
                 app:tint="?attr/color_main1_500"
                 app:layout_constraintBottom_toBottomOf="@id/title"
                 app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/help_fragment.xml b/app/src/main/res/layout/help_fragment.xml
index 679aa260a..ae5b0af53 100644
--- a/app/src/main/res/layout/help_fragment.xml
+++ b/app/src/main/res/layout/help_fragment.xml
@@ -46,6 +46,7 @@
                 android:padding="15dp"
                 android:src="@drawable/caret_left"
                 android:contentDescription="@string/content_description_go_back_icon"
+                android:background="@drawable/circle_transparent_button_background"
                 app:tint="?attr/color_main1_500"
                 app:layout_constraintBottom_toBottomOf="@id/title"
                 app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/history_fragment.xml b/app/src/main/res/layout/history_fragment.xml
index 4179d5ca3..3e0d0a32e 100644
--- a/app/src/main/res/layout/history_fragment.xml
+++ b/app/src/main/res/layout/history_fragment.xml
@@ -39,6 +39,7 @@
                 android:visibility="@{viewModel.showBackButton ? View.VISIBLE : View.GONE}"
                 android:src="@drawable/caret_left"
                 android:contentDescription="@string/content_description_go_back_icon"
+                android:background="@drawable/circle_transparent_button_background"
                 app:tint="?attr/color_main1_500"
                 app:layout_constraintBottom_toBottomOf="@id/invisible_title"
                 app:layout_constraintStart_toStartOf="parent"
@@ -65,6 +66,7 @@
                 android:adjustViewBounds="true"
                 android:src="@drawable/dots_three_vertical"
                 android:contentDescription="@string/content_description_show_popup_menu"
+                android:background="@drawable/circle_transparent_button_background"
                 app:tint="?attr/color_main2_500"
                 app:layout_constraintBottom_toBottomOf="@id/invisible_title"
                 app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/main_activity_alert_top_bar.xml b/app/src/main/res/layout/main_activity_alert_top_bar.xml
index 803575a95..a10a85ba0 100644
--- a/app/src/main/res/layout/main_activity_alert_top_bar.xml
+++ b/app/src/main/res/layout/main_activity_alert_top_bar.xml
@@ -53,12 +53,14 @@
         <ImageView
             android:id="@+id/close_notif"
             android:onClick="@{() -> viewModel.closeTopBar()}"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="@dimen/icon_size"
+            android:layout_height="@dimen/icon_size"
+            android:adjustViewBounds="true"
             android:layout_marginEnd="16dp"
             android:src="@drawable/x"
             app:tint="@color/bc_white"
             android:contentDescription="@string/content_description_dismiss_notification"
+            android:background="@drawable/circle_transparent_button_background"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"/>
diff --git a/app/src/main/res/layout/main_activity_pending_sharing_top_bar.xml b/app/src/main/res/layout/main_activity_pending_sharing_top_bar.xml
index f7f742ccf..bf5cc9e16 100644
--- a/app/src/main/res/layout/main_activity_pending_sharing_top_bar.xml
+++ b/app/src/main/res/layout/main_activity_pending_sharing_top_bar.xml
@@ -52,10 +52,12 @@
         <ImageView
             android:id="@+id/close_notif"
             android:onClick="@{() -> viewModel.cancelFileOrTextSharing()}"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="@dimen/icon_size"
+            android:layout_height="@dimen/icon_size"
+            android:adjustViewBounds="true"
             android:layout_marginEnd="16dp"
             android:src="@drawable/x"
+            android:background="@drawable/circle_transparent_button_background"
             app:tint="@color/bc_white"
             android:contentDescription="@string/content_description_cancel_files_or_text_pending_sharing"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/main_activity_top_bar.xml b/app/src/main/res/layout/main_activity_top_bar.xml
index ed12edcc4..7a1108506 100644
--- a/app/src/main/res/layout/main_activity_top_bar.xml
+++ b/app/src/main/res/layout/main_activity_top_bar.xml
@@ -80,10 +80,12 @@
             android:layout_width="wrap_content"
             android:layout_height="0dp"
             android:layout_marginEnd="5dp"
-            android:paddingStart="15dp"
-            android:paddingEnd="15dp"
+            android:padding="15dp"
             android:src="@drawable/magnifying_glass"
+            android:adjustViewBounds="true"
+            android:background="@drawable/circle_transparent_button_background"
             android:contentDescription="@string/content_description_open_filter"
+            app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintBottom_toBottomOf="@id/title"
             app:layout_constraintEnd_toStartOf="@id/extra_action"
             app:layout_constraintTop_toTopOf="@id/title"
@@ -95,11 +97,13 @@
             android:layout_width="wrap_content"
             android:layout_height="0dp"
             android:layout_marginEnd="5dp"
-            android:paddingStart="15dp"
-            android:paddingEnd="15dp"
+            android:padding="15dp"
             android:src="@{extraActionIcon, default=@drawable/dots_three_vertical}"
+            android:adjustViewBounds="true"
+            android:background="@drawable/circle_transparent_button_background"
             android:contentDescription="@{extraActionContentDescription}"
             android:visibility="@{enableExtraAction ? View.VISIBLE : View.GONE, default=gone}"
+            app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintBottom_toBottomOf="@id/title"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/title"
@@ -111,10 +115,12 @@
             android:layout_width="wrap_content"
             android:layout_height="0dp"
             android:layout_marginStart="5dp"
-            android:paddingStart="15dp"
-            android:paddingEnd="15dp"
+            android:padding="15dp"
             android:src="@drawable/caret_left"
+            android:adjustViewBounds="true"
+            android:background="@drawable/circle_transparent_button_background"
             android:contentDescription="@string/content_description_cancel_filter"
+            app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintBottom_toBottomOf="@id/search"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/search"
@@ -157,10 +163,12 @@
             android:layout_width="wrap_content"
             android:layout_height="0dp"
             android:layout_marginEnd="5dp"
-            android:paddingStart="15dp"
-            android:paddingEnd="15dp"
+            android:padding="15dp"
             android:src="@drawable/x"
+            android:adjustViewBounds="true"
+            android:background="@drawable/circle_transparent_button_background"
             android:contentDescription="@string/content_description_clear_filter"
+            app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintBottom_toBottomOf="@id/search"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/search"
diff --git a/app/src/main/res/layout/meeting_edit_fragment.xml b/app/src/main/res/layout/meeting_edit_fragment.xml
index 21800ace3..94670daf6 100644
--- a/app/src/main/res/layout/meeting_edit_fragment.xml
+++ b/app/src/main/res/layout/meeting_edit_fragment.xml
@@ -43,6 +43,7 @@
                 android:onClick="@{backClickListener}"
                 android:src="@drawable/caret_left"
                 android:contentDescription="@string/content_description_go_back_icon"
+                android:background="@drawable/circle_transparent_button_background"
                 app:tint="?attr/color_main1_500"
                 app:layout_constraintBottom_toBottomOf="@id/title"
                 app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/meeting_fragment.xml b/app/src/main/res/layout/meeting_fragment.xml
index 48f50b731..4f6c2c79e 100644
--- a/app/src/main/res/layout/meeting_fragment.xml
+++ b/app/src/main/res/layout/meeting_fragment.xml
@@ -43,6 +43,7 @@
                 android:padding="15dp"
                 android:src="@drawable/caret_left"
                 android:contentDescription="@string/content_description_go_back_icon"
+                android:background="@drawable/circle_transparent_button_background"
                 android:visibility="@{viewModel.showBackButton ? View.VISIBLE : View.GONE}"
                 app:tint="?attr/color_main1_500"
                 app:layout_constraintBottom_toBottomOf="@id/title"
@@ -69,6 +70,7 @@
                 android:adjustViewBounds="true"
                 android:src="@drawable/pencil_simple"
                 android:contentDescription="@string/content_description_meeting_edit"
+                android:background="@drawable/circle_transparent_button_background"
                 android:visibility="@{viewModel.isEditable ? View.VISIBLE : View.GONE}"
                 app:tint="?attr/color_main2_500"
                 app:layout_constraintStart_toEndOf="@id/title"
@@ -85,6 +87,7 @@
                 android:adjustViewBounds="true"
                 android:src="@drawable/dots_three_vertical"
                 android:contentDescription="@string/content_description_show_popup_menu"
+                android:background="@drawable/circle_transparent_button_background"
                 app:tint="?attr/color_main2_500"
                 app:layout_constraintStart_toEndOf="@id/edit"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -160,11 +163,13 @@
                     <ImageView
                         android:id="@+id/share"
                         android:onClick="@{shareClickListener}"
-                        android:layout_width="@dimen/icon_size"
-                        android:layout_height="@dimen/icon_size"
+                        android:layout_width="@dimen/big_icon_size"
+                        android:layout_height="@dimen/big_icon_size"
                         android:layout_marginEnd="16dp"
+                        android:padding="10dp"
                         android:src="@drawable/share_network"
                         android:contentDescription="@string/content_description_meeting_share"
+                        android:background="@drawable/circle_transparent_button_background"
                         app:layout_constraintTop_toTopOf="@id/sip_uri"
                         app:layout_constraintBottom_toBottomOf="@id/sip_uri"
                         app:layout_constraintStart_toEndOf="@id/sip_uri"
diff --git a/app/src/main/res/layout/meeting_schedule_fragment.xml b/app/src/main/res/layout/meeting_schedule_fragment.xml
index ea6205b89..a1b82e81f 100644
--- a/app/src/main/res/layout/meeting_schedule_fragment.xml
+++ b/app/src/main/res/layout/meeting_schedule_fragment.xml
@@ -43,6 +43,7 @@
                 android:onClick="@{backClickListener}"
                 android:src="@drawable/caret_left"
                 android:contentDescription="@string/content_description_go_back_icon"
+                android:background="@drawable/circle_transparent_button_background"
                 app:tint="?attr/color_main1_500"
                 app:layout_constraintBottom_toBottomOf="@id/title"
                 app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/meeting_waiting_room_fragment.xml b/app/src/main/res/layout/meeting_waiting_room_fragment.xml
index f2a3c474a..ae2c223ec 100644
--- a/app/src/main/res/layout/meeting_waiting_room_fragment.xml
+++ b/app/src/main/res/layout/meeting_waiting_room_fragment.xml
@@ -27,6 +27,7 @@
             android:padding="15dp"
             android:src="@drawable/caret_left"
             android:contentDescription="@string/content_description_go_back_icon"
+            android:background="@drawable/circle_transparent_button_background"
             app:tint="?attr/color_main1_500"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/recording_player_fragment.xml b/app/src/main/res/layout/recording_player_fragment.xml
index 3db49e36a..5dac491ff 100644
--- a/app/src/main/res/layout/recording_player_fragment.xml
+++ b/app/src/main/res/layout/recording_player_fragment.xml
@@ -49,13 +49,15 @@
         <ImageView
             android:id="@+id/play_pause_audio_playback"
             android:onClick="@{() -> viewModel.togglePlayPause()}"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="@dimen/big_icon_size"
+            android:layout_height="@dimen/big_icon_size"
             android:layout_marginStart="16dp"
             android:layout_marginBottom="@dimen/screen_bottom_margin"
-            android:padding="8dp"
-            android:contentDescription="@string/content_description_play_pause_audio_playback"
+            android:padding="10dp"
             android:src="@{viewModel.isPlaying ? @drawable/pause_fill : @drawable/play_fill, default=@drawable/play_fill}"
+            android:adjustViewBounds="true"
+            android:contentDescription="@string/content_description_play_pause_audio_playback"
+            android:background="@drawable/circle_transparent_dark_button_background"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:tint="@color/bc_white"/>
@@ -118,6 +120,7 @@
             android:padding="15dp"
             android:src="@drawable/caret_left"
             android:contentDescription="@string/content_description_go_back_icon"
+            android:background="@drawable/circle_transparent_button_background"
             app:tint="?attr/color_main1_500"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -127,6 +130,8 @@
             android:id="@+id/file_name"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:text="@{viewModel.recordingModel.displayName, default=`nomdufichier.jpg`}"
             android:textSize="13sp"
             android:textColor="@color/gray_main2_600"
@@ -143,6 +148,8 @@
             android:id="@+id/date_time"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:text="@{viewModel.recordingModel.dateTime, default=`envoyé le 02/05/2023 à 11h05`}"
             android:textSize="12sp"
             android:textColor="@color/gray_main2_500"
@@ -162,6 +169,7 @@
             android:padding="15dp"
             android:src="@drawable/share_network"
             android:contentDescription="@string/content_description_share_file"
+            android:background="@drawable/circle_transparent_button_background"
             android:visibility="@{viewModel.isUsingSmffFileFormat ? View.GONE : View.VISIBLE}"
             app:tint="@color/gray_main2_500"
             app:layout_constraintEnd_toStartOf="@id/save"
@@ -176,6 +184,7 @@
             android:padding="15dp"
             android:src="@drawable/download_simple"
             android:contentDescription="@string/content_description_save_file"
+            android:background="@drawable/circle_transparent_button_background"
             android:visibility="@{viewModel.isUsingSmffFileFormat ? View.GONE : View.VISIBLE}"
             app:tint="@color/gray_main2_500"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/recordings_list_fragment.xml b/app/src/main/res/layout/recordings_list_fragment.xml
index 65e8889c2..b3a7938f5 100644
--- a/app/src/main/res/layout/recordings_list_fragment.xml
+++ b/app/src/main/res/layout/recordings_list_fragment.xml
@@ -37,10 +37,11 @@
             android:layout_width="wrap_content"
             android:layout_height="0dp"
             android:adjustViewBounds="true"
-            android:contentDescription="@string/content_description_go_back_icon"
             android:onClick="@{backClickListener}"
             android:padding="15dp"
             android:src="@drawable/caret_left"
+            android:contentDescription="@string/content_description_go_back_icon"
+            android:background="@drawable/circle_transparent_button_background"
             app:layout_constraintBottom_toBottomOf="@id/title"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/title"
@@ -63,10 +64,13 @@
             android:id="@+id/search_toggle"
             android:layout_width="wrap_content"
             android:layout_height="0dp"
-            android:contentDescription="@string/content_description_open_filter"
+            android:layout_marginEnd="5dp"
             android:onClick="@{() -> viewModel.openSearchBar()}"
             android:padding="15dp"
             android:src="@drawable/magnifying_glass"
+            android:adjustViewBounds="true"
+            android:contentDescription="@string/content_description_open_filter"
+            android:background="@drawable/circle_transparent_button_background"
             android:visibility="@{viewModel.searchBarVisible ? View.GONE : View.VISIBLE}"
             app:layout_constraintBottom_toBottomOf="@id/title"
             app:layout_constraintEnd_toEndOf="parent"
@@ -77,10 +81,13 @@
             android:id="@+id/cancel_search"
             android:layout_width="wrap_content"
             android:layout_height="0dp"
-            android:contentDescription="@string/content_description_cancel_filter"
+            android:layout_marginStart="5dp"
             android:onClick="@{() -> viewModel.closeSearchBar()}"
             android:padding="15dp"
             android:src="@drawable/caret_left"
+            android:adjustViewBounds="true"
+            android:contentDescription="@string/content_description_cancel_filter"
+            android:background="@drawable/circle_transparent_button_background"
             app:layout_constraintBottom_toBottomOf="@id/search"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/search"
@@ -117,13 +124,14 @@
         <ImageView
             android:id="@+id/clear_field"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="9dp"
-            android:contentDescription="@string/content_description_clear_filter"
-            android:enabled="@{viewModel.searchFilter.length() > 0}"
+            android:layout_height="0dp"
+            android:layout_marginEnd="5dp"
             android:onClick="@{() -> viewModel.clearFilter()}"
-            android:padding="6dp"
+            android:padding="15dp"
             android:src="@drawable/x"
+            android:adjustViewBounds="true"
+            android:contentDescription="@string/content_description_clear_filter"
+            android:background="@drawable/circle_transparent_button_background"
             app:layout_constraintBottom_toBottomOf="@id/search"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/search"
diff --git a/app/src/main/res/layout/settings_advanced_calls_fragment.xml b/app/src/main/res/layout/settings_advanced_calls_fragment.xml
index 61bd69ae5..cbcd4b910 100644
--- a/app/src/main/res/layout/settings_advanced_calls_fragment.xml
+++ b/app/src/main/res/layout/settings_advanced_calls_fragment.xml
@@ -27,6 +27,7 @@
             android:padding="15dp"
             android:src="@drawable/caret_left"
             android:contentDescription="@string/content_description_go_back_icon"
+            android:background="@drawable/circle_transparent_button_background"
             app:tint="?attr/color_main1_500"
             app:layout_constraintBottom_toBottomOf="@id/title"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/settings_advanced_fragment.xml b/app/src/main/res/layout/settings_advanced_fragment.xml
index 6000c756c..9921b38a5 100644
--- a/app/src/main/res/layout/settings_advanced_fragment.xml
+++ b/app/src/main/res/layout/settings_advanced_fragment.xml
@@ -29,6 +29,7 @@
             android:padding="15dp"
             android:src="@drawable/caret_left"
             android:contentDescription="@string/content_description_go_back_icon"
+            android:background="@drawable/circle_transparent_button_background"
             app:tint="?attr/color_main1_500"
             app:layout_constraintBottom_toBottomOf="@id/title"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/settings_developer_fragment.xml b/app/src/main/res/layout/settings_developer_fragment.xml
index 65cd5901b..9c3f05434 100644
--- a/app/src/main/res/layout/settings_developer_fragment.xml
+++ b/app/src/main/res/layout/settings_developer_fragment.xml
@@ -26,6 +26,7 @@
             android:padding="15dp"
             android:src="@drawable/caret_left"
             android:contentDescription="@string/content_description_go_back_icon"
+            android:background="@drawable/circle_transparent_button_background"
             app:tint="?attr/color_main1_500"
             app:layout_constraintBottom_toBottomOf="@id/title"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/settings_fragment.xml b/app/src/main/res/layout/settings_fragment.xml
index 30e17770f..621ef075c 100644
--- a/app/src/main/res/layout/settings_fragment.xml
+++ b/app/src/main/res/layout/settings_fragment.xml
@@ -39,6 +39,7 @@
             android:padding="15dp"
             android:src="@drawable/caret_left"
             android:contentDescription="@string/content_description_go_back_icon"
+            android:background="@drawable/circle_transparent_button_background"
             app:tint="?attr/color_main1_500"
             app:layout_constraintBottom_toBottomOf="@id/title"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/single_sign_on_fragment.xml b/app/src/main/res/layout/single_sign_on_fragment.xml
index c090558d3..70e91d6fa 100644
--- a/app/src/main/res/layout/single_sign_on_fragment.xml
+++ b/app/src/main/res/layout/single_sign_on_fragment.xml
@@ -26,6 +26,7 @@
                 android:src="@drawable/caret_left"
                 android:visibility="invisible"
                 android:contentDescription="@string/content_description_go_back_icon"
+                android:background="@drawable/circle_transparent_button_background"
                 app:tint="?attr/color_main2_500"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintStart_toStartOf="parent"/>
diff --git a/app/src/main/res/layout/start_call_fragment.xml b/app/src/main/res/layout/start_call_fragment.xml
index e07c1a242..aa56fa669 100644
--- a/app/src/main/res/layout/start_call_fragment.xml
+++ b/app/src/main/res/layout/start_call_fragment.xml
@@ -44,6 +44,7 @@
                 android:padding="15dp"
                 android:src="@drawable/caret_left"
                 android:contentDescription="@string/content_description_go_back_icon"
+                android:background="@drawable/circle_transparent_button_background"
                 app:tint="?attr/color_main1_500"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/start_chat_fragment.xml b/app/src/main/res/layout/start_chat_fragment.xml
index 6095d5cd4..ef66d6f94 100644
--- a/app/src/main/res/layout/start_chat_fragment.xml
+++ b/app/src/main/res/layout/start_chat_fragment.xml
@@ -41,6 +41,7 @@
                 android:padding="15dp"
                 android:src="@drawable/caret_left"
                 android:contentDescription="@string/content_description_go_back_icon"
+                android:background="@drawable/circle_transparent_button_background"
                 app:tint="?attr/color_main1_500"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index c29ac7555..84b309d53 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -923,4 +923,5 @@
     <string name="content_description_voicemail_available">Au moins un message vocal est disponible</string>
     <string name="content_description_call_voicemail">Faire un appui long pour appeler la boite vocale</string>
     <string name="content_description_cancel_files_or_text_pending_sharing">Cliquer pour annuler le partage des fichiers ou du texte en attente</string>
+    <string name="content_description_close_drawer_menu">Ferme le menu</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 159d361b5..2e719c155 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -965,6 +965,7 @@
     <string name="content_description_voicemail_available">Voice message are available</string>
     <string name="content_description_call_voicemail">Long press to dial voicemail</string>
     <string name="content_description_cancel_files_or_text_pending_sharing">Click to cancel files or text pending sharing</string>
+    <string name="content_description_close_drawer_menu">Closes menu</string>
 
     <!-- Copy of private hosts_allowlist_sample in androidx.car.app:app:1.7.0-beta01, as they recommend it -->
     <string-array name="hosts_allowlist_sample_copy" translatable="false">