diff --git a/app/src/main/java/org/thoughtcrime/securesms/main/MainActivityListHostFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/main/MainActivityListHostFragment.kt
index 5d3d27757..3e2759745 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/main/MainActivityListHostFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/main/MainActivityListHostFragment.kt
@@ -178,6 +178,13 @@ class MainActivityListHostFragment : Fragment(R.layout.main_activity_list_host_f
     }
   }
 
+  private fun presentToolbarForMultiselect() {
+    _toolbar.visible = false
+    if (_basicToolbar.resolved()) {
+      _basicToolbar.get().visible = false
+    }
+  }
+
   override fun onDestroyView() {
     previousTopToastPopup = null
     super.onDestroyView()
@@ -212,12 +219,16 @@ class MainActivityListHostFragment : Fragment(R.layout.main_activity_list_host_f
   }
 
   override fun onMultiSelectStarted() {
-    _toolbar.visible = false
+    presentToolbarForMultiselect()
     conversationListTabsViewModel.onMultiSelectStarted()
   }
 
   override fun onMultiSelectFinished() {
-    _toolbar.visible = true
+    val currentDestination: NavDestination? = requireView().findViewById<View>(R.id.fragment_container).findNavController().currentDestination
+    if (currentDestination != null) {
+      presentToolbarForDestination(currentDestination)
+    }
+
     conversationListTabsViewModel.onMultiSelectFinished()
   }
 
@@ -301,22 +312,26 @@ class MainActivityListHostFragment : Fragment(R.layout.main_activity_list_host_f
     return viewGroup.children.find { it is ActionMenuView }
   }
 
+  private fun presentToolbarForDestination(destination: NavDestination) {
+    when (destination.id) {
+      R.id.conversationListFragment -> {
+        conversationListTabsViewModel.isShowingArchived(false)
+        presentToolbarForConversationListFragment()
+      }
+      R.id.conversationListArchiveFragment -> {
+        conversationListTabsViewModel.isShowingArchived(true)
+        presentToolbarForConversationListArchiveFragment()
+      }
+      R.id.storiesLandingFragment -> {
+        conversationListTabsViewModel.isShowingArchived(false)
+        presentToolbarForStoriesLandingFragment()
+      }
+    }
+  }
+
   private inner class DestinationChangedListener : NavController.OnDestinationChangedListener {
     override fun onDestinationChanged(controller: NavController, destination: NavDestination, arguments: Bundle?) {
-      when (destination.id) {
-        R.id.conversationListFragment -> {
-          conversationListTabsViewModel.isShowingArchived(false)
-          presentToolbarForConversationListFragment()
-        }
-        R.id.conversationListArchiveFragment -> {
-          conversationListTabsViewModel.isShowingArchived(true)
-          presentToolbarForConversationListArchiveFragment()
-        }
-        R.id.storiesLandingFragment -> {
-          conversationListTabsViewModel.isShowingArchived(false)
-          presentToolbarForStoriesLandingFragment()
-        }
-      }
+      presentToolbarForDestination(destination)
     }
   }
 
@@ -325,7 +340,7 @@ class MainActivityListHostFragment : Fragment(R.layout.main_activity_list_host_f
       Material3OnScrollHelper(
         requireActivity(),
         listOf(_toolbarBackground),
-        listOf(_searchToolbar, _basicToolbar)
+        listOf(_searchToolbar)
       )
     )
   }
diff --git a/app/src/main/res/layout/quote_view.xml b/app/src/main/res/layout/quote_view.xml
index e1f0bfca4..940f63593 100644
--- a/app/src/main/res/layout/quote_view.xml
+++ b/app/src/main/res/layout/quote_view.xml
@@ -71,11 +71,11 @@
 
                         <TextView
                             android:id="@+id/quote_attachment_name"
-                            style="@style/Signal.Text.BodyMedium"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:ellipsize="end"
                             android:maxLines="1"
+                            android:textAppearance="@style/Signal.Text.BodyMedium"
                             android:textColor="@color/core_grey_90"
                             tools:text="The-Amazing-Spider-Man.cba" />
 
@@ -89,18 +89,17 @@
                         android:paddingTop="4dp"
                         android:textAppearance="@style/Signal.Text.BodyMedium"
                         android:textColor="@color/core_black"
-                        android:textSize="14sp"
                         android:visibility="gone"
                         tools:text="Photo"
                         tools:visibility="visible" />
 
                     <org.thoughtcrime.securesms.components.emoji.EmojiTextView
                         android:id="@+id/quote_text"
-                        style="@style/Signal.Text.BodyMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:ellipsize="end"
                         android:maxLines="2"
+                        android:textAppearance="@style/Signal.Text.BodyMedium"
                         app:emoji_renderMentions="false"
                         tools:text="With great power comes great responsibility."
                         tools:visibility="visible" />
@@ -174,10 +173,10 @@
 
                 <TextView
                     android:id="@+id/quote_missing_text"
-                    style="@style/Signal.Text.MaterialCaption"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/QuoteView_original_missing"
+                    android:textAppearance="@style/Signal.Text.MaterialCaption"
                     android:textColor="@color/core_grey_90" />
 
             </LinearLayout>