diff --git a/app/src/main/java/org/linphone/ui/main/contacts/fragment/ContactsFragment.kt b/app/src/main/java/org/linphone/ui/main/contacts/fragment/ContactsFragment.kt
index 069241f65..ee7453424 100644
--- a/app/src/main/java/org/linphone/ui/main/contacts/fragment/ContactsFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/contacts/fragment/ContactsFragment.kt
@@ -63,24 +63,9 @@ class ContactsFragment : GenericFragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        postponeEnterTransition()
 
         binding.lifecycleOwner = viewLifecycleOwner
 
-        sharedViewModel.contactsListReadyToBeDisplayedEvent.observe(viewLifecycleOwner) {
-            it.consume {
-                Log.i("$TAG Contacts list is ready, starting postponed enter transition")
-                startPostponedEnterTransition()
-            }
-        }
-
-        sharedViewModel.contactEditorReadyToBeDisplayedEvent.observe(viewLifecycleOwner) {
-            it.consume {
-                Log.i("$TAG Contact editor is ready, starting postponed enter transition")
-                startPostponedEnterTransition()
-            }
-        }
-
         binding.root.doOnPreDraw {
             val slidingPane = binding.slidingPaneLayout
             slidingPane.lockMode = SlidingPaneLayout.LOCK_MODE_LOCKED
diff --git a/app/src/main/java/org/linphone/ui/main/contacts/fragment/ContactsListFragment.kt b/app/src/main/java/org/linphone/ui/main/contacts/fragment/ContactsListFragment.kt
index ccad67dd0..ba0cbe508 100644
--- a/app/src/main/java/org/linphone/ui/main/contacts/fragment/ContactsListFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/contacts/fragment/ContactsListFragment.kt
@@ -29,7 +29,6 @@ import android.view.ViewGroup
 import android.widget.PopupWindow
 import androidx.annotation.UiThread
 import androidx.core.content.FileProvider
-import androidx.core.view.doOnPreDraw
 import androidx.databinding.DataBindingUtil
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -70,7 +69,6 @@ class ContactsListFragment : AbstractTopBarFragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        postponeEnterTransition()
 
         listViewModel = requireActivity().run {
             ViewModelProvider(this)[ContactsListViewModel::class.java]
@@ -103,12 +101,7 @@ class ContactsListFragment : AbstractTopBarFragment() {
             adapter.submitList(it)
             Log.i("$TAG Contacts list updated with [${it.size}] items")
 
-            if (currentCount == 0) {
-                (view.parent as? ViewGroup)?.doOnPreDraw {
-                    startPostponedEnterTransition()
-                    sharedViewModel.contactsListReadyToBeDisplayedEvent.value = Event(true)
-                }
-            } else if (currentCount < it.size) {
+            if (currentCount < it.size) {
                 Log.i("$TAG Contacts list updated with new items, scrolling to top")
                 binding.contactsList.smoothScrollToPosition(0)
             }
diff --git a/app/src/main/java/org/linphone/ui/main/contacts/fragment/NewContactFragment.kt b/app/src/main/java/org/linphone/ui/main/contacts/fragment/NewContactFragment.kt
index 4e00e3ce0..510d58647 100644
--- a/app/src/main/java/org/linphone/ui/main/contacts/fragment/NewContactFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/contacts/fragment/NewContactFragment.kt
@@ -174,8 +174,6 @@ class NewContactFragment : GenericFragment() {
                 removeCell(model)
             }
         }
-
-        sharedViewModel.contactEditorReadyToBeDisplayedEvent.value = Event(true)
     }
 
     override fun onResume() {
diff --git a/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactsListViewModel.kt b/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactsListViewModel.kt
index 62b7f010a..59574aeab 100644
--- a/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactsListViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactsListViewModel.kt
@@ -50,6 +50,8 @@ class ContactsListViewModel @UiThread constructor() : AbstractTopBarViewModel()
 
     val favourites = MutableLiveData<ArrayList<ContactAvatarModel>>()
 
+    val fetchInProgress = MutableLiveData<Boolean>()
+
     val showFavourites = MutableLiveData<Boolean>()
 
     val isListFiltered = MutableLiveData<Boolean>()
@@ -172,6 +174,7 @@ class ContactsListViewModel @UiThread constructor() : AbstractTopBarViewModel()
 
         favourites.postValue(favouritesList)
         contactsList.postValue(list)
+        fetchInProgress.postValue(false)
 
         Log.i("$TAG Processed [${results.size}] results")
     }
@@ -221,6 +224,10 @@ class ContactsListViewModel @UiThread constructor() : AbstractTopBarViewModel()
         domain: String,
         sources: Int
     ) {
+        if (contactsList.value.orEmpty().isEmpty()) {
+            fetchInProgress.postValue(true)
+        }
+
         if (previousFilter.isNotEmpty() && (
             previousFilter.length > filter.length ||
                 (previousFilter.length == filter.length && previousFilter != filter)
diff --git a/app/src/main/java/org/linphone/ui/main/history/fragment/HistoryFragment.kt b/app/src/main/java/org/linphone/ui/main/history/fragment/HistoryFragment.kt
index 7e9d61f6f..ec43fecec 100644
--- a/app/src/main/java/org/linphone/ui/main/history/fragment/HistoryFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/history/fragment/HistoryFragment.kt
@@ -63,17 +63,9 @@ class HistoryFragment : GenericFragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        postponeEnterTransition()
 
         binding.lifecycleOwner = viewLifecycleOwner
 
-        sharedViewModel.callsListReadyToBeDisplayedEvent.observe(viewLifecycleOwner) {
-            it.consume {
-                Log.i("$TAG Calls list is ready, starting postponed enter transition")
-                startPostponedEnterTransition()
-            }
-        }
-
         binding.root.doOnPreDraw {
             val slidingPane = binding.slidingPaneLayout
             slidingPane.lockMode = SlidingPaneLayout.LOCK_MODE_LOCKED
diff --git a/app/src/main/java/org/linphone/ui/main/history/fragment/HistoryListFragment.kt b/app/src/main/java/org/linphone/ui/main/history/fragment/HistoryListFragment.kt
index 76773fc7c..e0d42e30b 100644
--- a/app/src/main/java/org/linphone/ui/main/history/fragment/HistoryListFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/history/fragment/HistoryListFragment.kt
@@ -29,7 +29,6 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.PopupWindow
 import androidx.annotation.UiThread
-import androidx.core.view.doOnPreDraw
 import androidx.databinding.DataBindingUtil
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -70,7 +69,6 @@ class HistoryListFragment : AbstractTopBarFragment() {
     }
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        postponeEnterTransition()
 
         listViewModel = requireActivity().run {
             ViewModelProvider(this)[HistoryListViewModel::class.java]
@@ -152,12 +150,7 @@ class HistoryListFragment : AbstractTopBarFragment() {
             adapter.submitList(it)
             Log.i("$TAG Call logs ready with [${it.size}] items")
 
-            if (currentCount == 0) {
-                (view.parent as? ViewGroup)?.doOnPreDraw {
-                    startPostponedEnterTransition()
-                    sharedViewModel.callsListReadyToBeDisplayedEvent.value = Event(true)
-                }
-            } else if (currentCount < it.size) {
+            if (currentCount < it.size) {
                 binding.historyList.scrollToPosition(0)
             }
         }
diff --git a/app/src/main/java/org/linphone/ui/main/history/viewmodel/HistoryListViewModel.kt b/app/src/main/java/org/linphone/ui/main/history/viewmodel/HistoryListViewModel.kt
index 8f9528c35..268f06061 100644
--- a/app/src/main/java/org/linphone/ui/main/history/viewmodel/HistoryListViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/history/viewmodel/HistoryListViewModel.kt
@@ -40,6 +40,8 @@ class HistoryListViewModel @UiThread constructor() : AbstractTopBarViewModel() {
 
     val callLogs = MutableLiveData<ArrayList<CallLogModel>>()
 
+    val fetchInProgress = MutableLiveData<Boolean>()
+
     val historyDeletedEvent: MutableLiveData<Event<Boolean>> by lazy {
         MutableLiveData<Event<Boolean>>()
     }
@@ -107,6 +109,10 @@ class HistoryListViewModel @UiThread constructor() : AbstractTopBarViewModel() {
 
     @WorkerThread
     private fun computeCallLogsList(filter: String) {
+        if (callLogs.value.orEmpty().isEmpty()) {
+            fetchInProgress.postValue(true)
+        }
+
         val list = arrayListOf<CallLogModel>()
 
         // TODO? : Add support for call logs in magic search
@@ -120,5 +126,6 @@ class HistoryListViewModel @UiThread constructor() : AbstractTopBarViewModel() {
         }
 
         callLogs.postValue(list)
+        fetchInProgress.postValue(false)
     }
 }
diff --git a/app/src/main/java/org/linphone/ui/main/viewmodel/SharedMainViewModel.kt b/app/src/main/java/org/linphone/ui/main/viewmodel/SharedMainViewModel.kt
index 8f7d1d5d0..f789d5e64 100644
--- a/app/src/main/java/org/linphone/ui/main/viewmodel/SharedMainViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/viewmodel/SharedMainViewModel.kt
@@ -63,10 +63,6 @@ class SharedMainViewModel @UiThread constructor() : ViewModel() {
 
     /* Contacts related */
 
-    val contactsListReadyToBeDisplayedEvent = MutableLiveData<Event<Boolean>>()
-
-    val contactEditorReadyToBeDisplayedEvent = MutableLiveData<Event<Boolean>>()
-
     val showContactEvent: MutableLiveData<Event<String>> by lazy {
         MutableLiveData<Event<String>>()
     }
@@ -79,8 +75,6 @@ class SharedMainViewModel @UiThread constructor() : ViewModel() {
 
     /* Call logs related */
 
-    val callsListReadyToBeDisplayedEvent = MutableLiveData<Event<Boolean>>()
-
     val showStartCallEvent: MutableLiveData<Event<Boolean>> by lazy {
         MutableLiveData<Event<Boolean>>()
     }
diff --git a/app/src/main/res/layout-land/contacts_list_fragment.xml b/app/src/main/res/layout-land/contacts_list_fragment.xml
index 3f6542cd9..c3c770db0 100644
--- a/app/src/main/res/layout-land/contacts_list_fragment.xml
+++ b/app/src/main/res/layout-land/contacts_list_fragment.xml
@@ -16,162 +16,172 @@
             type="org.linphone.ui.main.contacts.viewmodel.ContactsListViewModel" />
     </data>
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/orange_main_500">
+        android:layout_height="match_parent">
 
-        <androidx.constraintlayout.widget.Group
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:constraint_referenced_ids="no_contacts_image, no_contacts_label"
-            android:visibility="@{viewModel.contactsList.empty ? View.VISIBLE : View.GONE}" />
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/orange_main_500">
 
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/bottom_nav_bar"
-            android:name="org.linphone.ui.main.fragment.BottomNavBarFragment"
-            android:layout_width="75dp"
-            android:layout_height="0dp"
-            bind:layout="@layout/bottom_nav_bar"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent" />
+            <androidx.constraintlayout.widget.Group
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:constraint_referenced_ids="no_contacts_image, no_contacts_label"
+                android:visibility="@{viewModel.contactsList.empty ? View.VISIBLE : View.GONE}" />
+
+            <androidx.fragment.app.FragmentContainerView
+                android:id="@+id/bottom_nav_bar"
+                android:name="org.linphone.ui.main.fragment.BottomNavBarFragment"
+                android:layout_width="75dp"
+                android:layout_height="0dp"
+                bind:layout="@layout/bottom_nav_bar"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent" />
+
+            <include
+                android:id="@+id/top_bar"
+                layout="@layout/main_activity_top_bar"
+                bind:viewModel="@{viewModel}"
+                android:layout_width="0dp"
+                android:layout_height="@dimen/top_bar_height"
+                android:layout_marginEnd="9dp"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
+                app:layout_constraintEnd_toStartOf="@id/filter"/>
+
+            <ImageView
+                android:onClick="@{filterClickListener}"
+                android:id="@+id/filter"
+                android:layout_width="@dimen/icon_size"
+                android:layout_height="0dp"
+                android:layout_marginEnd="9dp"
+                android:src="@drawable/funnel"
+                android:visibility="@{viewModel.searchBarVisible ? View.GONE : View.VISIBLE}"
+                app:tint="@color/white"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="@id/top_bar"
+                app:layout_constraintBottom_toBottomOf="@id/top_bar" />
+
+            <include
+                android:id="@+id/in_call_top_bar"
+                layout="@layout/main_activity_in_call_top_bar"
+                bind:viewModel="@{viewModel}"
+                android:layout_width="0dp"
+                android:layout_height="@dimen/top_bar_height"
+                android:visibility="@{viewModel.atLastOneCall ? View.VISIBLE : View.GONE, default=gone}"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
+                app:layout_constraintEnd_toEndOf="parent"/>
+
+            <ImageView
+                android:id="@+id/background"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:src="@color/white"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
+                app:layout_constraintTop_toBottomOf="@id/top_bar"/>
+
+            <ImageView
+                android:id="@+id/no_contacts_image"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:src="@drawable/illu"
+                android:layout_margin="10dp"
+                app:layout_constraintHeight_max="200dp"
+                app:layout_constraintBottom_toTopOf="@id/no_contacts_label"
+                app:layout_constraintDimensionRatio="1:1"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
+                app:layout_constraintTop_toBottomOf="@id/background" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/section_header_style"
+                android:id="@+id/no_contacts_label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/contacts_list_empty"
+                app:layout_constraintBottom_toTopOf="@id/background"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
+                app:layout_constraintTop_toBottomOf="@id/no_contacts_image" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/section_header_style"
+                android:id="@+id/favourites_label"
+                android:visibility="@{!viewModel.isListFiltered &amp;&amp; viewModel.favourites.size() > 0 ? View.VISIBLE : View.GONE}"
+                onClickListener="@{() -> viewModel.toggleFavouritesVisibility()}"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:layout_marginTop="20dp"
+                android:text="@string/contacts_list_favourites_title"
+                android:drawableEnd="@drawable/caret_up"
+                android:drawableTint="@color/gray_main2_600"
+                app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="@id/background"/>
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/favourites_contacts_list"
+                android:visibility="@{viewModel.showFavourites &amp;&amp; !viewModel.isListFiltered &amp;&amp; viewModel.favourites.size() > 0 ? View.VISIBLE : View.GONE}"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
+                android:layout_marginTop="4dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
+                app:layout_constraintTop_toBottomOf="@id/favourites_label" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/section_header_style"
+                android:id="@+id/all_contacts_label"
+                android:visibility="@{!viewModel.isListFiltered &amp;&amp; viewModel.favourites.size() > 0 ? View.VISIBLE : View.GONE}"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:layout_marginTop="16dp"
+                android:text="@string/contacts_list_all_contacts_title"
+                app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/favourites_contacts_list"/>
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/contactsList"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_marginTop="8dp"
+                app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/all_contacts_label"
+                app:layout_constraintBottom_toBottomOf="parent" />
+
+            <com.google.android.material.floatingactionbutton.FloatingActionButton
+                android:id="@+id/new_contact"
+                android:onClick="@{onNewContactClicked}"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end|bottom"
+                android:layout_margin="16dp"
+                android:src="@drawable/user_plus"
+                app:tint="@color/gray_main2_700"
+                app:backgroundTint="@color/white"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
         <include
-            android:id="@+id/top_bar"
-            layout="@layout/main_activity_top_bar"
-            bind:viewModel="@{viewModel}"
-            android:layout_width="0dp"
-            android:layout_height="@dimen/top_bar_height"
-            android:layout_marginEnd="9dp"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
-            app:layout_constraintEnd_toStartOf="@id/filter"/>
+            layout="@layout/operation_in_progress"
+            bind:visibility="@{viewModel.fetchInProgress}" />
 
-        <ImageView
-            android:onClick="@{filterClickListener}"
-            android:id="@+id/filter"
-            android:layout_width="@dimen/icon_size"
-            android:layout_height="0dp"
-            android:layout_marginEnd="9dp"
-            android:src="@drawable/funnel"
-            android:visibility="@{viewModel.searchBarVisible ? View.GONE : View.VISIBLE}"
-            app:tint="@color/white"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@id/top_bar"
-            app:layout_constraintBottom_toBottomOf="@id/top_bar" />
-
-        <include
-            android:id="@+id/in_call_top_bar"
-            layout="@layout/main_activity_in_call_top_bar"
-            bind:viewModel="@{viewModel}"
-            android:layout_width="0dp"
-            android:layout_height="@dimen/top_bar_height"
-            android:visibility="@{viewModel.atLastOneCall ? View.VISIBLE : View.GONE, default=gone}"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
-            app:layout_constraintEnd_toEndOf="parent"/>
-
-        <ImageView
-            android:id="@+id/background"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:src="@color/white"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
-            app:layout_constraintTop_toBottomOf="@id/top_bar"/>
-
-        <ImageView
-            android:id="@+id/no_contacts_image"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:src="@drawable/illu"
-            android:layout_margin="10dp"
-            app:layout_constraintHeight_max="200dp"
-            app:layout_constraintBottom_toTopOf="@id/no_contacts_label"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
-            app:layout_constraintTop_toBottomOf="@id/background" />
-
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/section_header_style"
-            android:id="@+id/no_contacts_label"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/contacts_list_empty"
-            app:layout_constraintBottom_toTopOf="@id/background"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
-            app:layout_constraintTop_toBottomOf="@id/no_contacts_image" />
-
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/section_header_style"
-            android:id="@+id/favourites_label"
-            android:visibility="@{!viewModel.isListFiltered &amp;&amp; viewModel.favourites.size() > 0 ? View.VISIBLE : View.GONE}"
-            onClickListener="@{() -> viewModel.toggleFavouritesVisibility()}"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginTop="20dp"
-            android:text="@string/contacts_list_favourites_title"
-            android:drawableEnd="@drawable/caret_up"
-            android:drawableTint="@color/gray_main2_600"
-            app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@id/background"/>
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/favourites_contacts_list"
-            android:visibility="@{viewModel.showFavourites &amp;&amp; !viewModel.isListFiltered &amp;&amp; viewModel.favourites.size() > 0 ? View.VISIBLE : View.GONE}"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:layout_marginEnd="10dp"
-            android:layout_marginTop="4dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
-            app:layout_constraintTop_toBottomOf="@id/favourites_label" />
-
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/section_header_style"
-            android:id="@+id/all_contacts_label"
-            android:visibility="@{!viewModel.isListFiltered &amp;&amp; viewModel.favourites.size() > 0 ? View.VISIBLE : View.GONE}"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginTop="16dp"
-            android:text="@string/contacts_list_all_contacts_title"
-            app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/favourites_contacts_list"/>
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/contactsList"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_marginTop="8dp"
-            app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/all_contacts_label"
-            app:layout_constraintBottom_toBottomOf="parent" />
-
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/new_contact"
-            android:onClick="@{onNewContactClicked}"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end|bottom"
-            android:layout_margin="16dp"
-            android:src="@drawable/user_plus"
-            app:tint="@color/gray_main2_700"
-            app:backgroundTint="@color/white"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/history_list_fragment.xml b/app/src/main/res/layout-land/history_list_fragment.xml
index 1dee3bdc3..359d00c0a 100644
--- a/app/src/main/res/layout-land/history_list_fragment.xml
+++ b/app/src/main/res/layout-land/history_list_fragment.xml
@@ -22,120 +22,130 @@
             type="org.linphone.ui.main.history.viewmodel.HistoryListViewModel" />
     </data>
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/orange_main_500">
+        android:layout_height="match_parent">
 
-        <androidx.constraintlayout.widget.Group
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:constraint_referenced_ids="no_calls_image, no_calls_label"
-            android:visibility="@{viewModel.callLogs.empty ? View.VISIBLE : View.GONE}" />
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/orange_main_500">
+
+            <androidx.constraintlayout.widget.Group
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:constraint_referenced_ids="no_calls_image, no_calls_label"
+                android:visibility="@{viewModel.callLogs.empty ? View.VISIBLE : View.GONE}" />
+
+            <include
+                android:id="@+id/top_bar"
+                layout="@layout/main_activity_top_bar"
+                bind:viewModel="@{viewModel}"
+                android:layout_width="0dp"
+                android:layout_height="@dimen/top_bar_height"
+                android:layout_marginEnd="9dp"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
+                app:layout_constraintEnd_toStartOf="@id/menu"/>
+
+            <ImageView
+                android:onClick="@{menuClickListener}"
+                android:id="@+id/menu"
+                android:layout_width="@dimen/icon_size"
+                android:layout_height="0dp"
+                android:layout_marginEnd="9dp"
+                android:src="@drawable/dots_three_vertical"
+                android:visibility="@{viewModel.searchBarVisible ? View.GONE : View.VISIBLE}"
+                app:tint="@color/white"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="@id/top_bar"
+                app:layout_constraintBottom_toBottomOf="@id/top_bar" />
+
+            <include
+                android:id="@+id/in_call_top_bar"
+                layout="@layout/main_activity_in_call_top_bar"
+                bind:viewModel="@{viewModel}"
+                android:layout_width="0dp"
+                android:layout_height="@dimen/top_bar_height"
+                android:visibility="@{viewModel.atLastOneCall ? View.VISIBLE : View.GONE, default=gone}"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
+                app:layout_constraintEnd_toEndOf="parent"/>
+
+            <ImageView
+                android:id="@+id/background"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:src="@color/white"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
+                app:layout_constraintTop_toBottomOf="@id/top_bar" />
+
+            <ImageView
+                android:id="@+id/no_calls_image"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:src="@drawable/illu"
+                android:layout_margin="10dp"
+                app:layout_constraintHeight_max="200dp"
+                app:layout_constraintBottom_toTopOf="@id/no_calls_label"
+                app:layout_constraintDimensionRatio="1:1"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
+                app:layout_constraintTop_toBottomOf="@id/background" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/section_header_style"
+                android:id="@+id/no_calls_label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/history_list_empty_history"
+                app:layout_constraintBottom_toTopOf="@id/background"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
+                app:layout_constraintTop_toBottomOf="@id/no_calls_image" />
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/history_list"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/top_bar"
+                app:layout_constraintBottom_toBottomOf="parent" />
+
+            <androidx.fragment.app.FragmentContainerView
+                android:id="@+id/bottom_nav_bar"
+                android:name="org.linphone.ui.main.fragment.BottomNavBarFragment"
+                android:layout_width="75dp"
+                android:layout_height="0dp"
+                bind:layout="@layout/bottom_nav_bar"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent" />
+
+            <com.google.android.material.floatingactionbutton.FloatingActionButton
+                android:onClick="@{startCallClickListener}"
+                android:id="@+id/new_call"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end|bottom"
+                android:layout_margin="16dp"
+                android:src="@drawable/phone_plus"
+                app:tint="@color/gray_main2_700"
+                app:backgroundTint="@color/white"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
         <include
-            android:id="@+id/top_bar"
-            layout="@layout/main_activity_top_bar"
-            bind:viewModel="@{viewModel}"
-            android:layout_width="0dp"
-            android:layout_height="@dimen/top_bar_height"
-            android:layout_marginEnd="9dp"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
-            app:layout_constraintEnd_toStartOf="@id/menu"/>
+            layout="@layout/operation_in_progress"
+            bind:visibility="@{viewModel.fetchInProgress}" />
 
-        <ImageView
-            android:onClick="@{menuClickListener}"
-            android:id="@+id/menu"
-            android:layout_width="@dimen/icon_size"
-            android:layout_height="0dp"
-            android:layout_marginEnd="9dp"
-            android:src="@drawable/dots_three_vertical"
-            android:visibility="@{viewModel.searchBarVisible ? View.GONE : View.VISIBLE}"
-            app:tint="@color/white"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@id/top_bar"
-            app:layout_constraintBottom_toBottomOf="@id/top_bar" />
-
-        <include
-            android:id="@+id/in_call_top_bar"
-            layout="@layout/main_activity_in_call_top_bar"
-            bind:viewModel="@{viewModel}"
-            android:layout_width="0dp"
-            android:layout_height="@dimen/top_bar_height"
-            android:visibility="@{viewModel.atLastOneCall ? View.VISIBLE : View.GONE, default=gone}"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
-            app:layout_constraintEnd_toEndOf="parent"/>
-
-        <ImageView
-            android:id="@+id/background"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:src="@color/white"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
-            app:layout_constraintTop_toBottomOf="@id/top_bar" />
-
-        <ImageView
-            android:id="@+id/no_calls_image"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:src="@drawable/illu"
-            android:layout_margin="10dp"
-            app:layout_constraintHeight_max="200dp"
-            app:layout_constraintBottom_toTopOf="@id/no_calls_label"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
-            app:layout_constraintTop_toBottomOf="@id/background" />
-
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/section_header_style"
-            android:id="@+id/no_calls_label"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/history_list_empty_history"
-            app:layout_constraintBottom_toTopOf="@id/background"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
-            app:layout_constraintTop_toBottomOf="@id/no_calls_image" />
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/history_list"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/top_bar"
-            app:layout_constraintBottom_toBottomOf="parent" />
-
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/bottom_nav_bar"
-            android:name="org.linphone.ui.main.fragment.BottomNavBarFragment"
-            android:layout_width="75dp"
-            android:layout_height="0dp"
-            bind:layout="@layout/bottom_nav_bar"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent" />
-
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:onClick="@{startCallClickListener}"
-            android:id="@+id/new_call"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end|bottom"
-            android:layout_margin="16dp"
-            android:src="@drawable/phone_plus"
-            app:tint="@color/gray_main2_700"
-            app:backgroundTint="@color/white"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/contacts_list_fragment.xml b/app/src/main/res/layout/contacts_list_fragment.xml
index c844bbd49..5045bb9fa 100644
--- a/app/src/main/res/layout/contacts_list_fragment.xml
+++ b/app/src/main/res/layout/contacts_list_fragment.xml
@@ -16,164 +16,174 @@
             type="org.linphone.ui.main.contacts.viewmodel.ContactsListViewModel" />
     </data>
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/orange_main_500">
+        android:layout_height="match_parent">
 
-        <androidx.constraintlayout.widget.Group
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:constraint_referenced_ids="no_contacts_image, no_contacts_label"
-            android:visibility="@{viewModel.contactsList.empty ? View.VISIBLE : View.GONE}" />
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/orange_main_500">
+
+            <androidx.constraintlayout.widget.Group
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:constraint_referenced_ids="no_contacts_image, no_contacts_label"
+                android:visibility="@{viewModel.contactsList.empty ? View.VISIBLE : View.GONE}" />
+
+            <include
+                android:id="@+id/top_bar"
+                layout="@layout/main_activity_top_bar"
+                bind:viewModel="@{viewModel}"
+                android:layout_width="0dp"
+                android:layout_height="@dimen/top_bar_height"
+                android:layout_marginEnd="9dp"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/filter"/>
+
+            <ImageView
+                android:onClick="@{filterClickListener}"
+                android:id="@+id/filter"
+                android:layout_width="@dimen/icon_size"
+                android:layout_height="0dp"
+                android:layout_marginEnd="9dp"
+                android:src="@drawable/funnel"
+                android:visibility="@{viewModel.searchBarVisible ? View.GONE : View.VISIBLE}"
+                app:tint="@color/white"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="@id/top_bar"
+                app:layout_constraintBottom_toBottomOf="@id/top_bar" />
+
+            <include
+                android:id="@+id/in_call_top_bar"
+                layout="@layout/main_activity_in_call_top_bar"
+                bind:viewModel="@{viewModel}"
+                android:layout_width="0dp"
+                android:layout_height="@dimen/top_bar_height"
+                android:visibility="@{viewModel.atLastOneCall ? View.VISIBLE : View.GONE, default=gone}"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"/>
+
+            <ImageView
+                android:id="@+id/background"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:src="@color/white"
+                app:layout_constraintBottom_toTopOf="@id/bottom_nav_bar"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/top_bar" />
+
+            <ImageView
+                android:id="@+id/no_contacts_image"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:src="@drawable/illu"
+                android:layout_margin="10dp"
+                app:layout_constraintHeight_max="200dp"
+                app:layout_constraintBottom_toTopOf="@id/no_contacts_label"
+                app:layout_constraintDimensionRatio="1:1"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/background" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/section_header_style"
+                android:id="@+id/no_contacts_label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/contacts_list_empty"
+                app:layout_constraintBottom_toTopOf="@id/background"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/no_contacts_image" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/section_header_style"
+                android:id="@+id/favourites_label"
+                android:visibility="@{!viewModel.isListFiltered &amp;&amp; viewModel.favourites.size() > 0 ? View.VISIBLE : View.GONE}"
+                onClickListener="@{() -> viewModel.toggleFavouritesVisibility()}"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:padding="5dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:layout_marginTop="15dp"
+                android:text="@string/contacts_list_favourites_title"
+                android:drawableEnd="@{viewModel.showFavourites ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}"
+                android:drawableTint="@color/gray_main2_600"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="@id/background"/>
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/favourites_contacts_list"
+                android:visibility="@{viewModel.showFavourites &amp;&amp; !viewModel.isListFiltered &amp;&amp; viewModel.favourites.size() > 0 ? View.VISIBLE : View.GONE}"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
+                android:layout_marginTop="4dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/favourites_label" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/section_header_style"
+                android:id="@+id/all_contacts_label"
+                android:visibility="@{!viewModel.isListFiltered &amp;&amp; viewModel.favourites.size() > 0 ? View.VISIBLE : View.GONE}"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:padding="5dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:layout_marginTop="20dp"
+                android:text="@string/contacts_list_all_contacts_title"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/favourites_contacts_list"/>
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/contactsList"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_marginTop="8dp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/all_contacts_label"
+                app:layout_constraintBottom_toTopOf="@id/bottom_nav_bar" />
+
+            <androidx.fragment.app.FragmentContainerView
+                android:id="@+id/bottom_nav_bar"
+                android:name="org.linphone.ui.main.fragment.BottomNavBarFragment"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                bind:layout="@layout/bottom_nav_bar"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent" />
+
+            <com.google.android.material.floatingactionbutton.FloatingActionButton
+                android:id="@+id/new_contact"
+                android:onClick="@{onNewContactClicked}"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end|bottom"
+                android:layout_margin="16dp"
+                android:src="@drawable/user_plus"
+                app:tint="@color/gray_main2_700"
+                app:backgroundTint="@color/white"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintBottom_toTopOf="@id/bottom_nav_bar" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
         <include
-            android:id="@+id/top_bar"
-            layout="@layout/main_activity_top_bar"
-            bind:viewModel="@{viewModel}"
-            android:layout_width="0dp"
-            android:layout_height="@dimen/top_bar_height"
-            android:layout_marginEnd="9dp"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/filter"/>
+            layout="@layout/operation_in_progress"
+            bind:visibility="@{viewModel.fetchInProgress}" />
 
-        <ImageView
-            android:onClick="@{filterClickListener}"
-            android:id="@+id/filter"
-            android:layout_width="@dimen/icon_size"
-            android:layout_height="0dp"
-            android:layout_marginEnd="9dp"
-            android:src="@drawable/funnel"
-            android:visibility="@{viewModel.searchBarVisible ? View.GONE : View.VISIBLE}"
-            app:tint="@color/white"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@id/top_bar"
-            app:layout_constraintBottom_toBottomOf="@id/top_bar" />
-
-        <include
-            android:id="@+id/in_call_top_bar"
-            layout="@layout/main_activity_in_call_top_bar"
-            bind:viewModel="@{viewModel}"
-            android:layout_width="0dp"
-            android:layout_height="@dimen/top_bar_height"
-            android:visibility="@{viewModel.atLastOneCall ? View.VISIBLE : View.GONE, default=gone}"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"/>
-
-        <ImageView
-            android:id="@+id/background"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:src="@color/white"
-            app:layout_constraintBottom_toTopOf="@id/bottom_nav_bar"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/top_bar" />
-
-        <ImageView
-            android:id="@+id/no_contacts_image"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:src="@drawable/illu"
-            android:layout_margin="10dp"
-            app:layout_constraintHeight_max="200dp"
-            app:layout_constraintBottom_toTopOf="@id/no_contacts_label"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/background" />
-
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/section_header_style"
-            android:id="@+id/no_contacts_label"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/contacts_list_empty"
-            app:layout_constraintBottom_toTopOf="@id/background"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/no_contacts_image" />
-
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/section_header_style"
-            android:id="@+id/favourites_label"
-            android:visibility="@{!viewModel.isListFiltered &amp;&amp; viewModel.favourites.size() > 0 ? View.VISIBLE : View.GONE}"
-            onClickListener="@{() -> viewModel.toggleFavouritesVisibility()}"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:padding="5dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginTop="15dp"
-            android:text="@string/contacts_list_favourites_title"
-            android:drawableEnd="@{viewModel.showFavourites ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}"
-            android:drawableTint="@color/gray_main2_600"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@id/background"/>
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/favourites_contacts_list"
-            android:visibility="@{viewModel.showFavourites &amp;&amp; !viewModel.isListFiltered &amp;&amp; viewModel.favourites.size() > 0 ? View.VISIBLE : View.GONE}"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:layout_marginEnd="10dp"
-            android:layout_marginTop="4dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/favourites_label" />
-
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/section_header_style"
-            android:id="@+id/all_contacts_label"
-            android:visibility="@{!viewModel.isListFiltered &amp;&amp; viewModel.favourites.size() > 0 ? View.VISIBLE : View.GONE}"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:padding="5dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginTop="20dp"
-            android:text="@string/contacts_list_all_contacts_title"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/favourites_contacts_list"/>
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/contactsList"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_marginTop="8dp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/all_contacts_label"
-            app:layout_constraintBottom_toTopOf="@id/bottom_nav_bar" />
-
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/bottom_nav_bar"
-            android:name="org.linphone.ui.main.fragment.BottomNavBarFragment"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            bind:layout="@layout/bottom_nav_bar"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent" />
-
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/new_contact"
-            android:onClick="@{onNewContactClicked}"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end|bottom"
-            android:layout_margin="16dp"
-            android:src="@drawable/user_plus"
-            app:tint="@color/gray_main2_700"
-            app:backgroundTint="@color/white"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBottom_toTopOf="@id/bottom_nav_bar" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/history_list_fragment.xml b/app/src/main/res/layout/history_list_fragment.xml
index 096960834..bf0557470 100644
--- a/app/src/main/res/layout/history_list_fragment.xml
+++ b/app/src/main/res/layout/history_list_fragment.xml
@@ -22,120 +22,130 @@
             type="org.linphone.ui.main.history.viewmodel.HistoryListViewModel" />
     </data>
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/orange_main_500">
+        android:layout_height="match_parent">
 
-        <androidx.constraintlayout.widget.Group
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:constraint_referenced_ids="no_calls_image, no_calls_label"
-            android:visibility="@{viewModel.callLogs.empty ? View.VISIBLE : View.GONE}" />
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/orange_main_500">
+
+            <androidx.constraintlayout.widget.Group
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:constraint_referenced_ids="no_calls_image, no_calls_label"
+                android:visibility="@{viewModel.callLogs.empty ? View.VISIBLE : View.GONE}" />
+
+            <include
+                android:id="@+id/top_bar"
+                layout="@layout/main_activity_top_bar"
+                bind:viewModel="@{viewModel}"
+                android:layout_width="0dp"
+                android:layout_height="@dimen/top_bar_height"
+                android:layout_marginEnd="9dp"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/menu"/>
+
+            <ImageView
+                android:onClick="@{menuClickListener}"
+                android:id="@+id/menu"
+                android:layout_width="@dimen/icon_size"
+                android:layout_height="0dp"
+                android:layout_marginEnd="9dp"
+                android:src="@drawable/dots_three_vertical"
+                android:visibility="@{viewModel.searchBarVisible ? View.GONE : View.VISIBLE}"
+                app:tint="@color/white"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="@id/top_bar"
+                app:layout_constraintBottom_toBottomOf="@id/top_bar" />
+
+            <include
+                android:id="@+id/in_call_top_bar"
+                layout="@layout/main_activity_in_call_top_bar"
+                bind:viewModel="@{viewModel}"
+                android:layout_width="0dp"
+                android:layout_height="@dimen/top_bar_height"
+                android:visibility="@{viewModel.atLastOneCall ? View.VISIBLE : View.GONE, default=gone}"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"/>
+
+            <ImageView
+                android:id="@+id/background"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:src="@color/white"
+                app:layout_constraintBottom_toTopOf="@id/bottom_nav_bar"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/top_bar" />
+
+            <ImageView
+                android:id="@+id/no_calls_image"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:src="@drawable/illu"
+                android:layout_margin="10dp"
+                app:layout_constraintHeight_max="200dp"
+                app:layout_constraintBottom_toTopOf="@id/no_calls_label"
+                app:layout_constraintDimensionRatio="1:1"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/background" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/section_header_style"
+                android:id="@+id/no_calls_label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/history_list_empty_history"
+                app:layout_constraintBottom_toTopOf="@id/background"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/no_calls_image" />
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/history_list"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/top_bar"
+                app:layout_constraintBottom_toTopOf="@id/bottom_nav_bar" />
+
+            <androidx.fragment.app.FragmentContainerView
+                android:id="@+id/bottom_nav_bar"
+                android:name="org.linphone.ui.main.fragment.BottomNavBarFragment"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                bind:layout="@layout/bottom_nav_bar"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent" />
+
+            <com.google.android.material.floatingactionbutton.FloatingActionButton
+                android:onClick="@{startCallClickListener}"
+                android:id="@+id/new_call"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end|bottom"
+                android:layout_margin="16dp"
+                android:src="@drawable/phone_plus"
+                app:tint="@color/gray_main2_700"
+                app:backgroundTint="@color/white"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintBottom_toTopOf="@id/bottom_nav_bar" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
         <include
-            android:id="@+id/top_bar"
-            layout="@layout/main_activity_top_bar"
-            bind:viewModel="@{viewModel}"
-            android:layout_width="0dp"
-            android:layout_height="@dimen/top_bar_height"
-            android:layout_marginEnd="9dp"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/menu"/>
+            layout="@layout/operation_in_progress"
+            bind:visibility="@{viewModel.fetchInProgress}" />
 
-        <ImageView
-            android:onClick="@{menuClickListener}"
-            android:id="@+id/menu"
-            android:layout_width="@dimen/icon_size"
-            android:layout_height="0dp"
-            android:layout_marginEnd="9dp"
-            android:src="@drawable/dots_three_vertical"
-            android:visibility="@{viewModel.searchBarVisible ? View.GONE : View.VISIBLE}"
-            app:tint="@color/white"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@id/top_bar"
-            app:layout_constraintBottom_toBottomOf="@id/top_bar" />
-
-        <include
-            android:id="@+id/in_call_top_bar"
-            layout="@layout/main_activity_in_call_top_bar"
-            bind:viewModel="@{viewModel}"
-            android:layout_width="0dp"
-            android:layout_height="@dimen/top_bar_height"
-            android:visibility="@{viewModel.atLastOneCall ? View.VISIBLE : View.GONE, default=gone}"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"/>
-
-        <ImageView
-            android:id="@+id/background"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:src="@color/white"
-            app:layout_constraintBottom_toTopOf="@id/bottom_nav_bar"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/top_bar" />
-
-        <ImageView
-            android:id="@+id/no_calls_image"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:src="@drawable/illu"
-            android:layout_margin="10dp"
-            app:layout_constraintHeight_max="200dp"
-            app:layout_constraintBottom_toTopOf="@id/no_calls_label"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/background" />
-
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/section_header_style"
-            android:id="@+id/no_calls_label"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/history_list_empty_history"
-            app:layout_constraintBottom_toTopOf="@id/background"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/no_calls_image" />
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/history_list"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/top_bar"
-            app:layout_constraintBottom_toTopOf="@id/bottom_nav_bar" />
-
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/bottom_nav_bar"
-            android:name="org.linphone.ui.main.fragment.BottomNavBarFragment"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            bind:layout="@layout/bottom_nav_bar"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent" />
-
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:onClick="@{startCallClickListener}"
-            android:id="@+id/new_call"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end|bottom"
-            android:layout_margin="16dp"
-            android:src="@drawable/phone_plus"
-            app:tint="@color/gray_main2_700"
-            app:backgroundTint="@color/white"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBottom_toTopOf="@id/bottom_nav_bar" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 </layout>
\ No newline at end of file