diff --git a/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt b/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt
index e01f5d1be..f0b5bc12b 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt
@@ -708,11 +708,13 @@ class DetailChatRoomFragment : MasterFragment<ChatRoomDetailFragmentBinding, Cha
                 Log.i("[Chat Room] Found rich content URI: $uri")
                 lifecycleScope.launch {
                     withContext(Dispatchers.Main) {
+                        chatSendingViewModel.attachingFileInProgress.value = true
                         val path = FileUtils.getFilePath(requireContext(), uri)
                         Log.i("[Chat Room] Rich content URI: $uri matching path is: $path")
                         if (path != null) {
                             chatSendingViewModel.addAttachment(path)
                         }
+                        chatSendingViewModel.attachingFileInProgress.value = false
                     }
                 }
             }
@@ -811,13 +813,17 @@ class DetailChatRoomFragment : MasterFragment<ChatRoomDetailFragmentBinding, Cha
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         if (resultCode == Activity.RESULT_OK) {
             lifecycleScope.launch {
-                for (
-                    fileToUploadPath in FileUtils.getFilesPathFromPickerIntent(
-                        data,
-                        chatSendingViewModel.temporaryFileUploadPath
-                    )
-                ) {
-                    chatSendingViewModel.addAttachment(fileToUploadPath)
+                withContext(Dispatchers.Main) {
+                    chatSendingViewModel.attachingFileInProgress.value = true
+                    for (
+                        fileToUploadPath in FileUtils.getFilesPathFromPickerIntent(
+                            data,
+                            chatSendingViewModel.temporaryFileUploadPath
+                        )
+                    ) {
+                        chatSendingViewModel.addAttachment(fileToUploadPath)
+                    }
+                    chatSendingViewModel.attachingFileInProgress.value = false
                 }
             }
         }
diff --git a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessageSendingViewModel.kt b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessageSendingViewModel.kt
index 46333493b..0070971c0 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessageSendingViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessageSendingViewModel.kt
@@ -62,6 +62,8 @@ class ChatMessageSendingViewModel(private val chatRoom: ChatRoom) : ViewModel()
 
     val sendMessageEnabled = MutableLiveData<Boolean>()
 
+    val attachingFileInProgress = MutableLiveData<Boolean>()
+
     val isReadOnly = MutableLiveData<Boolean>()
 
     var textToSend = MutableLiveData<String>()
diff --git a/app/src/main/res/layout/chat_message_reply.xml b/app/src/main/res/layout/chat_message_reply.xml
index 8de834475..917b7ad98 100644
--- a/app/src/main/res/layout/chat_message_reply.xml
+++ b/app/src/main/res/layout/chat_message_reply.xml
@@ -16,6 +16,7 @@
     </data>
 
     <RelativeLayout
+        android:id="@+id/chat_message_reply"
         android:background="@{data.chatMessage.isOutgoing ? @color/chat_bubble_outgoing_color : @color/chat_bubble_incoming_color, default=@color/chat_bubble_incoming_color}"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/chat_message_voice_recording.xml b/app/src/main/res/layout/chat_message_voice_recording.xml
index 886234b2b..057b48021 100644
--- a/app/src/main/res/layout/chat_message_voice_recording.xml
+++ b/app/src/main/res/layout/chat_message_voice_recording.xml
@@ -13,6 +13,7 @@
     </data>
 
     <RelativeLayout
+        android:id="@+id/voice_recording"
         android:background="?attr/backgroundColor2"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
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 92a3cef8d..e6e10b3c3 100644
--- a/app/src/main/res/layout/chat_room_detail_fragment.xml
+++ b/app/src/main/res/layout/chat_room_detail_fragment.xml
@@ -73,18 +73,19 @@
                 android:layout_weight="0.4"
                 android:gravity="center_vertical|left"
                 android:orientation="vertical"
-                android:paddingLeft="15dp">
+                android:paddingStart="5dp"
+                android:paddingEnd="5dp">
 
                 <org.linphone.views.MarqueeTextView
                     android:onClick="@{titleClickListener}"
-                    android:text="@{viewModel.oneToOneChatRoom ? (viewModel.contact.name ?? viewModel.displayName) : viewModel.subject}"
+                    android:text="@{viewModel.oneToOneChatRoom ? (viewModel.contact.name ?? viewModel.displayName) : viewModel.subject, default=`Lorem Ipsum Dolor Sit Amet`}"
                     style="@style/toolbar_small_title_font"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:singleLine="true" />
 
                 <org.linphone.views.MarqueeTextView
-                    android:text="@{viewModel.participants}"
+                    android:text="@{viewModel.participants, default=`John Doe`}"
                     android:visibility="@{viewModel.oneToOneChatRoom ? View.GONE : View.VISIBLE}"
                     style="@style/toolbar_small_title_font"
                     android:layout_width="wrap_content"
@@ -93,7 +94,7 @@
 
                 <org.linphone.views.MarqueeTextView
                     android:id="@+id/sip_uri"
-                    android:text="@{viewModel.peerSipUri}"
+                    android:text="@{viewModel.peerSipUri, default=`sip:john.doe@sip.linphone.org`}"
                     android:visibility="gone"
                     style="@style/sip_uri_small_font"
                     android:layout_width="wrap_content"
@@ -147,141 +148,225 @@
             android:layout_alignTop="@id/top_bar"
             tools:layout="@layout/list_edit_top_bar_fragment" />
 
-        <LinearLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/footer"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
-            android:background="?attr/lightToolbarBackgroundColor"
-            android:orientation="vertical">
+            android:background="?attr/lightToolbarBackgroundColor">
+
+            <androidx.constraintlayout.widget.Group
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:visibility="@{chatSendingViewModel.isReadOnly ? View.GONE : View.VISIBLE}"
+                app:constraint_referenced_ids="voice_recording_separator, attached_files, attach_file, voice_record, message, send_message" />
 
             <ViewStub
                 android:id="@+id/stubbed_message_to_reply_to"
-                android:visibility="@{chatSendingViewModel.isPendingAnswer ? View.VISIBLE : View.GONE, default=gone}"
-                app:inflatedVisibility="@{chatSendingViewModel.isPendingAnswer ? View.VISIBLE : View.GONE}"
-                app:data="@{chatSendingViewModel.pendingChatMessageToReplyTo}"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:inflatedId="@+id/chat_message_reply"
                 android:layout="@layout/chat_message_reply"
+                android:visibility="@{chatSendingViewModel.isPendingAnswer ? View.VISIBLE : View.GONE, default=gone}"
                 app:cancelClickListener="@{cancelReplyToClickListener}"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
+                app:data="@{chatSendingViewModel.pendingChatMessageToReplyTo}"
+                app:inflatedVisibility="@{chatSendingViewModel.isPendingAnswer ? View.VISIBLE : View.GONE}"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <androidx.constraintlayout.widget.Barrier
+                android:id="@+id/reply_barrier"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:barrierDirection="bottom"
+                app:constraint_referenced_ids="stubbed_message_to_reply_to, chat_message_reply" />
 
             <ViewStub
                 android:id="@+id/stubbed_voice_recording"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:inflatedId="@+id/voice_recording"
+                android:layout="@layout/chat_message_voice_recording"
                 android:visibility="@{chatSendingViewModel.isPendingVoiceRecord ? View.VISIBLE : View.GONE, default=gone}"
                 app:inflatedVisibility="@{chatSendingViewModel.isPendingVoiceRecord ? View.VISIBLE : View.GONE}"
-                app:viewModel="@{chatSendingViewModel}"
-                android:layout="@layout/chat_message_voice_recording"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/reply_barrier"
+                app:viewModel="@{chatSendingViewModel}" />
+
+            <androidx.constraintlayout.widget.Barrier
+                android:id="@+id/voice_barrier"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:barrierDirection="bottom"
+                app:constraint_referenced_ids="stubbed_voice_recording, voice_recording" />
 
             <View
-                android:visibility="@{chatSendingViewModel.isPendingVoiceRecord &amp;&amp; chatSendingViewModel.attachments.size() > 0 ? View.VISIBLE : View.GONE, default=gone}"
-                android:layout_width="match_parent"
+                android:id="@+id/voice_recording_separator"
+                android:layout_width="0dp"
                 android:layout_height="1dp"
-                android:background="?attr/dividerColor" />
+                android:background="?attr/dividerColor"
+                android:visibility="@{chatSendingViewModel.isPendingVoiceRecord &amp;&amp; chatSendingViewModel.attachments.size() > 0 ? View.VISIBLE : View.GONE, default=gone}"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/voice_barrier" />
+
+            <androidx.constraintlayout.widget.Barrier
+                android:id="@+id/chat_message_reply_voice_barrier"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:barrierDirection="bottom"
+                app:constraint_referenced_ids="stubbed_message_to_reply_to, stubbed_voice_recording, voice_recording_separator" />
 
             <HorizontalScrollView
-                android:layout_width="match_parent"
+                android:id="@+id/attached_files"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:background="?attr/backgroundColor2"
-                android:orientation="horizontal">
+                android:orientation="horizontal"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/voice_recording_separator">
 
                 <LinearLayout
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_height="120dp"
                     android:orientation="horizontal"
+                    android:visibility="@{chatSendingViewModel.attachingFileInProgress || (chatSendingViewModel.attachments.size() > 0) ? View.VISIBLE : View.GONE, default=gone}"
                     app:entries="@{chatSendingViewModel.attachments}"
-                    app:layout="@{@layout/chat_message_attachment_cell}"/>
+                    app:layout="@{@layout/chat_message_attachment_cell}" />
 
             </HorizontalScrollView>
 
-            <LinearLayout
-                android:layout_width="match_parent"
+            <ImageView
+                android:id="@+id/attach_file"
+                android:layout_width="@dimen/chat_message_sending_icons_size"
+                android:layout_height="@dimen/chat_message_sending_icons_size"
+                android:layout_marginStart="@dimen/chat_message_sending_icons_margin"
+                android:layout_marginEnd="@dimen/chat_message_sending_icons_margin"
+                android:contentDescription="@string/content_description_attach_file"
+                android:enabled="@{chatSendingViewModel.attachFileEnabled}"
+                android:onClick="@{attachFileClickListener}"
+                android:paddingTop="@dimen/chat_message_sending_icons_margin"
+                android:paddingBottom="@dimen/chat_message_sending_icons_margin"
+                android:src="@drawable/chat_file"
+                app:layout_constraintBottom_toBottomOf="@id/message"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="@id/message" />
+
+            <ImageView
+                android:id="@+id/voice_record"
+                android:layout_width="@dimen/chat_message_sending_icons_size"
+                android:layout_height="@dimen/chat_message_sending_icons_size"
+                android:layout_marginStart="@dimen/chat_message_sending_icons_margin"
+                android:layout_marginEnd="@dimen/chat_message_sending_icons_margin"
+                android:contentDescription="@string/content_description_voice_recording"
+                android:onClick="@{() -> chatSendingViewModel.toggleVoiceRecording()}"
+                android:onTouch="@{voiceRecordingTouchListener}"
+                android:paddingTop="@dimen/chat_message_sending_icons_margin"
+                android:paddingBottom="@dimen/chat_message_sending_icons_margin"
+                android:selected="@{chatSendingViewModel.isVoiceRecording}"
+                android:src="@drawable/record_audio_message"
+                app:layout_constraintBottom_toBottomOf="@id/message"
+                app:layout_constraintStart_toEndOf="@id/attach_file"
+                app:layout_constraintTop_toTopOf="@id/message" />
+
+            <org.linphone.activities.main.chat.views.RichEditText
+                android:id="@+id/message"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:visibility="@{chatSendingViewModel.isReadOnly ? View.GONE : View.VISIBLE}"
-                android:gravity="center_vertical"
-                android:background="?attr/lightToolbarBackgroundColor"
-                android:orientation="horizontal">
+                android:layout_below="@id/attached_files"
+                android:layout_gravity="center_vertical"
+                android:layout_marginStart="@dimen/chat_message_sending_icons_margin"
+                android:layout_marginTop="10dp"
+                android:layout_marginEnd="@dimen/chat_message_sending_icons_margin"
+                android:layout_marginBottom="10dp"
+                android:background="@drawable/resizable_text_field"
+                android:hint="@{chatSendingViewModel.isPendingAnswer ? @string/chat_room_sending_reply_hint : @string/chat_room_sending_message_hint}"
+                android:imeOptions="@{chatSendingViewModel.imeFlags}"
+                android:inputType="textShortMessage|textMultiLine|textAutoComplete|textAutoCorrect|textCapSentences"
+                android:maxLines="6"
+                android:padding="5dp"
+                android:text="@={chatSendingViewModel.textToSend}"
+                android:textColor="@color/black_color"
+                android:textCursorDrawable="@null"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/send_message"
+                app:layout_constraintStart_toEndOf="@id/voice_record"
+                app:layout_constraintTop_toBottomOf="@id/attached_files" />
 
-                <ImageView
-                    android:onClick="@{attachFileClickListener}"
-                    android:enabled="@{chatSendingViewModel.attachFileEnabled}"
-                    android:contentDescription="@string/content_description_attach_file"
-                    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
+                android:id="@+id/send_message"
+                android:layout_width="@dimen/chat_message_sending_icons_size"
+                android:layout_height="@dimen/chat_message_sending_icons_size"
+                android:layout_marginStart="@dimen/chat_message_sending_icons_margin"
+                android:layout_marginEnd="@dimen/chat_message_sending_icons_margin"
+                android:contentDescription="@string/content_description_send_message"
+                android:enabled="@{chatSendingViewModel.sendMessageEnabled &amp;&amp; !chatSendingViewModel.attachingFileInProgress}"
+                android:onClick="@{() -> chatSendingViewModel.sendMessage()}"
+                android:paddingTop="@dimen/chat_message_sending_icons_margin"
+                android:paddingBottom="@dimen/chat_message_sending_icons_margin"
+                android:src="@drawable/chat_send_message"
+                app:layout_constraintBottom_toBottomOf="@id/message"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="@id/message" />
 
-                <ImageView
-                    android:id="@+id/voice_record"
-                    android:onTouch="@{voiceRecordingTouchListener}"
-                    android:onClick="@{() -> chatSendingViewModel.toggleVoiceRecording()}"
-                    android:selected="@{chatSendingViewModel.isVoiceRecording}"
-                    android:contentDescription="@string/content_description_voice_recording"
-                    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" />
+            <ImageView
+                android:id="@+id/send_ephemeral_message"
+                android:layout_width="20dp"
+                android:layout_height="wrap_content"
+                android:adjustViewBounds="true"
+                android:clickable="false"
+                android:contentDescription="@string/content_description_ephemeral_message"
+                android:enabled="@{chatSendingViewModel.sendMessageEnabled}"
+                android:padding="5dp"
+                android:src="@drawable/ephemeral_messages"
+                android:visibility="@{chatSendingViewModel.isReadOnly &amp;&amp; viewModel.chatRoom.isEphemeralEnabled() ? View.VISIBLE : View.GONE, default=gone}"
+                app:layout_constraintBottom_toBottomOf="@id/send_message"
+                app:layout_constraintEnd_toEndOf="@id/send_message" />
 
-                <org.linphone.activities.main.chat.views.RichEditText
-                    android:id="@+id/message"
-                    android:text="@={chatSendingViewModel.textToSend}"
-                    android:hint="@{chatSendingViewModel.isPendingAnswer ? @string/chat_room_sending_reply_hint : @string/chat_room_sending_message_hint}"
-                    android:imeOptions="@{chatSendingViewModel.imeFlags}"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:layout_marginTop="10dp"
-                    android:layout_marginBottom="10dp"
-                    android:layout_weight="1"
-                    android:background="@drawable/resizable_text_field"
-                    android:inputType="textShortMessage|textMultiLine|textAutoComplete|textAutoCorrect|textCapSentences"
-                    android:maxLines="6"
-                    android:padding="5dp"
-                    android:textColor="@color/black_color"
-                    android:textCursorDrawable="@null" />
+            <View
+                android:id="@+id/attaching_files_in_progress_background"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:background="#99c4c4c4"
+                android:clickable="true"
+                android:focusable="true"
+                android:visibility="@{chatSendingViewModel.attachingFileInProgress ? View.VISIBLE : View.GONE, default=gone}"
+                app:layout_constraintBottom_toBottomOf="@id/attached_files"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="@id/attached_files" />
 
-                <RelativeLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content">
+            <ProgressBar
+                android:id="@+id/attaching_files_in_progress"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:indeterminate="true"
+                android:indeterminateDrawable="@drawable/icon_spinner_rotating"
+                android:indeterminateTint="?attr/accentColor"
+                android:visibility="@{chatSendingViewModel.attachingFileInProgress ? View.VISIBLE : View.GONE, default=gone}"
+                app:layout_constraintBottom_toTopOf="@id/attaching_files_in_progress_label"
+                app:layout_constraintEnd_toEndOf="@id/attaching_files_in_progress_background"
+                app:layout_constraintStart_toStartOf="@id/attaching_files_in_progress_background"
+                app:layout_constraintTop_toBottomOf="@id/attached_files" />
 
-                    <ImageView
-                        android:id="@+id/send_message"
-                        android:onClick="@{() -> chatSendingViewModel.sendMessage()}"
-                        android:enabled="@{chatSendingViewModel.sendMessageEnabled}"
-                        android:contentDescription="@string/content_description_send_message"
-                        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" />
+            <TextView
+                android:id="@+id/attaching_files_in_progress_label"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
+                android:text="@string/operation_in_progress_wait"
+                android:textColor="@color/primary_color"
+                android:textStyle="bold"
+                android:visibility="@{chatSendingViewModel.attachingFileInProgress ? View.VISIBLE : View.GONE, default=gone}"
+                app:layout_constraintBottom_toTopOf="@id/attached_files"
+                app:layout_constraintEnd_toEndOf="@id/attaching_files_in_progress_background"
+                app:layout_constraintStart_toStartOf="@id/attaching_files_in_progress_background"
+                app:layout_constraintTop_toBottomOf="@id/attaching_files_in_progress" />
 
-                    <ImageView
-                        android:visibility="@{viewModel.chatRoom.isEphemeralEnabled() ? View.VISIBLE : View.GONE, default=gone}"
-                        android:enabled="@{chatSendingViewModel.sendMessageEnabled}"
-                        android:contentDescription="@string/content_description_ephemeral_message"
-                        android:clickable="false"
-                        android:layout_width="20dp"
-                        android:layout_height="wrap_content"
-                        android:adjustViewBounds="true"
-                        android:layout_alignRight="@id/send_message"
-                        android:layout_alignBottom="@id/send_message"
-                        android:padding="5dp"
-                        android:src="@drawable/ephemeral_messages" />
-
-                </RelativeLayout>
-
-            </LinearLayout>
-
-        </LinearLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/chat_messages_list"
@@ -303,7 +388,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_above="@id/footer"
-            android:paddingLeft="5dp"
+            android:paddingStart="5dp"
+            android:paddingEnd="5dp"
             android:background="?attr/backgroundColor"
             android:text="@{viewModel.composingList, default=@string/chat_remote_is_composing}"
             android:visibility="@{viewModel.remoteIsComposing ? View.VISIBLE : View.GONE}" />
@@ -312,9 +398,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@id/top_bar"
-            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             android:layout_marginTop="8dp"
-            android:layout_marginRight="8dp"
+            android:layout_marginEnd="8dp"
             android:adjustViewBounds="true"
             android:contentDescription="@{viewModel.securityLevelContentDescription}"
             android:onClick="@{securityIconClickListener}"