diff --git a/app/src/main/res/drawable-xhdpi/chat_file_over.png b/app/src/main/res/drawable-xhdpi/chat_file_over.png
index 720dd10cf..b36547ca1 100644
Binary files a/app/src/main/res/drawable-xhdpi/chat_file_over.png and b/app/src/main/res/drawable-xhdpi/chat_file_over.png differ
diff --git a/app/src/main/res/drawable-xhdpi/record_audio_message_default.png b/app/src/main/res/drawable-xhdpi/record_audio_message_default.png
index 5f319e5c8..715ff2bb1 100644
Binary files a/app/src/main/res/drawable-xhdpi/record_audio_message_default.png and b/app/src/main/res/drawable-xhdpi/record_audio_message_default.png differ
diff --git a/app/src/main/res/layout/chat_room_detail_fragment.xml b/app/src/main/res/layout/chat_room_detail_fragment.xml
index 51d9a8eaf..92a3cef8d 100644
--- a/app/src/main/res/layout/chat_room_detail_fragment.xml
+++ b/app/src/main/res/layout/chat_room_detail_fragment.xml
@@ -207,9 +207,12 @@
                     android:onClick="@{attachFileClickListener}"
                     android:enabled="@{chatSendingViewModel.attachFileEnabled}"
                     android:contentDescription="@string/content_description_attach_file"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:padding="10dp"
+                    android:layout_width="@dimen/chat_message_sending_icons_size"
+                    android:layout_height="@dimen/chat_message_sending_icons_size"
+                    android:paddingTop="@dimen/chat_message_sending_icons_margin"
+                    android:paddingBottom="@dimen/chat_message_sending_icons_margin"
+                    android:layout_marginStart="@dimen/chat_message_sending_icons_margin"
+                    android:layout_marginEnd="@dimen/chat_message_sending_icons_margin"
                     android:src="@drawable/chat_file" />
 
                 <ImageView
@@ -218,11 +221,12 @@
                     android:onClick="@{() -> chatSendingViewModel.toggleVoiceRecording()}"
                     android:selected="@{chatSendingViewModel.isVoiceRecording}"
                     android:contentDescription="@string/content_description_voice_recording"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingTop="10dp"
-                    android:paddingBottom="10dp"
-                    android:paddingRight="10dp"
+                    android:layout_width="@dimen/chat_message_sending_icons_size"
+                    android:layout_height="@dimen/chat_message_sending_icons_size"
+                    android:paddingTop="@dimen/chat_message_sending_icons_margin"
+                    android:paddingBottom="@dimen/chat_message_sending_icons_margin"
+                    android:layout_marginStart="@dimen/chat_message_sending_icons_margin"
+                    android:layout_marginEnd="@dimen/chat_message_sending_icons_margin"
                     android:src="@drawable/record_audio_message" />
 
                 <org.linphone.activities.main.chat.views.RichEditText
@@ -252,9 +256,12 @@
                         android:onClick="@{() -> chatSendingViewModel.sendMessage()}"
                         android:enabled="@{chatSendingViewModel.sendMessageEnabled}"
                         android:contentDescription="@string/content_description_send_message"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:padding="10dp"
+                        android:layout_width="@dimen/chat_message_sending_icons_size"
+                        android:layout_height="@dimen/chat_message_sending_icons_size"
+                        android:paddingTop="@dimen/chat_message_sending_icons_margin"
+                        android:paddingBottom="@dimen/chat_message_sending_icons_margin"
+                        android:layout_marginStart="@dimen/chat_message_sending_icons_margin"
+                        android:layout_marginEnd="@dimen/chat_message_sending_icons_margin"
                         android:src="@drawable/chat_send_message" />
 
                     <ImageView
diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml
index 05f3d0828..58f01fd80 100644
--- a/app/src/main/res/values/dimen.xml
+++ b/app/src/main/res/values/dimen.xml
@@ -80,4 +80,6 @@
     <dimen name="conference_waiting_room_buttons_max_width">250dp</dimen>
     <dimen name="mute_mic_miniature_margin">5dp</dimen>
     <dimen name="mute_mic_grid_margin">10dp</dimen>
+    <dimen name="chat_message_sending_icons_size">40dp</dimen>
+    <dimen name="chat_message_sending_icons_margin">5dp</dimen>
 </resources>
\ No newline at end of file