diff --git a/app/src/main/res/color/file_viewer_main2_500.xml b/app/src/main/res/color/file_viewer_main2_500.xml
deleted file mode 100644
index 83e5a2959..000000000
--- a/app/src/main/res/color/file_viewer_main2_500.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:color="@color/gray_main2_200" />
-    <item android:state_hovered="true" android:color="@color/gray_main2_200" />
-    <item android:color="@color/gray_main2_500"/>
-</selector>
diff --git a/app/src/main/res/drawable/circle_transparent_light_button_background.xml b/app/src/main/res/drawable/circle_transparent_light_button_background.xml
new file mode 100644
index 000000000..2957e4ec3
--- /dev/null
+++ b/app/src/main/res/drawable/circle_transparent_light_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_pressed_background" />
+    <item android:state_hovered="true"
+        android:drawable="@drawable/shape_circle_light_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_light_pressed_background.xml b/app/src/main/res/drawable/shape_circle_light_pressed_background.xml
new file mode 100644
index 000000000..fb7df193e
--- /dev/null
+++ b/app/src/main/res/drawable/shape_circle_light_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_300"/>
+</shape>
\ No newline at end of file
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 466d6f1a6..b20cc7e3a 100644
--- a/app/src/main/res/layout/file_media_viewer_activity.xml
+++ b/app/src/main/res/layout/file_media_viewer_activity.xml
@@ -62,6 +62,7 @@
             android:layout_width="wrap_content"
             android:layout_height="0dp"
             android:src="@drawable/caret_left"
+            android:background="@drawable/circle_transparent_light_button_background"
             android:contentDescription="@string/content_description_go_back_icon"
             app:tint="?attr/color_main1_500"
             app:layout_constraintStart_toStartOf="parent"
@@ -111,8 +112,9 @@
             android:layout_height="0dp"
             android:src="@drawable/share_network"
             android:contentDescription="@string/content_description_share_file"
+            android:background="@drawable/circle_transparent_light_button_background"
             android:visibility="@{sharedViewModel.mediaViewerFullScreenMode || viewModel.isCurrentlyDisplayedFileFromEphemeralMessage ? View.GONE : View.VISIBLE}"
-            app:tint="@color/file_viewer_main2_500"
+            app:tint="@color/gray_main2_600"
             app:layout_constraintEnd_toStartOf="@id/save"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="@id/top_bar_background" />
@@ -124,9 +126,10 @@
             android:layout_width="wrap_content"
             android:layout_height="0dp"
             android:src="@drawable/download_simple"
+            android:background="@drawable/circle_transparent_light_button_background"
             android:contentDescription="@string/content_description_save_file"
             android:visibility="@{sharedViewModel.mediaViewerFullScreenMode || viewModel.isCurrentlyDisplayedFileFromEphemeralMessage ? View.GONE : View.VISIBLE}"
-            app:tint="@color/file_viewer_main2_500"
+            app:tint="@color/gray_main2_600"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="@id/top_bar_background" />
diff --git a/app/src/main/res/layout/file_viewer_activity.xml b/app/src/main/res/layout/file_viewer_activity.xml
index e23624441..328f6793a 100644
--- a/app/src/main/res/layout/file_viewer_activity.xml
+++ b/app/src/main/res/layout/file_viewer_activity.xml
@@ -100,6 +100,7 @@
             android:layout_width="wrap_content"
             android:layout_height="0dp"
             android:src="@drawable/caret_left"
+            android:background="@drawable/circle_transparent_light_button_background"
             android:contentDescription="@string/content_description_go_back_icon"
             app:tint="?attr/color_main1_500"
             app:layout_constraintStart_toStartOf="parent"
@@ -148,9 +149,10 @@
             android:layout_width="wrap_content"
             android:layout_height="0dp"
             android:src="@drawable/share_network"
+            android:background="@drawable/circle_transparent_light_button_background"
             android:contentDescription="@string/content_description_share_file"
             android:visibility="@{viewModel.fullScreenMode || viewModel.isFromEphemeralMessage ? View.GONE : View.VISIBLE}"
-            app:tint="@color/file_viewer_main2_500"
+            app:tint="@color/gray_main2_600"
             app:layout_constraintEnd_toStartOf="@id/save"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="@id/top_bar_barrier" />
@@ -162,9 +164,10 @@
             android:layout_width="wrap_content"
             android:layout_height="0dp"
             android:src="@drawable/download_simple"
