diff --git a/app/src/main/res/layout/chat_conversation_attachments_area.xml b/app/src/main/res/layout/chat_conversation_attachments_area.xml
index 0da74fdb7..c14622576 100644
--- a/app/src/main/res/layout/chat_conversation_attachments_area.xml
+++ b/app/src/main/res/layout/chat_conversation_attachments_area.xml
@@ -18,7 +18,7 @@
             android:id="@+id/attachments_separator"
             android:layout_width="match_parent"
             android:layout_height="1dp"
-            android:background="?attr/color_main2_300"
+            android:background="?attr/color_separator"
             app:layout_constraintTop_toTopOf="parent"/>
 
         <com.google.android.flexbox.FlexboxLayout
diff --git a/app/src/main/res/layout/chat_conversation_file_pickers.xml b/app/src/main/res/layout/chat_conversation_file_pickers.xml
index db5d50d69..02b70ee9e 100644
--- a/app/src/main/res/layout/chat_conversation_file_pickers.xml
+++ b/app/src/main/res/layout/chat_conversation_file_pickers.xml
@@ -24,7 +24,7 @@
             android:id="@+id/file_pickers_separator"
             android:layout_width="match_parent"
             android:layout_height="1dp"
-            android:background="?attr/color_main2_300"
+            android:background="?attr/color_separator"
             app:layout_constraintTop_toTopOf="parent"/>
 
         <androidx.appcompat.widget.AppCompatTextView
diff --git a/app/src/main/res/layout/chat_conversation_fragment.xml b/app/src/main/res/layout/chat_conversation_fragment.xml
index e644f90d8..e55c41f38 100644
--- a/app/src/main/res/layout/chat_conversation_fragment.xml
+++ b/app/src/main/res/layout/chat_conversation_fragment.xml
@@ -69,13 +69,6 @@
                     app:constraint_referenced_ids="cancel_search, search, search_up, search_down"
                     android:visibility="@{viewModel.searchBarVisible ? View.VISIBLE : View.GONE, default=gone}" />
 
-                <androidx.constraintlayout.widget.Barrier
-                    android:id="@+id/background_barrier"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    app:barrierDirection="bottom"
-                    app:constraint_referenced_ids="back, cancel_search" />
-
                 <ImageView
                     android:id="@+id/back"
                     android:layout_width="wrap_content"
@@ -274,11 +267,12 @@
                     android:id="@+id/background"
                     android:layout_width="0dp"
                     android:layout_height="0dp"
+                    android:layout_marginTop="@dimen/top_bar_height"
                     android:background="?attr/color_main2_000"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/background_barrier" />
+                    app:layout_constraintTop_toTopOf="parent" />
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/events_list"
@@ -310,7 +304,6 @@
                     android:background="?attr/color_main2_000"
                     android:text="@{viewModel.composingLabel, default=`John Doe is composing...`}"
                     android:textSize="12sp"
-                    android:textColor="?attr/color_main2_400"
                     android:visibility="@{viewModel.composingLabel.length() == 0 ? View.GONE : View.VISIBLE}"
                     app:layout_constraintBottom_toTopOf="@id/warning_disabled_not_secured"
                     app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/chat_conversation_participants_area.xml b/app/src/main/res/layout/chat_conversation_participants_area.xml
index a45e85042..449635f18 100644
--- a/app/src/main/res/layout/chat_conversation_participants_area.xml
+++ b/app/src/main/res/layout/chat_conversation_participants_area.xml
@@ -18,7 +18,7 @@
             android:id="@+id/participants_separator"
             android:layout_width="match_parent"
             android:layout_height="1dp"
-            android:background="?attr/color_main2_300"
+            android:background="?attr/color_separator"
             app:layout_constraintTop_toTopOf="parent"/>
 
         <androidx.core.widget.NestedScrollView
diff --git a/app/src/main/res/layout/chat_conversation_reply_area.xml b/app/src/main/res/layout/chat_conversation_reply_area.xml
index 90f6fbe2a..bef11d463 100644
--- a/app/src/main/res/layout/chat_conversation_reply_area.xml
+++ b/app/src/main/res/layout/chat_conversation_reply_area.xml
@@ -18,7 +18,7 @@
             android:id="@+id/reply_separator"
             android:layout_width="match_parent"
             android:layout_height="1dp"
-            android:background="?attr/color_main2_300"
+            android:background="?attr/color_separator"
             app:layout_constraintTop_toTopOf="parent"/>
 
         <ImageView
diff --git a/app/src/main/res/layout/recordings_list_fragment.xml b/app/src/main/res/layout/recordings_list_fragment.xml
index 8a67caad0..65e8889c2 100644
--- a/app/src/main/res/layout/recordings_list_fragment.xml
+++ b/app/src/main/res/layout/recordings_list_fragment.xml
@@ -32,13 +32,6 @@
             android:visibility="@{viewModel.searchBarVisible ? View.VISIBLE : View.GONE, default=gone}"
             app:constraint_referenced_ids="cancel_search, search, clear_field" />
 
-        <androidx.constraintlayout.widget.Barrier
-            android:id="@+id/background_barrier"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:barrierDirection="bottom"
-            app:constraint_referenced_ids="back, cancel_search" />
-
         <ImageView
             android:id="@+id/back"
             android:layout_width="wrap_content"
@@ -140,11 +133,12 @@
             android:id="@+id/background"
             android:layout_width="0dp"
             android:layout_height="0dp"
+            android:layout_marginTop="@dimen/top_bar_height"
             android:background="?attr/color_main2_000"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/background_barrier" />
+            app:layout_constraintTop_toTopOf="parent" />
 
         <ImageView
             android:id="@+id/no_recording_image"