diff --git a/app/src/main/res/layout/activity_chat_room.xml b/app/src/main/res/layout/activity_chat_room.xml
index 5bf71349..4ac224dd 100644
--- a/app/src/main/res/layout/activity_chat_room.xml
+++ b/app/src/main/res/layout/activity_chat_room.xml
@@ -1,7 +1,7 @@
 
-
@@ -11,12 +11,12 @@
         android:id="@+id/iv_background_profile"
         android:layout_width="0dp"
         android:layout_height="0dp"
+        android:contentDescription="@string/a11y_profile_background"
         android:scaleType="centerCrop"
-        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        android:contentDescription="@string/a11y_profile_background" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     
     
+        app:layout_constraintTop_toTopOf="parent" />
 
     
     
+        app:layout_constraintTop_toTopOf="parent" />
 
     
     
+        app:layout_constraintTop_toBottomOf="@id/status_bar_background">
 
         
+            app:layout_constraintTop_toTopOf="parent" />
 
         
+            app:layout_constraintTop_toTopOf="parent" />
 
-        
-
-        
+            app:layout_constraintStart_toEndOf="@id/iv_profile"
+            app:layout_constraintTop_toTopOf="@id/iv_profile">
+
+            
+
+            
+        
 
     
 
@@ -112,24 +120,24 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
         android:layout_marginTop="8dp"
-        android:padding="12dp"
+        android:layout_marginEnd="16dp"
         android:background="@drawable/bg_chat_notice"
-        app:layout_constraintTop_toBottomOf="@id/header_container"
+        android:padding="12dp"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent">
+        app:layout_constraintTop_toBottomOf="@id/header_container">
 
         
+            app:tint="#FFFFFFFF" />
 
         
+            app:layout_constraintEnd_toStartOf="@id/iv_collapse"
+            app:layout_constraintStart_toEndOf="@id/iv_notice_icon"
+            app:layout_constraintTop_toTopOf="parent" />
 
         
+            app:tint="#FFFFFFFF" />
 
     
 
@@ -163,54 +171,52 @@
         android:id="@+id/rv_messages"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:paddingStart="12dp"
-        android:paddingEnd="12dp"
         android:clipToPadding="false"
-        app:layout_constraintTop_toBottomOf="@id/notice_container"
         app:layout_constraintBottom_toTopOf="@id/input_container"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        app:layout_constraintTop_toBottomOf="@id/notice_container" />
 
     
     
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
 
         
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         
+            app:layout_constraintTop_toTopOf="parent" />