diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/settings/select/BaseStoryRecipientSelectionFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/settings/select/BaseStoryRecipientSelectionFragment.kt
index eb121c8944..af56b1d688 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/settings/select/BaseStoryRecipientSelectionFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/settings/select/BaseStoryRecipientSelectionFragment.kt
@@ -147,7 +147,7 @@ abstract class BaseStoryRecipientSelectionFragment : Fragment(R.layout.stories_b
       canSelectSelf = false,
       currentSelection = emptyList(),
       displaySelectionCount = false,
-      displayChips = true,
+      displayChips = false,
       checkboxResource = checkboxResource
     )
 
diff --git a/app/src/main/res/layout/contact_selection_list_fragment.xml b/app/src/main/res/layout/contact_selection_list_fragment.xml
index 541cff5673..e2c827194a 100644
--- a/app/src/main/res/layout/contact_selection_list_fragment.xml
+++ b/app/src/main/res/layout/contact_selection_list_fragment.xml
@@ -129,25 +129,20 @@
         tools:listitem="@layout/contact_selection_list_chip"
         tools:visibility="visible" />
 
-    <TextView
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/header_action"
+        style="@style/Widget.Signal.Button.Small"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="?selectableItemBackground"
-        android:drawablePadding="4dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginEnd="16dp"
         android:ellipsize="end"
         android:fontFamily="sans-serif-medium"
         android:maxLines="1"
-        android:minHeight="48dp"
-        android:paddingStart="@dimen/dsl_settings_gutter"
-        android:paddingTop="16dp"
-        android:paddingEnd="@dimen/dsl_settings_gutter"
-        android:paddingBottom="12dp"
-        android:textAppearance="@style/Signal.Text.BodyLarge"
         android:textColor="@color/signal_text_primary"
         android:visibility="gone"
-        app:drawableStartCompat="@drawable/ic_plus_20"
-        app:drawableTint="@color/signal_icon_tint_primary"
+        app:backgroundTint="@color/signal_colorSurface1"
+        app:iconTint="@color/signal_colorOnSurfaceVariant"
         app:layout_constraintEnd_toEndOf="@id/swipe_refresh"
         app:layout_constraintTop_toTopOf="@id/swipe_refresh"
         tools:text="@string/ContactsCursorLoader_new_story"
diff --git a/app/src/main/res/layout/stories_base_recipient_selection_fragment.xml b/app/src/main/res/layout/stories_base_recipient_selection_fragment.xml
index ab96b38402..dffe76d430 100644
--- a/app/src/main/res/layout/stories_base_recipient_selection_fragment.xml
+++ b/app/src/main/res/layout/stories_base_recipient_selection_fragment.xml
@@ -8,7 +8,8 @@
     <org.thoughtcrime.securesms.util.views.DarkOverflowToolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?actionBarSize"
+        android:layout_height="64dp"
+        android:minHeight="64dp"
         app:layout_constraintTop_toTopOf="parent"
         app:navigationIcon="@drawable/ic_arrow_left_24" />
 
@@ -17,9 +18,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
-        android:layout_marginTop="4dp"
+        android:layout_marginTop="10dp"
         android:layout_marginEnd="16dp"
-        android:layout_marginBottom="12dp"
+        android:layout_marginBottom="10dp"
         android:background="@drawable/rounded_rectangle_secondary_18"
         android:hint="@string/TextStoryPostSendFragment__search"
         android:minHeight="44dp"