+            android:background="@drawable/circle_transparent_light_button_background"
             android:contentDescription="@string/content_description_save_file"
             android:visibility="@{viewModel.fullScreenMode || viewModel.isFromEphemeralMessage ? View.GONE : View.VISIBLE}"
-            app:tint="@color/file_viewer_main2_500"
+            app:tint="@color/gray_main2_600"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="@id/top_bar_barrier" />
diff --git a/app/src/main/res/layout/meeting_fragment.xml b/app/src/main/res/layout/meeting_fragment.xml
index 5c43e081c..f5892e6c0 100644
--- a/app/src/main/res/layout/meeting_fragment.xml
+++ b/app/src/main/res/layout/meeting_fragment.xml
@@ -114,6 +114,7 @@
                         android:text="@{viewModel.subject, default=`Broadcast about agility in software development`}"
                         android:textSize="20sp"
                         android:textColor="?attr/color_main2_600"
+                        android:includeFontPadding="false"
                         android:maxLines="2"
                         android:ellipsize="end"
                         android:drawableStart="@{viewModel.isBroadcast ? @drawable/slideshow : @drawable/video_conference, default=@drawable/video_conference}"
@@ -147,6 +148,7 @@
                         android:text="@{viewModel.sipUri, default=`linphone.com/wjre.fr`}"
                         android:textSize="14sp"
                         android:textColor="?attr/color_main2_600"
+                        android:includeFontPadding="false"
                         android:maxLines="1"
                         android:ellipsize="end"
                         android:drawableStart="@drawable/video_camera"
@@ -169,6 +171,7 @@
                         android:text="@{viewModel.dateTime, default=`October 11th, 2023 | 17:00 - 18:00`}"
                         android:textSize="14sp"
                         android:textColor="?attr/color_main2_600"
+                        android:includeFontPadding="false"
                         android:maxLines="1"
                         android:ellipsize="end"
                         android:drawableStart="@drawable/clock"
@@ -189,6 +192,7 @@
                         android:text="@{viewModel.timezone, default=@string/meeting_schedule_timezone_title}"
                         android:textSize="14sp"
                         android:textColor="?attr/color_main2_600"
+                        android:includeFontPadding="false"
                         android:maxLines="1"
                         android:ellipsize="end"
                         android:drawableStart="@drawable/globe_hemisphere_west"
@@ -220,6 +224,7 @@
                         android:text="@{viewModel.description, default=`Lorem ipsum dolor sit amet`}"
                         android:textSize="14sp"
                         android:textColor="?attr/color_main2_600"
+                        android:includeFontPadding="false"
                         android:maxLines="3"
                         android:ellipsize="end"
                         android:drawableStart="@drawable/file_text"
diff --git a/app/src/main/res/layout/recording_player_fragment.xml b/app/src/main/res/layout/recording_player_fragment.xml
index f1ce79aeb..6ade26680 100644
--- a/app/src/main/res/layout/recording_player_fragment.xml
+++ b/app/src/main/res/layout/recording_player_fragment.xml
@@ -118,6 +118,7 @@
             android:layout_width="wrap_content"
             android:layout_height="0dp"
             android:src="@drawable/caret_left"
+            android:background="@drawable/circle_transparent_light_button_background"
             android:contentDescription="@string/content_description_go_back_icon"
             app:tint="?attr/color_main1_500"
             app:layout_constraintStart_toStartOf="parent"
@@ -167,8 +168,9 @@
             android:layout_height="0dp"
             android:src="@drawable/share_network"
             android:contentDescription="@string/content_description_share_file"
+            android:background="@drawable/circle_transparent_light_button_background"
             android:visibility="@{viewModel.isUsingSmffFileFormat ? View.GONE : View.VISIBLE}"
-            app:tint="@color/file_viewer_main2_500"
+            app:tint="@color/gray_main2_600"
             app:layout_constraintEnd_toStartOf="@id/save"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="@id/top_bar_background" />
@@ -180,9 +182,10 @@
             android:layout_width="wrap_content"
             android:layout_height="0dp"
             android:src="@drawable/download_simple"
+            android:background="@drawable/circle_transparent_light_button_background"
             android:contentDescription="@string/content_description_save_file"
             android:visibility="@{viewModel.isUsingSmffFileFormat ? View.GONE : View.VISIBLE}"
-            app:tint="@color/file_viewer_main2_500"
+            app:tint="@color/gray_main2_600"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="@id/top_bar_background" />