diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
index 72623614..55d2a1fe 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
@@ -99,11 +99,15 @@ class ThreadActivity : SimpleActivity() {
     private var isAttachmentPickerVisible = false
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        isMaterialActivity = true
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_thread)
         setupOptionsMenu()
         refreshMenuItems()
 
+        updateMaterialActivityViews(thread_coordinator, null, false)
+        setupMaterialScrollListener(null, thread_toolbar)
+
         val extras = intent.extras
         if (extras == null) {
             toast(R.string.unknown_error_occurred)
@@ -147,7 +151,7 @@ class ThreadActivity : SimpleActivity() {
 
     override fun onResume() {
         super.onResume()
-        setupToolbar(thread_toolbar, NavigationIcon.Arrow)
+        setupToolbar(thread_toolbar, NavigationIcon.Arrow, statusBarColor = getProperBackgroundColor())
 
         val smsDraft = getSmsDraft(threadId)
         if (smsDraft != null) {
@@ -164,6 +168,10 @@ class ThreadActivity : SimpleActivity() {
                 }
             }
         }
+
+        val bottomBarColor = getBottomNavigationBackgroundColor()
+        thread_send_message_holder.setBackgroundColor(bottomBarColor)
+        updateNavigationBarColor(bottomBarColor)
     }
 
     override fun onPause() {
@@ -1406,9 +1414,8 @@ class ThreadActivity : SimpleActivity() {
     private fun setupScheduleSendUi() {
         val textColor = getProperTextColor()
         scheduled_message_holder.background.applyColorFilter(getProperPrimaryColor().darkenColor())
+        scheduled_message_icon.applyColorFilter(textColor)
         scheduled_message_button.apply {
-            val clockDrawable = ResourcesCompat.getDrawable(resources, R.drawable.ic_clock_vector, theme)?.apply { applyColorFilter(textColor) }
-            setCompoundDrawablesWithIntrinsicBounds(clockDrawable, null, null, null)
             setTextColor(textColor)
             setOnClickListener {
                 launchScheduleSendDialog(scheduledDateTime)
diff --git a/app/src/main/res/layout/activity_thread.xml b/app/src/main/res/layout/activity_thread.xml
index 42448012..9329a50e 100644
--- a/app/src/main/res/layout/activity_thread.xml
+++ b/app/src/main/res/layout/activity_thread.xml
@@ -6,28 +6,21 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/thread_app_bar_layout"
+    <com.google.android.material.appbar.MaterialToolbar
+        android:id="@+id/thread_toolbar"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/thread_toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="@color/color_primary"
-            app:menu="@menu/menu_thread"
-            app:title=""
-            app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
-
-    </com.google.android.material.appbar.AppBarLayout>
+        android:layout_height="?attr/actionBarSize"
+        android:background="@color/color_primary"
+        app:menu="@menu/menu_thread"
+        app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/thread_holder"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginBottom="@dimen/tiny_margin"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+        android:layout_marginTop="?attr/actionBarSize"
+        android:fillViewport="true"
+        android:scrollbars="none">
 
         <RelativeLayout
             android:id="@+id/thread_add_contacts"
@@ -59,7 +52,7 @@
             <View
                 android:id="@+id/message_divider_one"
                 android:layout_width="match_parent"
-                android:layout_height="1px"
+                android:layout_height="@dimen/divider_height"
                 android:layout_below="@+id/selected_contacts"
                 android:background="@color/divider_grey"
                 android:importantForAccessibility="no" />
@@ -98,17 +91,18 @@
             <View
                 android:id="@+id/message_divider_two"
                 android:layout_width="match_parent"
-                android:layout_height="1px"
+                android:layout_height="@dimen/divider_height"
                 android:layout_below="@+id/add_contact_or_number"
                 android:background="@color/divider_grey"
                 android:importantForAccessibility="no" />
+
         </RelativeLayout>
 
         <com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller
             android:id="@+id/thread_messages_fastscroller"
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            app:layout_constraintBottom_toTopOf="@id/message_divider"
+            app:layout_constraintBottom_toTopOf="@id/thread_send_message_holder"
             app:layout_constraintTop_toBottomOf="@id/thread_add_contacts"
             app:supportSwipeToRefresh="true">
 
@@ -127,203 +121,215 @@
 
         </com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller>
 
-        <View
-            android:id="@+id/message_divider"
-            android:layout_width="match_parent"
-            android:layout_height="1px"
-            android:background="@color/divider_grey"
-            android:importantForAccessibility="no"
-            app:layout_constraintBottom_toTopOf="@id/scheduled_message_holder"
-            app:layout_constraintTop_toBottomOf="@id/thread_messages_fastscroller"
-            tools:layout_height="1dp" />
-
-        <ImageView
-            android:id="@+id/thread_add_attachment"
-            android:layout_width="@dimen/normal_icon_size"
-            android:layout_height="@dimen/normal_icon_size"
-            android:layout_marginStart="@dimen/small_margin"
-            android:alpha="0.9"
-            android:background="?selectableItemBackgroundBorderless"
-            android:contentDescription="@string/attachment"
-            android:padding="@dimen/normal_margin"
-            android:src="@drawable/ic_plus_vector"
-            app:layout_constraintBottom_toTopOf="@id/attachment_picker_divider"
-            app:layout_constraintStart_toStartOf="parent" />
-
-        <androidx.coordinatorlayout.widget.CoordinatorLayout
-            android:id="@+id/scheduled_message_holder"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/normal_margin"
-            android:layout_marginTop="@dimen/medium_margin"
-            android:layout_marginEnd="@dimen/medium_margin"
-            android:background="@drawable/section_holder_stroke"
-            android:orientation="horizontal"
-            android:visibility="gone"
-            app:layout_constraintBottom_toTopOf="@id/thread_attachments_recyclerview"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/message_divider"
-            app:layout_goneMarginBottom="@dimen/medium_margin"
-            tools:visibility="visible">
-
-            <com.simplemobiletools.commons.views.MyTextView
-                android:id="@+id/scheduled_message_button"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="start"
-                android:background="?selectableItemBackgroundBorderless"
-                android:clickable="true"
-                android:drawableStart="@drawable/ic_clock_vector"
-                android:drawablePadding="@dimen/normal_margin"
-                android:focusable="true"
-                android:gravity="center_vertical"
-                android:minHeight="@dimen/normal_icon_size"
-                android:paddingStart="@dimen/normal_margin"
-                android:paddingEnd="48dp"
-                android:text="Tomorrow at 6PM GMT +05:30"
-                android:textSize="@dimen/middle_text_size"
-                tools:ignore="HardcodedText" />
-
-            <ImageView
-                android:id="@+id/discard_scheduled_message"
-                android:layout_width="@dimen/normal_icon_size"
-                android:layout_height="@dimen/normal_icon_size"
-                android:layout_gravity="end"
-                android:background="?selectableItemBackgroundBorderless"
-                android:contentDescription="@string/cancel_schedule_send"
-                android:padding="@dimen/normal_margin"
-                android:src="@drawable/ic_cross_vector" />
-
-        </androidx.coordinatorlayout.widget.CoordinatorLayout>
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/thread_attachments_recyclerview"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/tiny_margin"
-            android:layout_marginBottom="@dimen/small_margin"
-            android:clipToPadding="false"
-            android:orientation="horizontal"
-            android:paddingStart="@dimen/normal_margin"
-            android:paddingEnd="@dimen/normal_margin"
-            android:scrollbars="none"
-            android:visibility="gone"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-            app:layout_constraintBottom_toTopOf="@id/thread_type_message"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/scheduled_message_holder"
-            app:layout_goneMarginTop="@dimen/medium_margin"
-            tools:itemCount="2"
-            tools:listitem="@layout/item_attachment_document_preview"
-            tools:visibility="visible" />
-
-        <com.simplemobiletools.commons.views.MyEditText
-            android:id="@+id/thread_type_message"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/small_margin"
-            android:layout_marginEnd="@dimen/small_margin"
-            android:background="@android:color/transparent"
-            android:gravity="center_vertical"
-            android:hint="@string/type_a_message"
-            android:inputType="textCapSentences|textMultiLine"
-            android:minHeight="@dimen/normal_icon_size"
-            app:layout_constraintBottom_toTopOf="@id/attachment_picker_divider"
-            app:layout_constraintEnd_toStartOf="@id/thread_select_sim_icon"
-            app:layout_constraintStart_toEndOf="@+id/thread_add_attachment" />
-
-        <ImageView
-            android:id="@+id/thread_select_sim_icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:alpha="0.9"
-            android:background="?attr/selectableItemBackgroundBorderless"
-            android:paddingStart="@dimen/medium_margin"
-            android:paddingTop="@dimen/normal_margin"
-            android:paddingEnd="@dimen/medium_margin"
-            android:paddingBottom="@dimen/normal_margin"
-            android:src="@drawable/ic_sim_vector"
-            android:visibility="gone"
-            app:layout_constraintBottom_toTopOf="@id/attachment_picker_divider"
-            app:layout_constraintEnd_toStartOf="@id/thread_character_counter"
-            tools:visibility="visible" />
-
-        <TextView
-            android:id="@+id/thread_select_sim_number"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:textSize="@dimen/normal_text_size"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="@id/thread_select_sim_icon"
-            app:layout_constraintEnd_toEndOf="@id/thread_select_sim_icon"
-            app:layout_constraintStart_toStartOf="@id/thread_select_sim_icon"
-            app:layout_constraintTop_toTopOf="@id/thread_select_sim_icon"
-            tools:text="1"
-            tools:textColor="@color/dark_grey"
-            tools:visibility="visible" />
-
-        <com.simplemobiletools.commons.views.MyTextView
-            android:id="@+id/thread_character_counter"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:paddingStart="@dimen/small_margin"
-            android:paddingEnd="@dimen/small_margin"
-            android:text="0"
-            android:textSize="@dimen/normal_text_size"
-            android:visibility="gone"
-            app:layout_constraintBottom_toTopOf="@id/attachment_picker_divider"
-            app:layout_constraintEnd_toStartOf="@+id/thread_send_message"
-            app:layout_constraintTop_toTopOf="@+id/thread_send_message"
-            tools:ignore="HardcodedText"
-            tools:visibility="visible" />
-
-        <com.simplemobiletools.commons.views.MyButton
-            android:id="@+id/thread_send_message"
-            android:layout_width="@dimen/normal_icon_size"
-            android:layout_height="@dimen/normal_icon_size"
-            android:layout_marginEnd="@dimen/small_margin"
-            android:alpha="0.4"
-            android:background="?selectableItemBackgroundBorderless"
-            android:clickable="false"
-            android:contentDescription="@string/ok"
-            android:drawableTop="@drawable/ic_send_vector"
-            android:paddingVertical="@dimen/small_margin"
-            android:text="@string/sms"
-            android:textSize="@dimen/smaller_text_size"
-            app:layout_constraintBottom_toTopOf="@id/attachment_picker_divider"
-            app:layout_constraintEnd_toEndOf="parent" />
-
-        <View
-            android:id="@+id/attachment_picker_divider"
-            android:layout_width="match_parent"
-            android:layout_height="1px"
-            android:layout_alignParentStart="true"
-            android:layout_alignParentEnd="true"
-            android:background="@color/divider_grey"
-            android:importantForAccessibility="no"
-            app:layout_constraintBottom_toTopOf="@id/attachment_picker_holder" />
-
-        <ScrollView
-            android:id="@+id/attachment_picker_holder"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/thread_send_message_holder"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginHorizontal="@dimen/small_margin"
-            android:overScrollMode="always"
-            android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            tools:visibility="visible">
+            app:layout_constraintStart_toStartOf="parent">
 
-            <include
-                layout="@layout/layout_attachment_picker"
+            <RelativeLayout
+                android:id="@+id/scheduled_message_holder"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/normal_margin"
+                android:layout_marginTop="@dimen/medium_margin"
+                android:layout_marginEnd="@dimen/medium_margin"
+                android:background="@drawable/section_holder_stroke"
+                android:orientation="horizontal"
+                android:visibility="gone"
+                app:layout_constraintBottom_toTopOf="@id/thread_attachments_recyclerview"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_goneMarginBottom="@dimen/medium_margin"
+                tools:visibility="visible">
+
+                <ImageView
+                    android:id="@+id/scheduled_message_icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignTop="@+id/scheduled_message_button"
+                    android:layout_alignBottom="@+id/scheduled_message_button"
+                    android:paddingTop="@dimen/medium_margin"
+                    android:paddingBottom="@dimen/medium_margin"
+                    android:src="@drawable/ic_clock_vector" />
+
+                <com.simplemobiletools.commons.views.MyTextView
+                    android:id="@+id/scheduled_message_button"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="start"
+                    android:layout_toStartOf="@+id/discard_scheduled_message"
+                    android:layout_toEndOf="@+id/scheduled_message_icon"
+                    android:background="@drawable/ripple_background"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:gravity="center_vertical"
+                    android:minHeight="@dimen/normal_icon_size"
+                    android:paddingStart="@dimen/small_margin"
+                    android:paddingEnd="@dimen/activity_margin"
+                    android:textSize="@dimen/middle_text_size"
+                    tools:ignore="HardcodedText"
+                    tools:text="Tomorrow at 6PM GMT +05:30" />
+
+                <ImageView
+                    android:id="@+id/discard_scheduled_message"
+                    android:layout_width="@dimen/normal_icon_size"
+                    android:layout_height="@dimen/normal_icon_size"
+                    android:layout_alignParentEnd="true"
+                    android:layout_gravity="end"
+                    android:background="?selectableItemBackgroundBorderless"
+                    android:contentDescription="@string/cancel_schedule_send"
+                    android:padding="@dimen/normal_margin"
+                    android:src="@drawable/ic_cross_vector" />
+
+            </RelativeLayout>
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/thread_attachments_recyclerview"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/tiny_margin"
+                android:layout_marginBottom="@dimen/small_margin"
+                android:clipToPadding="false"
+                android:orientation="horizontal"
+                android:paddingStart="@dimen/normal_margin"
+                android:paddingEnd="@dimen/normal_margin"
+                android:scrollbars="none"
+                android:visibility="gone"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                app:layout_constraintBottom_toTopOf="@id/thread_type_message"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_goneMarginTop="@dimen/medium_margin"
+                tools:itemCount="2"
+                tools:listitem="@layout/item_attachment_document_preview"
+                tools:visibility="visible" />
+
+            <ImageView
+                android:id="@+id/thread_add_attachment"
+                android:layout_width="@dimen/normal_icon_size"
+                android:layout_height="@dimen/normal_icon_size"
+                android:layout_marginStart="@dimen/small_margin"
+                android:alpha="0.9"
+                android:background="?selectableItemBackgroundBorderless"
+                android:contentDescription="@string/attachment"
+                android:padding="@dimen/normal_margin"
+                android:src="@drawable/ic_plus_vector"
+                app:layout_constraintBottom_toBottomOf="@+id/thread_type_message"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="@+id/thread_type_message" />
+
+            <com.simplemobiletools.commons.views.MyEditText
+                android:id="@+id/thread_type_message"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/small_margin"
+                android:layout_marginEnd="@dimen/small_margin"
+                android:background="@android:color/transparent"
+                android:gravity="center_vertical"
+                android:hint="@string/type_a_message"
+                android:inputType="textCapSentences|textMultiLine"
+                android:minHeight="@dimen/normal_icon_size"
+                app:layout_constraintBottom_toTopOf="@+id/attachment_picker_divider"
+                app:layout_constraintEnd_toStartOf="@id/thread_select_sim_icon"
+                app:layout_constraintStart_toEndOf="@+id/thread_add_attachment" />
+
+            <ImageView
+                android:id="@+id/thread_select_sim_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:alpha="0.9"
+                android:background="?attr/selectableItemBackgroundBorderless"
+                android:paddingStart="@dimen/medium_margin"
+                android:paddingTop="@dimen/normal_margin"
+                android:paddingEnd="@dimen/medium_margin"
+                android:paddingBottom="@dimen/normal_margin"
+                android:src="@drawable/ic_sim_vector"
+                android:visibility="gone"
+                app:layout_constraintBottom_toBottomOf="@+id/thread_type_message"
+                app:layout_constraintEnd_toStartOf="@id/thread_character_counter"
+                app:layout_constraintTop_toTopOf="@+id/thread_type_message"
+                tools:visibility="visible" />
+
+            <TextView
+                android:id="@+id/thread_select_sim_number"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:textSize="@dimen/normal_text_size"
+                android:visibility="gone"
+                app:layout_constraintBottom_toBottomOf="@id/thread_select_sim_icon"
+                app:layout_constraintEnd_toEndOf="@id/thread_select_sim_icon"
+                app:layout_constraintStart_toStartOf="@id/thread_select_sim_icon"
+                app:layout_constraintTop_toTopOf="@id/thread_select_sim_icon"
+                tools:text="1"
+                tools:textColor="@color/dark_grey"
+                tools:visibility="visible" />
+
+            <com.simplemobiletools.commons.views.MyTextView
+                android:id="@+id/thread_character_counter"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingStart="@dimen/small_margin"
+                android:paddingEnd="@dimen/small_margin"
+                android:text="0"
+                android:textSize="@dimen/normal_text_size"
+                android:visibility="gone"
+                app:layout_constraintBottom_toBottomOf="@+id/thread_type_message"
+                app:layout_constraintEnd_toStartOf="@+id/thread_send_message"
+                app:layout_constraintTop_toTopOf="@+id/thread_type_message"
+                tools:ignore="HardcodedText"
+                tools:visibility="visible" />
+
+            <com.simplemobiletools.commons.views.MyButton
+                android:id="@+id/thread_send_message"
+                android:layout_width="@dimen/normal_icon_size"
+                android:layout_height="@dimen/normal_icon_size"
+                android:layout_marginEnd="@dimen/small_margin"
+                android:alpha="0.4"
+                android:background="?selectableItemBackgroundBorderless"
+                android:clickable="false"
+                android:contentDescription="@string/ok"
+                android:drawableTop="@drawable/ic_send_vector"
+                android:paddingVertical="@dimen/small_margin"
+                android:text="@string/sms"
+                android:textSize="@dimen/smaller_text_size"
+                app:layout_constraintBottom_toBottomOf="@+id/thread_type_message"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="@+id/thread_type_message" />
+
+            <View
+                android:id="@+id/attachment_picker_divider"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-        </ScrollView>
+                android:layout_height="@dimen/divider_height"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentEnd="true"
+                android:background="@color/divider_grey"
+                android:importantForAccessibility="no"
+                app:layout_constraintBottom_toTopOf="@id/attachment_picker_holder" />
 
+            <ScrollView
+                android:id="@+id/attachment_picker_holder"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/small_margin"
+                android:overScrollMode="always"
+                android:visibility="gone"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                tools:visibility="visible">
+
+                <include
+                    layout="@layout/layout_attachment_picker"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+            </ScrollView>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>